Custom Cloud auth UI

CHANGELOG.md

@@ -12,6 +12,7 @@ Releases marked with 🧪 (or previously with the "beta" suffix) were released o
 
 * 🔧 Shows: move manage lists button from more options menu to inside the overview and details tabs.
 * 🔨 Trakt: downloading ratings also works if API returns rating 0.
+* 🔨 Cloud: after deleting an account, signing in no longer re-uses the deleted account.
 
 ## Version 2026.2
 

CREDITS.txt

@@ -120,6 +120,9 @@ Copyright 2013 Uwe Trottmann
 truth (https://github.com/google/truth)
 Copyright 2011 Google, Inc.
 
+ZXing (https://github.com/zxing/zxing)
+Copyright ZXing authors
+
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
@@ -134,6 +137,8 @@ limitations under the License.
 
 ## Licensed under Android Software Development Kit License
 
+googleid (https://developers.google.com/identity/android-credential-manager)
+
 Google Play Billing (https://developer.android.com/google/play/billing/billing_library_overview)
 
 Google Play Services (https://developers.google.com/android/guides/overview)

app/build.gradle.kts

@@ -2,20 +2,30 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import java.io.FileInputStream
 import java.util.Properties
 
+// For CI (and so debug builds just work), use a placeholder file for google-services plugin
+val googleServicesJsonFile = project.file("google-services.json")
+val placeholderWarningMessage =
+    "WARNING: Using google-services.json with placeholder values, do not release this!"
+if (!googleServicesJsonFile.exists()) {
+    val templateFile = project.file("google-services-template.json")
+    templateFile.copyTo(googleServicesJsonFile)
+    // Also write warning message to template file so it shows up in git
+    templateFile.writeText(placeholderWarningMessage)
+}
+if (googleServicesJsonFile.readText().contains("placeholder")) {
+    println(placeholderWarningMessage)
+}
+
 plugins {
     id("com.android.application")
     kotlin("android")
     kotlin("kapt")
     alias(libs.plugins.compose.compiler)
+    // Firebase Authentication, Crashlytics
+    alias(libs.plugins.google.services)
+    alias(libs.plugins.firebase.crashlytics)
 }
 
-if (project.file("google-services.json").exists()) {
-    apply(plugin = "com.google.gms.google-services")
-}
-// Note: need to apply Crashlytics after Google services plugin,
-// above conditional apply doesn't work inside plugins block.
-apply(plugin = "com.google.firebase.crashlytics")
-
 val sgCompileSdk: Int by rootProject.extra
 val sgMinSdk: Int by rootProject.extra
 val sgTargetSdk: Int by rootProject.extra
@@ -213,6 +223,7 @@ dependencies {
     implementation(libs.androidx.constraintlayout)
     implementation(libs.androidx.coordinatorlayout)
     implementation(libs.androidx.preference)
+    implementation(libs.androidx.datastore)
     implementation(libs.androidx.swiperefreshlayout)
 
     // Compose
@@ -226,6 +237,7 @@ dependencies {
     implementation(libs.androidx.activity.compose)
     // Optional - Integration with ViewModels
     implementation(libs.androidx.lifecycle.compose)
+    implementation(libs.androidx.navigation)
 
     // ViewModel and LiveData
     implementation(libs.androidx.lifecycle.livedata)
@@ -273,14 +285,16 @@ dependencies {
         exclude(group = "org.threeten", module = "threetenbp") // using ThreeTenABP instead
     }
 
+    // Firebase Authentication
+    implementation(libs.firebase.auth)
+    implementation(libs.androidx.credentials)
+    implementation(libs.androidx.credentials.play)
+    implementation(libs.googleid)
+    implementation(libs.zxing)
+
     // Note: can not use Firebase BOM as firebase-ui-auth has not updated in a while
     // Crashlytics
     implementation(libs.firebase.crashlytics)
-    // Firebase Sign-In
-    implementation(libs.firebase.ui.auth)
-    // Use compatible later versions of firebase-ui-auth dependencies to get latest fixes.
-    implementation(libs.firebase.auth)
-    implementation(libs.play.services.auth)
 
     // Amazon Billing
     // Note: requires to add AppstoreAuthenticationKey.pem into amazon/assets.

app/google-services-template.json

@@ -0,0 +1,93 @@
+{
+  "project_info": {
+    "project_number": "123456789012",
+    "firebase_url": "https://project-id-placeholder.firebaseio.com",
+    "project_id": "project-id-placeholder",
+    "storage_bucket": "project-id-placeholder.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "app-id-placeholder",
+        "android_client_info": {
+          "package_name": "com.battlelancer.seriesguide"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "client-id-placeholder",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.battlelancer.seriesguide",
+            "certificate_hash": "certificate-hash-placeholder"
+          }
+        },
+        {
+          "client_id": "client-id-placeholder",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.battlelancer.seriesguide",
+            "certificate_hash": "certificate-hash-placeholder"
+          }
+        },
+        {
+          "client_id": "client-id-placeholder",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "api-key-placeholder"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "client-id-placeholder",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "app-id-placeholder",
+        "android_client_info": {
+          "package_name": "com.uwetrottmann.seriesguide.amzn"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "client-id-placeholder",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.uwetrottmann.seriesguide.amzn",
+            "certificate_hash": "certificate-hash-placeholder"
+          }
+        },
+        {
+          "client_id": "client-id-placeholder",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "api-key-placeholder"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "client-id-placeholder",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

app/lint.xml

@@ -21,4 +21,11 @@
     </issue>
     <!-- Avoid spamming lint output, there is no need to use these, it's just convenience -->
     <issue id="UseKtx" severity="ignore" />
+    <!--
+    AndroidX Credential Manager: lint errors that an asset_statements must be added, but according
+    to documentation it's only required for passkeys. It also requires providing a
+    .well-known/assetlinks.json from the sign-in domain, but currently not offering a web interface.
+    https://developer.android.com/identity/credential-manager/prerequisites#configure-digital-asset-links
+    -->
+    <issue id="CredManMissingDal" severity="ignore" />
 </lint>

app/src/main/AndroidManifest.xml

@@ -111,6 +111,8 @@
         <activity
             android:name="com.battlelancer.seriesguide.backend.CloudSetupActivity"
             android:label="@string/hexagon" />
+        <activity
+            android:name="com.battlelancer.seriesguide.backend.auth.FirebaseAuthActivity" />
 
         <!-- Shows -->
         <activity