androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/ReaderActivity.kt

@@ -37,6 +37,22 @@ class ReaderActivity :
     private val repository: Repository by instance()
     private val appSettingsService: AppSettingsService by instance()
 
+    private fun showMenuItem(willAddToFavorite: Boolean) {
+        if (willAddToFavorite) {
+            toolbarMenu.findItem(R.id.star).icon?.setTint(Color.WHITE)
+        } else {
+            toolbarMenu.findItem(R.id.star).icon?.setTint(Color.RED)
+        }
+    }
+
+    private fun canFavorite() {
+        showMenuItem(true)
+    }
+
+    private fun canRemoveFromFavorite() {
+        showMenuItem(false)
+    }
+
     @Suppress("detekt:SwallowedException")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -57,21 +73,14 @@ class ReaderActivity :
             finish()
         }
 
-        readItem()
+        try {
+            readItem(allItems[currentItem])
+        } catch (e: IndexOutOfBoundsException) {
+            finish()
+        }
 
         binding.pager.adapter = ScreenSlidePagerAdapter(this)
         binding.pager.setCurrentItem(currentItem, false)
-
-        binding.pager.registerOnPageChangeCallback(
-            object : ViewPager2.OnPageChangeCallback() {
-                override fun onPageSelected(position: Int) {
-                    super.onPageSelected(position)
-                    currentItem = position
-                    updateStarIcon()
-                    readItem()
-                }
-            },
-        )
     }
 
     override fun onResume() {
@@ -80,20 +89,14 @@ class ReaderActivity :
         binding.indicator.setViewPager(binding.pager)
     }
 
-    private fun readItem() {
+    private fun readItem(item: SelfossModel.Item) {
-        val item = allItems.getOrNull(currentItem)
+        if (appSettingsService.isMarkOnScrollEnabled() && !appSettingsService.getPublicAccess()) {
-        if (appSettingsService.isMarkOnScrollEnabled() && !appSettingsService.getPublicAccess() && item != null) {
             CoroutineScope(Dispatchers.IO).launch {
                 repository.markAsRead(item)
             }
         }
     }
 
-    private fun updateStarIcon() {
-        val isStarred = allItems.getOrNull(currentItem)?.starred ?: false
-        toolbarMenu.findItem(R.id.star)?.icon?.setTint(if (isStarred) Color.RED else Color.WHITE)
-    }
-
     override fun onSaveInstanceState(oldInstanceState: Bundle) {
         super.onSaveInstanceState(oldInstanceState)
         oldInstanceState.clear()
@@ -138,7 +141,8 @@ class ReaderActivity :
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        menuInflater.inflate(R.menu.reader_menu, menu)
+        val inflater = menuInflater
+        inflater.inflate(R.menu.reader_menu, menu)
         toolbarMenu = menu
 
         alignmentMenu()
@@ -146,50 +150,87 @@ class ReaderActivity :
         if (appSettingsService.getPublicAccess()) {
             menu.removeItem(R.id.star)
         } else {
-            updateStarIcon()
+            if (allItems.isNotEmpty() && allItems[currentItem].starred) {
+                canRemoveFromFavorite()
+            } else {
+                canFavorite()
+            }
+
+            binding.pager.registerOnPageChangeCallback(
+                object : ViewPager2.OnPageChangeCallback() {
+                    override fun onPageSelected(position: Int) {
+                        super.onPageSelected(position)
+
+                        if (!allItems.isNullOrEmpty() && allItems.size >= position) {
+                            if (allItems[position].starred) {
+                                canRemoveFromFavorite()
+                            } else {
+                                canFavorite()
+                            }
+                            readItem(allItems[position])
+                        }
+                    }
+                },
+            )
         }
 
         return true
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        fun afterSave() {
+            allItems[binding.pager.currentItem] =
+                allItems[binding.pager.currentItem].toggleStar()
+            canRemoveFromFavorite()
+        }
+
+        fun afterUnsave() {
+            allItems[binding.pager.currentItem] = allItems[binding.pager.currentItem].toggleStar()
+            canFavorite()
+        }
+
         when (item.itemId) {
-            android.R.id.home -> onBackPressedDispatcher.onBackPressed()
+            android.R.id.home -> {
-            R.id.star -> toggleFavorite()
+                onBackPressedDispatcher.onBackPressed()
-            R.id.align_left -> switchAlignmentSetting(AppSettingsService.ALIGN_LEFT)
+                return true
-            R.id.align_justify -> switchAlignmentSetting(AppSettingsService.JUSTIFY)
+            }
+
+            R.id.star -> {
+                if (allItems[binding.pager.currentItem].starred) {
+                    CoroutineScope(Dispatchers.IO).launch {
+                        repository.unstarr(allItems[binding.pager.currentItem])
+                    }
+                    afterUnsave()
+                } else {
+                    CoroutineScope(Dispatchers.IO).launch {
+                        repository.starr(allItems[binding.pager.currentItem])
+                    }
+                    afterSave()
+                }
+            }
+
+            R.id.align_left -> {
+                switchAlignmentSetting(AppSettingsService.ALIGN_LEFT)
+                refreshFragment()
+            }
+
+            R.id.align_justify -> {
+                switchAlignmentSetting(AppSettingsService.JUSTIFY)
+                refreshFragment()
+            }
         }
         return super.onOptionsItemSelected(item)
     }
 
-    private fun toggleFavorite() {
+    private fun switchAlignmentSetting(allignment: Int) {
-        val item = allItems.getOrNull(currentItem) ?: return
+        appSettingsService.changeAllignment(allignment)
-
+        alignmentMenu()
-        val starred = item.starred
-
-        CoroutineScope(Dispatchers.IO).launch {
-            if (starred) {
-                repository.unstarr(item)
-            } else {
-                repository.starr(item)
-            }
-        }
-
-        item.toggleStar()
-        updateStarIcon()
     }
 
-    private fun switchAlignmentSetting(alignment: Int) {
+    private fun refreshFragment() {
-        appSettingsService.changeAllignment(alignment)
+        finish()
-        alignmentMenu()
+        overridePendingTransition(0, 0)
-
+        startActivity(intent)
-        val fragmentManager = supportFragmentManager
+        overridePendingTransition(0, 0)
-        val fragments = fragmentManager.fragments
-
-        for (fragment in fragments) {
-            if (fragment is ArticleFragment) {
-                fragment.refreshAlignment()
-            }
-        }
     }
 }

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/ArticleFragment.kt

@@ -263,15 +263,13 @@ class ArticleFragment :
         )
     }
 
-    fun refreshAlignment() {
+    private fun refreshAlignment() {
         textAlignment =
             when (appSettingsService.getActiveAllignment()) {
                 1 -> "justify"
                 2 -> "left"
                 else -> "justify"
             }
-
-        htmlToWebview()
     }
 
     @Suppress("detekt:SwallowedException")