sforkowany z mirror/meshtastic-android
fix: revert TabInfo refactor
reverts b765ac4453
(causing: Fatal Exception: java.lang.IllegalStateException: onAttach called multiple times with different Context! Hilt Fragments should not be retained).
master
rodzic
919a430090
commit
56b1d6d965
|
@ -131,15 +131,35 @@ class MainActivity : AppCompatActivity(), Logging {
|
||||||
bluetoothViewModel.permissionsUpdated()
|
bluetoothViewModel.permissionsUpdated()
|
||||||
}
|
}
|
||||||
|
|
||||||
enum class TabInfo(val icon: Int, val content: Fragment) {
|
data class TabInfo(val text: String, val icon: Int, val content: Fragment)
|
||||||
Messages(R.drawable.ic_twotone_message_24, ContactsFragment()),
|
|
||||||
Users(R.drawable.ic_twotone_people_24, UsersFragment()),
|
|
||||||
Map(R.drawable.ic_twotone_map_24, MapFragment()),
|
|
||||||
Channels(R.drawable.ic_twotone_contactless_24, ChannelFragment()),
|
|
||||||
Settings(R.drawable.ic_twotone_settings_applications_24, SettingsFragment())
|
|
||||||
}
|
|
||||||
|
|
||||||
private val tabInfos = TabInfo.values()
|
private val tabInfos = arrayOf(
|
||||||
|
TabInfo(
|
||||||
|
"Messages",
|
||||||
|
R.drawable.ic_twotone_message_24,
|
||||||
|
ContactsFragment()
|
||||||
|
),
|
||||||
|
TabInfo(
|
||||||
|
"Users",
|
||||||
|
R.drawable.ic_twotone_people_24,
|
||||||
|
UsersFragment()
|
||||||
|
),
|
||||||
|
TabInfo(
|
||||||
|
"Map",
|
||||||
|
R.drawable.ic_twotone_map_24,
|
||||||
|
MapFragment()
|
||||||
|
),
|
||||||
|
TabInfo(
|
||||||
|
"Channel",
|
||||||
|
R.drawable.ic_twotone_contactless_24,
|
||||||
|
ChannelFragment()
|
||||||
|
),
|
||||||
|
TabInfo(
|
||||||
|
"Settings",
|
||||||
|
R.drawable.ic_twotone_settings_applications_24,
|
||||||
|
SettingsFragment()
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
private val tabsAdapter = object : FragmentStateAdapter(supportFragmentManager, lifecycle) {
|
private val tabsAdapter = object : FragmentStateAdapter(supportFragmentManager, lifecycle) {
|
||||||
|
|
||||||
|
|
Ładowanie…
Reference in New Issue