revert android files

shocknet · Sep 23, 2024 · 8dd3d83 · 8dd3d83
1 parent baac7ca
commit 8dd3d83
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -1,14 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    namespace "undefined"
+    namespace project.hasProperty('applicationId') ? project.property('applicationId') : System.getenv('VITE_ANDROID_APPLICATION_ID')
     compileSdkVersion rootProject.ext.compileSdkVersion
     defaultConfig {
-        applicationId "undefined"
+        applicationId project.hasProperty('applicationId') ? project.property('applicationId') : System.getenv('VITE_ANDROID_APPLICATION_ID')
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode undefined
-        versionName "undefined"
+        versionCode project.hasProperty('versionCode') ? project.property('versionCode') as int : 1
+        versionName project.hasProperty('versionName') ? project.property('versionName') : "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         resValue "string", "app_name", project.hasProperty('appName') ? project.property('appName') : "Default App Name"
         manifestPlaceholders = [appUrl: project.hasProperty('appUrl') ? project.property('appUrl') : (project.hasProperty('applicationId') ? project.property('applicationId').replace('app.', '') : "my.shockwallet.app")]

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="undefined">
+    package="${applicationId}">
     <application
         android:allowBackup="true"
         android:requestLegacyExternalStorage="true"
@@ -11,7 +11,7 @@
         android:theme="@style/AppTheme">
         <activity
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
-            android:name="undefined.MainActivity"
+            android:name=".MainActivity"
             android:label="@string/app_name"
             android:theme="@style/AppTheme.NoActionBarLaunch"
             android:launchMode="singleTask"
@@ -43,7 +43,7 @@
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="https" android:host="undefined" />
+                <data android:scheme="https" android:host="${appUrl}" />
             </intent-filter>
         </activity>