Rename and rearrange game tabs

ccomeaux · Sep 22, 2019 · f9427b3 · f9427b3
1 parent e5d4bde
commit f9427b3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/app/src/main/java/com/boardgamegeek/ui/adapter/GamePagerAdapter.kt b/app/src/main/java/com/boardgamegeek/ui/adapter/GamePagerAdapter.kt
@@ -62,10 +62,10 @@ class GamePagerAdapter(fragmentManager: FragmentManager, private val activity: F
 
     override fun getItem(position: Int): Fragment {
         return when (tabs.getOrNull(position)?.titleResId) {
-            R.string.title_description -> GameDescriptionFragment.newInstance()
+            R.string.title_descr -> GameDescriptionFragment.newInstance()
             R.string.title_info -> GameFragment.newInstance()
             R.string.title_credits -> GameCreditsFragment.newInstance()
-            R.string.title_collection -> GameCollectionFragment.newInstance()
+            R.string.title_my_games -> GameCollectionFragment.newInstance()
             R.string.title_plays -> GamePlaysFragment.newInstance()
             R.string.title_forums -> ForumsFragment.newInstanceForGame(gameId, gameName)
             R.string.links -> GameLinksFragment.newInstance()
@@ -77,15 +77,17 @@ class GamePagerAdapter(fragmentManager: FragmentManager, private val activity: F
 
     private fun updateTabs() {
         tabs.clear()
-        tabs.add(Tab(R.string.title_description, R.drawable.fab_log_play) {
+        tabs.add(Tab(R.string.title_info, R.drawable.fab_log_play) {
             LogPlayActivity.logPlay(activity, gameId, gameName, thumbnailUrl, imageUrl, heroImageUrl, arePlayersCustomSorted)
         })
-        tabs.add(Tab(R.string.title_info, R.drawable.fab_favorite_off) {
+        tabs.add(Tab(R.string.title_credits, R.drawable.fab_favorite_off) {
+            viewModel.updateFavorite(!isFavorite)
+        })
+        tabs.add(Tab(R.string.title_descr, R.drawable.fab_favorite_off) {
             viewModel.updateFavorite(!isFavorite)
         })
-        tabs.add(Tab(R.string.title_credits))
         if (shouldShowCollection())
-            tabs.add(Tab(R.string.title_collection, R.drawable.fab_add) {
+            tabs.add(Tab(R.string.title_my_games, R.drawable.fab_add) {
                 activity.showAndSurvive(CollectionStatusDialogFragment.newInstance())
             })
         if (shouldShowPlays())
@@ -113,7 +115,7 @@ class GamePagerAdapter(fragmentManager: FragmentManager, private val activity: F
     }
 
     private fun updateFavIcon(isFavorite: Boolean) {
-        tabs.find { it.titleResId == R.string.title_info }?.let {
+        tabs.find { it.titleResId == R.string.title_credits || it.titleResId == R.string.title_descr }?.let {
             it.imageResId = if (isFavorite) R.drawable.fab_favorite_on else R.drawable.fab_favorite_off
         }
     }

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -132,6 +132,7 @@
 	<string name="provider_label">Collection, Plays, and GeekBuddies</string>
 	<string name="title_search">Search</string>
 	<string name="title_collection">Collection</string>
+	<string name="title_my_games">My Games</string>
 	<string name="title_collection_details">Collection Details</string>
 	<string name="title_filtered_collection">Filtered Collection</string>
 	<string name="title_hotness">The Hotness</string>
@@ -651,6 +652,7 @@
 	<string name="empty_top_games">Error loading top games</string>
 	<string name="title_top_games">Top Games</string>
 	<string name="title_description">Description</string>
+	<string name="title_descr">Descr</string>
 	<string name="title_info">Info</string>
 	<string name="title_credits">Credits</string>
 	<string name="plays_sync_status_none">Plays have never been synced.</string>