refactor: remove old MyAccount activity

- update usage to new LoginFragment
ankidroid · Feb 1, 2025 · 25e9a69 · 25e9a69
1 parent 2d4b302
commit 25e9a69
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 545 deletions.
diff --git a/AnkiDroid/build.gradle b/AnkiDroid/build.gradle
@@ -134,7 +134,6 @@ android {
             // make the icon red if in debug mode
             resValue 'color', 'anki_foreground_icon_color_0', "#FFFF0000"
             resValue 'color', 'anki_foreground_icon_color_1', "#FFFF0000"
-            resValue "string", "applicationId", "${defaultConfig.applicationId}${applicationIdSuffix}"
         }
         named('release') {
             testCoverageEnabled = testReleaseBuild

diff --git a/AnkiDroid/src/main/AndroidManifest.xml b/AnkiDroid/src/main/AndroidManifest.xml
@@ -450,12 +450,6 @@
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/download_deck"
             android:theme="@style/Theme.MaterialComponents.NoActionBar" />
-        <activity
-            android:name="com.ichi2.anki.LoginActivity"
-            android:label="@string/menu_my_account"
-            android:exported="false"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            />
 
         <activity android:name=".IntroductionActivity"
             android:exported="false"

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/IntroductionActivity.kt b/AnkiDroid/src/main/java/com/ichi2/anki/IntroductionActivity.kt
@@ -23,6 +23,7 @@ import android.os.Bundle
 import androidx.activity.result.ActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.content.edit
+import com.ichi2.anki.account.AccountActivity
 import com.ichi2.anki.introduction.SetupCollectionFragment
 import com.ichi2.anki.introduction.SetupCollectionFragment.CollectionSetupOption
 import com.ichi2.anki.introduction.SetupCollectionFragment.Companion.handleCollectionSetupOption
@@ -68,7 +69,8 @@ class IntroductionActivity : AnkiActivity() {
 
     private fun openLoginDialog() {
         Timber.i("Opening login screen")
-        onLoginResult.launch(Intent(this, LoginActivity::class.java))
+        val intent = AccountActivity.getIntent(this)
+        onLoginResult.launch(intent)
     }
 
     private fun startDeckPicker(result: Int = RESULT_START_NEW) {

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/LoginActivity.kt b/AnkiDroid/src/main/java/com/ichi2/anki/LoginActivity.kt