From 490d12e8ef74618d7107a4951cafe44195bc4f4d Mon Sep 17 00:00:00 2001 From: RichardPavlikan Date: Tue, 12 Sep 2023 22:23:25 +0200 Subject: [PATCH] fix: opravit burzu a ios vzhled --- ios/Podfile.lock | 51 +++++++++++++------ ios/Runner.xcodeproj/project.pbxproj | 7 ++- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- ios/Runner/Info.plist | 2 + lib/main.dart | 7 ++- lib/okna/jidelnicek.dart | 3 +- pubspec.lock | 4 +- pubspec.yaml | 2 +- 8 files changed, 55 insertions(+), 23 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 03e4a2b..c491a84 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,58 +1,79 @@ PODS: - Flutter (1.0.0) + - flutter_keyboard_visibility (0.0.1): + - Flutter - flutter_local_notifications (0.0.1): - Flutter - flutter_native_timezone (0.0.1): - Flutter - - flutter_secure_storage (3.3.1): + - flutter_secure_storage (6.0.0): - Flutter + - fluttertoast (0.0.2): + - Flutter + - Toast - package_info_plus (0.4.5): - Flutter - - path_provider_ios (0.0.1): + - path_provider_foundation (0.0.1): - Flutter - - shared_preferences_ios (0.0.1): + - FlutterMacOS + - shared_preferences_foundation (0.0.1): - Flutter + - FlutterMacOS + - Toast (4.0.0) - url_launcher_ios (0.0.1): - Flutter DEPENDENCIES: - Flutter (from `Flutter`) + - flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/ios`) - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`) - flutter_native_timezone (from `.symlinks/plugins/flutter_native_timezone/ios`) - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`) + - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`) - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`) - - shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`) + - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) + - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) +SPEC REPOS: + trunk: + - Toast + EXTERNAL SOURCES: Flutter: :path: Flutter + flutter_keyboard_visibility: + :path: ".symlinks/plugins/flutter_keyboard_visibility/ios" flutter_local_notifications: :path: ".symlinks/plugins/flutter_local_notifications/ios" flutter_native_timezone: :path: ".symlinks/plugins/flutter_native_timezone/ios" flutter_secure_storage: :path: ".symlinks/plugins/flutter_secure_storage/ios" + fluttertoast: + :path: ".symlinks/plugins/fluttertoast/ios" package_info_plus: :path: ".symlinks/plugins/package_info_plus/ios" - path_provider_ios: - :path: ".symlinks/plugins/path_provider_ios/ios" - shared_preferences_ios: - :path: ".symlinks/plugins/shared_preferences_ios/ios" + path_provider_foundation: + :path: ".symlinks/plugins/path_provider_foundation/darwin" + shared_preferences_foundation: + :path: ".symlinks/plugins/shared_preferences_foundation/darwin" url_launcher_ios: :path: ".symlinks/plugins/url_launcher_ios/ios" SPEC CHECKSUMS: Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 + flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069 flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743 flutter_native_timezone: 5f05b2de06c9776b4cc70e1839f03de178394d22 - flutter_secure_storage: 7953c38a04c3fdbb00571bcd87d8e3b5ceb9daec - package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e - path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02 - shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad - url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de + flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be + fluttertoast: fafc4fa4d01a6a9e4f772ecd190ffa525e9e2d9c + package_info_plus: fd030dabf36271f146f1f3beacd48f564b0f17f7 + path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 + shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 + Toast: 91b396c56ee72a5790816f40d3a94dd357abc196 + url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4 PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3 -COCOAPODS: 1.11.3 +COCOAPODS: 1.12.1 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index a52916f..fa5f5f0 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -156,7 +156,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -222,10 +222,12 @@ }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); inputPaths = ( + "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", ); name = "Thin Binary"; outputPaths = ( @@ -236,6 +238,7 @@ }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index c87d15a..a6b826d 100644 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ CADisableMinimumFrameDurationOnPhone + UIApplicationSupportsIndirectInputEvents + diff --git a/lib/main.dart b/lib/main.dart index 0236b9c..f91e897 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -145,7 +145,12 @@ class MyApp extends StatelessWidget { home: const LoginPage(), ) : Theme( - data: ThemeData(useMaterial3: true, colorScheme: lightColorScheme), + data: ThemeData( + useMaterial3: true, + colorScheme: (MediaQuery.of(context).platformBrightness == + Brightness.dark) + ? darkColorScheme + : lightColorScheme), child: const CupertinoApp( debugShowCheckedModeBanner: false, localizationsDelegates: [ diff --git a/lib/okna/jidelnicek.dart b/lib/okna/jidelnicek.dart index c83bdf3..52b40f0 100644 --- a/lib/okna/jidelnicek.dart +++ b/lib/okna/jidelnicek.dart @@ -475,7 +475,7 @@ class _MealViewState extends State { onRefresh: loadMeals, child: Center( child: SizedBox( - width: MediaQuery.of(context).size.width - 50, + width: MediaQuery.of(context).size.width, child: Column( children: [ const SizedBox(height: 10), @@ -541,6 +541,7 @@ class _MealViewState extends State { physics: const AlwaysScrollableScrollPhysics(), child: GestureDetector( child: Container( + padding: const EdgeInsets.only(left: 20, right: 20), color: Theme.of(context) .colorScheme .onPrimary diff --git a/pubspec.lock b/pubspec.lock index 20b1d66..1516c78 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -29,10 +29,10 @@ packages: dependency: "direct main" description: name: canteenlib - sha256: "4b04a2e3d206e66931b8285fa0f6ab4436d267ce9c8169a210045f735195f480" + sha256: f415b4f71f65b85c0766fc095a16c9b7ef1fd6c912a23e66963b5fdb1a7a6467 url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "1.1.4" characters: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 473500d..96e2eef 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -12,7 +12,7 @@ environment: sdk: ">=2.18.2 <3.0.0" dependencies: - canteenlib: ^1.1.2 + canteenlib: ^1.1.4 flutter: sdk: flutter flutter_local_notifications: ^12.0.3+1