diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist index 9367d48..8d4492f 100644 --- a/ios/Flutter/AppFrameworkInfo.plist +++ b/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 8.0 + 9.0 diff --git a/ios/Podfile b/ios/Podfile index 1e8c3c9..85b2f8f 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -15,7 +15,7 @@ def flutter_root unless File.exist?(generated_xcode_build_settings_path) raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first" end - + File.foreach(generated_xcode_build_settings_path) do |line| matches = line.match(/FLUTTER_ROOT\=(.*)/) return matches[1].strip if matches @@ -30,12 +30,15 @@ flutter_ios_podfile_setup target 'Runner' do use_frameworks! use_modular_headers! - + flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) end post_install do |installer| installer.pods_project.targets.each do |target| flutter_additional_ios_build_settings(target) + target.build_configurations.each do |config| + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '9.0' + end end end diff --git a/ios/Podfile.lock b/ios/Podfile.lock index f6150e2..91f42af 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -160,7 +160,7 @@ SPEC CHECKSUMS: FirebaseInstanceID: ad5135045a498d7775903efd39762d2cdfa1be27 FirebaseMessaging: 163435fb6db065e3b6228f1e577b10ed2cc506d2 FirebaseRemoteConfig: 0ea30de5fb0231df8c1bdcdf3b6c23bdc5066131 - Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c + Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743 FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a GoogleDataTransport: cd9db2180fcecd8da1b561aea31e3e56cf834aa7 @@ -173,6 +173,6 @@ SPEC CHECKSUMS: sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904 url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef -PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c +PODFILE CHECKSUM: 2c1172121d7e54f5012361bdacbf0587d146212a -COCOAPODS: 1.10.0 +COCOAPODS: 1.11.2 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 2c134b8..0c23bd3 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -35,7 +35,7 @@ 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; 19C99266E3771CEEC44CEE8E /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; - 2592EE42265141B5008C227E /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "../../GoogleService-Info.plist"; sourceTree = ""; }; + 2592EE42265141B5008C227E /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "../GoogleService-Info.plist"; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; 42F03E5B9EF47767B221E891 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; diff --git a/lib/components/athkar_card.dart b/lib/components/athkar_card.dart index bfe3524..54ad4f9 100644 --- a/lib/components/athkar_card.dart +++ b/lib/components/athkar_card.dart @@ -69,9 +69,10 @@ class AthkarCard extends StatelessWidget { '${counter.position}'.arabicDigit(), key: ValueKey(counter.position), style: TextStyle( - color: Theme.of(context).accentColor, - fontSize: 16, - height: 1.25), + color: Theme.of(context).colorScheme.secondary, + fontSize: 16, + height: 1.25, + ), ), ), decoration: BoxDecoration( diff --git a/lib/components/card_text.dart b/lib/components/card_text.dart index 328995f..9399f8f 100644 --- a/lib/components/card_text.dart +++ b/lib/components/card_text.dart @@ -114,7 +114,9 @@ class CardText extends StatelessWidget { children.add( TextSpan( text: m, - style: TextStyle(color: Theme.of(context).buttonColor), + style: TextStyle( + color: Theme.of(context).buttonTheme.colorScheme!.primary, + ), ), ); } else { @@ -132,7 +134,9 @@ class CardText extends StatelessWidget { children.add( TextSpan( text: s, - style: TextStyle(color: Theme.of(context).buttonColor), + style: TextStyle( + color: Theme.of(context).buttonTheme.colorScheme!.primary, + ), ), ); } else { diff --git a/lib/constants/theme.dart b/lib/constants/theme.dart index 9e509aa..92ed18e 100644 --- a/lib/constants/theme.dart +++ b/lib/constants/theme.dart @@ -1,10 +1,13 @@ import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; const double kContentFontSize = 16.0; ThemeData lightTheme() => ThemeData( brightness: Brightness.light, - appBarTheme: AppBarTheme(brightness: Brightness.light), + appBarTheme: AppBarTheme( + systemOverlayStyle: SystemUiOverlayStyle.light, + ), fontFamily: 'SST Arabic', primaryColor: Color(0xff6db7e5), pageTransitionsTheme: PageTransitionsTheme( @@ -15,7 +18,9 @@ ThemeData lightTheme() => ThemeData( unselectedWidgetColor: Colors.grey[300], canvasColor: Colors.white, dividerColor: Colors.grey[300], - accentColor: Color(0xff6f85d5), + colorScheme: ColorScheme.light().copyWith( + secondary: Color(0xff6f85d5), + ), dialogTheme: DialogTheme(backgroundColor: Colors.white), highlightColor: Colors.black.withOpacity(0.1), splashColor: Colors.black.withOpacity(0.1), @@ -58,13 +63,19 @@ ThemeData lightTheme() => ThemeData( filled: true, hintStyle: TextStyle(color: Colors.grey), ), - buttonColor: Color(0xff6f85d5), + buttonTheme: ButtonThemeData( + colorScheme: ColorScheme.light().copyWith( + primary: Color(0xff6f85d5), + ), + ), cardColor: Colors.grey[200], ); ThemeData darkTheme() => ThemeData( brightness: Brightness.dark, - appBarTheme: AppBarTheme(brightness: Brightness.dark), + appBarTheme: AppBarTheme( + systemOverlayStyle: SystemUiOverlayStyle.dark, + ), fontFamily: 'SST Arabic', primaryColor: Color(0xff6db7e5), pageTransitionsTheme: PageTransitionsTheme( @@ -110,8 +121,14 @@ ThemeData darkTheme() => ThemeData( height: 1, ), ), - accentColor: Colors.white, - buttonColor: Color(0xff6f85d5), + colorScheme: ColorScheme.dark().copyWith( + secondary: Colors.white, + ), + buttonTheme: ButtonThemeData( + colorScheme: ColorScheme.dark().copyWith( + primary: Color(0xff6f85d5), + ), + ), splashColor: Colors.black.withOpacity(0.1), highlightColor: Color(0xff3C387B).withOpacity(0.5), dialogTheme: DialogTheme(backgroundColor: Color(0xff1B2349)), diff --git a/lib/pages/tabs/1_home/ad3yah_expanded.dart b/lib/pages/tabs/1_home/ad3yah_expanded.dart index ef06df3..724595b 100644 --- a/lib/pages/tabs/1_home/ad3yah_expanded.dart +++ b/lib/pages/tabs/1_home/ad3yah_expanded.dart @@ -55,7 +55,9 @@ class _Ad3yahListState extends State { textAlign: TextAlign.center, style: Theme.of(context).textTheme.headline1, ), - NoorCloseButton(color: Theme.of(context).accentColor), + NoorCloseButton( + color: Theme.of(context).colorScheme.secondary, + ), ], ), ), diff --git a/lib/pages/tabs/1_home/allah_names_expanded.dart b/lib/pages/tabs/1_home/allah_names_expanded.dart index f8ed7ce..d26fbed 100644 --- a/lib/pages/tabs/1_home/allah_names_expanded.dart +++ b/lib/pages/tabs/1_home/allah_names_expanded.dart @@ -118,7 +118,9 @@ class _AllahNamesListState extends State }, ), ), - NoorCloseButton(color: Theme.of(context).accentColor), + NoorCloseButton( + color: Theme.of(context).colorScheme.secondary, + ), ], ), ), @@ -223,7 +225,9 @@ class ReferenceList extends StatelessWidget { textAlign: TextAlign.center, style: Theme.of(context).textTheme.headline1, ), - NoorCloseButton(color: Theme.of(context).accentColor), + NoorCloseButton( + color: Theme.of(context).colorScheme.secondary, + ), ], ), ), diff --git a/lib/pages/tabs/1_home/athkar_expanded.dart b/lib/pages/tabs/1_home/athkar_expanded.dart index 2ec78bd..0fd66ea 100644 --- a/lib/pages/tabs/1_home/athkar_expanded.dart +++ b/lib/pages/tabs/1_home/athkar_expanded.dart @@ -134,7 +134,9 @@ class _AthkarListState extends State }, ), ), - NoorCloseButton(color: Theme.of(context).accentColor), + NoorCloseButton( + color: Theme.of(context).colorScheme.secondary, + ), ], ), ), diff --git a/lib/pages/tabs/1_home/home.dart b/lib/pages/tabs/1_home/home.dart index ef2c5a7..62574f5 100644 --- a/lib/pages/tabs/1_home/home.dart +++ b/lib/pages/tabs/1_home/home.dart @@ -372,7 +372,6 @@ class _AnimatedHeaderState extends State return AnimatedSize( curve: Curves.easeInOutCirc, duration: Duration(milliseconds: 300), - vsync: this, child: Container( decoration: BoxDecoration( image: DecorationImage( diff --git a/lib/pages/tabs/1_home/my_ad3yah.dart b/lib/pages/tabs/1_home/my_ad3yah.dart index df6aad5..d1f562f 100644 --- a/lib/pages/tabs/1_home/my_ad3yah.dart +++ b/lib/pages/tabs/1_home/my_ad3yah.dart @@ -50,7 +50,7 @@ class _MyAd3yahState extends State with TickerProviderStateMixin { child: SingleChildScrollView( child: TextField( controller: controller, - style: Theme.of(context).textTheme.body1, + style: Theme.of(context).textTheme.bodyText2, decoration: InputDecoration( filled: false, contentPadding: diff --git a/lib/pages/tabs/4_settings.dart b/lib/pages/tabs/4_settings.dart index 6e75015..66ad7e1 100644 --- a/lib/pages/tabs/4_settings.dart +++ b/lib/pages/tabs/4_settings.dart @@ -566,7 +566,8 @@ class _SettingsState extends State .bold, color: Theme.of( context) - .accentColor, + .colorScheme + .secondary, fontSize: 12), ), onPressed: () async { @@ -617,13 +618,14 @@ class _SettingsState extends State .textTheme .bodyText1! .copyWith( - fontWeight: - FontWeight - .bold, - color: Theme.of( - context) - .accentColor, - fontSize: 12), + fontWeight: + FontWeight.bold, + color: Theme.of( + context) + .colorScheme + .secondary, + fontSize: 12, + ), ), onPressed: () { Navigator.of(context) @@ -761,7 +763,8 @@ class _SettingsState extends State .bold, color: Theme.of( context) - .accentColor, + .colorScheme + .secondary, fontSize: 12), ), onPressed: () async { @@ -811,13 +814,14 @@ class _SettingsState extends State .textTheme .bodyText1! .copyWith( - fontWeight: - FontWeight - .bold, - color: Theme.of( - context) - .accentColor, - fontSize: 12), + fontWeight: + FontWeight.bold, + color: Theme.of( + context) + .colorScheme + .secondary, + fontSize: 12, + ), ), onPressed: () { Navigator.of(context) @@ -845,7 +849,7 @@ class _SettingsState extends State fontSize: 16, color: Theme.of(context) .textTheme - .body1! + .bodyText2! .color, ), ), @@ -1049,7 +1053,6 @@ class _SettingsState extends State ? activeLabelStyle : inactiveLabelStyle, ), - vsync: this, duration: Duration(milliseconds: 500), ); }