From de0fc464a48a2b2a26912afc7751c4ee2d8f008a Mon Sep 17 00:00:00 2001
From: Thomas Andres Gomez <andres.gomez.thomas@gmail.com>
Date: Thu, 10 Aug 2023 08:50:32 +0200
Subject: [PATCH] Change certificat configuration for debug

---
 app/build.gradle.kts                          |  53 +++++++++---------
 app/google-services.json                      |   2 +-
 .../authentication/AuthenticationScreen.kt    |   2 +-
 .../authentication/VersionViewModel.kt        |   6 +-
 debug.keystore                                | Bin 0 -> 2518 bytes
 5 files changed, 34 insertions(+), 29 deletions(-)
 create mode 100644 debug.keystore

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index f982505..fd08d2f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,5 +1,3 @@
-import com.android.build.gradle.internal.dsl.SigningConfig
-
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
@@ -14,11 +12,17 @@ android {
     compileSdk = 33
 
     signingConfigs {
+        getByName("debug") {
+            storeFile = file("../debug.keystore")
+            storePassword = "123456"
+            keyAlias = "debug"
+            keyPassword = "123456"
+        }
         create("pixelized") {
-            storeFile = file(project.properties["PIXELIZED_RELEASE_STORE_FILE"] as String)
-            storePassword = project.properties["PIXELIZED_RELEASE_STORE_PASSWORD"] as String
-            keyAlias = project.properties["PIXELIZED_RELEASE_KEY_ALIAS"] as String
-            keyPassword = project.properties["PIXELIZED_RELEASE_KEY_PASSWORD"] as String
+            storeFile = (project.properties["PIXELIZED_RELEASE_STORE_FILE"] as? String)?.let { file(it) }
+            storePassword = project.properties["PIXELIZED_RELEASE_STORE_PASSWORD"] as? String
+            keyAlias = project.properties["PIXELIZED_RELEASE_KEY_ALIAS"] as? String
+            keyPassword = project.properties["PIXELIZED_RELEASE_KEY_PASSWORD"] as? String
         }
     }
 
@@ -36,19 +40,19 @@ android {
     }
 
     buildTypes {
-        release {
-            isDebuggable = false
-            isMinifyEnabled = true
-            signingConfig = signingConfigs.pixelized
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
-            )
-        }
         debug {
             applicationIdSuffix = ".dev"
             isDebuggable = true
             isMinifyEnabled = false
-            signingConfig = signingConfigs.pixelized
+            signingConfig = signingConfigs.getByName("debug")
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
+            )
+        }
+        release {
+            isDebuggable = false
+            isMinifyEnabled = true
+            signingConfig = signingConfigs.getByName("pixelized")
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
             )
@@ -126,13 +130,12 @@ dependencies {
     kapt("com.github.bumptech.glide:compiler:4.14.2") // this have to be align with landscapist-glide
 }
 
-private val NamedDomainObjectContainer<SigningConfig>.pixelized get() = this.getByName("pixelized")
-
-val gitBuildNumber: Int get() {
-    val stdout = org.apache.commons.io.output.ByteArrayOutputStream()
-    rootProject.exec {
-        commandLine("git", "rev-list", "--count", "HEAD")
-        standardOutput = stdout
-    }
-    return stdout.toString().trim().toInt()
-}
\ No newline at end of file
+val gitBuildNumber: Int
+    get() {
+        val stdout = org.apache.commons.io.output.ByteArrayOutputStream()
+        rootProject.exec {
+            commandLine("git", "rev-list", "--count", "HEAD")
+            standardOutput = stdout
+        }
+        return stdout.toString().trim().toInt()
+    }
\ No newline at end of file
diff --git a/app/google-services.json b/app/google-services.json
index 585f264..df0d6b0 100644
--- a/app/google-services.json
+++ b/app/google-services.json
@@ -55,7 +55,7 @@
           "client_type": 1,
           "android_info": {
             "package_name": "com.pixelized.rplexicon.dev",
-            "certificate_hash": "39ee1766d2225263052d4a4e82182d1c3e886f35"
+            "certificate_hash": "b5bd860f1f89de118613c3e94b3f6c8cbd6d876a"
           }
         },
         {
diff --git a/app/src/main/java/com/pixelized/rplexicon/ui/screens/authentication/AuthenticationScreen.kt b/app/src/main/java/com/pixelized/rplexicon/ui/screens/authentication/AuthenticationScreen.kt
index 7051c88..df167fa 100644
--- a/app/src/main/java/com/pixelized/rplexicon/ui/screens/authentication/AuthenticationScreen.kt
+++ b/app/src/main/java/com/pixelized/rplexicon/ui/screens/authentication/AuthenticationScreen.kt
@@ -387,7 +387,7 @@ private fun AuthenticationScreenContentPreview() {
                 modifier = Modifier
                     .fillMaxSize()
                     .padding(all = 16.dp),
-                version = VersionViewModel.Version(R.string.app_name, "0.0.0", "0"),
+                version = VersionViewModel.Version(R.string.app_name, "0.0.0", "0", true),
                 onGoogleSignIn = { },
             )
         }
diff --git a/app/src/main/java/com/pixelized/rplexicon/ui/screens/authentication/VersionViewModel.kt b/app/src/main/java/com/pixelized/rplexicon/ui/screens/authentication/VersionViewModel.kt
index 92705d3..091f014 100644
--- a/app/src/main/java/com/pixelized/rplexicon/ui/screens/authentication/VersionViewModel.kt
+++ b/app/src/main/java/com/pixelized/rplexicon/ui/screens/authentication/VersionViewModel.kt
@@ -16,7 +16,8 @@ class VersionViewModel @Inject constructor() : ViewModel() {
     val version = Version(
         appName = R.string.app_name,
         version = BuildConfig.VERSION_NAME,
-        code = BuildConfig.VERSION_CODE.toString()
+        code = BuildConfig.VERSION_CODE.toString(),
+        debug = BuildConfig.DEBUG,
     )
 
     @Stable
@@ -24,11 +25,12 @@ class VersionViewModel @Inject constructor() : ViewModel() {
         @StringRes val appName: Int,
         val version: String,
         val code: String,
+        val debug: Boolean,
     ) {
         @Composable
         @Stable
         fun toText(): String {
-            return "${stringResource(id = appName)} ${version}.${code}"
+            return "${stringResource(id = appName)}${if (debug) "-dev" else ""} ${version}.${code}"
         }
     }
 }
\ No newline at end of file
diff --git a/debug.keystore b/debug.keystore
new file mode 100644
index 0000000000000000000000000000000000000000..03cdaab7ea64f7903486ad39bb522386465ecafc
GIT binary patch
literal 2518
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
N-uZZ;`(scR1psPlf1m&W

literal 0
HcmV?d00001