From 8544b3ce3dd45f0bfaace8970832a2f5f0568db5 Mon Sep 17 00:00:00 2001 From: devamirsaleemahmad Date: Mon, 30 Oct 2023 10:11:32 +0300 Subject: [PATCH] changes & Deletion --- android/app/build.gradle | 2 +- android/app/src/main/AndroidManifest.xml | 3 -- android/build.gradle | 2 +- lib/core/viewModels/base_view_model.dart | 2 +- lib/main.dart | 40 ++++++++++++++++-------- lib/uitl/app_shared_preferences.dart | 2 +- pubspec.yaml | 2 +- 7 files changed, 32 insertions(+), 21 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 965934fd..a1387dd3 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -75,7 +75,7 @@ android { buildTypes { debug { debuggable true - signingConfig signingConfigs.release + signingConfig signingConfigs.debug } release { debuggable false diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 42fc0237..7b48db28 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -7,10 +7,7 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> - - - diff --git a/android/build.gradle b/android/build.gradle index 39ec218a..bef6ad3c 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1..20' + ext.kotlin_version = '1.8.20' repositories { google() jcenter() diff --git a/lib/core/viewModels/base_view_model.dart b/lib/core/viewModels/base_view_model.dart index 6f3cebc3..e0498134 100644 --- a/lib/core/viewModels/base_view_model.dart +++ b/lib/core/viewModels/base_view_model.dart @@ -36,7 +36,7 @@ class BaseViewModel extends ChangeNotifier { BaseViewModel() { //authenticatedUserObject.getUser(); - user = authenticatedUserObject.user!; + user = authenticatedUserObject.user; this.isLogin = authenticatedUserObject.isLogin; } diff --git a/lib/main.dart b/lib/main.dart index a6008faa..7f294b3c 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -36,11 +36,11 @@ class MyApp extends StatefulWidget { @override _MyApp createState() => new _MyApp(); } -class MyHttpOverrides extends HttpOverrides{ + +class MyHttpOverrides extends HttpOverrides { @override - HttpClient createHttpClient(SecurityContext? context){ - return super.createHttpClient(context) - ..badCertificateCallback = (X509Certificate cert, String host, int port)=> true; + HttpClient createHttpClient(SecurityContext? context) { + return super.createHttpClient(context)..badCertificateCallback = (X509Certificate cert, String host, int port) => true; } } @@ -65,7 +65,7 @@ class _MyApp extends State { @override void initState() { - // ProjectViewModel projectProvider; + //ProjectViewModel projectProvider; // projectProvider = Provider.of(context); // var font = projectProvider.isArabic ? 'Cairo' : 'WorkSans'; @@ -106,25 +106,39 @@ class _MyApp extends State { ChangeNotifierProvider( create: (context) => DashboardViewModel(), ), - ChangeNotifierProvider(create: (context) => ToDoCountProviderModel()), - ChangeNotifierProvider(create: (context) => SearchProvider()), + ChangeNotifierProvider( + create: (context) => ToDoCountProviderModel(), + ), + ChangeNotifierProvider( + create: (context) => SearchProvider(), + ), ChangeNotifierProvider.value( value: SearchProvider(), ), - ChangeNotifierProvider(create: (context) => ThemeNotifier(defaultTheme())), + ChangeNotifierProvider( + create: (context) => ThemeNotifier( + defaultTheme(), + ), + ), StreamProvider.value( value: RobotProvider().intStream(), initialData: RobotProvider().setValue({}), ), - ChangeNotifierProvider(create: (context) => CompareList()), - ChangeNotifierProvider(create: (context) => OrderPreviewViewModel()), + ChangeNotifierProvider( + create: (context) => CompareList(), + ), + ChangeNotifierProvider( + create: (context) => OrderPreviewViewModel(), + ), ], child: Consumer( builder: (context, projectProvider, child) => MaterialApp( - builder: (_, __) { + builder: (_, __) { return MediaQuery( - data: MediaQuery.of(context).copyWith(textScaleFactor: 1.0,), //set desired text scale factor here - child: child ?? SizedBox(), + data: MediaQuery.of(context).copyWith( + textScaleFactor: 1.0, + ), //set desired text scale factor here + child: child ?? SizedBox(), ); }, navigatorKey: locator().navigatorKey, diff --git a/lib/uitl/app_shared_preferences.dart b/lib/uitl/app_shared_preferences.dart index d4dbbabf..2d5fa774 100644 --- a/lib/uitl/app_shared_preferences.dart +++ b/lib/uitl/app_shared_preferences.dart @@ -75,7 +75,7 @@ class AppSharedPreferences { getStringWithDefaultValue(String key, String defaultVal) async { final SharedPreferences prefs = await _prefs; await prefs.reload(); - String value = prefs.getString(key)!; + String value = prefs.getString(key).toString(); return value == null ? defaultVal : value; } diff --git a/pubspec.yaml b/pubspec.yaml index 86841913..bc85dcd7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -219,7 +219,7 @@ dependencies: # crypto: dependency_overrides: - #provider: ^5.0.0 + provider: ^5.0.0 # permission_handler : ^10.2.0 #flutter_svg: ^1.1.6 # firebase_messaging_platform_interface: any