Contains many bugs

open-learning-exchange · Dec 18, 2024 · 30dbba4 · 30dbba4
1 parent 1c65362
commit 30dbba4
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 33 deletions.
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
@@ -187,32 +187,29 @@ class DashboardActivity : DashboardElementActivity(), OnHomeItemClickListener, N
             when (item.itemId) {
                 R.id.action_chat -> {
                     if (user?.id?.startsWith("guest") == false) {
-                        val fragmentManager = supportFragmentManager
-                        val existingFragment = fragmentManager.findFragmentByTag(ChatHistoryListFragment::class.java.simpleName)
-                        if (existingFragment == null) {
-                            openCallFragment(
-                                ChatHistoryListFragment(),
-                                ChatHistoryListFragment::class.java.simpleName
-                            )
-                        }
+                        openCallFragment(
+                            ChatHistoryListFragment(),
+                            ChatHistoryListFragment::class.java.simpleName
+                        )
                     } else {
                         guestDialog(this)
                     }
                 }
                 R.id.menu_goOnline -> wifiStatusSwitch()
-                R.id.action_sync -> {
-                    logSyncInSharedPrefs()
-                }
+                R.id.action_sync -> logSyncInSharedPrefs()
                 R.id.action_feedback -> {
                     if (user?.id?.startsWith("guest") == false) {
-                        openCallFragment(FeedbackListFragment())
+                        openCallFragment(
+                            FeedbackListFragment(),
+                            FeedbackListFragment::class.java.simpleName
+                        )
                     } else {
                         guestDialog(this)
                     }
                 }
                 R.id.action_settings -> startActivity(Intent(this@DashboardActivity, SettingActivity::class.java))
-                R.id.action_disclaimer -> openCallFragment(DisclaimerFragment())
-                R.id.action_about -> openCallFragment(AboutFragment())
+                R.id.action_disclaimer -> openCallFragment(DisclaimerFragment(), DisclaimerFragment::class.java.simpleName)
+                R.id.action_about -> openCallFragment(AboutFragment(), AboutFragment::class.java.simpleName)
                 R.id.action_logout -> logout()
                 else -> {}
             }

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
@@ -187,32 +187,29 @@ class DashboardActivity : DashboardElementActivity(), OnHomeItemClickListener, N
             when (item.itemId) {
                 R.id.action_chat -> {
                     if (user?.id?.startsWith("guest") == false) {
-                        val fragmentManager = supportFragmentManager
-                        val existingFragment = fragmentManager.findFragmentByTag(ChatHistoryListFragment::class.java.simpleName)
-                        if (existingFragment == null) {
-                            openCallFragment(
-                                ChatHistoryListFragment(),
-                                ChatHistoryListFragment::class.java.simpleName
-                            )
-                        }
+                        openCallFragment(
+                            ChatHistoryListFragment(),
+                            ChatHistoryListFragment::class.java.simpleName
+                        )
                     } else {
                         guestDialog(this)
                     }
                 }
                 R.id.menu_goOnline -> wifiStatusSwitch()
-                R.id.action_sync -> {
-                    logSyncInSharedPrefs()
-                }
+                R.id.action_sync -> logSyncInSharedPrefs()
                 R.id.action_feedback -> {
                     if (user?.id?.startsWith("guest") == false) {
-                        openCallFragment(FeedbackListFragment())
+                        openCallFragment(
+                            FeedbackListFragment(),
+                            FeedbackListFragment::class.java.simpleName
+                        )
                     } else {
                         guestDialog(this)
                     }
                 }
                 R.id.action_settings -> startActivity(Intent(this@DashboardActivity, SettingActivity::class.java))
-                R.id.action_disclaimer -> openCallFragment(DisclaimerFragment())
-                R.id.action_about -> openCallFragment(AboutFragment())
+                R.id.action_disclaimer -> openCallFragment(DisclaimerFragment(), DisclaimerFragment::class.java.simpleName)
+                R.id.action_about -> openCallFragment(AboutFragment(), AboutFragment::class.java.simpleName)
                 R.id.action_logout -> logout()
                 else -> {}
             }

diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/sync/DashboardElementActivity.kt b/app/src/main/java/org/ole/planet/myplanet/ui/sync/DashboardElementActivity.kt
@@ -10,6 +10,7 @@ import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.provider.Settings
+import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.widget.Toast
@@ -84,12 +85,26 @@ abstract class DashboardElementActivity : SyncActivity(), FragmentManager.OnBack
     }
 
     fun openCallFragment(newFragment: Fragment, tag: String?) {
-        supportFragmentManager.beginTransaction()
-            .replace(R.id.fragment_container, newFragment, tag)
-            .addToBackStack(tag)
-            .commit()
-    }
+        val fragmentManager = supportFragmentManager
+        val existingFragment = fragmentManager.findFragmentByTag(tag)
 
+        if (existingFragment != null && existingFragment.isVisible) {
+            // If the fragment exists and is already visible, do nothing
+            Log.d("openCallFragment", "Fragment with tag $tag is already visible.")
+        } else if (existingFragment != null) {
+            // If the fragment exists but is not visible, bring it to the front
+            Log.d("openCallFragment", "Bringing fragment with tag $tag to the front.")
+            fragmentManager.popBackStack(tag, 0)
+        } else {
+            // If the fragment doesn't exist, add it
+            Log.d("openCallFragment", "Adding new fragment with tag $tag.")
+            Log.d("openCallFragment", "Its been called from ${newFragment.javaClass.simpleName}")
+            fragmentManager.beginTransaction()
+                .replace(R.id.fragment_container, newFragment, tag)
+                .addToBackStack(tag)
+                .commit()
+        }
+    }
     override fun onPrepareOptionsMenu(menu: Menu): Boolean {
         goOnline.isVisible = showBetaFeature(Constants.KEY_SYNC, this)
         return super.onPrepareOptionsMenu(menu)
@@ -238,5 +253,6 @@ abstract class DashboardElementActivity : SyncActivity(), FragmentManager.OnBack
         b.putString("type", "enterprise")
         fragment.arguments = b
         openCallFragment(fragment, "Enterprise")
+        Log.d("openEnterpriseFragment", "Opening Enterprise Fragment")
     }
 }