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.
This commit is contained in:
		@@ -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"
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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>
 | 
			
		||||
@@ -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()
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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 {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user