From 7867e6c7282d96c25f5a547cc2f509eaeb6f2bc3 Mon Sep 17 00:00:00 2001
From: Sicherhaven <admin@bshtech.net>
Date: Sun, 19 Apr 2026 21:44:57 +0530
Subject: [PATCH] chore: restore AndroidManifest/Info.plist changes + resolve
 stash conflicts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Merges in-progress manifest/plist changes (stashed before merge).
Resolves trivial comment conflicts in api_endpoints.dart and auth_service.dart —
both retained backend.eventifyplus.com URL and Google OAuth serverClientId.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 android/app/src/main/AndroidManifest.xml | 17 ++++++++++++-----
 ios/Runner/Info.plist                    | 13 +++++++++++++
 lib/core/api/api_endpoints.dart          |  2 +-
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 74bf722..14f8fd1 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -18,6 +18,18 @@
             android:name="com.google.android.geo.API_KEY"
             android:value="YOUR_GOOGLE_MAPS_API_KEY"/>
 
+        <!-- Splash video plays first, then launches MainActivity -->
+        <activity
+            android:name=".SplashActivity"
+            android:exported="true"
+            android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
+            android:screenOrientation="portrait">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
         <activity
             android:name=".MainActivity"
             android:exported="true"
@@ -31,11 +43,6 @@
             <meta-data
                 android:name="io.flutter.embedding.android.NormalTheme"
                 android:resource="@style/NormalTheme" />
-
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
         </activity>
 
         <!-- Don't delete the meta-data below. Used by Flutter tool. -->
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 3af8016..b86a432 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -47,5 +47,18 @@
 		<true/>
 		<key>UIStatusBarHidden</key>
 		<false/>
+		<key>GIDClientID</key>
+		<string>639347358523-1siq78p4vntem3dtr067ajdhqsv9a2jd.apps.googleusercontent.com</string>
+		<key>CFBundleURLTypes</key>
+		<array>
+			<dict>
+				<key>CFBundleTypeRole</key>
+				<string>Editor</string>
+				<key>CFBundleURLSchemes</key>
+				<array>
+					<string>com.googleusercontent.apps.639347358523-1siq78p4vntem3dtr067ajdhqsv9a2jd</string>
+				</array>
+			</dict>
+		</array>
 	</dict>
 </plist>
diff --git a/lib/core/api/api_endpoints.dart b/lib/core/api/api_endpoints.dart
index ac30036..5d1da40 100644
--- a/lib/core/api/api_endpoints.dart
+++ b/lib/core/api/api_endpoints.dart
@@ -2,7 +2,7 @@
 class ApiEndpoints {
   // Change this to your desired backend base URL (local or UAT)
   // For local Django dev use: "http://127.0.0.1:8000/api"
-  // em.eventifyplus.com DNS points to K8s with broken TLS — use backend.eventifyplus.com (EC2, valid cert)
+  // em.eventifyplus.com / uat.eventifyplus.com DNS → K8s, broken TLS. backend.eventifyplus.com → EC2 174.129.72.160, valid cert.
   static const String baseUrl = "https://backend.eventifyplus.com/api";
 
   /// Base URL for media files (images, icons uploaded via Django admin).