diff --git a/AndroidTriviaFragment/app/src/main/java/com/example/android/navigation/MainActivity.kt b/AndroidTriviaFragment/app/src/main/java/com/example/android/navigation/MainActivity.kt index 5d94bb1..591a505 100755 --- a/AndroidTriviaFragment/app/src/main/java/com/example/android/navigation/MainActivity.kt +++ b/AndroidTriviaFragment/app/src/main/java/com/example/android/navigation/MainActivity.kt @@ -19,24 +19,29 @@ package com.example.android.navigation import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil +import androidx.drawerlayout.widget.DrawerLayout import androidx.navigation.findNavController import androidx.navigation.ui.NavigationUI import com.example.android.navigation.databinding.ActivityMainBinding class MainActivity : AppCompatActivity() { + + private lateinit var drawerLayout: DrawerLayout + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @Suppress("UNUSED_VARIABLE") val binding = DataBindingUtil.setContentView(this, R.layout.activity_main) + drawerLayout = binding.drawerLayout val navController = this.findNavController(R.id.myNavHostFragment) - NavigationUI.setupActionBarWithNavController(this, navController) + NavigationUI.setupActionBarWithNavController(this, navController, drawerLayout) NavigationUI.setupWithNavController(binding.navView, navController) } override fun onSupportNavigateUp(): Boolean { val navController = this.findNavController(R.id.myNavHostFragment) - return navController.navigateUp() + return NavigationUI.navigateUp(navController, drawerLayout) }