Merge remote-tracking branch 'origin/main' into ios

assets/translations/am.json

@@ -9,12 +9,14 @@
   "cont": "ቀጥል",
   "register": "ይመዝገቡ",
   "login_with_google": "በጉግል ይግቡ",
+  "login_with_apple": "በአፕል ይግቡ",
   "or": "ወይም",
   "login_with_phone": "በስልክ ቁጥር ይግቡ",
   "create_account": "አዲስ መለያ ይፍጠሩ",
   "already_have_account": "መለያ አለዎት?",
   "login": " ይግቡ ",
   "register_with_google": "በጉግል ይመዝገቡ",
+  "register_with_apple": "በአፕል ይመዝገቡ",
   "register_with_phone": "በስልክ ቁጥር ይመዝገቡ",
   "enter_phone_number": "የስልክ ቁጥርዎን ያስገቡ። የማረጋገጫ ኮድ እንልክልዎታለን።",
   "login_with_email": "በኢሜይል ይግቡ",

assets/translations/en.json

@@ -9,12 +9,14 @@
   "cont": "Continue",
   "register": "Register",
   "login_with_google": "Login with Google",
+  "login_with_apple": "Login with Apple",
   "or": "Or",
   "login_with_phone": "Login with phone number",
   "create_account": "Create an account",
   "already_have_account": "Already have an account?",
   "login": "Login",
   "register_with_google": "Register with Google",
+  "register_with_apple": "Register with Apple",
   "register_with_phone": "Register with phone number",
   "enter_phone_number": "Enter your phone number. We will send you a confirmation code there.",
   "login_with_email": "Login with email",
@@ -190,7 +192,7 @@
   "finish_all_practice_previouse_course": "Finish the previous course  practice to take this",
   "track_journey": "Track your learning journey and see your growth over time.",
   "learn_english": "Learn English",
-  "keep_momentum":"Great job! Keep the momentum.",
+  "keep_momentum": "Great job! Keep the momentum.",
   "completed_practices": "Completed Practices",
   "total_practices": "Total Practices",
   "progress_percentage": "Progress Percentage"

ios/Flutter/AppFrameworkInfo.plist

@@ -20,7 +20,5 @@
   <string>????</string>
   <key>CFBundleVersion</key>
   <string>1.0</string>
-  <key>MinimumOSVersion</key>
-  <string>13.0</string>
 </dict>
 </plist>

ios/Flutter/Debug.xcconfig

@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"

ios/Flutter/Release.xcconfig

@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"

ios/Podfile

@@ -0,0 +1,46 @@
+# Uncomment this line to define a global platform for your project
+platform :ios, '15.0'
+
+# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
+ENV['COCOAPODS_DISABLE_STATS'] = 'true'
+
+project 'Runner', {
+  'Debug' => :debug,
+  'Profile' => :release,
+  'Release' => :release,
+}
+
+def flutter_root
+  generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
+  unless File.exist?(generated_xcode_build_settings_path)
+    raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
+  end
+
+  File.foreach(generated_xcode_build_settings_path) do |line|
+    matches = line.match(/FLUTTER_ROOT\=(.*)/)
+    return matches[1].strip if matches
+  end
+  raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
+end
+
+require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
+
+flutter_ios_podfile_setup
+
+target 'Runner' do
+  use_frameworks!
+
+  flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
+  target 'RunnerTests' do
+    inherit! :search_paths
+  end
+end
+
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    flutter_additional_ios_build_settings(target)
+    target.build_configurations.each do |config|
+      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '15.0'
+    end
+  end
+end

ios/Podfile.lock

@@ -0,0 +1,28 @@
+PODS:
+  - Flutter (1.0.0)
+  - flutter_phone_direct_caller (0.0.1):
+    - Flutter
+  - permission_handler_apple (9.3.0):
+    - Flutter
+
+DEPENDENCIES:
+  - Flutter (from `Flutter`)
+  - flutter_phone_direct_caller (from `.symlinks/plugins/flutter_phone_direct_caller/ios`)
+  - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
+
+EXTERNAL SOURCES:
+  Flutter:
+    :path: Flutter
+  flutter_phone_direct_caller:
+    :path: ".symlinks/plugins/flutter_phone_direct_caller/ios"
+  permission_handler_apple:
+    :path: ".symlinks/plugins/permission_handler_apple/ios"
+
+SPEC CHECKSUMS:
+  Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
+  flutter_phone_direct_caller: 7d5d72794577b96f12b4b6da13a9ef90ba438665
+  permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
+
+PODFILE CHECKSUM: 4b015915ec662986b54bf30ab778da63f7dda016
+
+COCOAPODS: 1.16.2

ios/Runner.xcodeproj/project.pbxproj

@@ -11,9 +11,13 @@
 		331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
+		78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
+		896DC9E666DF8098D827C010 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9793345F00B89E38C23EBB8 /* Pods_RunnerTests.framework */; };
+		8E1B3E4A2C540A0B00F51C11 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8E1B3E492C540A0B00F51C11 /* GoogleService-Info.plist */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
+		99CE3BFD23F69C6D49568DE0 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 93B517F10FA92BB14B3CDC5A /* Pods_Runner.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -42,12 +46,19 @@
 /* Begin PBXFileReference section */
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
+		18336A33563E3B5B5B9974CC /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
+		20E44080F42EAC6B045A6D89 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
 		331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
 		331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
+		69301B8842E33A5CD16999A8 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
+		74C1B93B8C9E9562FD058B56 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
+		78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
+		8E1B3E492C540A0B00F51C11 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
+		93B517F10FA92BB14B3CDC5A /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
 		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -55,13 +66,27 @@
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		ACEEA7C32CFC6E9900D60211 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
+		A8C2A6C7D1D99F7BA12EAF94 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
+		F1F6AAAC52D909E27AEDEFC0 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
+		F9793345F00B89E38C23EBB8 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
+		932D3841F05A890DB5B188A4 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				896DC9E666DF8098D827C010 /* Pods_RunnerTests.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		97C146EB1CF9000F007C117D /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */,
+				99CE3BFD23F69C6D49568DE0 /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -76,9 +101,32 @@
 			path = RunnerTests;
 			sourceTree = "<group>";
 		};
+		633D6DCBF46C9B68DCD511FE /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				93B517F10FA92BB14B3CDC5A /* Pods_Runner.framework */,
+				F9793345F00B89E38C23EBB8 /* Pods_RunnerTests.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		8096B886696A019BCD318B6B /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				74C1B93B8C9E9562FD058B56 /* Pods-Runner.debug.xcconfig */,
+				69301B8842E33A5CD16999A8 /* Pods-Runner.release.xcconfig */,
+				F1F6AAAC52D909E27AEDEFC0 /* Pods-Runner.profile.xcconfig */,
+				20E44080F42EAC6B045A6D89 /* Pods-RunnerTests.debug.xcconfig */,
+				18336A33563E3B5B5B9974CC /* Pods-RunnerTests.release.xcconfig */,
+				A8C2A6C7D1D99F7BA12EAF94 /* Pods-RunnerTests.profile.xcconfig */,
+			);
+			path = Pods;
+			sourceTree = "<group>";
+		};
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
+				78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */,
 				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
 				9740EEB21CF90195004384FC /* Debug.xcconfig */,
 				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
@@ -94,6 +142,8 @@
 				97C146F01CF9000F007C117D /* Runner */,
 				97C146EF1CF9000F007C117D /* Products */,
 				331C8082294A63A400263BE5 /* RunnerTests */,
+				8096B886696A019BCD318B6B /* Pods */,
+				633D6DCBF46C9B68DCD511FE /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -113,6 +163,8 @@
 				97C146FD1CF9000F007C117D /* Assets.xcassets */,
 				97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
 				97C147021CF9000F007C117D /* Info.plist */,
+				8E1B3E492C540A0B00F51C11 /* GoogleService-Info.plist */,
+				ACEEA7C32CFC6E9900D60211 /* Runner.entitlements */,
 				1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */,
 				1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */,
 				74858FAE1ED2DC5600515810 /* AppDelegate.swift */,
@@ -128,8 +180,10 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
 			buildPhases = (
+				94F71B9A2AE7A340918A2B71 /* [CP] Check Pods Manifest.lock */,
 				331C807D294A63A400263BE5 /* Sources */,
 				331C807F294A63A400263BE5 /* Resources */,
+				932D3841F05A890DB5B188A4 /* Frameworks */,
 			);
 			buildRules = (
 			);
@@ -145,18 +199,24 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
+				EDCDA15227D1D12483183F4E /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
+				DE13979F911D29D4A95BCE2F /* [CP] Embed Pods Frameworks */,
+				E684A37538F596FB5432DE3F /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 			);
 			name = Runner;
+			packageProductDependencies = (
+				78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
+			);
 			productName = Runner;
 			productReference = 97C146EE1CF9000F007C117D /* Runner.app */;
 			productType = "com.apple.product-type.application";
@@ -178,6 +238,11 @@
 					97C146ED1CF9000F007C117D = {
 						CreatedOnToolsVersion = 7.3.1;
 						LastSwiftMigration = 1100;
+						SystemCapabilities = {
+							com.apple.SignInWithApple = {
+								enabled = 1;
+							};
+						};
 					};
 				};
 			};
@@ -190,6 +255,9 @@
 				Base,
 			);
 			mainGroup = 97C146E51CF9000F007C117D;
+			packageReferences = (
+				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */,
+			);
 			productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -215,6 +283,7 @@
 				97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
 				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
 				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
+				8E1B3E4A2C540A0B00F51C11 /* GoogleService-Info.plist in Resources */,
 				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -238,6 +307,28 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
+		94F71B9A2AE7A340918A2B71 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@@ -253,6 +344,62 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 		};
+		DE13979F911D29D4A95BCE2F /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		E684A37538F596FB5432DE3F /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		EDCDA15227D1D12483183F4E /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -346,7 +493,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -361,15 +508,23 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = K73ZX6D43Q;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.yimaru.lms.app;
+				PRODUCT_BUNDLE_IDENTIFIER = com.yimaru.lms.testapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Yimaru LMS TestApp App Store Profile";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -378,13 +533,14 @@
 		};
 		331C8088294A63A400263BE5 /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 20E44080F42EAC6B045A6D89 /* Pods-RunnerTests.debug.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.yimaru.lms.app.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.yimaru.lms.testapp.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -395,13 +551,14 @@
 		};
 		331C8089294A63A400263BE5 /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 18336A33563E3B5B5B9974CC /* Pods-RunnerTests.release.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.yimaru.lms.app.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.yimaru.lms.testapp.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
@@ -410,13 +567,14 @@
 		};
 		331C808A294A63A400263BE5 /* Profile */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = A8C2A6C7D1D99F7BA12EAF94 /* Pods-RunnerTests.profile.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.yimaru.lms.app.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.yimaru.lms.testapp.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
@@ -472,7 +630,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -523,7 +681,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -540,15 +698,23 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = K73ZX6D43Q;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.yimaru.lms.app;
+				PRODUCT_BUNDLE_IDENTIFIER = com.yimaru.lms.testapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Yimaru LMS TestApp App Store Profile";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -562,15 +728,23 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = K73ZX6D43Q;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.yimaru.lms.app;
+				PRODUCT_BUNDLE_IDENTIFIER = com.yimaru.lms.testapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Yimaru LMS TestApp App Store Profile";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -611,6 +785,20 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
+
+/* Begin XCLocalSwiftPackageReference section */
+		781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = {
+			isa = XCLocalSwiftPackageReference;
+			relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
+		};
+/* End XCLocalSwiftPackageReference section */
+
+/* Begin XCSwiftPackageProductDependency section */
+		78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = FlutterGeneratedPluginSwiftPackage;
+		};
+/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 97C146E61CF9000F007C117D /* Project object */;
 }

ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -0,0 +1,167 @@
+{
+  "pins" : [
+    {
+      "identity" : "abseil-cpp-binary",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/abseil-cpp-binary.git",
+      "state" : {
+        "revision" : "bbe8b69694d7873315fd3a4ad41efe043e1c07c5",
+        "version" : "1.2024072200.0"
+      }
+    },
+    {
+      "identity" : "app-check",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/app-check.git",
+      "state" : {
+        "revision" : "61b85103a1aeed8218f17c794687781505fbbef5",
+        "version" : "11.2.0"
+      }
+    },
+    {
+      "identity" : "appauth-ios",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/openid/AppAuth-iOS.git",
+      "state" : {
+        "revision" : "145104f5ea9d58ae21b60add007c33c1cc0c948e",
+        "version" : "2.0.0"
+      }
+    },
+    {
+      "identity" : "firebase-ios-sdk",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/firebase-ios-sdk",
+      "state" : {
+        "revision" : "8d5b4189f1f482df8d5c58c9985ea70491ef5382",
+        "version" : "12.14.0"
+      }
+    },
+    {
+      "identity" : "flutterfire",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/flutterfire",
+      "state" : {
+        "revision" : "05731e3fb091093546db363e379bff166f7286a3",
+        "version" : "4.4.0-firebase-core-swift"
+      }
+    },
+    {
+      "identity" : "google-ads-on-device-conversion-ios-sdk",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/googleads/google-ads-on-device-conversion-ios-sdk",
+      "state" : {
+        "revision" : "9bfcc6cf435b2e7c5562c1900b8680c594fa9a64",
+        "version" : "3.6.0"
+      }
+    },
+    {
+      "identity" : "googleappmeasurement",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleAppMeasurement.git",
+      "state" : {
+        "revision" : "219e564a8510e983e675c94f77f7f7c50049f22d",
+        "version" : "12.14.0"
+      }
+    },
+    {
+      "identity" : "googledatatransport",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleDataTransport.git",
+      "state" : {
+        "revision" : "617af071af9aa1d6a091d59a202910ac482128f9",
+        "version" : "10.1.0"
+      }
+    },
+    {
+      "identity" : "googlesignin-ios",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleSignIn-iOS.git",
+      "state" : {
+        "revision" : "913b4005ea26aebe1c97d54e35ad82a515924c71",
+        "version" : "9.1.0"
+      }
+    },
+    {
+      "identity" : "googleutilities",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleUtilities.git",
+      "state" : {
+        "revision" : "60da361632d0de02786f709bdc0c4df340f7613e",
+        "version" : "8.1.0"
+      }
+    },
+    {
+      "identity" : "grpc-binary",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/grpc-binary.git",
+      "state" : {
+        "revision" : "75b31c842f664a0f46a2e590a570e370249fd8f6",
+        "version" : "1.69.1"
+      }
+    },
+    {
+      "identity" : "gtm-session-fetcher",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/gtm-session-fetcher.git",
+      "state" : {
+        "revision" : "a2ab612cb980066ee56d90d60d8462992c07f24b",
+        "version" : "3.5.0"
+      }
+    },
+    {
+      "identity" : "gtmappauth",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GTMAppAuth.git",
+      "state" : {
+        "revision" : "56e0ccf09a6dd29dc7e68bdf729598240ca8aa16",
+        "version" : "5.0.0"
+      }
+    },
+    {
+      "identity" : "interop-ios-for-google-sdks",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/interop-ios-for-google-sdks.git",
+      "state" : {
+        "revision" : "040d087ac2267d2ddd4cca36c757d1c6a05fdbfe",
+        "version" : "101.0.0"
+      }
+    },
+    {
+      "identity" : "leveldb",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/leveldb.git",
+      "state" : {
+        "revision" : "a0bc79961d7be727d258d33d5a6b2f1023270ba1",
+        "version" : "1.22.5"
+      }
+    },
+    {
+      "identity" : "nanopb",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/nanopb.git",
+      "state" : {
+        "revision" : "b7e1104502eca3a213b46303391ca4d3bc8ddec1",
+        "version" : "2.30910.0"
+      }
+    },
+    {
+      "identity" : "promises",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/promises.git",
+      "state" : {
+        "revision" : "540318ecedd63d883069ae7f1ed811a2df00b6ac",
+        "version" : "2.4.0"
+      }
+    },
+    {
+      "identity" : "swift-collections",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-collections.git",
+      "state" : {
+        "revision" : "fea17c02d767f46b23070fdfdacc28a03a39232a",
+        "version" : "1.5.1"
+      }
+    }
+  ],
+  "version" : 2
+}

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -5,6 +5,24 @@
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
+      <PreActions>
+         <ExecutionAction
+            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+            <ActionContent
+               title = "Run Prepare Flutter Framework Script"
+               scriptText = "/bin/sh &quot;$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh&quot; prepare&#10;">
+               <EnvironmentBuildable>
+                  <BuildableReference
+                     BuildableIdentifier = "primary"
+                     BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+                     BuildableName = "Runner.app"
+                     BlueprintName = "Runner"
+                     ReferencedContainer = "container:Runner.xcodeproj">
+                  </BuildableReference>
+               </EnvironmentBuildable>
+            </ActionContent>
+         </ExecutionAction>
+      </PreActions>
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"

ios/Runner.xcworkspace/contents.xcworkspacedata

@@ -4,4 +4,7 @@
    <FileRef
       location = "group:Runner.xcodeproj">
    </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
 </Workspace>

ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -0,0 +1,167 @@
+{
+  "pins" : [
+    {
+      "identity" : "abseil-cpp-binary",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/abseil-cpp-binary.git",
+      "state" : {
+        "revision" : "bbe8b69694d7873315fd3a4ad41efe043e1c07c5",
+        "version" : "1.2024072200.0"
+      }
+    },
+    {
+      "identity" : "app-check",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/app-check.git",
+      "state" : {
+        "revision" : "61b85103a1aeed8218f17c794687781505fbbef5",
+        "version" : "11.2.0"
+      }
+    },
+    {
+      "identity" : "appauth-ios",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/openid/AppAuth-iOS.git",
+      "state" : {
+        "revision" : "145104f5ea9d58ae21b60add007c33c1cc0c948e",
+        "version" : "2.0.0"
+      }
+    },
+    {
+      "identity" : "firebase-ios-sdk",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/firebase-ios-sdk",
+      "state" : {
+        "revision" : "8d5b4189f1f482df8d5c58c9985ea70491ef5382",
+        "version" : "12.14.0"
+      }
+    },
+    {
+      "identity" : "flutterfire",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/flutterfire",
+      "state" : {
+        "revision" : "05731e3fb091093546db363e379bff166f7286a3",
+        "version" : "4.4.0-firebase-core-swift"
+      }
+    },
+    {
+      "identity" : "google-ads-on-device-conversion-ios-sdk",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/googleads/google-ads-on-device-conversion-ios-sdk",
+      "state" : {
+        "revision" : "9bfcc6cf435b2e7c5562c1900b8680c594fa9a64",
+        "version" : "3.6.0"
+      }
+    },
+    {
+      "identity" : "googleappmeasurement",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleAppMeasurement.git",
+      "state" : {
+        "revision" : "219e564a8510e983e675c94f77f7f7c50049f22d",
+        "version" : "12.14.0"
+      }
+    },
+    {
+      "identity" : "googledatatransport",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleDataTransport.git",
+      "state" : {
+        "revision" : "617af071af9aa1d6a091d59a202910ac482128f9",
+        "version" : "10.1.0"
+      }
+    },
+    {
+      "identity" : "googlesignin-ios",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleSignIn-iOS.git",
+      "state" : {
+        "revision" : "913b4005ea26aebe1c97d54e35ad82a515924c71",
+        "version" : "9.1.0"
+      }
+    },
+    {
+      "identity" : "googleutilities",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleUtilities.git",
+      "state" : {
+        "revision" : "60da361632d0de02786f709bdc0c4df340f7613e",
+        "version" : "8.1.0"
+      }
+    },
+    {
+      "identity" : "grpc-binary",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/grpc-binary.git",
+      "state" : {
+        "revision" : "75b31c842f664a0f46a2e590a570e370249fd8f6",
+        "version" : "1.69.1"
+      }
+    },
+    {
+      "identity" : "gtm-session-fetcher",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/gtm-session-fetcher.git",
+      "state" : {
+        "revision" : "a2ab612cb980066ee56d90d60d8462992c07f24b",
+        "version" : "3.5.0"
+      }
+    },
+    {
+      "identity" : "gtmappauth",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GTMAppAuth.git",
+      "state" : {
+        "revision" : "56e0ccf09a6dd29dc7e68bdf729598240ca8aa16",
+        "version" : "5.0.0"
+      }
+    },
+    {
+      "identity" : "interop-ios-for-google-sdks",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/interop-ios-for-google-sdks.git",
+      "state" : {
+        "revision" : "040d087ac2267d2ddd4cca36c757d1c6a05fdbfe",
+        "version" : "101.0.0"
+      }
+    },
+    {
+      "identity" : "leveldb",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/leveldb.git",
+      "state" : {
+        "revision" : "a0bc79961d7be727d258d33d5a6b2f1023270ba1",
+        "version" : "1.22.5"
+      }
+    },
+    {
+      "identity" : "nanopb",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/nanopb.git",
+      "state" : {
+        "revision" : "b7e1104502eca3a213b46303391ca4d3bc8ddec1",
+        "version" : "2.30910.0"
+      }
+    },
+    {
+      "identity" : "promises",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/promises.git",
+      "state" : {
+        "revision" : "540318ecedd63d883069ae7f1ed811a2df00b6ac",
+        "version" : "2.4.0"
+      }
+    },
+    {
+      "identity" : "swift-collections",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-collections.git",
+      "state" : {
+        "revision" : "fea17c02d767f46b23070fdfdacc28a03a39232a",
+        "version" : "1.5.1"
+      }
+    }
+  ],
+  "version" : 2
+}

ios/Runner/AppDelegate.swift

@@ -2,12 +2,15 @@ import Flutter
 import UIKit
 
 @main
-@objc class AppDelegate: FlutterAppDelegate {
+@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate {
   override func application(
     _ application: UIApplication,
     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
   ) -> Bool {
-    GeneratedPluginRegistrant.register(with: self)
     return super.application(application, didFinishLaunchingWithOptions: launchOptions)
   }
+
+  func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) {
+    GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry)
+  }
 }

ios/Runner/GoogleService-Info.plist

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CLIENT_ID</key>
+	<string>900714037062-3qqf7urii8vg99id91nmmuvom3fm5c1u.apps.googleusercontent.com</string>
+	<key>REVERSED_CLIENT_ID</key>
+	<string>com.googleusercontent.apps.900714037062-3qqf7urii8vg99id91nmmuvom3fm5c1u</string>
+	<key>ANDROID_CLIENT_ID</key>
+	<string>900714037062-4trqu7ln6en4kcm6gadk0uo01qijn1mk.apps.googleusercontent.com</string>
+	<key>API_KEY</key>
+	<string>AIzaSyDbaGD47oUJOyn9n3b0pbH6ozmbGyIlOKk</string>
+	<key>GCM_SENDER_ID</key>
+	<string>900714037062</string>
+	<key>PLIST_VERSION</key>
+	<string>1</string>
+	<key>BUNDLE_ID</key>
+	<string>com.yimaru.lms.testapp</string>
+	<key>PROJECT_ID</key>
+	<string>yimaru-academy-5e7e2</string>
+	<key>STORAGE_BUCKET</key>
+	<string>yimaru-academy-5e7e2.firebasestorage.app</string>
+	<key>IS_ADS_ENABLED</key>
+	<false></false>
+	<key>IS_ANALYTICS_ENABLED</key>
+	<false></false>
+	<key>IS_APPINVITE_ENABLED</key>
+	<true></true>
+	<key>IS_GCM_ENABLED</key>
+	<true></true>
+	<key>IS_SIGNIN_ENABLED</key>
+	<true></true>
+	<key>GOOGLE_APP_ID</key>
+	<string>1:900714037062:ios:45b484d79222c3ab4e6f47</string>
+</dict>
+</plist>

ios/Runner/Info.plist

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-	<dict>
+<dict>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
@@ -16,6 +18,17 @@
 	<string>yimaru_app</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>com.googleusercontent.apps.900714037062-3qqf7urii8vg99id91nmmuvom3fm5c1u</string>
+			</array>
+		</dict>
+	</array>
 	<key>CFBundleShortVersionString</key>
 	<string>$(FLUTTER_BUILD_NAME)</string>
 	<key>CFBundleSignature</key>
@@ -24,10 +37,35 @@
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>UIApplicationSceneManifest</key>
+	<dict>
+		<key>UIApplicationSupportsMultipleScenes</key>
+		<false/>
+		<key>UISceneConfigurations</key>
+		<dict>
+			<key>UIWindowSceneSessionRoleApplication</key>
+			<array>
+				<dict>
+					<key>UISceneClassName</key>
+					<string>UIWindowScene</string>
+					<key>UISceneConfigurationName</key>
+					<string>flutter</string>
+					<key>UISceneDelegateClassName</key>
+					<string>FlutterSceneDelegate</string>
+					<key>UISceneStoryboardFile</key>
+					<string>Main</string>
+				</dict>
+			</array>
+		</dict>
+	</dict>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
 	<string>Main</string>
+	<key>UIStatusBarHidden</key>
+	<false/>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
@@ -41,11 +79,5 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-		<key>CADisableMinimumFrameDurationOnPhone</key>
+</dict>
-		<true/>
-		<key>UIApplicationSupportsIndirectInputEvents</key>
-		<true/>
-		<key>UIStatusBarHidden</key>
-		<false/>
-	</dict>
 </plist>

ios/Runner/Runner.entitlements

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.developer.applesignin</key>
+	<array>
+		<string>Default</string>
+	</array>
+</dict>
+</plist>

lib/app/app.dart

@@ -56,6 +56,7 @@ import 'package:yimaru_app/services/localization_service.dart';
 import 'package:yimaru_app/ui/views/landing/landing_view.dart';
 import 'package:yimaru_app/ui/views/course_module/course_module_view.dart';
 import 'package:yimaru_app/services/onboarding_service.dart';
+import 'package:yimaru_app/services/apple_auth_service.dart';
 import 'package:yimaru_app/ui/views/learn_course/learn_course_view.dart';
 import 'package:yimaru_app/ui/views/payment/payment_view.dart';
 // @stacked-import
@@ -124,6 +125,7 @@ import 'package:yimaru_app/ui/views/payment/payment_view.dart';
     LazySingleton(classType: LearnService),
     LazySingleton(classType: LocalizationService),
     LazySingleton(classType: OnboardingService),
+    LazySingleton(classType: AppleAuthService),
 // @stacked-service
   ],
   bottomsheets: [

lib/app/app.locator.dart

@@ -13,6 +13,7 @@ import 'package:stacked_services/src/navigation/navigation_service.dart';
 import 'package:stacked_shared/stacked_shared.dart';
 
 import '../services/api_service.dart';
+import '../services/apple_auth_service.dart';
 import '../services/audio_player_service.dart';
 import '../services/authentication_service.dart';
 import '../services/course_service.dart';
@@ -67,4 +68,5 @@ Future<void> setupLocator(
   locator.registerLazySingleton(() => LearnService());
   locator.registerLazySingleton(() => LocalizationService());
   locator.registerLazySingleton(() => OnboardingService());
+  locator.registerLazySingleton(() => AppleAuthService());
 }

lib/firebase_options.dart

@@ -59,14 +59,14 @@ class DefaultFirebaseOptions {
 
   static const FirebaseOptions ios = FirebaseOptions(
     apiKey: 'AIzaSyDbaGD47oUJOyn9n3b0pbH6ozmbGyIlOKk',
-    appId: '1:900714037062:ios:1caf8f24a4333b8e4e6f47',
+    appId: '1:900714037062:ios:45b484d79222c3ab4e6f47',
     messagingSenderId: '900714037062',
     projectId: 'yimaru-academy-5e7e2',
     storageBucket: 'yimaru-academy-5e7e2.firebasestorage.app',
     androidClientId:
         '900714037062-4trqu7ln6en4kcm6gadk0uo01qijn1mk.apps.googleusercontent.com',
     iosClientId:
-        '900714037062-35bg0hsou56hg37mbcbpiar9uti7tcku.apps.googleusercontent.com',
+        '900714037062-3qqf7urii8vg99id91nmmuvom3fm5c1u.apps.googleusercontent.com',
-    iosBundleId: 'com.yimaru.lms.app',
+    iosBundleId: 'com.yimaru.lms.testapp',
   );
 }

lib/services/api_service.dart

@@ -112,6 +112,34 @@ class ApiService {
     }
   }
 
+  // Apple auth
+  Future<Map<String, dynamic>> appleAuth(Map<String, dynamic> data) async {
+    try {
+      Response response = await _service.dio.post(
+        '$kBaseUrl/$kAppleAuthUrl',
+        data: data,
+      );
+
+      if (response.statusCode == 200) {
+        return {
+          'status': ResponseStatus.success,
+          'message': 'Logged in successfully',
+          'data': User.fromJson(response.data['data']),
+        };
+      } else {
+        return {
+          'status': ResponseStatus.failure,
+          'message': '${response.data['message']}, ${response.data['error']}'
+        };
+      }
+    } on DioException catch (e) {
+      return {
+        'status': ResponseStatus.failure,
+        'message': e.response?.data.toString(),
+      };
+    }
+  }
+
   // Verify otp
   Future<Map<String, dynamic>> verifyOtp(Map<String, dynamic> data) async {
     try {

lib/services/apple_auth_service.dart

@@ -0,0 +1,36 @@
+import 'dart:io';
+
+import 'package:sign_in_with_apple/sign_in_with_apple.dart';
+import 'package:stacked/stacked.dart';
+
+class AppleAuthService with ListenableServiceMixin {
+  AuthorizationCredentialAppleID? _appleCredential;
+
+  AuthorizationCredentialAppleID? get appleCredential => _appleCredential;
+
+  AppleAuthService() {
+    listenToReactiveValues([_appleCredential]);
+  }
+
+  bool get isSupported => Platform.isIOS;
+
+  Future<void> appleAuth() async {
+    if (!isSupported) {
+      throw UnsupportedError('Apple Sign-In is only available on iOS.');
+    }
+
+    _appleCredential = await SignInWithApple.getAppleIDCredential(
+      scopes: [
+        AppleIDAuthorizationScopes.email,
+        AppleIDAuthorizationScopes.fullName,
+      ],
+    );
+
+    notifyListeners();
+  }
+
+  void logout() {
+    _appleCredential = null;
+    notifyListeners();
+  }
+}

lib/ui/common/app_constants.dart

@@ -101,6 +101,8 @@ String kLessonProgressUrl = 'api/v1/progress/videos';
 
 String kGoogleAuthUrl = 'api/v1/auth/google/android';
 
+String kAppleAuthUrl = 'api/v1/auth/apple';
+
 String kCourseProgressUrl = 'api/v1/progress/courses';
 
 String kAssessmentsUrl = 'api/v1/assessment/questions';
@@ -124,5 +126,4 @@ String kTelegramSupportLink = 'https://t.me/yimaruacademy2026';
 
 String kErrorUrl = 'https://api.yimaruacademy.com/payment/error';
 
-String kSuccessUrl =
+String kSuccessUrl = 'https://api.yimaruacademy.com/payment/success';
-    'https://api.yimaruacademy.com/payment/success';

lib/ui/common/enmus.dart

@@ -5,10 +5,10 @@ enum Voice { sample, recorded }
 enum ResponseStatus { success, failure }
 
 // Login method
-enum LoginMethod { phone, email, google }
+enum LoginMethod { phone, email, google, apple }
 
 // Sign-up method
-enum SignUpMethod { phone, email, google }
+enum SignUpMethod { phone, email, google, apple }
 
 // Learn practice
 enum LearnPractices { course, module, lesson }
@@ -61,7 +61,9 @@ enum StateObjects {
   profileCompletion,
   learnSubscription,
   learnSubscriptions,
+  loginWithApple,
   registerWithGoogle,
+  registerWithApple,
   learnPracticeSample,
   learnPracticeAnswer,
   loginWithPhoneNumber,

lib/ui/common/translations/codegen_loader.g.dart

@@ -14,204 +14,7 @@ class CodegenLoader extends AssetLoader{
     return Future.value(mapLocales[locale.toString()]);
   }
 
-  static const Map<String,dynamic> _am = {
+  static const Map<String,dynamic> _en = {
-  "loading": "በመጫን ላይ",
-  "welcome_back": "እንኳን በደህና ተመለሱ",
-  "checking_user_info": "የተጠቃሚ መረጃን በማረጋገጥ ላይ",
-  "dont_have_account": "መለያ የለዎትም?",
-  "email": "ኢሜይል",
-  "password": "የይለፍ ቃል",
-  "forgot_password": "የይለፍ ቃል ረሱ?",
-  "cont": "ቀጥል",
-  "register": "ይመዝገቡ",
-  "login_with_google": "በጉግል ይግቡ",
-  "or": "ወይም",
-  "login_with_phone": "በስልክ ቁጥር ይግቡ",
-  "create_account": "አዲስ መለያ ይፍጠሩ",
-  "already_have_account": "መለያ አለዎት?",
-  "login": " ይግቡ ",
-  "register_with_google": "በጉግል ይመዝገቡ",
-  "register_with_phone": "በስልክ ቁጥር ይመዝገቡ",
-  "enter_phone_number": "የስልክ ቁጥርዎን ያስገቡ። የማረጋገጫ ኮድ እንልክልዎታለን።",
-  "login_with_email": "በኢሜይል ይግቡ",
-  "create_password": "የይለፍ ቃል ይፍጠሩ",
-  "confirm_password": "የይለፍ ቃል ያረጋግጡ",
-  "eight_character_minimum": "ቢያንስ 8 ፊደላት",
-  "password_match": "የይለፍ ቃሉ ተመሳስሏል",
-  "sign_up_agreement": "‘ይመዝገቡ’ የሚለውን ሲጫኑ በ‘አገልግሎት ውሎች’ እና ‘በግላዊነት ፖሊሲ’ ይስማማሉ።",
-  "terms_of_services": "የአገልግሎት ውሎች",
-  "and": "እና",
-  "privacy_policy": "የግላዊነት ፖሊሲ",
-  "register_with_email": "በኢሜል ይመዝገቡ",
-  "verification_code": "የማረጋገጫ ኮድ",
-  "resend_code": "ኮዱን እንደገና ላክ",
-  "code_sent_to_phone": "ኮዱ ወደ ስልክ ቁጥርዎ ተልኳል",
-  "code_sent_to_email": "ኮዱ ወደ ኢሜል ተልኳል",
-  "resend_code_in": "ኮዱን እንደገና ለመላክ የቀረው ጊዜ",
-  "reset_password": " የይለፍ ቃልን ይቀይሩ",
-  "enter_email_reset_code": "ኢሜይልዎን ያስገቡ። የይለፍ ቃል መለወጫ ኮድ እንልክልዎታለን።",
-  "please_wait": "እባክዎ ይጠብቁ",
-  "reset_code_sent": "የመቀየሪያ ኮድ በተሳካ ሁኔታ ተልኳል",
-  "reset_code": " የመቀየሪያ ኮድ ",
-  "new_password": "አዲስ የይለፍ ቃል",
-  "logged_in_successfully": "በተሳካ ሁኔታ ገብተዋል",
-  "view_course": " ኮርሱን ይመልከቱ",
-  "continue_learning": "መማርን ይቀጥሉ",
-  "start_learning": "ትምህርትን ይጀምሩ",
-  "completed": "ተጠናቋል",
-  "take_practice": "ልምምድ ያድርጉ",
-  "your_current_level": "የአሁኑ ደረጃዎ",
-  "overall_progress": "አጠቃላይ እድገት",
-  "great_work": "በርቱ! በጣም ጥሩ እየሰሩ ነው",
-  "view_module": "ሞጁሉን ይመልከቱ",
-  "progress": "እድገት",
-  "keep_going": "ይቀጥሉ - ከግማሽ በላይ ጨርሰዋል ",
-  "lessons_in_module": "በዚህ ሞጁል ውስጥ ያሉ ትምህርቶች ",
-  "practice": "ልምምድ",
-  "start": "ጀምር",
-  "in_progress": "በሂደት ላይ",
-  "hello": "ሰላም",
-  "ready_to_learn": " ዛሬ እንግሊዝኛ ለመማር ተዘጋጅተዋል? ",
-  "learn": "ይማሩ ",
-  "course": "ኮርስ",
-  "profile": " ፕሮፋይል ",
-  "speaking_partner": "የንግግር  ጓደኛ",
-  "practice_what_you_learned": "አሁን የተማሩትን እንለማመድ",
-  "practice_questions": "ጥቂት ጥያቄዎችን እጠይቃለሁ እና መልስ መስጠት ይችላሉ",
-  "start_practice": "ልምምድ ጀምር",
-  "almost_there": "ሊጨርሱ ተቃርበዋል",
-  "finish_session": "እድገትዎን ለማየት ክፍለ ጊዜውን ያጠናቅቁ",
-  "continue_practice": "ልምምዱን ይቀጥሉ",
-  "end_session": "ክፍለ ጊዜውን ያብቁ ",
-  "tap_start_to_listen": "ለማዳመጥ የጀምር ቁልፉን ይጫኑ",
-  "practice_speaking": "ንግግርን ይለማመዱ",
-  "tap_microphone": "ለመናገር ማይክሮፎኑን ይጫኑ",
-  "reply": "እንደገና አዳምጥ",
-  "cancel": "ይቅር",
-  "you_are_speaking": "እየተናገሩ ነው",
-  "practice_completed": "ልምምዱ ተጠናቅቋል",
-  "great_improvement": "በዚህኛው በራስ መተማመንዎ ጨምሯል፤ ትልቅ መሻሻል ነው",
-  "practice_again": "እንደገና ይለማመዱ",
-  "conversation_review": "የንግግር ግምገማ",
-  "result": "ውጤት",
-  "quick_tip": "ጠቃሚ ምክር",
-  "retry": "እንደገና ይሞክሩ",
-  "completed_a1": "እንኳን ደስ አለዎት! A1 ደረጃን አጠናቅቀዋል",
-  "analyzing_speaking": "የንግግር ችሎታዎን እየገመገምን ነው",
-  "view_profile": "ፕሮፋይሎን ይመልከቱ ",
-  "hi": "ሰላም",
-  "edit_profile": "መገለጫ ያስተካክሉ",
-  "first_name": "የመጀመሪያ ስም",
-  "last_name": "የአባት ስም",
-  "gender": "ፆታ",
-  "male": "ወንድ",
-  "female": "ሴት",
-  "phone_number": "የስልክ ቁጥር",
-  "country": "ሀገር",
-  "region": "ክልል",
-  "select_region": "ክልል ይምረጡ",
-  "enter_your_city": "ከተማዎን ያስገቡ",
-  "occupation": "የስራ መስክ",
-  "select_occupation": "ሙያዎን ይምረጡ",
-  "save_changes": "ለውጦችን ያስቀምጡ",
-  "my_progress": "የእኔ እድገት",
-  "track_your_achievement": "ስኬቶችዎን እና ተከታታይ የትምህርት ጉዞዎን ይከታተሉ",
-  "account_and_privacy": "መለያ እና ግላዊነት",
-  "manage_settings": "ቅንብሮችን እና የመተግበሪያ ምርጫዎችን ያስተዳድሩ",
-  "support": "ድጋፍ",
-  "get_help": "በስልክ ወይም በቴሌግራም እገዛ ያግኙ",
-  "logout": "ውጣ",
-  "app_settings": "የመተግበሪያ ቅንብሮች",
-  "legal_and_information": "ሕጋዊ እና መረጃ",
-  "change_language": "ቋንቋ ቀይር",
-  "terms_and_conditions": "ውሎች እና ሁኔታዎች",
-  "delete_account": "መለያ ሰርዝ",
-  "language_preference": "የቋንቋ ምርጫ",
-  "choose_your_language": "ለውጦችን አስቀምጥ",
-  "switch_language_anytime": "ቋንቋዎችን በማንኛውም ጊዜ መቀየር ይችላሉ",
-  "need_help": "እገዛ ይፈልጋሉ?",
-  "call_support": "የስልክ ድጋፍ",
-  "talk_with_support": "በቀጥታ ከድጋፍ ቡድናችን ጋር ይነጋገሩ",
-  "telegram_support": "የቴሌግራም ድጋፍ",
-  "chat_via_telegram": "በቴሌግራም በፍጥነት ይወያዩ",
-  "call_our_support": "ከ3 ጠዋት እስከ 12 ማታ ድረስ የድጋፍ ቡድናችንን ይደውሉ",
-  "tap_to_call": "ለመደወል ይንኩ",
-  "join_telegram": "በቴሌግራም የይማሩ አካዳሚን ይቀላቀሉ",
-  "connect_with_support_team": "ለፈጣን እርዳታ እና የማህበረሰብ ዝማኔዎች፣ በቴሌግራም ከድጋፍ ቡድናችን ጋር ወዲያውኑ ይገናኙ።",
-  "open_in_telegram": "በቴሌግራም ይክፈቱ",
-  "search_for": "ፈልጉት",
-  "current_level": "የአሁኑ ደረጃ",
-  "keep_up_the_great_work": "በጣም ጥሩ እየሰራህ ነው! ቀጥልበት፣ አስደናቂ ነህ።",
-  "no_practice_available": "ምንም ልምምድ አልተገኘም!",
-  "begin_module_practice": "የሞጁሉን ልምምድ ጀምር",
-  "lets_practice_lesson": "እንለማመድ",
-  "lets_quickly_review": "በዚህ ሞጁል ውስጥ የተማርከውን በፍጥነት እንከልስ!",
-  "lets_practice_module": "አሁን የተማርከውን እንለማመድ!",
-  "ask_you_few_actions": "ጥቂት ጥያቄዎችን እጠይቅሃለሁ፣ አንተም በተፈጥሮ መልስ ልትሰጥ ትችላለህ።",
-  "begin_level_practice": "የደረጃ ልምምድን ጀምር",
-  "lets_practice_course": "የኮርሱን ልምምድ እንለማመድ",
-  "lets_quick_review": "በዚህ ደረጃ የተማርከውን በፍጥነት እንከልስ!",
-  "speaking": "እየተናገረ ነው",
-  "you_have_finished_practice": "ልምምድህን አጠናቀቅህ",
-  "view_results": "ውጤቶቼን እይ",
-  "sample_answer": "ናሙና መልስ",
-  "your_answer": "መልስህ",
-  "sound_confident": "በዚህ ጊዜ የበለጠ እምነት ያለህ ይመስላል — በጣም ጥሩ መሻሻል ነው!",
-  "you_have_completed": "አያይ! አጠናቀቅህ",
-  "yes": "አዎ",
-  "no": "አይ",
-  "want_to_quit": "ለመውጣት እርግጠኛ ነህ?",
-  "required_field": "ይህ መስክ ያስፈልጋል",
-  "enter_full_name": "ሙሉ ስምህን አስገባ",
-  "invalid_email": "የማይሰራ የኢሜይል ቅርጸት",
-  "phone_must_start_with": "የስልክ ቁጥር በ251 መጀመር አለበት",
-  "phone_must_be": "የስልክ ቁጥር 12 አሃዞች መሆን አለበት",
-  "what_should_we_call_you": "ምን ብለን እንጠራህ?",
-  "name_for_personalization": "በመማር ጉዞህ ውስጥ ለግል ለማድረግ ስምህን እንጠቀማለን።",
-  "choose_your_gender": "ጾታህን ምረጥ",
-  "gender_for_personalization": "በጾታህ መሰረት የመማር ተሞክሮህን እናበጅለታለን።",
-  "age_range": "በየትኛው የእድሜ ክልል ውስጥ ነህ?",
-  "age_for_personalization": "በእድሜህ መሰረት የመማር ተሞክሮህን እናበጅለታለን።",
-  "educational_background": "አሁን ያለህ የትምህርት ደረጃ ምንድን ነው?",
-  "education_for_personalization": "ይህ ትምህርቶችን ከልምድህ ጋር እንዲስማሙ ለማድረግ ይረዳናል።",
-  "your_occupation": "ስራህ ምንድን ነው?",
-  "occupation_for_personalization": "በስራህ መሰረት የመማር ተሞክሮህን እናበጅለታለን።",
-  "location": "ከየት ነህ?",
-  "select_country_region": "አገርህን እና ክልልህን ከተቆልቋይ ዝርዝሩ ምረጥ",
-  "select_country": "አገር ምረጥ",
-  "learning_goal": "የመማር ዓላማህን ምረጥ",
-  "language_goal": "እንግሊዝኛህን ለማሻሻል ዋና ዓላማህ ምንድን ነው?",
-  "your_goal": "ዓላማህ የመማር ጉዞህን እንዲስማማ ለማድረግ ይረዳናል።",
-  "write_your_goal": "ዓላማህን ጻፍ…",
-  "challenge_you_face": "What challenge do you face most with English?",
-  "evey_one_has_strugle": "ሁሉም ሰው ችግሮች አሉት፣ የአንተን እንጀምር እንፍታ",
-  "write_your_challenge": "ችግርህን ጻፍ…",
-  "topic_interest": "በጣም የሚስቡህ ርዕሶች የትኞቹ ናቸው?",
-  "favourite_topic": "የምትወዳቸው ርዕሶች አስደሳች እና ከሕይወትህ ጋር የተዛመዱ ትምህርቶችን ለመፍጠር ይረዱናል።",
-  "your_interest": "ፍላጎትህን ጻፍ…",
-  "want_quick_assessment": "የእንግሊዝኛ ደረጃህን ለማወቅ ፈጣን ግምገማ ትፈልጋለህ?",
-  "answer_quick_questions": "የእንግሊዝኛ ችሎታህን ለመረዳት ጥቂት ፈጣን ጥያቄዎችን መልስ።",
-  "skip": "ዝለል",
-  "finish_level": "ደረጃውን አጠናቅቅ",
-  "likely_speaker": "አንተ ምናልባት ተናጋሪ ነህ",
-  "great_job": "በጣም ጥሩ ስራ! ለመሻሻል ቀጣዩ ደረጃህ ይኸው ነው።",
-  "lets_start_practice": "ልምምድህን እንጀምር",
-  "welcome_abroad": "እንኳን ደህና መጣህ",
-  "ready_to_explore": "የግል ትምህርቶችህን ለማሰስ ዝግጁ ነህ።",
-  "finish": "አጠናቅቅ",
-  "finish_all_practice_lesson": "ይህን ልምምድ ለመውሰድ የቀድሞውን የትምህርት ልምምድ ያጠናቅቁ",
-  "finish_all_practice_module": "የሞጁሉን ልምምድ ለመውሰድ የትምህርት ልምምዶችን ያጠናቅቁ",
-  "finish_all_practice_course": "የኮርሱን ልምምድ ለመውሰድ የሞጁል ልምምዶችን ያጠናቅቁ",
-  "finish_all_practice_previouse_module": "ይህን ልምምድ ለመውሰድ የቀድሞውን የሞጁል ልምምድ ያጠናቅቁ",
-  "finish_all_practice_previouse_course": "ይህን ለመውሰድ የቀድሞውን የኮርስ ልምምድ ያጠናቅቁ",
-  "track_journey": "የትምህርት ጉዞዎን ይከታተሉ እና በጊዜ ሂደት ያሳዩትን እድገት ይመልከቱ።",
-  "learn_english": "እንግሊዝኛ ይማሩ",
-  "keep_momentum": "በጣም ጥሩ ስራ! በዚሁ ብርታት ይቀጥሉ።",
-  "completed_practices": "የተጠናቀቁ ልምምዶች",
-  "total_practices": "ጠቅላላ ልምምዶች",
-  "progress_percentage": "የእድገት መቶኛ"
-};
-static const Map<String,dynamic> _en = {
   "loading": "Loading",
   "welcome_back": "Welcome back",
   "checking_user_info": "Checking user info",
@@ -222,12 +25,14 @@ static const Map<String,dynamic> _en = {
   "cont": "Continue",
   "register": "Register",
   "login_with_google": "Login with Google",
+  "login_with_apple": "Login with Apple",
   "or": "Or",
   "login_with_phone": "Login with phone number",
   "create_account": "Create an account",
   "already_have_account": "Already have an account?",
   "login": "Login",
   "register_with_google": "Register with Google",
+  "register_with_apple": "Register with Apple",
   "register_with_phone": "Register with phone number",
   "enter_phone_number": "Enter your phone number. We will send you a confirmation code there.",
   "login_with_email": "Login with email",
@@ -408,5 +213,204 @@ static const Map<String,dynamic> _en = {
   "total_practices": "Total Practices",
   "progress_percentage": "Progress Percentage"
 };
-static const Map<String, Map<String,dynamic>> mapLocales = {"am": _am, "en": _en};
+static const Map<String,dynamic> _am = {
+  "loading": "በመጫን ላይ",
+  "welcome_back": "እንኳን በደህና ተመለሱ",
+  "checking_user_info": "የተጠቃሚ መረጃን በማረጋገጥ ላይ",
+  "dont_have_account": "መለያ የለዎትም?",
+  "email": "ኢሜይል",
+  "password": "የይለፍ ቃል",
+  "forgot_password": "የይለፍ ቃል ረሱ?",
+  "cont": "ቀጥል",
+  "register": "ይመዝገቡ",
+  "login_with_google": "በጉግል ይግቡ",
+  "login_with_apple": "በአፕል ይግቡ",
+  "or": "ወይም",
+  "login_with_phone": "በስልክ ቁጥር ይግቡ",
+  "create_account": "አዲስ መለያ ይፍጠሩ",
+  "already_have_account": "መለያ አለዎት?",
+  "login": " ይግቡ ",
+  "register_with_google": "በጉግል ይመዝገቡ",
+  "register_with_apple": "በአፕል ይመዝገቡ",
+  "register_with_phone": "በስልክ ቁጥር ይመዝገቡ",
+  "enter_phone_number": "የስልክ ቁጥርዎን ያስገቡ። የማረጋገጫ ኮድ እንልክልዎታለን።",
+  "login_with_email": "በኢሜይል ይግቡ",
+  "create_password": "የይለፍ ቃል ይፍጠሩ",
+  "confirm_password": "የይለፍ ቃል ያረጋግጡ",
+  "eight_character_minimum": "ቢያንስ 8 ፊደላት",
+  "password_match": "የይለፍ ቃሉ ተመሳስሏል",
+  "sign_up_agreement": "‘ይመዝገቡ’ የሚለውን ሲጫኑ በ‘አገልግሎት ውሎች’ እና ‘በግላዊነት ፖሊሲ’ ይስማማሉ።",
+  "terms_of_services": "የአገልግሎት ውሎች",
+  "and": "እና",
+  "privacy_policy": "የግላዊነት ፖሊሲ",
+  "register_with_email": "በኢሜል ይመዝገቡ",
+  "verification_code": "የማረጋገጫ ኮድ",
+  "resend_code": "ኮዱን እንደገና ላክ",
+  "code_sent_to_phone": "ኮዱ ወደ ስልክ ቁጥርዎ ተልኳል",
+  "code_sent_to_email": "ኮዱ ወደ ኢሜል ተልኳል",
+  "resend_code_in": "ኮዱን እንደገና ለመላክ የቀረው ጊዜ",
+  "reset_password": " የይለፍ ቃልን ይቀይሩ",
+  "enter_email_reset_code": "ኢሜይልዎን ያስገቡ። የይለፍ ቃል መለወጫ ኮድ እንልክልዎታለን።",
+  "please_wait": "እባክዎ ይጠብቁ",
+  "reset_code_sent": "የመቀየሪያ ኮድ በተሳካ ሁኔታ ተልኳል",
+  "reset_code": " የመቀየሪያ ኮድ ",
+  "new_password": "አዲስ የይለፍ ቃል",
+  "logged_in_successfully": "በተሳካ ሁኔታ ገብተዋል",
+  "view_course": " ኮርሱን ይመልከቱ",
+  "continue_learning": "መማርን ይቀጥሉ",
+  "start_learning": "ትምህርትን ይጀምሩ",
+  "completed": "ተጠናቋል",
+  "take_practice": "ልምምድ ያድርጉ",
+  "your_current_level": "የአሁኑ ደረጃዎ",
+  "overall_progress": "አጠቃላይ እድገት",
+  "great_work": "በርቱ! በጣም ጥሩ እየሰሩ ነው",
+  "view_module": "ሞጁሉን ይመልከቱ",
+  "progress": "እድገት",
+  "keep_going": "ይቀጥሉ - ከግማሽ በላይ ጨርሰዋል ",
+  "lessons_in_module": "በዚህ ሞጁል ውስጥ ያሉ ትምህርቶች ",
+  "practice": "ልምምድ",
+  "start": "ጀምር",
+  "in_progress": "በሂደት ላይ",
+  "hello": "ሰላም",
+  "ready_to_learn": " ዛሬ እንግሊዝኛ ለመማር ተዘጋጅተዋል? ",
+  "learn": "ይማሩ ",
+  "course": "ኮርስ",
+  "profile": " ፕሮፋይል ",
+  "speaking_partner": "የንግግር  ጓደኛ",
+  "practice_what_you_learned": "አሁን የተማሩትን እንለማመድ",
+  "practice_questions": "ጥቂት ጥያቄዎችን እጠይቃለሁ እና መልስ መስጠት ይችላሉ",
+  "start_practice": "ልምምድ ጀምር",
+  "almost_there": "ሊጨርሱ ተቃርበዋል",
+  "finish_session": "እድገትዎን ለማየት ክፍለ ጊዜውን ያጠናቅቁ",
+  "continue_practice": "ልምምዱን ይቀጥሉ",
+  "end_session": "ክፍለ ጊዜውን ያብቁ ",
+  "tap_start_to_listen": "ለማዳመጥ የጀምር ቁልፉን ይጫኑ",
+  "practice_speaking": "ንግግርን ይለማመዱ",
+  "tap_microphone": "ለመናገር ማይክሮፎኑን ይጫኑ",
+  "reply": "እንደገና አዳምጥ",
+  "cancel": "ይቅር",
+  "you_are_speaking": "እየተናገሩ ነው",
+  "practice_completed": "ልምምዱ ተጠናቅቋል",
+  "great_improvement": "በዚህኛው በራስ መተማመንዎ ጨምሯል፤ ትልቅ መሻሻል ነው",
+  "practice_again": "እንደገና ይለማመዱ",
+  "conversation_review": "የንግግር ግምገማ",
+  "result": "ውጤት",
+  "quick_tip": "ጠቃሚ ምክር",
+  "retry": "እንደገና ይሞክሩ",
+  "completed_a1": "እንኳን ደስ አለዎት! A1 ደረጃን አጠናቅቀዋል",
+  "analyzing_speaking": "የንግግር ችሎታዎን እየገመገምን ነው",
+  "view_profile": "ፕሮፋይሎን ይመልከቱ ",
+  "hi": "ሰላም",
+  "edit_profile": "መገለጫ ያስተካክሉ",
+  "first_name": "የመጀመሪያ ስም",
+  "last_name": "የአባት ስም",
+  "gender": "ፆታ",
+  "male": "ወንድ",
+  "female": "ሴት",
+  "phone_number": "የስልክ ቁጥር",
+  "country": "ሀገር",
+  "region": "ክልል",
+  "select_region": "ክልል ይምረጡ",
+  "enter_your_city": "ከተማዎን ያስገቡ",
+  "occupation": "የስራ መስክ",
+  "select_occupation": "ሙያዎን ይምረጡ",
+  "save_changes": "ለውጦችን ያስቀምጡ",
+  "my_progress": "የእኔ እድገት",
+  "track_your_achievement": "ስኬቶችዎን እና ተከታታይ የትምህርት ጉዞዎን ይከታተሉ",
+  "account_and_privacy": "መለያ እና ግላዊነት",
+  "manage_settings": "ቅንብሮችን እና የመተግበሪያ ምርጫዎችን ያስተዳድሩ",
+  "support": "ድጋፍ",
+  "get_help": "በስልክ ወይም በቴሌግራም እገዛ ያግኙ",
+  "logout": "ውጣ",
+  "app_settings": "የመተግበሪያ ቅንብሮች",
+  "legal_and_information": "ሕጋዊ እና መረጃ",
+  "change_language": "ቋንቋ ቀይር",
+  "terms_and_conditions": "ውሎች እና ሁኔታዎች",
+  "delete_account": "መለያ ሰርዝ",
+  "language_preference": "የቋንቋ ምርጫ",
+  "choose_your_language": "ለውጦችን አስቀምጥ",
+  "switch_language_anytime": "ቋንቋዎችን በማንኛውም ጊዜ መቀየር ይችላሉ",
+  "need_help": "እገዛ ይፈልጋሉ?",
+  "call_support": "የስልክ ድጋፍ",
+  "talk_with_support": "በቀጥታ ከድጋፍ ቡድናችን ጋር ይነጋገሩ",
+  "telegram_support": "የቴሌግራም ድጋፍ",
+  "chat_via_telegram": "በቴሌግራም በፍጥነት ይወያዩ",
+  "call_our_support": "ከ3 ጠዋት እስከ 12 ማታ ድረስ የድጋፍ ቡድናችንን ይደውሉ",
+  "tap_to_call": "ለመደወል ይንኩ",
+  "join_telegram": "በቴሌግራም የይማሩ አካዳሚን ይቀላቀሉ",
+  "connect_with_support_team": "ለፈጣን እርዳታ እና የማህበረሰብ ዝማኔዎች፣ በቴሌግራም ከድጋፍ ቡድናችን ጋር ወዲያውኑ ይገናኙ።",
+  "open_in_telegram": "በቴሌግራም ይክፈቱ",
+  "search_for": "ፈልጉት",
+  "current_level": "የአሁኑ ደረጃ",
+  "keep_up_the_great_work": "በጣም ጥሩ እየሰራህ ነው! ቀጥልበት፣ አስደናቂ ነህ።",
+  "no_practice_available": "ምንም ልምምድ አልተገኘም!",
+  "begin_module_practice": "የሞጁሉን ልምምድ ጀምር",
+  "lets_practice_lesson": "እንለማመድ",
+  "lets_quickly_review": "በዚህ ሞጁል ውስጥ የተማርከውን በፍጥነት እንከልስ!",
+  "lets_practice_module": "አሁን የተማርከውን እንለማመድ!",
+  "ask_you_few_actions": "ጥቂት ጥያቄዎችን እጠይቅሃለሁ፣ አንተም በተፈጥሮ መልስ ልትሰጥ ትችላለህ።",
+  "begin_level_practice": "የደረጃ ልምምድን ጀምር",
+  "lets_practice_course": "የኮርሱን ልምምድ እንለማመድ",
+  "lets_quick_review": "በዚህ ደረጃ የተማርከውን በፍጥነት እንከልስ!",
+  "speaking": "እየተናገረ ነው",
+  "you_have_finished_practice": "ልምምድህን አጠናቀቅህ",
+  "view_results": "ውጤቶቼን እይ",
+  "sample_answer": "ናሙና መልስ",
+  "your_answer": "መልስህ",
+  "sound_confident": "በዚህ ጊዜ የበለጠ እምነት ያለህ ይመስላል — በጣም ጥሩ መሻሻል ነው!",
+  "you_have_completed": "አያይ! አጠናቀቅህ",
+  "yes": "አዎ",
+  "no": "አይ",
+  "want_to_quit": "ለመውጣት እርግጠኛ ነህ?",
+  "required_field": "ይህ መስክ ያስፈልጋል",
+  "enter_full_name": "ሙሉ ስምህን አስገባ",
+  "invalid_email": "የማይሰራ የኢሜይል ቅርጸት",
+  "phone_must_start_with": "የስልክ ቁጥር በ251 መጀመር አለበት",
+  "phone_must_be": "የስልክ ቁጥር 12 አሃዞች መሆን አለበት",
+  "what_should_we_call_you": "ምን ብለን እንጠራህ?",
+  "name_for_personalization": "በመማር ጉዞህ ውስጥ ለግል ለማድረግ ስምህን እንጠቀማለን።",
+  "choose_your_gender": "ጾታህን ምረጥ",
+  "gender_for_personalization": "በጾታህ መሰረት የመማር ተሞክሮህን እናበጅለታለን።",
+  "age_range": "በየትኛው የእድሜ ክልል ውስጥ ነህ?",
+  "age_for_personalization": "በእድሜህ መሰረት የመማር ተሞክሮህን እናበጅለታለን።",
+  "educational_background": "አሁን ያለህ የትምህርት ደረጃ ምንድን ነው?",
+  "education_for_personalization": "ይህ ትምህርቶችን ከልምድህ ጋር እንዲስማሙ ለማድረግ ይረዳናል።",
+  "your_occupation": "ስራህ ምንድን ነው?",
+  "occupation_for_personalization": "በስራህ መሰረት የመማር ተሞክሮህን እናበጅለታለን።",
+  "location": "ከየት ነህ?",
+  "select_country_region": "አገርህን እና ክልልህን ከተቆልቋይ ዝርዝሩ ምረጥ",
+  "select_country": "አገር ምረጥ",
+  "learning_goal": "የመማር ዓላማህን ምረጥ",
+  "language_goal": "እንግሊዝኛህን ለማሻሻል ዋና ዓላማህ ምንድን ነው?",
+  "your_goal": "ዓላማህ የመማር ጉዞህን እንዲስማማ ለማድረግ ይረዳናል።",
+  "write_your_goal": "ዓላማህን ጻፍ…",
+  "challenge_you_face": "What challenge do you face most with English?",
+  "evey_one_has_strugle": "ሁሉም ሰው ችግሮች አሉት፣ የአንተን እንጀምር እንፍታ",
+  "write_your_challenge": "ችግርህን ጻፍ…",
+  "topic_interest": "በጣም የሚስቡህ ርዕሶች የትኞቹ ናቸው?",
+  "favourite_topic": "የምትወዳቸው ርዕሶች አስደሳች እና ከሕይወትህ ጋር የተዛመዱ ትምህርቶችን ለመፍጠር ይረዱናል።",
+  "your_interest": "ፍላጎትህን ጻፍ…",
+  "want_quick_assessment": "የእንግሊዝኛ ደረጃህን ለማወቅ ፈጣን ግምገማ ትፈልጋለህ?",
+  "answer_quick_questions": "የእንግሊዝኛ ችሎታህን ለመረዳት ጥቂት ፈጣን ጥያቄዎችን መልስ።",
+  "skip": "ዝለል",
+  "finish_level": "ደረጃውን አጠናቅቅ",
+  "likely_speaker": "አንተ ምናልባት ተናጋሪ ነህ",
+  "great_job": "በጣም ጥሩ ስራ! ለመሻሻል ቀጣዩ ደረጃህ ይኸው ነው።",
+  "lets_start_practice": "ልምምድህን እንጀምር",
+  "welcome_abroad": "እንኳን ደህና መጣህ",
+  "ready_to_explore": "የግል ትምህርቶችህን ለማሰስ ዝግጁ ነህ።",
+  "finish": "አጠናቅቅ",
+  "finish_all_practice_lesson": "ይህን ልምምድ ለመውሰድ የቀድሞውን የትምህርት ልምምድ ያጠናቅቁ",
+  "finish_all_practice_module": "የሞጁሉን ልምምድ ለመውሰድ የትምህርት ልምምዶችን ያጠናቅቁ",
+  "finish_all_practice_course": "የኮርሱን ልምምድ ለመውሰድ የሞጁል ልምምዶችን ያጠናቅቁ",
+  "finish_all_practice_previouse_module": "ይህን ልምምድ ለመውሰድ የቀድሞውን የሞጁል ልምምድ ያጠናቅቁ",
+  "finish_all_practice_previouse_course": "ይህን ለመውሰድ የቀድሞውን የኮርስ ልምምድ ያጠናቅቁ",
+  "track_journey": "የትምህርት ጉዞዎን ይከታተሉ እና በጊዜ ሂደት ያሳዩትን እድገት ይመልከቱ።",
+  "learn_english": "እንግሊዝኛ ይማሩ",
+  "keep_momentum": "በጣም ጥሩ ስራ! በዚሁ ብርታት ይቀጥሉ።",
+  "completed_practices": "የተጠናቀቁ ልምምዶች",
+  "total_practices": "ጠቅላላ ልምምዶች",
+  "progress_percentage": "የእድገት መቶኛ"
+};
+static const Map<String, Map<String,dynamic>> mapLocales = {"en": _en, "am": _am};
 }

lib/ui/common/translations/locale_keys.g.dart

@@ -13,12 +13,14 @@ abstract class  LocaleKeys {
   static const cont = 'cont';
   static const register = 'register';
   static const login_with_google = 'login_with_google';
+  static const login_with_apple = 'login_with_apple';
   static const or = 'or';
   static const login_with_phone = 'login_with_phone';
   static const create_account = 'create_account';
   static const already_have_account = 'already_have_account';
   static const login = 'login';
   static const register_with_google = 'register_with_google';
+  static const register_with_apple = 'register_with_apple';
   static const register_with_phone = 'register_with_phone';
   static const enter_phone_number = 'enter_phone_number';
   static const login_with_email = 'login_with_email';
@@ -43,10 +45,10 @@ abstract class  LocaleKeys {
   static const reset_code = 'reset_code';
   static const new_password = 'new_password';
   static const logged_in_successfully = 'logged_in_successfully';
-  static const view_course = 'view_course';
   static const continue_learning = 'continue_learning';
   static const start_learning = 'start_learning';
   static const completed = 'completed';
+  static const view_course = 'view_course';
   static const take_practice = 'take_practice';
   static const your_current_level = 'your_current_level';
   static const overall_progress = 'overall_progress';

lib/ui/views/login/login_viewmodel.dart

@@ -7,6 +7,7 @@ import 'package:yimaru_app/app/app.router.dart';
 import 'package:yimaru_app/models/user.dart';
 
 import '../../../services/api_service.dart';
+import '../../../services/apple_auth_service.dart';
 import '../../../services/authentication_service.dart';
 import '../../../services/google_auth_service.dart';
 import '../../../services/localization_service.dart';
@@ -25,19 +26,23 @@ class LoginViewModel extends ReactiveViewModel
 
   final _googleAuthService = locator<GoogleAuthService>();
 
+  final _appleAuthService = locator<AppleAuthService>();
+
   final _localizationService = locator<LocalizationService>();
 
   final _authenticationService = locator<AuthenticationService>();
 
   @override
   List<ListenableServiceMixin> get listenableServices =>
-      [_googleAuthService, _localizationService];
+      [_googleAuthService, _appleAuthService, _localizationService];
 
   // Google user
   GoogleSignInAccount? get _googleUser => _googleAuthService.googleUser;
 
   GoogleSignInAccount? get googleUser => _googleUser;
 
+  bool get isAppleSignInAvailable => _appleAuthService.isSupported;
+
   // Languages
   Map<String, dynamic> get _selectedLanguage =>
       _localizationService.selectedLanguage;
@@ -235,6 +240,50 @@ class LoginViewModel extends ReactiveViewModel
   Future<void> signInWithGoogle() async => await runBusyFuture(_googleAuth(),
       busyObject: StateObjects.loginWithGoogle);
 
+  // Sign-in with Apple
+  Future<void> _appleAuth() async {
+    if (await _statusChecker.checkConnection()) {
+      await _appleAuthService.appleAuth();
+
+      final credential = _appleAuthService.appleCredential;
+      final identityToken = credential?.identityToken;
+
+      if (identityToken == null || identityToken.isEmpty) {
+        showErrorToast('Apple login failed. Please try again.');
+        return;
+      }
+
+      Map<String, dynamic> data = {
+        'id_token': identityToken,
+        'email': credential?.email,
+        'first_name': credential?.givenName,
+        'last_name': credential?.familyName,
+      };
+
+      data.removeWhere((_, value) => value == null || value == '');
+
+      Map<String, dynamic> response = await _apiService.appleAuth(data);
+
+      if (response['status'] == ResponseStatus.success) {
+        User user = response['data'] as User;
+        Map<String, dynamic> data = {
+          'userId': user.userId,
+          'accessToken': user.accessToken,
+          'refreshToken': user.refreshToken
+        };
+        await _authenticationService.saveUserCredential(data);
+        clearUserData();
+        await replaceWithStartUp();
+        showSuccessToast(response['message']);
+      } else {
+        showErrorToast(response['message']);
+      }
+    }
+  }
+
+  Future<void> signInWithApple() async => await runBusyFuture(_appleAuth(),
+      busyObject: StateObjects.loginWithApple);
+
   // Login with phone
   Future<void> loginWithPhoneNumber() async =>
       await runBusyFuture(_loginWithPhoneNumber(),

lib/ui/views/login/screens/login_with_email_screen.dart

@@ -66,7 +66,8 @@ class LoginWithEmailScreen extends ViewModelWidget<LoginViewModel> {
       Stack(children: [
         _buildScaffold(context: context, viewModel: viewModel),
         _buildLoginWithEmailState(viewModel),
-        _buildLoginWithGoogleState(viewModel)
+        _buildLoginWithGoogleState(viewModel),
+        _buildLoginWithAppleState(viewModel)
       ]);
 
   Widget _buildScaffold(
@@ -232,6 +233,8 @@ class LoginWithEmailScreen extends ViewModelWidget<LoginViewModel> {
   List<Widget> _buildLowerColumnChildren(LoginViewModel viewModel) => [
         _buildContinueButton(viewModel),
         _buildLoginWithGoogleButton(viewModel),
+        if (viewModel.isAppleSignInAvailable)
+          _buildLoginWithAppleButton(viewModel),
         _buildOptionTextDivider(),
         _buildLoginWithPhoneButton(viewModel),
         verticalSpaceMedium
@@ -265,6 +268,18 @@ class LoginWithEmailScreen extends ViewModelWidget<LoginViewModel> {
         onTap: () async => await viewModel.signInWithGoogle(),
       );
 
+  Widget _buildLoginWithAppleButton(LoginViewModel viewModel) =>
+      CustomElevatedButton(
+        height: 55,
+        borderRadius: 12,
+        backgroundColor: kcWhite,
+        borderColor: kcPrimaryColor,
+        foregroundColor: kcPrimaryColor,
+        text: LocaleKeys.login_with_apple.tr(),
+        leadingIcon: Icons.apple,
+        onTap: () async => await viewModel.signInWithApple(),
+      );
+
   Widget _buildOptionTextDivider() => const OptionTextDivider();
 
   Widget _buildLoginWithPhoneButton(LoginViewModel viewModel) =>
@@ -287,4 +302,9 @@ class LoginWithEmailScreen extends ViewModelWidget<LoginViewModel> {
       viewModel.busy(StateObjects.loginWithGoogle)
           ? const PageLoadingIndicator()
           : Container();
+
+  Widget _buildLoginWithAppleState(LoginViewModel viewModel) =>
+      viewModel.busy(StateObjects.loginWithApple)
+          ? const PageLoadingIndicator()
+          : Container();
 }

lib/ui/views/register/register_viewmodel.dart

@@ -10,6 +10,7 @@ import 'package:yimaru_app/ui/common/ui_helpers.dart';
 
 import '../../../app/app.locator.dart';
 import '../../../models/user.dart';
+import '../../../services/apple_auth_service.dart';
 import '../../../services/google_auth_service.dart';
 import '../../../services/localization_service.dart';
 import '../../../services/status_checker_service.dart';
@@ -25,19 +26,23 @@ class RegisterViewModel extends ReactiveViewModel
 
   final _googleAuthService = locator<GoogleAuthService>();
 
+  final _appleAuthService = locator<AppleAuthService>();
+
   final _localizationService = locator<LocalizationService>();
 
   final _authenticationService = locator<AuthenticationService>();
 
   @override
   List<ListenableServiceMixin> get listenableServices =>
-      [_googleAuthService, _localizationService];
+      [_googleAuthService, _appleAuthService, _localizationService];
 
   // Google user
   GoogleSignInAccount? get _googleUser => _googleAuthService.googleUser;
 
   GoogleSignInAccount? get googleUser => _googleUser;
 
+  bool get isAppleSignInAvailable => _appleAuthService.isSupported;
+
   // Languages
   Map<String, dynamic> get _selectedLanguage =>
       _localizationService.selectedLanguage;
@@ -337,6 +342,50 @@ class RegisterViewModel extends ReactiveViewModel
     }
   }
 
+  // Register with Apple
+  Future<void> registerWithApple() async => await runBusyFuture(_appleLogin(),
+      busyObject: StateObjects.registerWithApple);
+
+  Future<void> _appleLogin() async {
+    if (await _statusChecker.checkConnection()) {
+      await _appleAuthService.appleAuth();
+
+      final credential = _appleAuthService.appleCredential;
+      final identityToken = credential?.identityToken;
+
+      if (identityToken == null || identityToken.isEmpty) {
+        showErrorToast('Apple login failed. Please try again.');
+        return;
+      }
+
+      Map<String, dynamic> data = {
+        'id_token': identityToken,
+        'email': credential?.email,
+        'first_name': credential?.givenName,
+        'last_name': credential?.familyName,
+      };
+
+      data.removeWhere((_, value) => value == null || value == '');
+
+      Map<String, dynamic> response = await _apiService.appleAuth(data);
+
+      if (response['status'] == ResponseStatus.success) {
+        User user = response['data'] as User;
+        Map<String, dynamic> data = {
+          'userId': user.userId,
+          'accessToken': user.accessToken,
+          'refreshToken': user.refreshToken
+        };
+        await _authenticationService.saveUserCredential(data);
+        clearUserData();
+        await replaceWithStartUp();
+        showSuccessToast(response['message']);
+      } else {
+        showErrorToast(response['message']);
+      }
+    }
+  }
+
   Future<void> verifyOtp() async =>
       await runBusyFuture(_verifyOtp(), busyObject: StateObjects.verifyOtp);
 

lib/ui/views/register/screens/register_with_email_screen.dart

@@ -65,7 +65,9 @@ class RegisterWithEmailScreen extends ViewModelWidget<RegisterViewModel> {
       Stack(
         children: [
           _buildScaffold(context: context, viewModel: viewModel),
-          _buildRegisterWithEmailState(viewModel)
+          _buildRegisterWithEmailState(viewModel),
+          _buildRegisterWithGoogleState(viewModel),
+          _buildRegisterWithAppleState(viewModel)
         ],
       );
 
@@ -191,6 +193,8 @@ class RegisterWithEmailScreen extends ViewModelWidget<RegisterViewModel> {
   List<Widget> _buildLowerColumnChildren(RegisterViewModel viewModel) => [
         _buildContinueButton(viewModel),
         _buildRegisterWithGoogleButton(viewModel),
+        if (viewModel.isAppleSignInAvailable)
+          _buildRegisterWithAppleButton(viewModel),
         _buildOptionTextDivider(),
         _buildRegisterWithEmailButton(viewModel),
         verticalSpaceMedium
@@ -225,6 +229,18 @@ class RegisterWithEmailScreen extends ViewModelWidget<RegisterViewModel> {
         onTap: () async => await viewModel.registerWithGoogle(),
       );
 
+  Widget _buildRegisterWithAppleButton(RegisterViewModel viewModel) =>
+      CustomElevatedButton(
+        height: 55,
+        borderRadius: 12,
+        backgroundColor: kcWhite,
+        borderColor: kcPrimaryColor,
+        foregroundColor: kcPrimaryColor,
+        text: LocaleKeys.register_with_apple.tr(),
+        leadingIcon: Icons.apple,
+        onTap: () async => await viewModel.registerWithApple(),
+      );
+
   Widget _buildOptionTextDivider() => const OptionTextDivider();
 
   Widget _buildRegisterWithEmailButton(RegisterViewModel viewModel) =>
@@ -243,4 +259,14 @@ class RegisterWithEmailScreen extends ViewModelWidget<RegisterViewModel> {
       viewModel.busy(StateObjects.register)
           ? const PageLoadingIndicator()
           : Container();
+
+  Widget _buildRegisterWithGoogleState(RegisterViewModel viewModel) =>
+      viewModel.busy(StateObjects.registerWithGoogle)
+          ? const PageLoadingIndicator()
+          : Container();
+
+  Widget _buildRegisterWithAppleState(RegisterViewModel viewModel) =>
+      viewModel.busy(StateObjects.registerWithApple)
+          ? const PageLoadingIndicator()
+          : Container();
 }

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -17,6 +17,7 @@ import google_sign_in_ios
 import package_info_plus
 import record_macos
 import shared_preferences_foundation
+import sign_in_with_apple
 import sqflite_darwin
 import url_launcher_macos
 import video_player_avfoundation
@@ -35,6 +36,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
   RecordMacOsPlugin.register(with: registry.registrar(forPlugin: "RecordMacOsPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
+  SignInWithApplePlugin.register(with: registry.registrar(forPlugin: "SignInWithApplePlugin"))
   SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))
   UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
   FVPVideoPlayerPlugin.register(with: registry.registrar(forPlugin: "FVPVideoPlayerPlugin"))

pubspec.lock

@@ -1121,10 +1121,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
+      sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349"
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.0"
+    version: "1.18.0"
   mime:
     dependency: transitive
     description:
@@ -1557,6 +1557,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.1"
+  sign_in_with_apple:
+    dependency: "direct main"
+    description:
+      name: sign_in_with_apple
+      sha256: "5568378c3cc5993931955357d85e4c3344fa4365006915bdef965fa3de1dc0a5"
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.0.0"
+  sign_in_with_apple_platform_interface:
+    dependency: transitive
+    description:
+      name: sign_in_with_apple_platform_interface
+      sha256: "981bca52cf3bb9c3ad7ef44aace2d543e5c468bb713fd8dda4275ff76dfa6659"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.0"
+  sign_in_with_apple_web:
+    dependency: transitive
+    description:
+      name: sign_in_with_apple_web
+      sha256: f316400827f52cafcf50d00e1a2e8a0abc534ca1264e856a81c5f06bd5b10fed
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -1718,10 +1742,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a"
+      sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.10"
+    version: "0.7.11"
   timezone:
     dependency: transitive
     description:
@@ -2011,5 +2035,5 @@ packages:
     source: hosted
     version: "3.1.3"
 sdks:
-  dart: ">=3.10.3 <4.0.0"
+  dart: ">=3.11.0 <4.0.0"
-  flutter: ">=3.38.4"
+  flutter: ">=3.41.0"

pubspec.yaml

@@ -55,6 +55,7 @@ dependencies:
   flutter_phone_direct_caller: ^2.2.1
   flutter_local_notifications: ^20.1.0
   internet_connection_checker_plus: ^2.9.1+2
+  sign_in_with_apple: ^8.0.0
 
 dev_dependencies:
   flutter_test: