chore: restore AndroidManifest/Info.plist changes + resolve stash conflicts
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>
This commit is contained in:
@@ -18,6 +18,18 @@
|
|||||||
android:name="com.google.android.geo.API_KEY"
|
android:name="com.google.android.geo.API_KEY"
|
||||||
android:value="YOUR_GOOGLE_MAPS_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
|
<activity
|
||||||
android:name=".MainActivity"
|
android:name=".MainActivity"
|
||||||
android:exported="true"
|
android:exported="true"
|
||||||
@@ -31,11 +43,6 @@
|
|||||||
<meta-data
|
<meta-data
|
||||||
android:name="io.flutter.embedding.android.NormalTheme"
|
android:name="io.flutter.embedding.android.NormalTheme"
|
||||||
android:resource="@style/NormalTheme" />
|
android:resource="@style/NormalTheme" />
|
||||||
|
|
||||||
<intent-filter>
|
|
||||||
<action android:name="android.intent.action.MAIN" />
|
|
||||||
<category android:name="android.intent.category.LAUNCHER" />
|
|
||||||
</intent-filter>
|
|
||||||
</activity>
|
</activity>
|
||||||
|
|
||||||
<!-- Don't delete the meta-data below. Used by Flutter tool. -->
|
<!-- Don't delete the meta-data below. Used by Flutter tool. -->
|
||||||
|
|||||||
@@ -47,5 +47,18 @@
|
|||||||
<true/>
|
<true/>
|
||||||
<key>UIStatusBarHidden</key>
|
<key>UIStatusBarHidden</key>
|
||||||
<false/>
|
<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>
|
</dict>
|
||||||
</plist>
|
</plist>
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
class ApiEndpoints {
|
class ApiEndpoints {
|
||||||
// Change this to your desired backend base URL (local or UAT)
|
// Change this to your desired backend base URL (local or UAT)
|
||||||
// For local Django dev use: "http://127.0.0.1:8000/api"
|
// 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";
|
static const String baseUrl = "https://backend.eventifyplus.com/api";
|
||||||
|
|
||||||
/// Base URL for media files (images, icons uploaded via Django admin).
|
/// Base URL for media files (images, icons uploaded via Django admin).
|
||||||
|
|||||||
Reference in New Issue
Block a user