kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-17 19:35:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

#2227 renamed toolbar

Browse Source
This commit is contained in:
HissPirat 2020-07-24 11:30:39 +02:00
parent da9574e5f4
commit b3c29b69b2
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/org/kiwix/kiwixmobile/main/KiwixNewNavigationActivity.kt
View File

@ -31,10 +31,9 @@ import androidx.navigation.ui.AppBarConfiguration
import androidx.navigation.ui.onNavDestinationSelected import androidx.navigation.ui.onNavDestinationSelected
import androidx.navigation.ui.setupWithNavController import androidx.navigation.ui.setupWithNavController
import com.google.android.material.navigation.NavigationView 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.bottom_nav_view
import kotlinx.android.synthetic.main.activity_new_navigation.container 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.R
import org.kiwix.kiwixmobile.core.base.BaseFragmentActivityExtensions import org.kiwix.kiwixmobile.core.base.BaseFragmentActivityExtensions
import org.kiwix.kiwixmobile.core.di.components.CoreComponent import org.kiwix.kiwixmobile.core.di.components.CoreComponent
@ -70,10 +69,19 @@ class KiwixNewNavigationActivity : CoreMainActivity() {
), container ), container
) )
findViewById<NavigationView>(R.id.drawer_nav_view).setupWithNavController(navController) findViewById<NavigationView>(R.id.drawer_nav_view).setupWithNavController(navController)
findViewById<Toolbar>(R.id.toolbar).setupWithNavController(navController, appBarConfiguration) findViewById<Toolbar>(R.id.activity_toolbar).setupWithNavController(
setSupportActionBar(toolbar) navController,
appBarConfiguration
)
setSupportActionBar(activity_toolbar)
drawerToggle = 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) bottom_nav_view.setupWithNavController(navController)
} }

2
app/src/main/res/layout/activity_new_navigation.xml
View File

@ -40,7 +40,7 @@
<androidx.appcompat.widget.Toolbar <androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar" android:id="@+id/activity_toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:popupTheme="@style/KiwixTheme" app:popupTheme="@style/KiwixTheme"