all: smoother navigation highlighting (fixes #5070) (#5116)

Co-authored-by: dogi <[email protected]>
open-learning-exchange · Jan 24, 2025 · 26d7f5c · 26d7f5c
1 parent 1d5211f
commit 26d7f5c
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 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 2238
-        versionName "0.22.38"
+        versionCode 2239
+        versionName "0.22.39"
         ndkVersion '21.3.6528147'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true

diff --git a/app/src/main/java/org/ole/planet/myplanet/callback/OnHomeItemClickListener.kt b/app/src/main/java/org/ole/planet/myplanet/callback/OnHomeItemClickListener.kt
@@ -5,6 +5,7 @@ import org.ole.planet.myplanet.model.RealmMyLibrary
 import org.ole.planet.myplanet.model.RealmStepExam
 
 interface OnHomeItemClickListener {
+    fun openMyFragment(f: Fragment)
     fun openCallFragment(f: Fragment)
     fun openLibraryDetailFragment(library: RealmMyLibrary?)
     fun showRatingDialog(type: String?, resourceId: String?, title: String?, listener: OnRatingChangeListener?)

diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/BellDashboardFragment.kt b/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/BellDashboardFragment.kt
@@ -218,14 +218,14 @@ class BellDashboardFragment : BaseDashboardFragment() {
             if (user?.id?.startsWith("guest") == true) {
                 guestDialog(requireContext())
             } else {
-                openHelperFragment(ResourcesFragment())
+                homeItemClickListener?.openMyFragment(ResourcesFragment())
             }
         }
         fragmentHomeBellBinding.homeCardCourses.myCoursesImageButton.setOnClickListener {
             if (user?.id?.startsWith("guest") == true) {
                 guestDialog(requireContext())
             } else {
-                openHelperFragment(CoursesFragment())
+                homeItemClickListener?.openMyFragment(CoursesFragment())
             }
         }
         fragmentHomeBellBinding.fabMyActivity.setOnClickListener { openHelperFragment(MyActivityFragment()) }

diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.kt b/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.kt
@@ -796,12 +796,19 @@ class DashboardActivity : DashboardElementActivity(), OnHomeItemClickListener, N
         }
     }
 
-    fun openMyFragment(f: Fragment) {
+    override fun openMyFragment(f: Fragment) {
         val b = Bundle()
         b.putBoolean("isMyCourseLib", true)
         f.arguments = b
         val fragmentName = f::class.java.simpleName
         val tag = "My$fragmentName"
+        when (tag) {
+            "MyCoursesFragment" -> result?.setSelection(2, false)
+            "MyResourcesFragment" -> result?.setSelection(1, false)
+            else -> {
+                result?.setSelection(0, false)
+            }
+        }
         openCallFragment(f, tag)
     }
 

diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.kt.lite b/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.kt.lite
@@ -796,12 +796,19 @@ class DashboardActivity : DashboardElementActivity(), OnHomeItemClickListener, N
         }
     }
 
-    fun openMyFragment(f: Fragment) {
+    override fun openMyFragment(f: Fragment) {
         val b = Bundle()
         b.putBoolean("isMyCourseLib", true)
         f.arguments = b
         val fragmentName = f::class.java.simpleName
         val tag = "My$fragmentName"
+        when (tag) {
+            "MyCoursesFragment" -> result?.setSelection(2, false)
+            "MyResourcesFragment" -> result?.setSelection(1, false)
+            else -> {
+                result?.setSelection(0, false)
+            }
+        }
         openCallFragment(f, tag)
     }