Merge pull request #1569 from osodebailar/features/toolbar-now-in-material

toolbar in material now
This commit is contained in:
Milos Kozak 2022-04-06 10:21:29 +02:00 committed by GitHub
commit cb59a86e8c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -7,23 +7,20 @@
android:clipChildren="false" android:clipChildren="false"
android:clipToPadding="false"> android:clipToPadding="false">
<androidx.appcompat.widget.Toolbar <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:contentInsetEndWithActions="48dp" app:contentInsetEndWithActions="48dp"
app:contentInsetStartWithNavigation="48dp" app:contentInsetStartWithNavigation="48dp"
android:elevation="4dp"> android:elevation="2dp">
<com.google.android.material.tabs.TabLayout <com.google.android.material.tabs.TabLayout
android:id="@+id/tabs_normal" android:id="@+id/tabs_normal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@android:color/transparent" android:background="@android:color/transparent"
app:tabIndicatorColor="?attr/tabSelectedTextColor"
app:tabTextColor="?attr/tabTextColor"
app:tabSelectedTextColor="?attr/tabSelectedTextColor"
app:tabMode="scrollable" /> app:tabMode="scrollable" />
<com.google.android.material.tabs.TabLayout <com.google.android.material.tabs.TabLayout
@ -33,12 +30,10 @@
android:background="@android:color/transparent" android:background="@android:color/transparent"
app:tabMinWidth="0dp" app:tabMinWidth="0dp"
app:tabPadding="0dp" app:tabPadding="0dp"
app:tabIndicatorColor="?attr/tabSelectedTextColor"
app:tabTextColor="?attr/tabTextColor"
app:tabSelectedTextColor="?attr/tabSelectedTextColor"
app:tabMode="scrollable" /> app:tabMode="scrollable" />
</androidx.appcompat.widget.Toolbar> </com.google.android.material.appbar.MaterialToolbar>
<androidx.drawerlayout.widget.DrawerLayout <androidx.drawerlayout.widget.DrawerLayout
android:id="@+id/main_drawer_layout" android:id="@+id/main_drawer_layout"