diff --git a/app/src/main/java/com/geeksville/mesh/MainActivity.kt b/app/src/main/java/com/geeksville/mesh/MainActivity.kt index 63a569076..a73793ba3 100644 --- a/app/src/main/java/com/geeksville/mesh/MainActivity.kt +++ b/app/src/main/java/com/geeksville/mesh/MainActivity.kt @@ -37,6 +37,7 @@ import android.widget.TextView import android.widget.Toast import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.viewModels +import androidx.annotation.StringRes import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatDelegate import androidx.appcompat.widget.Toolbar @@ -182,31 +183,31 @@ class MainActivity : AppCompatActivity(), Logging { } } - data class TabInfo(val text: String, val icon: Int, val content: Fragment) + data class TabInfo(@StringRes val textResId: Int, val icon: Int, val content: Fragment) private val tabInfos = arrayOf( TabInfo( - "Messages", + R.string.main_tab_messages, R.drawable.ic_twotone_message_24, ContactsFragment() ), TabInfo( - "Users", + R.string.main_tab_users, R.drawable.ic_twotone_people_24, UsersFragment() ), TabInfo( - "Map", + R.string.main_tab_map, R.drawable.ic_twotone_map_24, MapFragment() ), TabInfo( - "Channel", + R.string.main_tab_channel, R.drawable.ic_twotone_contactless_24, ChannelFragment() ), TabInfo( - "Settings", + R.string.main_tab_settings, R.drawable.ic_twotone_settings_applications_24, SettingsFragment() ) @@ -249,8 +250,8 @@ class MainActivity : AppCompatActivity(), Logging { false // Gestures for screen switching doesn't work so good with the map view // pager.offscreenPageLimit = 0 // Don't keep any offscreen pages around, because we want to make sure our bluetooth scanning stops TabLayoutMediator(binding.tabLayout, binding.pager, false, false) { tab, position -> - // tab.text = tabInfos[position].text // I think it looks better with icons only tab.icon = ContextCompat.getDrawable(this, tabInfos[position].icon) + tab.contentDescription = ContextCompat.getString(this, tabInfos[position].textResId) }.attach() binding.tabLayout.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0f9107723..36d8f31b0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -13,6 +13,12 @@ 55.332244 34.442211 hey I found the cache, it is over here next to the big tiger. I\'m kinda scared. + Messages + Users + Map + Channel + Settings + \??? Filter clear node filter