diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixNewNavigationActivity.kt b/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixNewNavigationActivity.kt index 42fa623da..7cafb9aff 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixNewNavigationActivity.kt +++ b/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixNewNavigationActivity.kt @@ -31,10 +31,9 @@ import androidx.navigation.ui.AppBarConfiguration import androidx.navigation.ui.onNavDestinationSelected import androidx.navigation.ui.setupWithNavController import com.google.android.material.navigation.NavigationView +import kotlinx.android.synthetic.main.activity_new_navigation.activity_toolbar import kotlinx.android.synthetic.main.activity_new_navigation.bottom_nav_view import kotlinx.android.synthetic.main.activity_new_navigation.container -import kotlinx.android.synthetic.main.activity_new_navigation.nav_host_fragment -import kotlinx.android.synthetic.main.activity_new_navigation.toolbar import org.kiwix.kiwixmobile.R import org.kiwix.kiwixmobile.core.base.BaseFragmentActivityExtensions import org.kiwix.kiwixmobile.core.di.components.CoreComponent @@ -70,10 +69,19 @@ class KiwixNewNavigationActivity : CoreMainActivity() { ), container ) findViewById(R.id.drawer_nav_view).setupWithNavController(navController) - findViewById(R.id.toolbar).setupWithNavController(navController, appBarConfiguration) - setSupportActionBar(toolbar) + findViewById(R.id.activity_toolbar).setupWithNavController( + navController, + appBarConfiguration + ) + setSupportActionBar(activity_toolbar) drawerToggle = - ActionBarDrawerToggle(this, container, toolbar, R.string.open, R.string.close_all_tabs) + ActionBarDrawerToggle( + this, + container, + activity_toolbar, + R.string.open, + R.string.close_all_tabs + ) bottom_nav_view.setupWithNavController(navController) } diff --git a/app/src/main/res/layout/activity_new_navigation.xml b/app/src/main/res/layout/activity_new_navigation.xml index 7069a3ced..5a1545b6b 100644 --- a/app/src/main/res/layout/activity_new_navigation.xml +++ b/app/src/main/res/layout/activity_new_navigation.xml @@ -40,7 +40,7 @@