Skip to content

fix(stats): recreate statistics and card info on rotation #21244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ayush-Patel-56 wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −8
Open

fix(stats): recreate statistics and card info on rotation #21244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions AnkiDroid/src/main/java/com/ichi2/anki/pages/CardInfoDestination.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ import android.content.Context
import android.content.Intent
import android.os.Bundle
import com.ichi2.anki.R
import com.ichi2.anki.SingleFragmentActivity
import com.ichi2.anki.libanki.CardId
import com.ichi2.anki.libanki.withoutUnicodeIsolation
import com.ichi2.anki.ui.internationalization.toSentenceCase
import com.ichi2.anki.utils.ConfigAwareSingleFragmentActivity
import com.ichi2.anki.utils.Destination

data class CardInfoDestination(
Expand All @@ -44,7 +44,7 @@ data class CardInfoDestination(
putString(CardInfoFragment.KEY_TITLE, cardInfoTitle)
putLong(CardInfoFragment.KEY_CARD_ID, cardId)
}
return SingleFragmentActivity.getIntent(
return ConfigAwareSingleFragmentActivity.getIntent(
context,
fragmentClass = CardInfoFragment::class,
arguments = arguments,
Expand Down
10 changes: 10 additions & 0 deletions AnkiDroid/src/main/java/com/ichi2/anki/pages/Statistics.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,16 @@ class Statistics : PageFragment(R.layout.page_statistics) {
webViewLayout.evaluateJavascript(javascriptCode, null)
}

override fun onCreateWebViewClient(savedInstanceState: Bundle?): PageWebViewClient =
super.onCreateWebViewClient(savedInstanceState).apply {
onPageFinishedCallbacks.add {
val deckName = binding.deckName.text.toString()
if (deckName.isNotEmpty()) {
changeDeck(deckName)
}
}
}

companion object {
private const val KEY_DECK_NAME = "key_deck_name"
}
Expand Down
5 changes: 3 additions & 2 deletions AnkiDroid/src/main/java/com/ichi2/anki/pages/StatisticsDestination.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ package com.ichi2.anki.pages

import android.content.Context
import android.content.Intent
import com.ichi2.anki.SingleFragmentActivity
import com.ichi2.anki.utils.ConfigAwareSingleFragmentActivity
import com.ichi2.anki.utils.Destination

class StatisticsDestination : Destination {
override fun toIntent(context: Context): Intent = SingleFragmentActivity.getIntent(context, fragmentClass = Statistics::class)
override fun toIntent(context: Context): Intent =
ConfigAwareSingleFragmentActivity.getIntent(context, fragmentClass = Statistics::class)
}
8 changes: 4 additions & 4 deletions AnkiDroid/src/test/java/com/ichi2/anki/pages/StatisticsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
import com.ichi2.anki.CollectionManager.withCol
import com.ichi2.anki.R
import com.ichi2.anki.RobolectricTest
import com.ichi2.anki.SingleFragmentActivity
import com.ichi2.anki.dialogs.DeckSelectionDialog
import com.ichi2.anki.utils.ConfigAwareSingleFragmentActivity
import kotlinx.coroutines.test.advanceUntilIdle
import org.junit.Test
import org.junit.jupiter.api.assertNotNull
Expand All @@ -43,7 +43,7 @@ class StatisticsTest : RobolectricTest() {
fun `shows 'Default' deck when collection is empty`() =
runTest {
ActivityScenario
.launch<SingleFragmentActivity>(
.launch<ConfigAwareSingleFragmentActivity>(
StatisticsDestination().toIntent(
targetContext,
),
Expand All @@ -62,7 +62,7 @@ class StatisticsTest : RobolectricTest() {
withCol { decks.select(testDeck1) }
addDeck(testDeckName2)
ActivityScenario
.launch<SingleFragmentActivity>(
.launch<ConfigAwareSingleFragmentActivity>(
StatisticsDestination().toIntent(
targetContext,
),
Expand All @@ -84,7 +84,7 @@ class StatisticsTest : RobolectricTest() {
// the statistics screen doesn't allow the selection of 'All Decks' and filtered decks,
// also 'Default' deck should be enabled no matter its status(empty/not empty)
ActivityScenario
.launch<SingleFragmentActivity>(StatisticsDestination().toIntent(targetContext))
.launch<ConfigAwareSingleFragmentActivity>(StatisticsDestination().toIntent(targetContext))
.onActivity { activity ->
val statisticsFragment =
activity.supportFragmentManager.findFragmentById(R.id.fragment_container)
Expand Down
Loading