changes & Deletion

merge-update-with-lab-changes
devamirsaleemahmad 2 years ago
parent 720c0ac6e9
commit 8544b3ce3d

@ -75,7 +75,7 @@ android {
buildTypes { buildTypes {
debug { debug {
debuggable true debuggable true
signingConfig signingConfigs.release signingConfig signingConfigs.debug
} }
release { release {
debuggable false debuggable false

@ -7,10 +7,7 @@
additional functionality it is fine to subclass or reimplement additional functionality it is fine to subclass or reimplement
FlutterApplication and put your custom class here. --> FlutterApplication and put your custom class here. -->
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/> <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

@ -1,5 +1,5 @@
buildscript { buildscript {
ext.kotlin_version = '1..20' ext.kotlin_version = '1.8.20'
repositories { repositories {
google() google()
jcenter() jcenter()

@ -36,7 +36,7 @@ class BaseViewModel extends ChangeNotifier {
BaseViewModel() { BaseViewModel() {
//authenticatedUserObject.getUser(); //authenticatedUserObject.getUser();
user = authenticatedUserObject.user!; user = authenticatedUserObject.user;
this.isLogin = authenticatedUserObject.isLogin; this.isLogin = authenticatedUserObject.isLogin;
} }

@ -36,11 +36,11 @@ class MyApp extends StatefulWidget {
@override @override
_MyApp createState() => new _MyApp(); _MyApp createState() => new _MyApp();
} }
class MyHttpOverrides extends HttpOverrides{
class MyHttpOverrides extends HttpOverrides {
@override @override
HttpClient createHttpClient(SecurityContext? context){ HttpClient createHttpClient(SecurityContext? context) {
return super.createHttpClient(context) return super.createHttpClient(context)..badCertificateCallback = (X509Certificate cert, String host, int port) => true;
..badCertificateCallback = (X509Certificate cert, String host, int port)=> true;
} }
} }
@ -65,7 +65,7 @@ class _MyApp extends State<MyApp> {
@override @override
void initState() { void initState() {
// ProjectViewModel projectProvider; //ProjectViewModel projectProvider;
// projectProvider = Provider.of(context); // projectProvider = Provider.of(context);
// var font = projectProvider.isArabic ? 'Cairo' : 'WorkSans'; // var font = projectProvider.isArabic ? 'Cairo' : 'WorkSans';
@ -106,25 +106,39 @@ class _MyApp extends State<MyApp> {
ChangeNotifierProvider<DashboardViewModel>( ChangeNotifierProvider<DashboardViewModel>(
create: (context) => DashboardViewModel(), create: (context) => DashboardViewModel(),
), ),
ChangeNotifierProvider<ToDoCountProviderModel>(create: (context) => ToDoCountProviderModel()), ChangeNotifierProvider<ToDoCountProviderModel>(
ChangeNotifierProvider<SearchProvider>(create: (context) => SearchProvider()), create: (context) => ToDoCountProviderModel(),
),
ChangeNotifierProvider<SearchProvider>(
create: (context) => SearchProvider(),
),
ChangeNotifierProvider.value( ChangeNotifierProvider.value(
value: SearchProvider(), value: SearchProvider(),
), ),
ChangeNotifierProvider<ThemeNotifier>(create: (context) => ThemeNotifier(defaultTheme())), ChangeNotifierProvider<ThemeNotifier>(
create: (context) => ThemeNotifier(
defaultTheme(),
),
),
StreamProvider.value( StreamProvider.value(
value: RobotProvider().intStream(), value: RobotProvider().intStream(),
initialData: RobotProvider().setValue({}), initialData: RobotProvider().setValue({}),
), ),
ChangeNotifierProvider<CompareList>(create: (context) => CompareList()), ChangeNotifierProvider<CompareList>(
ChangeNotifierProvider<OrderPreviewViewModel>(create: (context) => OrderPreviewViewModel()), create: (context) => CompareList(),
),
ChangeNotifierProvider<OrderPreviewViewModel>(
create: (context) => OrderPreviewViewModel(),
),
], ],
child: Consumer<ProjectViewModel>( child: Consumer<ProjectViewModel>(
builder: (context, projectProvider, child) => MaterialApp( builder: (context, projectProvider, child) => MaterialApp(
builder: (_, __) { builder: (_, __) {
return MediaQuery( return MediaQuery(
data: MediaQuery.of(context).copyWith(textScaleFactor: 1.0,), //set desired text scale factor here data: MediaQuery.of(context).copyWith(
child: child ?? SizedBox(), textScaleFactor: 1.0,
), //set desired text scale factor here
child: child ?? SizedBox(),
); );
}, },
navigatorKey: locator<NavigationService>().navigatorKey, navigatorKey: locator<NavigationService>().navigatorKey,

@ -75,7 +75,7 @@ class AppSharedPreferences {
getStringWithDefaultValue(String key, String defaultVal) async { getStringWithDefaultValue(String key, String defaultVal) async {
final SharedPreferences prefs = await _prefs; final SharedPreferences prefs = await _prefs;
await prefs.reload(); await prefs.reload();
String value = prefs.getString(key)!; String value = prefs.getString(key).toString();
return value == null ? defaultVal : value; return value == null ? defaultVal : value;
} }

@ -219,7 +219,7 @@ dependencies:
# crypto: # crypto:
dependency_overrides: dependency_overrides:
#provider: ^5.0.0 provider: ^5.0.0
# permission_handler : ^10.2.0 # permission_handler : ^10.2.0
#flutter_svg: ^1.1.6 #flutter_svg: ^1.1.6
# firebase_messaging_platform_interface: any # firebase_messaging_platform_interface: any

Loading…
Cancel
Save