Merge remote-tracking branch 'origin/main'

pennlabs · Sep 5, 2023 · 4dcc7ac · 4dcc7ac
2 parents c2b247a + 1f052d9
commit 4dcc7ac
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/PennCourseAlertHolderFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/PennCourseAlertHolderFragment.kt
@@ -42,6 +42,11 @@ class PennCourseAlertHolderFragment : Fragment() {
         return view
     }
 
+    override fun onResume() {
+        mActivity.setSelectedTab(MainActivity.PCA)
+        super.onResume()
+    }
+
     private fun initAppBar(view: View?) {
         view?.title_view?.text = "Penn Course Alert"
         view?.date_view?.text = Utils.getCurrentSystemTime()

diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/more_fragments/MoreFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/more_fragments/MoreFragment.kt
@@ -56,6 +56,7 @@ class MoreFragment : Fragment() {
                             R.drawable.ic_guest_avatar, context?.theme)
             )
         }
+        mActivity.setSelectedTab(MainActivity.MORE)
         super.onResume()
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,6 +56,7 @@ class MoreFragment : Fragment() { @@
                                 R.drawable.ic_guest_avatar, context?.theme)
                 )
             }
+            mActivity.setSelectedTab(MainActivity.MORE)
             super.onResume()
         }
@@ Expand Down @@