diff --git a/android/app/src/main/res/drawable-v21/launch_background.xml b/android/app/src/main/res/drawable-v21/launch_background.xml new file mode 100644 index 0000000..f88598c --- /dev/null +++ b/android/app/src/main/res/drawable-v21/launch_background.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/android/app/src/main/res/drawable/launch_background.xml b/android/app/src/main/res/drawable/launch_background.xml new file mode 100644 index 0000000..f88598c --- /dev/null +++ b/android/app/src/main/res/drawable/launch_background.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/devtools_options.yaml b/devtools_options.yaml new file mode 100644 index 0000000..fa0b357 --- /dev/null +++ b/devtools_options.yaml @@ -0,0 +1,3 @@ +description: This file stores settings for Dart & Flutter DevTools. +documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states +extensions: diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 2791e99..43becde 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,7 +1,12 @@ PODS: - Flutter (1.0.0) + - flutter_angle (0.3.8): + - Flutter + - FlutterAngle (~> 0.0.8) + - FlutterMacOS - flutter_native_splash (2.4.3): - Flutter + - FlutterAngle (0.0.8) - geolocator_apple (1.2.0): - Flutter - FlutterMacOS @@ -24,9 +29,15 @@ PODS: - shared_preferences_foundation (0.0.1): - Flutter - FlutterMacOS + - three_js_sensors (0.1.2): + - Flutter + - video_player_avfoundation (0.0.1): + - Flutter + - FlutterMacOS DEPENDENCIES: - Flutter (from `Flutter`) + - flutter_angle (from `.symlinks/plugins/flutter_angle/darwin`) - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`) - geolocator_apple (from `.symlinks/plugins/geolocator_apple/darwin`) - google_maps_flutter_ios (from `.symlinks/plugins/google_maps_flutter_ios/ios`) @@ -34,15 +45,20 @@ DEPENDENCIES: - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) + - three_js_sensors (from `.symlinks/plugins/three_js_sensors/ios`) + - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`) SPEC REPOS: trunk: + - FlutterAngle - Google-Maps-iOS-Utils - GoogleMaps EXTERNAL SOURCES: Flutter: :path: Flutter + flutter_angle: + :path: ".symlinks/plugins/flutter_angle/darwin" flutter_native_splash: :path: ".symlinks/plugins/flutter_native_splash/ios" geolocator_apple: @@ -57,10 +73,16 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/path_provider_foundation/darwin" shared_preferences_foundation: :path: ".symlinks/plugins/shared_preferences_foundation/darwin" + three_js_sensors: + :path: ".symlinks/plugins/three_js_sensors/ios" + video_player_avfoundation: + :path: ".symlinks/plugins/video_player_avfoundation/darwin" SPEC CHECKSUMS: Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467 + flutter_angle: 7b1a2b3e733221bf2e0325e42fc3edf95b5d44c4 flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf + FlutterAngle: c810891af800750361b1d0e7cc944f2338d5ae18 geolocator_apple: ab36aa0e8b7d7a2d7639b3b4e48308394e8cef5e Google-Maps-iOS-Utils: 0a484b05ed21d88c9f9ebbacb007956edd508a96 google_maps_flutter_ios: 0291eb2aa252298a769b04d075e4a9d747ff7264 @@ -69,6 +91,8 @@ SPEC CHECKSUMS: package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499 path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564 shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb + three_js_sensors: f516b092803411e05b1e3dc7625efa36acd8f455 + video_player_avfoundation: dd410b52df6d2466a42d28550e33e4146928280a PODFILE CHECKSUM: 1857a7cdb7dfafe45f2b0e9a9af44644190f7506 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index c20759a..5ae94a6 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -316,14 +316,10 @@ inputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - ); name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); - outputPaths = ( - ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; @@ -374,14 +370,10 @@ inputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - ); name = "[CP] Copy Pods Resources"; outputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist", ); - outputPaths = ( - ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index d1bb903..9fc7388 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -23,7 +23,7 @@ CFBundleSignature ???? CFBundleVersion - 1 + 3 LSRequiresIPhoneOS NSCameraUsageDescription diff --git a/lib/buy_a_pass/widget/pass_card_view.dart b/lib/buy_a_pass/widget/pass_card_view.dart index 4f9d5cb..44f4e1f 100644 --- a/lib/buy_a_pass/widget/pass_card_view.dart +++ b/lib/buy_a_pass/widget/pass_card_view.dart @@ -20,14 +20,14 @@ class PassCardView extends StatelessWidget { @override Widget build(BuildContext context) { - return Container( - decoration: BoxDecoration( - color: Colors.white, - border: Border.all(color:( themeColor ?? Color(0xFFF95FAF)).withOpacity(0.24)), - borderRadius: BorderRadius.circular(8.r), - ), - child: Expanded( - child: Row( + return Expanded( + child: Container( + decoration: BoxDecoration( + color: Colors.white, + border: Border.all(color:( themeColor ?? Color(0xFFF95FAF)).withOpacity(0.24)), + borderRadius: BorderRadius.circular(8.r), + ), + child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Row( @@ -54,7 +54,7 @@ class PassCardView extends StatelessWidget { weight: FontWeight.w500, size: 16.sp, ), - + Row( children: [ Text( @@ -83,7 +83,7 @@ class PassCardView extends StatelessWidget { ), ], ), - + Row( children: [ Text( @@ -112,7 +112,7 @@ class PassCardView extends StatelessWidget { ), ], ), - + SizedBox( width: 193.w, child: CustomText( @@ -126,7 +126,7 @@ class PassCardView extends StatelessWidget { ), ], ), - + Container( width: 35.w, height: 140.h, @@ -159,7 +159,7 @@ class PassCardView extends StatelessWidget { ), ], ), - ), - ); + ), + ); } } diff --git a/lib/cart/views/my_pass_page_view.dart b/lib/cart/views/my_pass_page_view.dart index f9bb37a..360b0fb 100644 --- a/lib/cart/views/my_pass_page_view.dart +++ b/lib/cart/views/my_pass_page_view.dart @@ -22,15 +22,15 @@ class MyPassesPage extends StatelessWidget { Column( children: [ SizedBox(height: 22.h), - Container( - decoration: BoxDecoration( - color: Colors.white, - border: Border.all( - color: Color(0xFFF95FAF).withOpacity(0.2), + Expanded( + child: Container( + decoration: BoxDecoration( + color: Colors.white, + border: Border.all( + color: Color(0xFFF95FAF).withOpacity(0.2), + ), + borderRadius: BorderRadius.circular(8.r), ), - borderRadius: BorderRadius.circular(8.r), - ), - child: Expanded( child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ diff --git a/lib/checkout/view/checkout_view.dart b/lib/checkout/view/checkout_view.dart index e90a9c5..6cd045d 100644 --- a/lib/checkout/view/checkout_view.dart +++ b/lib/checkout/view/checkout_view.dart @@ -40,13 +40,13 @@ class CheckoutView extends StatelessWidget { ), SizedBox(height: 22.h), - Container( - decoration: BoxDecoration( - color: Colors.white, - border: Border.all(color: Color(0xFFF95FAF).withOpacity(0.2)), - borderRadius: BorderRadius.circular(8.r), - ), - child: Expanded( + Expanded( + child: Container( + decoration: BoxDecoration( + color: Colors.white, + border: Border.all(color: Color(0xFFF95FAF).withOpacity(0.2)), + borderRadius: BorderRadius.circular(8.r), + ), child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ diff --git a/lib/trail.dart b/lib/trail.dart index 7394c20..fca4e58 100644 --- a/lib/trail.dart +++ b/lib/trail.dart @@ -246,4 +246,4 @@ // ), // ); // } -// } +// } \ No newline at end of file diff --git a/pubspec.lock b/pubspec.lock index 41ae5ce..8e07278 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -129,6 +129,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.7.11" + dylib: + dependency: transitive + description: + name: dylib + sha256: bf609b3eb6492a3309b3d1dbe8f83a4031de5535dd7686be33487051cc760bb0 + url: "https://pub.dev" + source: hosted + version: "0.3.3" equatable: dependency: "direct main" description: @@ -206,6 +214,14 @@ packages: description: flutter source: sdk version: "0.0.0" + flutter_angle: + dependency: transitive + description: + name: flutter_angle + sha256: "344a6b5ba7fa4893799ba8a98ed1b164e0b92ce77cf98b6c0f276efe1032249e" + url: "https://pub.dev" + source: hosted + version: "0.3.8" flutter_bloc: dependency: "direct main" description: @@ -557,6 +573,14 @@ packages: url: "https://pub.dev" source: hosted version: "5.1.1" + logger: + dependency: transitive + description: + name: logger + sha256: a7967e31b703831a893bbc3c3dd11db08126fe5f369b5c648a36f821979f5be3 + url: "https://pub.dev" + source: hosted + version: "2.6.2" lottie: dependency: "direct main" description: @@ -585,10 +609,10 @@ packages: dependency: transitive description: name: meta - sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c + sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" url: "https://pub.dev" source: hosted - version: "1.16.0" + version: "1.17.0" mime: dependency: transitive description: @@ -605,6 +629,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.0" + opentype_dart: + dependency: transitive + description: + name: opentype_dart + sha256: "4bd96aeed494289a87e92bde20afe60f59648dcef253c0a7159b65ffa23899dc" + url: "https://pub.dev" + source: hosted + version: "0.0.1" package_info_plus: dependency: transitive description: @@ -878,10 +910,106 @@ packages: dependency: transitive description: name: test_api - sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00" + sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55 url: "https://pub.dev" source: hosted - version: "0.7.6" + version: "0.7.7" + three_js: + dependency: "direct main" + description: + name: three_js + sha256: "76554d705ee0f7101d969773bc92fbd18d2e0f28ee87a9e41f7c0a86bd76f480" + url: "https://pub.dev" + source: hosted + version: "0.2.6" + three_js_advanced_loaders: + dependency: transitive + description: + name: three_js_advanced_loaders + sha256: "901ee356fba0ffe57547e448ee73aaa351b68a46608cf8f13c798b28980fbd38" + url: "https://pub.dev" + source: hosted + version: "0.2.4" + three_js_animations: + dependency: transitive + description: + name: three_js_animations + sha256: "7f7d708e96301e0fef1ab71ebaef280d5885c081f184e49c6956a22bd51ee444" + url: "https://pub.dev" + source: hosted + version: "0.2.1" + three_js_controls: + dependency: transitive + description: + name: three_js_controls + sha256: "4cc52d53e3bf1cca0d469c5f200b10c5c96954663d551bdb6b0b4278a0dca148" + url: "https://pub.dev" + source: hosted + version: "0.2.2" + three_js_core: + dependency: transitive + description: + name: three_js_core + sha256: "4aa78017f1562cd2c67b3146587eb8c6b75870ca030b0a5263d532d6660c31dd" + url: "https://pub.dev" + source: hosted + version: "0.2.6" + three_js_core_loaders: + dependency: transitive + description: + name: three_js_core_loaders + sha256: "85ca58d66b57b94acb5b4598e97ebd54a1679025f4eaf8cfa2dade4b561b2189" + url: "https://pub.dev" + source: hosted + version: "0.2.1" + three_js_curves: + dependency: transitive + description: + name: three_js_curves + sha256: "9f11f2fa869dc6b1aa01219bd0587b768cc0dcbf0bde5bbb576c5fabcbb3b3c7" + url: "https://pub.dev" + source: hosted + version: "0.2.1" + three_js_geometry: + dependency: transitive + description: + name: three_js_geometry + sha256: "11cbf2661b32fe90d7150c2dddd2846866de6500589e13eb9d682b017c19420a" + url: "https://pub.dev" + source: hosted + version: "0.2.1" + three_js_math: + dependency: transitive + description: + name: three_js_math + sha256: "8687016308b8d6d027a8fb3982eedb7514bbc4cf21145da0116dbd801254aa50" + url: "https://pub.dev" + source: hosted + version: "0.2.5" + three_js_sensors: + dependency: transitive + description: + name: three_js_sensors + sha256: "40874a52c6e617762d324e8149356ccacf90aa65a8904f6e3520e4aba1bff447" + url: "https://pub.dev" + source: hosted + version: "0.1.2" + three_js_simple_loaders: + dependency: transitive + description: + name: three_js_simple_loaders + sha256: "3728e84dd74cf68fbf7b6260d5eda47afbcddc48dd7b127a56fef85d92b87c78" + url: "https://pub.dev" + source: hosted + version: "0.2.2" + three_js_text: + dependency: transitive + description: + name: three_js_text + sha256: ba5f44e5da00b5f510a24308644da72c5d3b039542da3d1c13b08f7e28066d29 + url: "https://pub.dev" + source: hosted + version: "0.2.0" timezone: dependency: transitive description: @@ -926,10 +1054,10 @@ packages: dependency: "direct main" description: name: video_player - sha256: "0d55b1f1a31e5ad4c4967bfaa8ade0240b07d20ee4af1dfef5f531056512961a" + sha256: "096bc28ce10d131be80dfb00c223024eb0fba301315a406728ab43dd99c45bdf" url: "https://pub.dev" source: hosted - version: "2.10.0" + version: "2.10.1" video_player_android: dependency: transitive description: @@ -942,10 +1070,10 @@ packages: dependency: transitive description: name: video_player_avfoundation - sha256: "19ed1162a7a5520e7d7791e0b7b73ba03161b6a69428b82e4689e435b325432d" + sha256: "03fc6d07dba2499588d30887329b399c1fe2d68ce4b7fcff0db79f44a2603f69" url: "https://pub.dev" source: hosted - version: "2.8.5" + version: "2.8.6" video_player_platform_interface: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 7ef67e0..ba1f021 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -33,6 +33,7 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. + three_js: ^0.2.6 google_fonts: ^6.3.2 flutter_bloc: ^9.1.1 cupertino_icons: ^1.0.8 @@ -50,6 +51,7 @@ dependencies: flutter_glass_morphism: ^1.0.2 lottie: ^3.3.2 flutter_native_splash: ^2.4.7 + video_player: ^2.10.1 dev_dependencies: flutter_test: