@@ -6,50 +6,41 @@ import android.os.Bundle
66import android.view.Menu
77import android.view.MenuItem
88import androidx.appcompat.app.AppCompatActivity
9- import androidx.appcompat.widget.Toolbar
109import androidx.core.view.GravityCompat
11- import androidx.drawerlayout.widget.DrawerLayout
1210import com.google.android.material.navigation.NavigationView
11+ import info.hannes.logcat.sample.databinding.ActivityMainBinding
1312import info.hannes.logcat.ui.BothLogActivity
1413import info.hannes.logcat.ui.LogcatActivity
1514import info.hannes.logcat.ui.LogfileActivity
1615
1716class MainActivity : AppCompatActivity () {
1817
19- private lateinit var drawerLayout : DrawerLayout
18+ private lateinit var binding : ActivityMainBinding
2019
2120 override fun onCreate (savedInstanceState : Bundle ? ) {
2221 super .onCreate(savedInstanceState)
23- setContentView(R .layout.activity_main)
22+ binding = ActivityMainBinding .inflate(layoutInflater)
23+ setContentView(binding.root)
2424
25- drawerLayout = findViewById(R .id.drawer_layout)
26-
27- val toolbar = findViewById<Toolbar >(R .id.toolbar)
28- setSupportActionBar(toolbar)
25+ setSupportActionBar(binding.containMain.toolbar)
2926
3027 // enable ActionBar app icon to behave as action to toggle nav drawer
3128 supportActionBar?.setHomeAsUpIndicator(R .drawable.ic_menu)
3229 supportActionBar?.setDisplayHomeAsUpEnabled(true )
3330
34- val navigationView = findViewById<NavigationView >(R .id.nav_view)
35- if (navigationView != null ) {
36- setupDrawerContent(navigationView)
37- }
38-
31+ setupDrawerContent(binding.navView)
3932 }
4033
4134 private fun setupDrawerContent (navigationView : NavigationView ) {
4235 navigationView.setNavigationItemSelectedListener { menuItem ->
4336 menuItem.isChecked = true
4437 selectNavigationItem(menuItem.itemId)
45- drawerLayout.closeDrawers()
38+ binding. drawerLayout.closeDrawers()
4639 true
4740 }
48-
4941 }
5042
5143 private fun selectNavigationItem (itemId : Int ) {
52-
5344 when (itemId) {
5445 R .id.nav_drawer_logcat -> startActivity(Intent (this , LogcatActivity ::class .java))
5546 R .id.nav_drawer_logfile -> startActivity(Intent (this , LogfileActivity ::class .java))
@@ -71,7 +62,7 @@ class MainActivity : AppCompatActivity() {
7162 override fun onOptionsItemSelected (item : MenuItem ): Boolean {
7263 when (item.itemId) {
7364 android.R .id.home -> {
74- drawerLayout.openDrawer(GravityCompat .START )
65+ binding. drawerLayout.openDrawer(GravityCompat .START )
7566 }
7667 R .id.nav_drawer_logcat -> {
7768 startActivity(Intent (this , LogcatActivity ::class .java))
0 commit comments