New icon images, reorganize files, update banner

hrydgard · Nov 3, 2024 · 7ce876d · 7ce876d · Jack54guythecoder · Nov 3, 2024
1 parent 325d6d7
commit 7ce876d
Show file tree

Hide file tree

Showing 65 changed files with 22 additions and 13 deletions.
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
@@ -111,7 +111,7 @@
 
         <meta-data
             android:name="xperiaplayoptimized_content"
-            android:resource="@drawable/ic_launcher" />
+            android:resource="@mipmap/ic_launcher" />
 
         <profileable android:shell="true" android:enabled="true" />
     </application>

diff --git a/android/build.gradle b/android/build.gradle
@@ -48,7 +48,11 @@ android {
 
 	compileSdk 35
 	ndkVersion "21.4.7075529"
-
+	java {
+		toolchain {
+			languageVersion = JavaLanguageVersion.of(17)
+		}
+	}
 	defaultConfig {
 		/*
 		configurations.all {
@@ -117,10 +121,14 @@ android {
 					'../assets',
 			]
 		}
+		normal {
+			res.srcDirs = ['normal/res']
+		}
 		gold {
 			res.srcDirs = ['gold/res']
 		}
 		vr {
+			res.srcDirs = ['normal/res']
 			manifest.srcFile 'VRManifest.xml'
 		}
 		legacy {

diff --git a/android/d.txt b/android/d.txt
diff --git a/android/gold/res/drawable-hdpi/ic_launcher.png b/android/gold/res/drawable-hdpi/ic_launcher.png
diff --git a/android/gold/res/drawable-ldpi/ic_launcher.png b/android/gold/res/drawable-ldpi/ic_launcher.png
diff --git a/android/gold/res/drawable-mdpi/ic_launcher.png b/android/gold/res/drawable-mdpi/ic_launcher.png
diff --git a/android/gold/res/drawable-xhdpi/ic_banner.png b/android/gold/res/drawable-xhdpi/ic_banner.png
diff --git a/android/gold/res/drawable-xhdpi/ic_launcher.png b/android/gold/res/drawable-xhdpi/ic_launcher.png
diff --git a/android/gold/res/drawable-xxhdpi/ic_launcher.png b/android/gold/res/drawable-xxhdpi/ic_launcher.png
diff --git a/...oid/res/mipmap-anydpi-v26/ic_launcher.xml → ...s/mipmap-anydpi-v26/ic_launcher_round.xml b/...oid/res/mipmap-anydpi-v26/ic_launcher.xml → ...s/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/android/gold/res/mipmap-hdpi/ic_launcher.png b/android/gold/res/mipmap-hdpi/ic_launcher.png
diff --git a/android/gold/res/mipmap-hdpi/ic_launcher_foreground.png b/android/gold/res/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/android/gold/res/mipmap-hdpi/ic_launcher_round.png b/android/gold/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/android/gold/res/mipmap-mdpi/ic_launcher.png b/android/gold/res/mipmap-mdpi/ic_launcher.png
diff --git a/android/gold/res/mipmap-mdpi/ic_launcher_foreground.png b/android/gold/res/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/android/gold/res/mipmap-mdpi/ic_launcher_round.png b/android/gold/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/android/gold/res/mipmap-xhdpi/ic_launcher.png b/android/gold/res/mipmap-xhdpi/ic_launcher.png
diff --git a/android/gold/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/gold/res/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/android/gold/res/mipmap-xhdpi/ic_launcher_round.png b/android/gold/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/android/gold/res/mipmap-xxhdpi/ic_launcher.png b/android/gold/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/android/gold/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/gold/res/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/android/gold/res/mipmap-xxhdpi/ic_launcher_round.png b/android/gold/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/android/gold/res/mipmap-xxxhdpi/ic_launcher.png b/android/gold/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/android/gold/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/gold/res/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/android/gold/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/gold/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/android/gold/res/values/ic_launcher_background.xml b/android/gold/res/values/ic_launcher_background.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#53482D</color>
+    <color name="ic_launcher_background">#534820</color>
 </resources>
diff --git a/android/legacy/res/drawable-hdpi/ic_launcher.png b/android/legacy/res/drawable-hdpi/ic_launcher.png
diff --git a/android/legacy/res/drawable-mdpi/ic_launcher.png b/android/legacy/res/drawable-mdpi/ic_launcher.png
diff --git a/android/legacy/res/drawable-xhdpi/ic_launcher.png b/android/legacy/res/drawable-xhdpi/ic_launcher.png
diff --git a/android/legacy/res/drawable-xxhdpi/ic_launcher.png b/android/legacy/res/drawable-xxhdpi/ic_launcher.png
diff --git a/android/res/drawable-xhdpi/ic_banner.png → ...d/normal/res/drawable-xhdpi/ic_banner.png b/android/res/drawable-xhdpi/ic_banner.png → ...d/normal/res/drawable-xhdpi/ic_banner.png
diff --git a/android/normal/res/mipmap-anydpi-v26/ic_launcher.xml b/android/normal/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="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>
diff --git a/android/normal/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/normal/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="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>
diff --git a/android/normal/res/mipmap-hdpi/ic_launcher.png b/android/normal/res/mipmap-hdpi/ic_launcher.png
diff --git a/android/normal/res/mipmap-hdpi/ic_launcher_foreground.png b/android/normal/res/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/android/normal/res/mipmap-hdpi/ic_launcher_round.png b/android/normal/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/android/normal/res/mipmap-mdpi/ic_launcher.png b/android/normal/res/mipmap-mdpi/ic_launcher.png
diff --git a/android/normal/res/mipmap-mdpi/ic_launcher_foreground.png b/android/normal/res/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/android/normal/res/mipmap-mdpi/ic_launcher_round.png b/android/normal/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/android/normal/res/mipmap-xhdpi/ic_launcher.png b/android/normal/res/mipmap-xhdpi/ic_launcher.png
diff --git a/android/normal/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/normal/res/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/android/normal/res/mipmap-xhdpi/ic_launcher_round.png b/android/normal/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/android/normal/res/mipmap-xxhdpi/ic_launcher.png b/android/normal/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/android/normal/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/normal/res/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/android/normal/res/mipmap-xxhdpi/ic_launcher_round.png b/android/normal/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/android/normal/res/mipmap-xxxhdpi/ic_launcher.png b/android/normal/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/android/normal/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/normal/res/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/android/normal/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/normal/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/...oid/res/values/ic_launcher_background.xml → ...mal/res/values/ic_launcher_background.xml b/...oid/res/values/ic_launcher_background.xml → ...mal/res/values/ic_launcher_background.xml
diff --git a/android/res/drawable-hdpi/ic_launcher.png b/android/res/drawable-hdpi/ic_launcher.png
diff --git a/android/res/drawable-mdpi/ic_launcher.png b/android/res/drawable-mdpi/ic_launcher.png
diff --git a/android/res/drawable-xhdpi/ic_launcher.png b/android/res/drawable-xhdpi/ic_launcher.png
diff --git a/android/res/drawable-xxhdpi/ic_launcher.png b/android/res/drawable-xxhdpi/ic_launcher.png
diff --git a/android/res/mipmap-hdpi/ic_launcher.png b/android/res/mipmap-hdpi/ic_launcher.png
diff --git a/android/res/mipmap-hdpi/ic_launcher_foreground.png b/android/res/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/android/res/mipmap-mdpi/ic_launcher.png b/android/res/mipmap-mdpi/ic_launcher.png
diff --git a/android/res/mipmap-mdpi/ic_launcher_foreground.png b/android/res/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/android/res/mipmap-xhdpi/ic_launcher.png b/android/res/mipmap-xhdpi/ic_launcher.png
diff --git a/android/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/res/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/android/res/mipmap-xxhdpi/ic_launcher.png b/android/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/android/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/res/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/android/res/values/analytics.xml b/android/res/values/analytics.xml
diff --git a/android/src/gold/ic_launcher-playstore.png b/android/src/gold/ic_launcher-playstore.png
diff --git a/android/src/normal/ic_launcher-playstore.png b/android/src/normal/ic_launcher-playstore.png
diff --git a/android/src/org/ppsspp/ppsspp/ShortcutActivity.java b/android/src/org/ppsspp/ppsspp/ShortcutActivity.java
@@ -154,7 +154,7 @@ private void respondToShortcutRequest(Uri uri) {
 		}
 		if (!setIcon) {
 			// Fall back to the PPSSPP icon.
-			ShortcutIconResource iconResource = ShortcutIconResource.fromContext(this, R.drawable.ic_launcher);
+			ShortcutIconResource iconResource = ShortcutIconResource.fromContext(this, R.mipmap.ic_launcher);
 			responseIntent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, iconResource);
 		}
 		setResult(RESULT_OK, responseIntent);