From 571633331882890bd2c3f69aa8d42edb1c2e7c0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakob=20K=C3=B6rber?= <56073945+jakobkoerber@users.noreply.github.com> Date: Wed, 11 Oct 2023 16:48:13 +0200 Subject: [PATCH] Quick fix of Android build and Styling (#112) --- ios/Podfile.lock | 4 ++-- lib/theme.dart | 15 --------------- pubspec.lock | 12 ++++++------ pubspec.yaml | 3 +++ 4 files changed, 11 insertions(+), 23 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index dab9b5ff..c6d93636 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -121,7 +121,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: connectivity_plus: bf0076dd84a130856aa636df1c71ccaff908fa1d - device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6 + device_info_plus: 7545d84d8d1b896cb16a4ff98c19f07ec4b298ea Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be @@ -129,7 +129,7 @@ SPEC CHECKSUMS: geolocator_apple: cc556e6844d508c95df1e87e3ea6fa4e58c50401 google_maps_flutter_ios: 828b0ddcee41ceae4ba568975d5349159af9399f map_launcher: e325db1261d029ff33e08e03baccffe09593ffea - package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85 + package_info_plus: fd030dabf36271f146f1f3beacd48f564b0f17f7 path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825 shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 diff --git a/lib/theme.dart b/lib/theme.dart index 3c7ce72d..7eebe18a 100644 --- a/lib/theme.dart +++ b/lib/theme.dart @@ -168,15 +168,6 @@ ThemeData lightTheme(BuildContext context) { } })), - /// style list tiles - listTileTheme: ListTileThemeData( - dense: false, - titleTextStyle: Theme.of(context).textTheme.bodyMedium, - subtitleTextStyle: Theme.of(context) - .textTheme - .bodySmall - ?.copyWith(color: Theme.of(context).colorScheme.secondary)), - /// style for segmented button segmentedButtonTheme: SegmentedButtonThemeData( style: ButtonStyle( @@ -346,12 +337,6 @@ ThemeData darkTheme(BuildContext context) { } })), - /// style list tiles - /*listTileTheme: ListTileThemeData( - //dense: true - titleTextStyle: Theme.of(context).textTheme.bodyMedium?.copyWith(color: _almostWhite) - ),*/ - /// style for segmented button segmentedButtonTheme: SegmentedButtonThemeData( style: ButtonStyle( diff --git a/pubspec.lock b/pubspec.lock index 1e0bd0e1..5229fadc 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -301,10 +301,10 @@ packages: dependency: "direct main" description: name: device_info_plus - sha256: "093b02a284b4969bb641a6236bbb8e626e4035c6ec9e30c20b65d505c24b3080" + sha256: "86add5ef97215562d2e090535b0a16f197902b10c369c558a100e74ea06e8659" url: "https://pub.dev" source: hosted - version: "10.0.0" + version: "9.0.3" device_info_plus_platform_interface: dependency: transitive description: @@ -858,10 +858,10 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: "0351aaba3b267c4962ed73058a5f62a84de7e39670a20e2916a6baff2ffcfbe5" + sha256: "6ff267fcd9d48cb61c8df74a82680e8b82e940231bb5f68356672fde0397334a" url: "https://pub.dev" source: hosted - version: "5.0.0" + version: "4.1.0" package_info_plus_platform_interface: dependency: transitive description: @@ -1335,10 +1335,10 @@ packages: dependency: "direct main" description: name: tflite_flutter - sha256: "38c6fa5c5197cadc595e596f7f307a03eaf68917bc14edb5bc8ba8585f6c230a" + sha256: d5acf30411b6a4ee299be25bad5a44e7fc103231fefaecb1c27f42df48251eb9 url: "https://pub.dev" source: hosted - version: "0.10.3" + version: "0.10.1" timeago: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 76e0fb48..b7f7dd24 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -66,6 +66,9 @@ dependency_overrides: url: https://github.com/jakobkoerber/packages.git path: packages/google_maps_flutter/google_maps_flutter_ios ref: main + tflite_flutter: 0.10.1 + package_info_plus: 4.1.0 + device_info_plus: 9.0.3 dev_dependencies: flutter_test: