From 2289f7ad1536cdb44ae02c25d1c6ed85d7567e2e Mon Sep 17 00:00:00 2001
From: Charles Lombardo <clombardo169@gmail.com>
Date: Sat, 13 May 2023 12:39:28 -0400
Subject: [PATCH] android: Fix issues with ea/main icons and version codes
Now all yuzu icon variants are taken care of and now we have a build variant that uses the versioning we need for the play store.
---
src/android/app/build.gradle.kts | 25 ++++++++++++++-----
.../app/src/ea/res/drawable/ic_launcher.xml | 6 -----
.../res/drawable/ic_yuzu.xml} | 0
.../res/drawable/ic_yuzu_full.xml} | 0
.../res/drawable/ic_yuzu_title.xml} | 0
.../yuzu/yuzu_emu/fragments/AboutFragment.kt | 9 -------
.../fragments/HomeSettingsFragment.kt | 7 ------
7 files changed, 19 insertions(+), 28 deletions(-)
delete mode 100644 src/android/app/src/ea/res/drawable/ic_launcher.xml
rename src/android/app/src/{main/res/drawable/ic_yuzu_ea.xml => ea/res/drawable/ic_yuzu.xml} (100%)
rename src/android/app/src/{main/res/drawable/ic_yuzu_ea_full.xml => ea/res/drawable/ic_yuzu_full.xml} (100%)
rename src/android/app/src/{main/res/drawable/ic_yuzu_ea_title.xml => ea/res/drawable/ic_yuzu_title.xml} (100%)
diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.kts
index 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 = 30
targetSdk = 33
- versionCode = 1
versionName = 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 = true
isDebuggable = true
+ versionNameSuffix = "-debug"
+ enableAndroidTestCoverage = false
isJniDebuggable = 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 = true
isJniDebuggable = 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.xml
deleted file mode 100644
index 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.xml
similarity index 100%
rename from src/android/app/src/main/res/drawable/ic_yuzu_ea.xml
rename to src/android/app/src/ea/res/drawable/ic_yuzu.xml
diff --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.xml
similarity index 100%
rename from src/android/app/src/main/res/drawable/ic_yuzu_ea_full.xml
rename to src/android/app/src/ea/res/drawable/ic_yuzu_full.xml
diff --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.xml
similarity index 100%
rename from src/android/app/src/main/res/drawable/ic_yuzu_ea_title.xml
rename to src/android/app/src/ea/res/drawable/ic_yuzu_title.xml
diff --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.kt
index 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.kt
index 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 {