br0kenpixel/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-09-06 06:36:58 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Updated appbar design to be more android-like

Browse Source
This commit is contained in:
Viktor De Pasquale
2019-10-22 18:08:57 +02:00
parent d2e171eabc
commit fbfc4e72ca
7 changed files with 40 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/activity_main_md2.xml
+18 -9
View File
@@ -24,32 +24,41 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
<com.google.android.material.card.MaterialCardView
style="?styleCardElevated"
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/main_toolbar_wrapper"
style="?styleAppbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/main_toolbar_wrapper"
android:layout_marginStart="@dimen/l1"
android:layout_marginTop="@{(int) @dimen/l1 + viewModel.insets.top}"
android:layout_marginEnd="@dimen/l1"
tools:layout_marginTop="40dp">
android:paddingTop="@{viewModel.insets.top}">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/main_toolbar"
style="?styleToolbar"
android:layout_width="match_parent"
android:background="@android:color/transparent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_scrollFlags="noScroll"
tools:layout_marginTop="24dp"
tools:title="Home" />
</com.google.android.material.appbar.AppBarLayout>
<!--<com.google.android.material.card.MaterialCardView
style="?styleCardElevated"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/main_toolbar_wrapper"
android:layout_marginStart="@dimen/l1"
android:layout_marginEnd="@dimen/l1">
<View
android:layout_width="match_parent"
android:layout_height="3dp"
android:layout_gravity="start|bottom"
android:background="@drawable/bg_accent" />
</com.google.android.material.card.MaterialCardView>
</com.google.android.material.card.MaterialCardView>-->
<com.google.android.material.card.MaterialCardView
android:id="@+id/main_bottom_bar"
app/src/main/res/layout/fragment_home_md2.xml
+2 -2
View File
@@ -21,7 +21,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:paddingTop="@{viewModel.insets.top + (int) @dimen/internal_action_bar_size + (int) @dimen/l2}"
android:paddingTop="@{viewModel.insets.top + (int) @dimen/internal_action_bar_size}"
android:paddingBottom="@{viewModel.insets.bottom + (int) @dimen/l2}"
tools:layout_marginTop="24dp">
@@ -36,7 +36,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/l1">
android:paddingTop="@dimen/l2">
<com.google.android.material.card.MaterialCardView
android:id="@+id/home_magisk_wrapper"
app/src/main/res/layout/fragment_settings_md2.xml
+2 -1
View File
@@ -16,13 +16,14 @@
android:layout_height="match_parent"
android:clipToPadding="false"
android:fillViewport="true"
android:paddingTop="@{viewModel.insets.top + (int) @dimen/internal_action_bar_size + (int) @dimen/l2}"
android:paddingTop="@{viewModel.insets.top + (int) @dimen/internal_action_bar_size}"
android:paddingBottom="@{viewModel.insets.bottom + (int) @dimen/l2}"
tools:layout_marginTop="24dp"
tools:paddingTop="@dimen/l1">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:paddingTop="@dimen/l1"
android:layout_height="wrap_content">
<com.google.android.material.card.MaterialCardView
app/src/main/res/layout/fragment_superuser_md2.xml
+2 -1
View File
@@ -18,7 +18,7 @@
android:layout_height="match_parent"
android:clipToPadding="false"
android:fillViewport="true"
android:paddingTop="@{viewModel.insets.top + (int) @dimen/internal_action_bar_size + (int) @dimen/l2}"
android:paddingTop="@{viewModel.insets.top + (int) @dimen/internal_action_bar_size}"
android:paddingBottom="@{viewModel.insets.bottom + (int) @dimen/l2}"
tools:layout_marginTop="24dp"
tools:paddingTop="@dimen/l1">
@@ -26,6 +26,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/l1"
android:orientation="vertical">
<com.google.android.material.card.MaterialCardView