VERY experimental Nintendo Switch 2 emulator
C++
android: Fix issues with ea/main icons and version codes
Charles Lombardo5fd13f02fd4a
diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.ktsindex 8c970609ff..f0a4dbd5a9 100644--- a/src/android/app/build.gradle.kts+++ b/src/android/app/build.gradle.kts@@ -48,7 +48,6 @@ android {applicationId = "org.yuzu.yuzu_emu"minSdk = 30targetSdk = 33- versionCode = 1versionName = getVersion()ndk {@@ -85,26 +84,39 @@ android {getDefaultProguardFile("proguard-android.txt"),"proguard-rules.pro")+ defaultConfig.versionCode = 1+ }++ register("relWithVersionCode") {+ signingConfig = signingConfigs.getByName("debug")+ isMinifyEnabled = true+ isDebuggable = false+ proguardFiles(+ getDefaultProguardFile("proguard-android.txt"),+ "proguard-rules.pro"+ )+ defaultConfig.versionCode = autoVersion}// builds a release build that doesn't need signing// Attaches 'debug' suffix to version and package name, allowing installation alongside the release build.register("relWithDebInfo") {- initWith(getByName("release"))- versionNameSuffix = "-debug"signingConfig = signingConfigs.getByName("debug")- enableAndroidTestCoverage = false+ isMinifyEnabled = trueisDebuggable = true+ versionNameSuffix = "-debug"+ enableAndroidTestCoverage = falseisJniDebuggable = true+ defaultConfig.versionCode = 1}// Signed by debug key disallowing distribution on Play Store.// Attaches 'debug' suffix to version and package name, allowing installation alongside the release build.debug {- // TODO If this is ever modified, change application_id in debug/strings.xml- versionNameSuffix = "-debug"isDebuggable = trueisJniDebuggable = true+ versionNameSuffix = "-debug"+ defaultConfig.versionCode = 1}}@@ -118,6 +130,7 @@ android {create("ea") {dimension = "version"buildConfigField("Boolean", "PREMIUM", "true")+ applicationIdSuffix = ".ea"}}diff --git a/src/android/app/src/ea/res/drawable/ic_launcher.xml b/src/android/app/src/ea/res/drawable/ic_launcher.xmldeleted file mode 100644index 9d074c347f..0000000000--- a/src/android/app/src/ea/res/drawable/ic_launcher.xml+++ /dev/null@@ -1,6 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">- <background android:drawable="@drawable/ic_icon_bg" />- <foreground android:drawable="@drawable/ic_yuzu_ea" />- <monochrome android:drawable="@drawable/ic_yuzu_ea" />-</adaptive-icon>diff --git a/src/android/app/src/main/res/drawable/ic_yuzu_ea.xml b/src/android/app/src/ea/res/drawable/ic_yuzu.xmlsimilarity index 100%rename from src/android/app/src/main/res/drawable/ic_yuzu_ea.xmlrename to src/android/app/src/ea/res/drawable/ic_yuzu.xmldiff --git a/src/android/app/src/main/res/drawable/ic_yuzu_ea_full.xml b/src/android/app/src/ea/res/drawable/ic_yuzu_full.xmlsimilarity index 100%rename from src/android/app/src/main/res/drawable/ic_yuzu_ea_full.xmlrename to src/android/app/src/ea/res/drawable/ic_yuzu_full.xmldiff --git a/src/android/app/src/main/res/drawable/ic_yuzu_ea_title.xml b/src/android/app/src/ea/res/drawable/ic_yuzu_title.xmlsimilarity index 100%rename from src/android/app/src/main/res/drawable/ic_yuzu_ea_title.xmlrename to src/android/app/src/ea/res/drawable/ic_yuzu_title.xmldiff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.ktindex c2e0b96158..0314feff68 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt@@ -88,15 +88,6 @@ class AboutFragment : Fragment() {binding.buttonWebsite.setOnClickListener { openLink(getString(R.string.website_link)) }binding.buttonGithub.setOnClickListener { openLink(getString(R.string.github_link)) }- if (BuildConfig.PREMIUM) {- binding.imageLogo.setImageDrawable(- ContextCompat.getDrawable(- requireContext(),- R.drawable.ic_yuzu_ea_title- )- )- }-setInsets()}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.ktindex 09628634dc..3a334a74c3 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt@@ -127,13 +127,6 @@ class HomeSettingsFragment : Fragment() {?.navigate(R.id.action_homeSettingsFragment_to_earlyAccessFragment)})- } else {- binding.logoImage.setImageDrawable(- ContextCompat.getDrawable(- requireContext(),- R.drawable.ic_yuzu_ea_full- )- )}binding.homeSettingsList.apply {