Migrate to non-transitive R

This commit is contained in:
Mygod
2021-11-05 22:18:43 -04:00
parent 4e639e5c17
commit cdfa662a1d
4 changed files with 11 additions and 7 deletions

View File

@@ -40,13 +40,15 @@ class MainActivity : AppCompatActivity(), NavigationBarView.OnItemSelectedListen
binding.navigation.setOnItemSelectedListener(this)
val badge = binding.navigation.getOrCreateBadge(R.id.navigation_clients).apply {
backgroundColor = ContextCompat.getColor(this@MainActivity, R.color.colorSecondary)
badgeTextColor = ContextCompat.getColor(this@MainActivity, R.color.primary_text_default_material_light)
badgeTextColor = ContextCompat.getColor(this@MainActivity,
androidx.appcompat.R.color.primary_text_default_material_light)
}
updateItem = binding.navigation.menu.findItem(R.id.navigation_update)
updateItem.isCheckable = false
updateBadge = binding.navigation.getOrCreateBadge(R.id.navigation_update).apply {
backgroundColor = ContextCompat.getColor(this@MainActivity, R.color.colorSecondary)
badgeTextColor = ContextCompat.getColor(this@MainActivity, R.color.primary_text_default_material_light)
badgeTextColor = ContextCompat.getColor(this@MainActivity,
androidx.appcompat.R.color.primary_text_default_material_light)
}
if (savedInstanceState == null) displayFragment(TetheringFragment())
val model by viewModels<ClientViewModel>()