diff --git a/README.md b/README.md index 2a68a2ad3c13a86be5fcf35fb0a94839da94ebda..07654a1885186e40e3bd98e8c3f77213076551b1 100644 --- a/README.md +++ b/README.md @@ -41,11 +41,11 @@ This repository makes use of the following pub packages: | [Hydrated Bloc](https://pub.dev/packages/hydrated_bloc) | ^8.0.0 | Persists Bloc state with Hive | [Equatable](https://pub.dev/packages/equatable) | ^2.0.3 | Easily compare custom classes, used for Bloc states* | [Flutter Lints](https://pub.dev/packages/flutter_lints) | ^1.0.4 | Stricter linting rules -| [Path Provider](https://pub.dev/packages/path_provider) | ^2.0.8 | Get the save path for Hive +| [Path Provider](https://pub.dev/packages/path_provider) | ^2.0.9 | Get the save path for Hive | [Flutter Displaymode](https://pub.dev/packages/flutter_displaymode) | ^0.3.2 | Support high refresh rate displays | [Easy Localization](https://pub.dev/packages/easy_localization) | ^3.0.0 | Makes localization easy | [Hive](https://pub.dev/packages/hive) | ^2.0.5 | Platform independent storage. -| [Url Launcher](https://pub.dev/packages/url_launcher) | ^6.0.17 | Open urls in Browser +| [Url Launcher](https://pub.dev/packages/url_launcher) | ^6.0.20 | Open urls in Browser | [Ionicons](https://pub.dev/packages/ionicons) | ^0.1.2 | Modern icon library > \* Recommended to keep regardless of your project diff --git a/android/app/build.gradle b/android/app/build.gradle index e250f3245849cdd07374ed6a416bb0e316ab31a4..76b9be24d8ecfee3cd2bb0fb78711bcf0779d2b5 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 30 + compileSdkVersion 31 sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -36,7 +36,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "dev.feichtinger.flutterproductionboilerplate.flutter_production_boilerplate" minSdkVersion 23 - targetSdkVersion 30 + targetSdkVersion 31 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/android/build.gradle b/android/build.gradle index 9b6ed06eb38acc554df2b8a38e5a794cb05fb354..7603b1627da064e84d95d227c3a6121389f5bd48 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.3.50' + ext.kotlin_version = '1.6.10' repositories { google() jcenter() diff --git a/lib/ui/widgets/bottom_nav_bar.dart b/lib/ui/widgets/bottom_nav_bar.dart index 27d5356c5b7dd88ed3dc725ce6bcfef88fd3d293..0cea5e6d920b5bb253c500284a8b1e0f192d6c11 100644 --- a/lib/ui/widgets/bottom_nav_bar.dart +++ b/lib/ui/widgets/bottom_nav_bar.dart @@ -22,25 +22,27 @@ class BottomNavBar extends StatelessWidget { topRight: Radius.circular(12), ), ), - child: BottomNavigationBar( - currentIndex: context.read<BottomNavCubit>().state, - onTap: (index) => context.read<BottomNavCubit>().updateIndex(index), - type: BottomNavigationBarType.fixed, - elevation: 0, - backgroundColor: Colors.transparent, - selectedItemColor: Theme.of(context).primaryColor, - unselectedItemColor: Theme.of(context).textTheme.bodyText1!.color, - items: [ - BottomNavigationBarItem( - icon: const Icon(Ionicons.home_outline), - label: tr('bottom_nav_first'), - ), - BottomNavigationBarItem( - icon: const Icon(Ionicons.information_circle_outline), - label: tr('bottom_nav_second'), - ), - ], - ), + child: BlocBuilder<BottomNavCubit, int>(builder: (context, state) { + return BottomNavigationBar( + currentIndex: state, + onTap: (index) => context.read<BottomNavCubit>().updateIndex(index), + type: BottomNavigationBarType.fixed, + elevation: 0, + backgroundColor: Colors.transparent, + selectedItemColor: Theme.of(context).primaryColor, + unselectedItemColor: Theme.of(context).textTheme.bodyText1!.color, + items: [ + BottomNavigationBarItem( + icon: const Icon(Ionicons.home_outline), + label: tr('bottom_nav_first'), + ), + BottomNavigationBarItem( + icon: const Icon(Ionicons.information_circle_outline), + label: tr('bottom_nav_second'), + ), + ], + ); + }), ); } } diff --git a/pubspec.lock b/pubspec.lock index 08be2939fb1ec4bc639731911c99e549cacd5b2c..be0f7a71a665d9cb24c47b5940794f5dd502721a 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -196,6 +196,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.12.11" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.3" meta: dependency: transitive description: @@ -223,7 +230,7 @@ packages: name: path_provider url: "https://pub.dartlang.org" source: hosted - version: "2.0.8" + version: "2.0.9" path_provider_android: dependency: transitive description: @@ -244,28 +251,28 @@ packages: name: path_provider_linux url: "https://pub.dartlang.org" source: hosted - version: "2.1.4" + version: "2.1.5" path_provider_macos: dependency: transitive description: name: path_provider_macos url: "https://pub.dartlang.org" source: hosted - version: "2.0.4" + version: "2.0.5" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.3" path_provider_windows: dependency: transitive description: name: path_provider_windows url: "https://pub.dartlang.org" source: hosted - version: "2.0.4" + version: "2.0.5" platform: dependency: transitive description: @@ -300,35 +307,35 @@ packages: name: shared_preferences url: "https://pub.dartlang.org" source: hosted - version: "2.0.11" + version: "2.0.13" shared_preferences_android: dependency: transitive description: name: shared_preferences_android url: "https://pub.dartlang.org" source: hosted - version: "2.0.9" + version: "2.0.11" shared_preferences_ios: dependency: transitive description: name: shared_preferences_ios url: "https://pub.dartlang.org" source: hosted - version: "2.0.8" + version: "2.1.0" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux url: "https://pub.dartlang.org" source: hosted - version: "2.0.3" + version: "2.1.0" shared_preferences_macos: dependency: transitive description: name: shared_preferences_macos url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.3" shared_preferences_platform_interface: dependency: transitive description: @@ -342,14 +349,14 @@ packages: name: shared_preferences_web url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.3" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows url: "https://pub.dartlang.org" source: hosted - version: "2.0.3" + version: "2.1.0" sky_engine: dependency: transitive description: flutter @@ -403,7 +410,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.3" + version: "0.4.8" typed_data: dependency: transitive description: @@ -417,35 +424,35 @@ packages: name: url_launcher url: "https://pub.dartlang.org" source: hosted - version: "6.0.17" + version: "6.0.20" url_launcher_android: dependency: transitive description: name: url_launcher_android url: "https://pub.dartlang.org" source: hosted - version: "6.0.13" + version: "6.0.15" url_launcher_ios: dependency: transitive description: name: url_launcher_ios url: "https://pub.dartlang.org" source: hosted - version: "6.0.13" + version: "6.0.15" url_launcher_linux: dependency: transitive description: name: url_launcher_linux url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "3.0.0" url_launcher_macos: dependency: transitive description: name: url_launcher_macos url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "3.0.0" url_launcher_platform_interface: dependency: transitive description: @@ -459,14 +466,14 @@ packages: name: url_launcher_web url: "https://pub.dartlang.org" source: hosted - version: "2.0.5" + version: "2.0.8" url_launcher_windows: dependency: transitive description: name: url_launcher_windows url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "3.0.0" vector_math: dependency: transitive description: @@ -480,14 +487,14 @@ packages: name: win32 url: "https://pub.dartlang.org" source: hosted - version: "2.3.3" + version: "2.4.1" xdg_directories: dependency: transitive description: name: xdg_directories url: "https://pub.dartlang.org" source: hosted - version: "0.2.0" + version: "0.2.0+1" sdks: - dart: ">=2.14.0 <3.0.0" - flutter: ">=2.5.0" + dart: ">=2.15.0 <3.0.0" + flutter: ">=2.10.0" diff --git a/pubspec.yaml b/pubspec.yaml index cc933630df2afa832f787dcbf1678e82c5ac71c6..9a9742a90ae3740e53165ee9612506ea4ff56094 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 0.0.3+1 +version: 0.0.4+1 environment: sdk: ">=2.12.0 <3.0.0" @@ -28,11 +28,11 @@ dependencies: flutter_bloc: ^8.0.1 hydrated_bloc: ^8.0.0 equatable: ^2.0.3 - path_provider: ^2.0.8 + path_provider: ^2.0.9 flutter_displaymode: ^0.3.2 easy_localization: ^3.0.0 hive: ^2.0.5 - url_launcher: ^6.0.17 + url_launcher: ^6.0.20 ionicons: ^0.1.2 dev_dependencies: