Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
49 changes: 35 additions & 14 deletions AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,13 @@ import android.graphics.PixelFormat
import android.os.Build
import android.os.Bundle
import android.text.util.Linkify
import android.view.Gravity
import android.view.KeyEvent
import android.view.Menu
import android.view.MenuItem
import android.view.View
import android.view.ViewGroup.MarginLayoutParams
import android.widget.LinearLayout
import android.widget.TextView
import androidx.activity.OnBackPressedCallback
import androidx.activity.SystemBarStyle
Expand All @@ -37,6 +39,7 @@ import androidx.activity.result.contract.ActivityResultContracts
import androidx.activity.viewModels
import androidx.annotation.VisibleForTesting
import androidx.appcompat.app.AlertDialog
import androidx.appcompat.widget.AppCompatCheckBox
import androidx.appcompat.widget.SearchView
import androidx.appcompat.widget.Toolbar
import androidx.appcompat.widget.TooltipCompat
Expand Down Expand Up @@ -1545,23 +1548,37 @@ open class DeckPicker :
launchCatchingTask {
val summary = AnkiquestStudySession.finish()
if (summary != null && sharedPrefs().getBoolean(AnkiquestNavigation.SESSION_SUMMARY_KEY, true)) {
val neverAgain =
AppCompatCheckBox(this@DeckPicker).apply {
setText(R.string.ankiquest_summary_dont_show_again)
}
val content =
LinearLayout(this@DeckPicker).apply {
orientation = LinearLayout.VERTICAL
val padding = (20 * resources.displayMetrics.density).toInt()
setPadding(padding, 0, padding, 0)
addView(
com.ichi2.anki.ankiquest.AnkiquestAki
.image(
this@DeckPicker,
if (summary.remaining == 0) R.drawable.aki_celebrate else R.drawable.aki_streak,
112,
).apply {
layoutParams =
LinearLayout
.LayoutParams(
layoutParams,
).apply { gravity = Gravity.CENTER_HORIZONTAL }
},
)
addView(neverAgain)
}
val builder =
AlertDialog
.Builder(this@DeckPicker)
.setTitle(R.string.ankiquest_summary_title)
.setView(
com.ichi2.anki.ankiquest.AnkiquestAki.image(
this@DeckPicker,
if (summary.remaining ==
0
) {
R.drawable.aki_celebrate
} else {
R.drawable.aki_streak
},
112,
),
).setMessage(
.setView(content)
.setMessage(
getString(
R.string.ankiquest_summary_body,
summary.reviews,
Expand All @@ -1575,7 +1592,11 @@ open class DeckPicker :
if (summary.remaining > 0) {
builder.setPositiveButton(R.string.ankiquest_summary_continue) { _, _ -> openReviewer() }
}
builder.show()
builder.show().setOnDismissListener {
if (neverAgain.isChecked) {
sharedPrefs().edit { putBoolean(AnkiquestNavigation.SESSION_SUMMARY_KEY, false) }
}
}
}
fragment?.refreshInterface()
}
Expand Down
1 change: 1 addition & 0 deletions AnkiDroid/src/main/res/values-de/ankiquest_navigation.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<string name="ankiquest_summary_progress">Fortschritt ansehen</string>
<string name="ankiquest_summary_preference_title">Sitzungszusammenfassung</string>
<string name="ankiquest_summary_preference_summary">Zeige eine unaufdringliche, barrierefreie Zusammenfassung, wenn du eine Lernsitzung verlässt.</string>
<string name="ankiquest_summary_dont_show_again">Nicht mehr anzeigen</string>
<string name="ankiquest_missing_deck">Dieser Stapel ist nicht mehr verfügbar. Wähle einen anderen.</string>
<string name="ankiquest_deck_ready_later">In diesem Stapel sind gerade keine Karten bereit. Wähle einen anderen oder komme später wieder.</string>
</resources>
1 change: 1 addition & 0 deletions AnkiDroid/src/main/res/values-es/ankiquest_navigation.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<string name="ankiquest_summary_progress">Ver progreso</string>
<string name="ankiquest_summary_preference_title">Resumen de la sesión</string>
<string name="ankiquest_summary_preference_summary">Mostrar un resumen accesible y discreto al salir de una sesión de estudio.</string>
<string name="ankiquest_summary_dont_show_again">No volver a mostrar esto</string>
<string name="ankiquest_missing_deck">Este mazo ya no está disponible. Elige otro.</string>
<string name="ankiquest_deck_ready_later">No hay tarjetas listas en este mazo ahora. Elige otro mazo o vuelve más tarde.</string>
</resources>
1 change: 1 addition & 0 deletions AnkiDroid/src/main/res/values-fr/ankiquest_navigation.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<string name="ankiquest_summary_progress">Voir la progression</string>
<string name="ankiquest_summary_preference_title">Résumé de la session</string>
<string name="ankiquest_summary_preference_summary">Affiche un résumé discret et accessible quand tu quittes une séance d’étude.</string>
<string name="ankiquest_summary_dont_show_again">Ne plus afficher ceci</string>
<string name="ankiquest_missing_deck">Ce paquet n’est plus disponible. Choisis-en un autre.</string>
<string name="ankiquest_deck_ready_later">Aucune carte n’est prête dans ce paquet pour le moment. Choisis un autre paquet ou reviens plus tard.</string>
</resources>
1 change: 1 addition & 0 deletions AnkiDroid/src/main/res/values-pt/ankiquest_navigation.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<string name="ankiquest_summary_progress">Ver progresso</string>
<string name="ankiquest_summary_preference_title">Resumo da sessão</string>
<string name="ankiquest_summary_preference_summary">Mostra um resumo discreto e acessível quando terminas uma sessão de estudo.</string>
<string name="ankiquest_summary_dont_show_again">Não voltar a mostrar</string>
<string name="ankiquest_missing_deck">Este baralho já não está disponível. Escolhe outro.</string>
<string name="ankiquest_deck_ready_later">Não há cartões prontos neste baralho agora. Escolhe outro ou volta mais tarde.</string>
</resources>
1 change: 1 addition & 0 deletions AnkiDroid/src/main/res/values/ankiquest_navigation.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<string name="ankiquest_summary_preference_key" translatable="false">ankiquestSessionSummary</string>
<string name="ankiquest_summary_preference_title" maxLength="41">Session summary</string>
<string name="ankiquest_summary_preference_summary">Show a quiet, accessible recap when you leave a study session.</string>
<string name="ankiquest_summary_dont_show_again">Don’t show this again</string>
<string name="ankiquest_missing_deck">This deck is no longer available. Choose another deck.</string>
<string name="ankiquest_deck_ready_later">No cards are ready in this deck right now. Choose another deck or come back later.</string>
</resources>
Loading