Merge pull request #87 from foxtrotdev/feature/app-improvements-1

[Android] Correct versioning, increase gradle version, new launcher icon, configs clean up

android/app/build.gradle

@@ -2,14 +2,16 @@ apply plugin: 'com.android.application'
 
 android {
 	compileSdkVersion 29
-	buildToolsVersion "29.0.2"
+	buildToolsVersion "29.0.3"
 	ndkVersion "21.1.6352462"
+
 	defaultConfig {
 		applicationId = 'com.drbeef.ioq3quest'
 		minSdkVersion 25
-		targetSdkVersion 26
+		//noinspection ExpiredTargetSdkVersion
-		versionCode 1
+		targetSdkVersion 29
-		versionName "1.0"
+		versionCode 57
+		versionName "1.1.2"
 		externalNativeBuild {
 			cmake {
 				arguments '-DANDROID_STL=c++_static'

android/app/src/main/AndroidManifest.xml

@@ -1,41 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="com.drbeef.ioq3quest"
+    package="com.drbeef.ioq3quest"
-	android:installLocation="preferExternal"
+    android:installLocation="preferExternal">
-	android:versionCode="57"
-	android:versionName="1.1.2">
-	<uses-feature android:name="android.hardware.vr.headtracking" android:version="1" android:required="true" />
-	<uses-feature android:glEsVersion="0x00030001" />
-	<!-- <uses-feature android:name="oculus.software.overlay_keyboard" android:required="false"/>-->
 
-	<uses-permission android:name="android.permission.INTERNET" />
+    <uses-feature
-	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+        android:name="android.hardware.vr.headtracking"
-	<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+        android:required="true"
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+        android:version="1" />
-	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-feature android:glEsVersion="0x00030001" />
 
-	<application
+    <uses-permission android:name="android.permission.INTERNET" />
-		android:allowBackup="false"
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-		android:fullBackupContent="false"
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-		android:requestLegacyExternalStorage="true"
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-		android:icon="@mipmap/ic_launcher"
+
-		android:label="@string/app_name"
+    <application
-		android:hasCode="true">
+        android:hasCode="true"
-		<meta-data android:name="com.samsung.android.vr.application.mode" android:value="vr_only"/>
+        android:icon="@mipmap/ic_launcher"
-		<meta-data android:name="com.oculus.supportedDevices" android:value="quest|quest2"/>
+        android:label="@string/app_name"
-		<meta-data android:name="com.oculus.ossplash" android:value="true"/>
+        android:requestLegacyExternalStorage="true">
-		<meta-data android:name="com.oculus.environmentVersion" android:value="1"/>
+        <meta-data
-		<activity android:name="com.drbeef.ioq3quest.MainActivity"
+            android:name="com.samsung.android.vr.application.mode"
-			android:label="@string/app_name"
+            android:value="vr_only" />
-			android:screenOrientation="landscape"
+        <meta-data
-			android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
+            android:name="com.oculus.supportedDevices"
-			android:configChanges="density|keyboard|keyboardHidden|navigation|orientation|screenLayout|screenSize|uiMode"
+            android:value="quest|quest2" />
-			android:launchMode="singleTask"
+        <meta-data
-			android:resizeableActivity="false">
+            android:name="com.oculus.ossplash"
-			<intent-filter>
+            android:value="true" />
-				<action android:name="android.intent.action.MAIN" />
+        <meta-data
-				<category android:name="android.intent.category.LAUNCHER" />
+            android:name="com.oculus.environmentVersion"
-			</intent-filter>
+            android:value="1" />
-		</activity>
+
-	</application>
+        <activity
+            android:name="com.drbeef.ioq3quest.MainActivity"
+            android:configChanges="density|keyboard|keyboardHidden|navigation|orientation|screenLayout|screenSize|uiMode"
+            android:exported="true"
+            android:launchMode="singleTask"
+            android:resizeableActivity="false"
+            android:screenOrientation="landscape"
+            android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
 </manifest>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

android/app/src/main/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#D7DCD4</color>
+</resources>

android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:7.2.1'
     }
 }
 

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip