resources: smoother navigation (fixes #5315) (#5331)

Co-authored-by: Gideon Okuro <[email protected]> Co-authored-by: dogi <[email protected]>
open-learning-exchange · Feb 21, 2025 · 5f86b87 · 5f86b87
1 parent 5d07d95
commit 5f86b87
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdkVersion 26
         targetSdkVersion 34
-        versionCode 2325
-        versionName "0.23.25"
+        versionCode 2326
+        versionName "0.23.26"
         ndkVersion '21.3.6528147'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true

diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/resources/ResourcesFragment.kt b/app/src/main/java/org/ole/planet/myplanet/ui/resources/ResourcesFragment.kt
@@ -97,7 +97,7 @@ class ResourcesFragment : BaseRecyclerFragment<RealmMyLibrary?>(), OnLibraryItem
             tvSelected.visibility = View.VISIBLE
         }
         initArrays()
-        updateTvDelete()
+        hideButton()
 
         if(userModel?.isGuest() == true){
             tvAddToLib.visibility = View.GONE
@@ -157,7 +157,7 @@ class ResourcesFragment : BaseRecyclerFragment<RealmMyLibrary?>(), OnLibraryItem
         checkList()
 
         selectAll.setOnClickListener {
-            updateTvDelete()
+            hideButton()
             val allSelected = selectedItems?.size == adapterLibrary.getLibraryList().size
             adapterLibrary.selectAllItems(!allSelected)
             if (allSelected) {
@@ -184,8 +184,17 @@ class ResourcesFragment : BaseRecyclerFragment<RealmMyLibrary?>(), OnLibraryItem
             homeItemClickListener = context
         }
     }
-    private fun updateTvDelete(){
+
+    private fun hideButton(){
         tvDelete?.isEnabled = selectedItems?.size!! != 0
+        tvAddToLib.isEnabled = selectedItems?.size!! != 0
+        if(selectedItems?.size!! != 0){
+            if(isMyCourseLib) tvDelete?.visibility = View.VISIBLE
+            else tvAddToLib.visibility = View.VISIBLE
+        } else {
+            if(isMyCourseLib) tvDelete?.visibility = View.GONE
+            else tvAddToLib.visibility = View.GONE
+        }
     }
 
     private fun checkList() {
@@ -266,7 +275,7 @@ class ResourcesFragment : BaseRecyclerFragment<RealmMyLibrary?>(), OnLibraryItem
     override fun onSelectedListChange(list: MutableList<RealmMyLibrary?>) {
         selectedItems = list
         changeButtonStatus()
-        updateTvDelete()
+        hideButton()
     }
 
     override fun onTagClicked(realmTag: RealmTag) {
@@ -413,4 +422,4 @@ class ResourcesFragment : BaseRecyclerFragment<RealmMyLibrary?>(), OnLibraryItem
         orderByDate.setOnClickListener { adapterLibrary.toggleSortOrder() }
         orderByTitle.setOnClickListener { adapterLibrary.toggleTitleSortOrder() }
     }
-}
+}