diff --git a/android/app/build.gradle b/android/app/build.gradle index 048944e..00c966e 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -38,7 +38,7 @@ if (keystorePropertiesFile.exists()) { android { namespace "com.mobileapp.store.ride" compileSdk 35 - ndkVersion "26.1.10909125" + ndkVersion "27.0.12077973" compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/android/app/src/main/res/drawable/icon_share.png b/android/app/src/main/res/drawable/icon_share.png new file mode 100644 index 0000000..ae92be6 Binary files /dev/null and b/android/app/src/main/res/drawable/icon_share.png differ diff --git a/android/app/src/main/res/drawable/icon_support.png b/android/app/src/main/res/drawable/icon_support.png new file mode 100644 index 0000000..5a9fef9 Binary files /dev/null and b/android/app/src/main/res/drawable/icon_support.png differ diff --git a/android/app/src/main/res/drawable/icon_user.png b/android/app/src/main/res/drawable/icon_user.png new file mode 100644 index 0000000..c8802f2 Binary files /dev/null and b/android/app/src/main/res/drawable/icon_user.png differ diff --git a/android/app/src/main/res/drawable/icon_wallet.png b/android/app/src/main/res/drawable/icon_wallet.png new file mode 100644 index 0000000..551f8a4 Binary files /dev/null and b/android/app/src/main/res/drawable/icon_wallet.png differ diff --git a/android/build.gradle b/android/build.gradle index eccf533..e3d1a86 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -12,7 +12,7 @@ buildscript { // classpath 'com.android.tools.build:gradle:7.3.1' classpath 'com.google.gms:google-services:4.3.15' // END: FlutterFire Configuration - classpath 'com.android.tools.build:gradle:8.4.0' + classpath 'com.android.tools.build:gradle:8.8.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 684137a..edeffcc 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -4,4 +4,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip diff --git a/ios/Runner/Assets.xcassets/Contents.json b/ios/Runner/Assets.xcassets/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/ios/Runner/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/Runner/Assets.xcassets/icon_share.imageset/Contents.json b/ios/Runner/Assets.xcassets/icon_share.imageset/Contents.json new file mode 100644 index 0000000..028dbdf --- /dev/null +++ b/ios/Runner/Assets.xcassets/icon_share.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "icon_share.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/Runner/Assets.xcassets/icon_share.imageset/icon_share.png b/ios/Runner/Assets.xcassets/icon_share.imageset/icon_share.png new file mode 100644 index 0000000..ae92be6 Binary files /dev/null and b/ios/Runner/Assets.xcassets/icon_share.imageset/icon_share.png differ diff --git a/ios/Runner/Assets.xcassets/icon_support.imageset/Contents.json b/ios/Runner/Assets.xcassets/icon_support.imageset/Contents.json new file mode 100644 index 0000000..cc0fc26 --- /dev/null +++ b/ios/Runner/Assets.xcassets/icon_support.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "icon_support.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/Runner/Assets.xcassets/icon_support.imageset/icon_support.png b/ios/Runner/Assets.xcassets/icon_support.imageset/icon_support.png new file mode 100644 index 0000000..5a9fef9 Binary files /dev/null and b/ios/Runner/Assets.xcassets/icon_support.imageset/icon_support.png differ diff --git a/ios/Runner/Assets.xcassets/icon_user.imageset/Contents.json b/ios/Runner/Assets.xcassets/icon_user.imageset/Contents.json new file mode 100644 index 0000000..32ae8f7 --- /dev/null +++ b/ios/Runner/Assets.xcassets/icon_user.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "icon_user.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/Runner/Assets.xcassets/icon_user.imageset/icon_user.png b/ios/Runner/Assets.xcassets/icon_user.imageset/icon_user.png new file mode 100644 index 0000000..c8802f2 Binary files /dev/null and b/ios/Runner/Assets.xcassets/icon_user.imageset/icon_user.png differ diff --git a/ios/Runner/Assets.xcassets/icon_wallet.imageset/Contents.json b/ios/Runner/Assets.xcassets/icon_wallet.imageset/Contents.json new file mode 100644 index 0000000..3800eed --- /dev/null +++ b/ios/Runner/Assets.xcassets/icon_wallet.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "icon_wallet.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/Runner/Assets.xcassets/icon_wallet.imageset/icon_wallet.png b/ios/Runner/Assets.xcassets/icon_wallet.imageset/icon_wallet.png new file mode 100644 index 0000000..551f8a4 Binary files /dev/null and b/ios/Runner/Assets.xcassets/icon_wallet.imageset/icon_wallet.png differ diff --git a/lib/controller/auth/apple_signin_controller.dart b/lib/controller/auth/apple_signin_controller.dart index 3e02d63..615b097 100644 --- a/lib/controller/auth/apple_signin_controller.dart +++ b/lib/controller/auth/apple_signin_controller.dart @@ -7,30 +7,24 @@ class AuthController extends GetxController { Future signInWithApple() async { try { - print('Starting Apple Sign In process'); - final appleCredential = await SignInWithApple.getAppleIDCredential( scopes: [ AppleIDAuthorizationScopes.email, AppleIDAuthorizationScopes.fullName, ], ); - print('Apple ID Credential obtained'); final oAuthProvider = OAuthProvider('apple.com'); final credential = oAuthProvider.credential( idToken: appleCredential.identityToken, accessToken: appleCredential.authorizationCode, ); - print('OAuth credential created'); UserCredential userCredential = await _auth.signInWithCredential(credential); - print('User signed in successfully: ${userCredential.user?.uid}'); return userCredential.user; } catch (error) { - print('Error during Apple Sign In: $error'); return null; } } @@ -38,9 +32,6 @@ class AuthController extends GetxController { Future signOut() async { try { await _auth.signOut(); - print('User signed out successfully'); - } catch (error) { - print('Error during sign out: $error'); - } + } catch (error) {} } } diff --git a/lib/controller/auth/google_sign.dart b/lib/controller/auth/google_sign.dart index 0c924a6..14b0112 100644 --- a/lib/controller/auth/google_sign.dart +++ b/lib/controller/auth/google_sign.dart @@ -166,7 +166,6 @@ class GoogleSignInHelper { static Future _handleSignUp(GoogleSignInAccount user) async { // Store driver information - Log.print('email is ${user.email}'); box.write(BoxName.passengerID, user.id); box.write(BoxName.email, encryptionHelper.encryptData(user.email)); box.write(BoxName.name, diff --git a/lib/main.dart b/lib/main.dart index 27da035..59cf8ec 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -126,7 +126,7 @@ void main() async { ShortcutItem( type: 'share_app', localizedTitle: 'Share App'.tr, - icon: 'icon_main', + icon: 'icon_share', ), ShortcutItem( type: 'wallet',