Correção para não fechar o aplicativo ao editar a consulta. Ajuste de…

… bug ao mudar de tela que estava crashando. Liberação de versão.
JhonnySalles · Jul 22, 2022 · 14f0091 · 14f0091
1 parent ce0a2ed
commit 14f0091
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 20 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,8 +11,8 @@ android {
         applicationId "br.com.fenix.bilingualmangareader"
         minSdk 26
         targetSdk 31
-        versionCode 12
-        versionName "2.12"
+        versionCode 13
+        versionName "2.13"
         archivesBaseName = "BilingualManga_" + versionName
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -11,9 +11,9 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 12,
-      "versionName": "2.12",
-      "outputFile": "BilingualManga_2.12-release.apk"
+      "versionCode": 13,
+      "versionName": "2.13",
+      "outputFile": "BilingualManga_2.13-release.apk"
     }
   ],
   "elementType": "File"

diff --git a/app/src/main/java/br/com/fenix/bilingualmangareader/view/ui/library/LibraryFragment.kt b/app/src/main/java/br/com/fenix/bilingualmangareader/view/ui/library/LibraryFragment.kt
@@ -17,6 +17,7 @@ import android.view.*
 import android.view.animation.AnimationUtils
 import android.view.inputmethod.EditorInfo
 import android.widget.*
+import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AlertDialog
 import androidx.core.app.ActivityCompat
 import androidx.fragment.app.Fragment
@@ -138,7 +139,7 @@ class LibraryFragment : Fragment(), SwipeRefreshLayout.OnRefreshListener {
                 GeneralConsts.SCANNER.MESSAGE_MANGA_UPDATED_REMOVE -> refreshLibraryRemoveDelayed(obj as Manga)
                 GeneralConsts.SCANNER.MESSAGE_MANGA_UPDATE_FINISHED -> {
                     setIsRefreshing(false)
-                    if (obj as Boolean) {
+                    if (obj as Boolean && ::mViewModel.isInitialized) { // Bug when rotate is necessary verify is initialized
                         mViewModel.updateList { change, _ ->
                             if (change)
                                 sortList()
@@ -378,6 +379,23 @@ class LibraryFragment : Fragment(), SwipeRefreshLayout.OnRefreshListener {
         generateLayout()
         setIsRefreshing(true)
         Scanner.getInstance(requireContext()).scanLibrary()
+
+        val callback: OnBackPressedCallback = object : OnBackPressedCallback(true) {
+            // Prevent backpress if query is actived
+            override fun handleOnBackPressed() {
+                if (searchView.query.isNotEmpty())
+                    searchView.setQuery("", true)
+                else if (!searchView.isIconified)
+                    searchView.isIconified = true
+                else{
+                    isEnabled = false
+                    requireActivity().onBackPressed()
+                }
+            }
+        }
+
+        requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner, callback)
+
         return root
     }
 
@@ -543,7 +561,7 @@ class LibraryFragment : Fragment(), SwipeRefreshLayout.OnRefreshListener {
         }
     }
 
-    private var itemTouchHelperCallback = object : ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT) {
+    private var itemTouchHelperCallback = object : ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT) {
         override fun onMove(
             recyclerView: RecyclerView,
             viewHolder: ViewHolder, target: ViewHolder

diff --git a/...n/java/br/com/fenix/bilingualmangareader/view/ui/reader/PopupReaderColorFilterFragment.kt b/...n/java/br/com/fenix/bilingualmangareader/view/ui/reader/PopupReaderColorFilterFragment.kt
@@ -153,14 +153,14 @@ class PopupReaderColorFilterFragment : Fragment() {
     ): View? {
         val root = inflater.inflate(R.layout.popup_reader_color_filter, container, false)
 
-        mViewModel.colorRed.observe(viewLifecycleOwner, { mFilterRed.text = it.toString() })
-        mViewModel.colorGreen.observe(viewLifecycleOwner, { mFilterGreen.text = it.toString() })
-        mViewModel.colorBlue.observe(viewLifecycleOwner, { mFilterBlue.text = it.toString() })
-        mViewModel.colorAlpha.observe(viewLifecycleOwner, { mFilterAlpha.text = it.toString() })
-        mViewModel.blueLightAlpha.observe(viewLifecycleOwner, {
+        mViewModel.colorRed.observe(viewLifecycleOwner) { mFilterRed.text = it.toString() }
+        mViewModel.colorGreen.observe(viewLifecycleOwner) { mFilterGreen.text = it.toString() }
+        mViewModel.colorBlue.observe(viewLifecycleOwner) { mFilterBlue.text = it.toString() }
+        mViewModel.colorAlpha.observe(viewLifecycleOwner) { mFilterAlpha.text = it.toString() }
+        mViewModel.blueLightAlpha.observe(viewLifecycleOwner) {
             val value = if (it > 0) (it * 100 / 200) else 0
             mFilterBlueLightAlpha.text = "$value %"
-        })
+        }
 
         return root
     }

diff --git a/app/src/main/java/br/com/fenix/bilingualmangareader/view/ui/reader/ReaderFragment.kt b/app/src/main/java/br/com/fenix/bilingualmangareader/view/ui/reader/ReaderFragment.kt
@@ -341,7 +341,7 @@ class ReaderFragment : Fragment(), View.OnTouchListener {
         requireActivity().title = mFileName
         updateSeekBar()
 
-        mViewModel.filters.observe(viewLifecycleOwner, { onRefresh() })
+        mViewModel.filters.observe(viewLifecycleOwner) { onRefresh() }
 
         return view
     }

diff --git a/app/src/main/java/br/com/fenix/bilingualmangareader/view/ui/reader/ReaderViewModel.kt b/app/src/main/java/br/com/fenix/bilingualmangareader/view/ui/reader/ReaderViewModel.kt
@@ -87,17 +87,13 @@ class ReaderViewModel(application: Application) : AndroidViewModel(application)
         mColorGreen.value = green
         mColorBlue.value = blue
         mColorAlpha.value = alpha
-
-        if (mCustomFilter.value!!)
-            generateFilters()
+        generateFilters()
     }
 
     fun changeBlueLightAlpha(value: Int) {
         mBlueLightAlpha.value = value
         mBlueLightColor = Color.argb(mBlueLightAlpha.value!!, 255, 50, 0)
-
-        if (mBlueLight.value!!)
-            generateFilters()
+        generateFilters()
     }
 
     fun clearOcrItem() {