Fix: Scroll state in retained in the partial translation mode

quran · Mar 30, 2024 · 089106c · 089106c
1 parent 149bdbb
commit 089106c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/...main/java/com/quran/labs/androidquran/presenter/translation/InlineTranslationPresenter.kt b/...main/java/com/quran/labs/androidquran/presenter/translation/InlineTranslationPresenter.kt
@@ -28,6 +28,7 @@ class InlineTranslationPresenter @Inject constructor(
 ) {
   private val scope = MainScope()
   private var cachedTranslations = emptyList<LocalTranslation>()
+  private var lastVerseRange: VerseRange? = null
 
   init {
     translationListPresenter.translations()
@@ -39,10 +40,12 @@ class InlineTranslationPresenter @Inject constructor(
   }
 
   suspend fun refresh(verseRange: VerseRange) {
+    val ayahHasBeenChanged = verseRange != lastVerseRange
     val result = withContext(Dispatchers.IO) {
       getVerses(false, getTranslations(quranSettings), verseRange)
     }
-    translationScreen?.setVerses(result.translations, result.ayahInformation)
+    translationScreen?.setVerses(result.translations, result.ayahInformation, ayahHasBeenChanged)
+    lastVerseRange = verseRange
   }
 
   override fun bind(what: TranslationScreen) {
@@ -52,7 +55,7 @@ class InlineTranslationPresenter @Inject constructor(
   }
 
   interface TranslationScreen {
-    fun setVerses(translations: Array<LocalTranslation>, verses: List<QuranAyahInfo>)
+    fun setVerses(translations: Array<LocalTranslation>, verses: List<QuranAyahInfo>, ayahHasBeenChanged: Boolean)
     fun onTranslationsUpdated(translations: List<LocalTranslation>)
   }
 }
diff --git a/app/src/main/java/com/quran/labs/androidquran/ui/fragment/AyahTranslationFragment.kt b/app/src/main/java/com/quran/labs/androidquran/ui/fragment/AyahTranslationFragment.kt
@@ -163,14 +163,17 @@ class AyahTranslationFragment : AyahActionFragment(), TranslationScreen {
     }
   }
 
-  override fun setVerses(translations: Array<LocalTranslation>, verses: List<QuranAyahInfo>) {
+  override fun setVerses(translations: Array<LocalTranslation>, verses: List<QuranAyahInfo>, ayahHasBeenChanged: Boolean) {
     progressBar.visibility = View.GONE
     if (verses.isNotEmpty()) {
       emptyState.visibility = View.GONE
       translationControls.visibility = View.VISIBLE
       translator.visibility = View.VISIBLE
       translationView.visibility = View.VISIBLE
       translationView.setAyahs(translations, verses)
+      if (ayahHasBeenChanged) {
+        translationView.resetScroll()
+      }
     } else {
       emptyState.visibility = View.VISIBLE
     }

diff --git a/app/src/main/java/com/quran/labs/androidquran/view/InlineTranslationView.kt b/app/src/main/java/com/quran/labs/androidquran/view/InlineTranslationView.kt
@@ -88,10 +88,13 @@ class InlineTranslationView @JvmOverloads constructor(
         i++
       }
       addFooterSpacer()
-      scrollTo(0, 0)
     }
   }
 
+  fun resetScroll() {
+    scrollTo(0, 0)
+  }
+
   private fun addFooterSpacer() {
     val params = LinearLayout.LayoutParams(
       LayoutParams.MATCH_PARENT, footerSpacerHeight