This commit is contained in:
Hamza-Ayed
2025-02-07 23:55:10 +03:00
parent bacf22204d
commit 218e174c87
19 changed files with 95 additions and 15 deletions

View File

@@ -38,7 +38,7 @@ if (keystorePropertiesFile.exists()) {
android { android {
namespace "com.mobileapp.store.ride" namespace "com.mobileapp.store.ride"
compileSdk 35 compileSdk 35
ndkVersion "26.1.10909125" ndkVersion "27.0.12077973"
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

View File

@@ -12,7 +12,7 @@ buildscript {
// classpath 'com.android.tools.build:gradle:7.3.1' // classpath 'com.android.tools.build:gradle:7.3.1'
classpath 'com.google.gms:google-services:4.3.15' classpath 'com.google.gms:google-services:4.3.15'
// END: FlutterFire Configuration // 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" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
} }

View File

@@ -4,4 +4,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME 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

View File

@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}

View File

@@ -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
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

View File

@@ -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
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

View File

@@ -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
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

View File

@@ -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
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

View File

@@ -7,30 +7,24 @@ class AuthController extends GetxController {
Future<User?> signInWithApple() async { Future<User?> signInWithApple() async {
try { try {
print('Starting Apple Sign In process');
final appleCredential = await SignInWithApple.getAppleIDCredential( final appleCredential = await SignInWithApple.getAppleIDCredential(
scopes: [ scopes: [
AppleIDAuthorizationScopes.email, AppleIDAuthorizationScopes.email,
AppleIDAuthorizationScopes.fullName, AppleIDAuthorizationScopes.fullName,
], ],
); );
print('Apple ID Credential obtained');
final oAuthProvider = OAuthProvider('apple.com'); final oAuthProvider = OAuthProvider('apple.com');
final credential = oAuthProvider.credential( final credential = oAuthProvider.credential(
idToken: appleCredential.identityToken, idToken: appleCredential.identityToken,
accessToken: appleCredential.authorizationCode, accessToken: appleCredential.authorizationCode,
); );
print('OAuth credential created');
UserCredential userCredential = UserCredential userCredential =
await _auth.signInWithCredential(credential); await _auth.signInWithCredential(credential);
print('User signed in successfully: ${userCredential.user?.uid}');
return userCredential.user; return userCredential.user;
} catch (error) { } catch (error) {
print('Error during Apple Sign In: $error');
return null; return null;
} }
} }
@@ -38,9 +32,6 @@ class AuthController extends GetxController {
Future<void> signOut() async { Future<void> signOut() async {
try { try {
await _auth.signOut(); await _auth.signOut();
print('User signed out successfully'); } catch (error) {}
} catch (error) {
print('Error during sign out: $error');
}
} }
} }

View File

@@ -166,7 +166,6 @@ class GoogleSignInHelper {
static Future<void> _handleSignUp(GoogleSignInAccount user) async { static Future<void> _handleSignUp(GoogleSignInAccount user) async {
// Store driver information // Store driver information
Log.print('email is ${user.email}');
box.write(BoxName.passengerID, user.id); box.write(BoxName.passengerID, user.id);
box.write(BoxName.email, encryptionHelper.encryptData(user.email)); box.write(BoxName.email, encryptionHelper.encryptData(user.email));
box.write(BoxName.name, box.write(BoxName.name,

View File

@@ -126,7 +126,7 @@ void main() async {
ShortcutItem( ShortcutItem(
type: 'share_app', type: 'share_app',
localizedTitle: 'Share App'.tr, localizedTitle: 'Share App'.tr,
icon: 'icon_main', icon: 'icon_share',
), ),
ShortcutItem( ShortcutItem(
type: 'wallet', type: 'wallet',