TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-12-26 08:37:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated styles and simplified dimension usage

Browse Source
This commit is contained in:
Viktor De Pasquale 2019-09-30 19:37:57 +02:00
parent b4e1585e2b
commit 122e2f7a8e
16 changed files with 237 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/res/color/color_error_transient.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?colorDisabled" android:state_enabled="false" />
<item android:color="?colorError" />
</selector>

5
app/src/main/res/color/color_primary_transient.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?colorDisabled" android:state_enabled="false" />
<item android:color="?colorPrimary" />
</selector>

5
app/src/main/res/color/color_text_transient.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?colorDisabled" android:state_enabled="false" />
<item android:color="?colorOnSurface" />
</selector>

14
app/src/main/res/drawable/bg_circle.xml
View File

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:left="-300dp"
android:right="-300dp"
android:top="-300dp">
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<gradient
android:endColor="?colorSecondary"
android:startColor="?colorPrimary" />
</shape>
</item>
</layer-list>

21
app/src/main/res/drawable/bg_divider_top.xml
View File

@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<solid android:color="?colorSurface" />
</shape>
</item>
<item
android:bottom="-2dp"
android:left="-2dp"
android:right="-2dp"
android:top="0dp">
<shape android:shape="rectangle">
<stroke
android:width="2px"
android:color="#1F000000" />
</shape>
</item>
</layer-list>

10
app/src/main/res/drawable/ic_delete_md2.xml Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?colorOnPrimary"
android:pathData="M9,3V4H4V6H5V19A2,2 0 0,0 7,21H17A2,2 0 0,0 19,19V6H20V4H15V3H9M7,6H17V19H7V6M9,8V17H11V8H9M13,8V17H15V8H13Z" />
</vector>

10
app/src/main/res/drawable/ic_home.xml Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?colorOnPrimary"
android:pathData="M12 5.69L17 10.19V18H15V12H9V18H7V10.19L12 5.69M12 3L2 12H5V20H11V14H13V20H19V12H22L12 3Z" />
</vector>

10
app/src/main/res/drawable/ic_install.xml Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?colorOnSurface"
android:pathData="M12,18L7,13H10V9H14V13H17L12,18M10,2H14A2,2 0 0,1 16,4V6H20A2,2 0 0,1 22,8V19A2,2 0 0,1 20,21H4C2.89,21 2,20.1 2,19V8C2,6.89 2.89,6 4,6H8V4C8,2.89 8.89,2 10,2M14,6V4H10V6H14M4,8V19H20V8H4Z" />
</vector>

10
app/src/main/res/drawable/ic_update_md2.xml Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?colorOnSurface"
android:pathData="M17,1H7A2,2 0 0,0 5,3V21A2,2 0 0,0 7,23H17A2,2 0 0,0 19,21V3A2,2 0 0,0 17,1M17,19H7V5H17V19M16,13H13V8H11V13H8L12,17L16,13Z" />
</vector>

109
app/src/main/res/layout/test.xml
View File

@ -10,21 +10,7 @@
style="?styleAppbar" style="?styleAppbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@android:color/transparent"> android:background="?colorSurfaceVariant">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<View
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_gravity="center_horizontal|bottom"
android:background="@drawable/bg_circle"
app:layout_constraintBottom_toBottomOf="@+id/home_toolbar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.appbar.MaterialToolbar <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/home_toolbar" android:id="@+id/home_toolbar"
@ -39,14 +25,13 @@
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="?l1"> android:paddingBottom="@dimen/l1">
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
style="?styleToolbarTitle" style="?styleToolbarTitle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:textColor="?colorOnPrimary"
tools:text="Home" /> tools:text="Home" />
<View <View
@ -59,20 +44,20 @@
</com.google.android.material.appbar.MaterialToolbar> </com.google.android.material.appbar.MaterialToolbar>
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clipToPadding="false"
android:orientation="vertical" android:orientation="vertical"
android:padding="?l1" android:padding="@dimen/l1"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"> app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:paddingTop="@dimen/l1">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/home_magisk_wrapper" android:id="@+id/home_magisk_wrapper"
@ -94,7 +79,7 @@
android:id="@+id/title1" android:id="@+id/title1"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="?l1" android:layout_marginStart="@dimen/l1"
android:text="Magisk" android:text="Magisk"
android:textAppearance="?appearanceTextTitleNormal" android:textAppearance="?appearanceTextTitleNormal"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -112,9 +97,13 @@
app:layout_constraintTop_toBottomOf="@+id/title1" /> app:layout_constraintTop_toBottomOf="@+id/title1" />
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:id="@+id/button_container1"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="?l1" android:layout_marginTop="@dimen/l1"
android:layout_marginEnd="@dimen/l_50"
app:layout_constraintEnd_toStartOf="@+id/delete1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/status1"> app:layout_constraintTop_toBottomOf="@+id/status1">
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
@ -122,23 +111,39 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/update" android:text="@string/update"
app:icon="@drawable/ic_update_md2"
app:iconGravity="textEnd"
app:iconPadding="@dimen/l_50"
app:iconSize="18dp"
tools:visibility="gone" /> tools:visibility="gone" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
style="?styleButtonText" style="?styleButtonText"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/install" /> android:text="@string/install"
app:icon="@drawable/ic_install"
app:iconGravity="textEnd"
app:iconPadding="@dimen/l_50"
app:iconSize="18dp" />
</FrameLayout> </FrameLayout>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/delete1"
style="?styleIconError"
app:layout_constraintBottom_toBottomOf="@+id/button_container1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/button_container1"
app:srcCompat="@drawable/ic_delete_md2" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/home_manager_wrapper" android:id="@+id/home_manager_wrapper"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="?l1" android:layout_marginStart="@dimen/l1"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/home_magisk_wrapper" app:layout_constraintStart_toEndOf="@+id/home_magisk_wrapper"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
@ -155,7 +160,7 @@
android:id="@+id/title1" android:id="@+id/title1"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="?l1" android:layout_marginStart="@dimen/l1"
android:text="Manager" android:text="Manager"
android:textAppearance="?appearanceTextTitleNormal" android:textAppearance="?appearanceTextTitleNormal"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -175,20 +180,28 @@
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="?l1" android:layout_marginTop="@dimen/l1"
app:layout_constraintTop_toBottomOf="@+id/status1"> app:layout_constraintTop_toBottomOf="@+id/status1">
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
style="?styleButtonDefault" style="?styleButtonDefault"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/update" /> android:text="@string/update"
app:icon="@drawable/ic_update_md2"
app:iconGravity="textEnd"
app:iconPadding="@dimen/l_50"
app:iconSize="18dp" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
style="?styleButtonText" style="?styleButtonText"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/install" android:text="@string/install"
app:icon="@drawable/ic_install"
app:iconGravity="textEnd"
app:iconPadding="@dimen/l_50"
app:iconSize="18dp"
tools:visibility="gone" /> tools:visibility="gone" />
</FrameLayout> </FrameLayout>
@ -197,17 +210,23 @@
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="@dimen/l2"
android:layout_marginBottom="@dimen/l2"
android:background="?colorSurfaceVariant" />
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
style="?styleCardNormal" style="?styleCardNormal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:layout_marginTop="?l1">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:padding="?l1"> android:padding="@dimen/l1">
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -230,24 +249,34 @@
</LinearLayout> </LinearLayout>
<com.google.android.material.bottomnavigation.BottomNavigationView <com.google.android.material.bottomappbar.BottomAppBar
android:id="@+id/home_bottom_bar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:background="@drawable/bg_divider_top"
android:paddingBottom="48dp" android:paddingBottom="48dp"
app:itemIconSize="20dp" app:contentInsetEnd="0dp"
app:contentInsetStart="0dp"
app:fabCradleMargin="@dimen/l_50">
<com.google.android.material.bottomnavigation.BottomNavigationView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
app:itemIconTint="@color/color_menu_tint" app:itemIconTint="@color/color_menu_tint"
app:itemTextAppearanceActive="@style/AppearanceFoundation.Tiny" app:itemTextAppearanceActive="@style/AppearanceFoundation.Tiny.Bold"
app:itemTextAppearanceInactive="@style/AppearanceFoundation.Tiny" app:itemTextAppearanceInactive="@style/AppearanceFoundation.Tiny.Bold"
app:itemTextColor="@color/color_menu_tint" app:itemTextColor="@color/color_menu_tint"
app:labelVisibilityMode="labeled" app:labelVisibilityMode="unlabeled"
app:menu="@menu/menu_bottom_nav" /> app:menu="@menu/menu_bottom_nav" />
<!--<com.google.android.material.floatingactionbutton.FloatingActionButton </com.google.android.material.bottomappbar.BottomAppBar>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:fabSize="normal" app:fabSize="normal"
app:layout_anchor="@+id/home_bottom_bar" />--> app:layout_anchor="@+id/home_bottom_bar"
app:srcCompat="@drawable/ic_superuser" />
</androidx.coordinatorlayout.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>

8
app/src/main/res/menu/menu_bottom_nav.xml
View File

@ -4,7 +4,7 @@
<item <item
android:id="@+id/magiskFragment" android:id="@+id/magiskFragment"
android:icon="@drawable/ic_magisk_outline" android:icon="@drawable/ic_home"
android:title="Home" android:title="Home"
tools:showAsAction="always" /> tools:showAsAction="always" />
@ -14,6 +14,12 @@
android:title="@string/modules" android:title="@string/modules"
tools:showAsAction="always" /> tools:showAsAction="always" />
<item
android:id="@+id/fake"
android:enabled="false"
android:title=""
tools:showAsAction="always" />
<item <item
android:id="@+id/magiskFragment" android:id="@+id/magiskFragment"
android:icon="@drawable/ic_bug_report" android:icon="@drawable/ic_bug_report"

54
app/src/main/res/values/attrs.xml
View File

@ -9,67 +9,71 @@
<!--region Widgets--> <!--region Widgets-->
<!--region Appbar--> <!--Appbar-->
<attr name="styleAppbar" format="reference" /> <attr name="styleAppbar" format="reference" />
<!--endregion-->
<!--region Toolbar--> <!--Toolbar-->
<attr name="styleToolbar" format="reference" /> <attr name="styleToolbar" format="reference" />
<attr name="styleToolbarTitle" format="reference" /> <attr name="styleToolbarTitle" format="reference" />
<!--endregion-->
<!--region Card--> <!--Card-->
<attr name="styleCardNormal" format="reference" /> <attr name="styleCardNormal" format="reference" />
<attr name="styleCardOnPrimary" format="reference" /> <attr name="styleCardOnPrimary" format="reference" />
<!--endregion-->
<!--region Button--> <!--Button-->
<attr name="styleButtonDefault" format="reference" /> <attr name="styleButtonDefault" format="reference" />
<attr name="styleButtonFlat" format="reference" /> <attr name="styleButtonFlat" format="reference" />
<attr name="styleButtonText" format="reference" /> <attr name="styleButtonText" format="reference" />
<!--endregion--> <attr name="styleButtonError" format="reference" />
<!--Icon-->
<attr name="styleIconNormal" format="reference" />
<attr name="styleIconPrimary" format="reference" />
<attr name="styleIconError" format="reference" />
<!--endregion--> <!--endregion-->
<!--region Texts--> <!--region Texts-->
<!--region Display--> <!--Display-->
<attr name="appearanceTextDisplayNormal" format="reference" /> <attr name="appearanceTextDisplayNormal" format="reference" />
<attr name="appearanceTextDisplayVariant" format="reference" /> <attr name="appearanceTextDisplayVariant" format="reference" />
<attr name="appearanceTextDisplayOnPrimary" format="reference" /> <attr name="appearanceTextDisplayOnPrimary" format="reference" />
<attr name="appearanceTextDisplayOnPrimaryVariant" format="reference" /> <attr name="appearanceTextDisplayOnPrimaryVariant" format="reference" />
<!--endregion-->
<!--region Title--> <!--Title-->
<attr name="appearanceTextTitleNormal" format="reference" /> <attr name="appearanceTextTitleNormal" format="reference" />
<attr name="appearanceTextTitleVariant" format="reference" /> <attr name="appearanceTextTitleVariant" format="reference" />
<attr name="appearanceTextTitleOnPrimary" format="reference" /> <attr name="appearanceTextTitleOnPrimary" format="reference" />
<attr name="appearanceTextTitleOnPrimaryVariant" format="reference" /> <attr name="appearanceTextTitleOnPrimaryVariant" format="reference" />
<!--endregion-->
<!--region Body--> <!--Body-->
<attr name="appearanceTextBodyNormal" format="reference" /> <attr name="appearanceTextBodyNormal" format="reference" />
<attr name="appearanceTextBodyVariant" format="reference" /> <attr name="appearanceTextBodyVariant" format="reference" />
<attr name="appearanceTextBodyOnPrimary" format="reference" /> <attr name="appearanceTextBodyOnPrimary" format="reference" />
<attr name="appearanceTextBodyOnPrimaryVariant" format="reference" /> <attr name="appearanceTextBodyOnPrimaryVariant" format="reference" />
<!--endregion-->
<!--region Caption--> <!--Caption-->
<attr name="appearanceTextCaptionNormal" format="reference" /> <attr name="appearanceTextCaptionNormal" format="reference" />
<attr name="appearanceTextCaptionVariant" format="reference" /> <attr name="appearanceTextCaptionVariant" format="reference" />
<attr name="appearanceTextCaptionOnPrimary" format="reference" /> <attr name="appearanceTextCaptionOnPrimary" format="reference" />
<attr name="appearanceTextCaptionOnPrimaryVariant" format="reference" /> <attr name="appearanceTextCaptionOnPrimaryVariant" format="reference" />
<!--endregion-->
<!--endregion--> <!--endregion-->
<!--region Colors--> <!--region Colors-->
<!--Transient-->
<attr name="colorTextTransient" format="reference" />
<attr name="colorPrimaryTransient" format="reference" />
<attr name="colorErrorTransient" format="reference" />
<!--Static-->
<attr name="colorDisabled" format="color" />
<attr name="colorSurfaceVariant" format="color" />
<attr name="colorOnPrimaryVariant" format="color" /> <attr name="colorOnPrimaryVariant" format="color" />
<attr name="colorOnSurfaceVariant" format="color" /> <attr name="colorOnSurfaceVariant" format="color" />
<!--endregion-->
<!--region Dimens-->
<attr name="l_125" format="dimension" />
<attr name="l_25" format="dimension" />
<attr name="l_50" format="dimension" />
<attr name="l1" format="dimension" />
<attr name="l2" format="dimension" />
<attr name="l3" format="dimension" />
<attr name="l4" format="dimension" />
<!--endregion--> <!--endregion-->
</resources> </resources>

10
app/src/main/res/values/dimens.xml
View File

@ -3,13 +3,15 @@
<dimen name="card_elevation">2dp</dimen> <dimen name="card_elevation">2dp</dimen>
<dimen name="fab_padding">16dp</dimen> <dimen name="fab_padding">16dp</dimen>
<!--new dimens-->
<dimen name="margin_generic_double">32dp</dimen> <dimen name="margin_generic_double">32dp</dimen>
<dimen name="margin_generic">16dp</dimen> <dimen name="margin_generic">16dp</dimen>
<dimen name="margin_generic_half">8dp</dimen> <dimen name="margin_generic_half">8dp</dimen>
<dimen name="radius_generic">8dp</dimen> <dimen name="radius_generic">8dp</dimen>
<!--new dimens ^^--> <dimen name="l_125">2dp</dimen>
<dimen name="l_25">4dp</dimen>
<dimen name="l_50">8dp</dimen>
<dimen name="l_75">12dp</dimen>
<dimen name="l1">16dp</dimen>
<dimen name="l2">32dp</dimen>
</resources> </resources>

25
app/src/main/res/values/styles_md2.xml
View File

@ -14,17 +14,12 @@
<style name="AppearanceFoundation" /> <style name="AppearanceFoundation" />
<!--endregion--> <!--endregion-->
<style name="Foundation.Dimen" parent="Foundation.Compat"> <style name="Foundation.Base" parent="Foundation.Compat">
<item name="l_125">2dp</item> <item name="android:fontFamily">@font/exo</item>
<item name="l_25">4dp</item> <item name="android:includeFontPadding">false</item>
<item name="l_50">8dp</item>
<item name="l1">16dp</item> <!--///-->
<item name="l2">32dp</item>
<item name="l3">48dp</item>
<item name="l4">64dp</item>
</style>
<style name="Foundation.Base" parent="Foundation.Dimen">
<item name="actionBarSize">60dp</item> <item name="actionBarSize">60dp</item>
<item name="styleAppbar">@style/WidgetFoundation.Appbar</item> <item name="styleAppbar">@style/WidgetFoundation.Appbar</item>
@ -38,6 +33,11 @@
<item name="styleButtonDefault">@style/WidgetFoundation.Button</item> <item name="styleButtonDefault">@style/WidgetFoundation.Button</item>
<item name="styleButtonFlat">@style/WidgetFoundation.Button.Flat</item> <item name="styleButtonFlat">@style/WidgetFoundation.Button.Flat</item>
<item name="styleButtonText">@style/WidgetFoundation.Button.Text</item> <item name="styleButtonText">@style/WidgetFoundation.Button.Text</item>
<item name="styleButtonError">@style/WidgetFoundation.Button.Error</item>
<item name="styleIconNormal">@style/WidgetFoundation.Icon</item>
<item name="styleIconPrimary">@style/WidgetFoundation.Icon.Primary</item>
<item name="styleIconError">@style/WidgetFoundation.Icon.Error</item>
<!--///--> <!--///-->
@ -76,6 +76,7 @@
<item name="colorSecondary">#00C853</item> <item name="colorSecondary">#00C853</item>
<item name="colorSecondaryVariant">#8000C853</item> <item name="colorSecondaryVariant">#8000C853</item>
<item name="colorSurface">#F2F2F2</item> <item name="colorSurface">#F2F2F2</item>
<item name="colorSurfaceVariant">#0D000000</item>
<item name="colorOnPrimary">#F2F2F2</item> <item name="colorOnPrimary">#F2F2F2</item>
<item name="colorOnPrimaryVariant">#80F2F2F2</item> <item name="colorOnPrimaryVariant">#80F2F2F2</item>
<item name="colorOnSecondary">#F2F2F2</item> <item name="colorOnSecondary">#F2F2F2</item>
@ -84,6 +85,10 @@
<item name="colorOnError">#F2F2F2</item> <item name="colorOnError">#F2F2F2</item>
<item name="colorOnSurface">#444444</item> <item name="colorOnSurface">#444444</item>
<item name="colorOnSurfaceVariant">#80444444</item> <item name="colorOnSurfaceVariant">#80444444</item>
<item name="colorDisabled">#808080</item>
<item name="colorTextTransient">@color/color_text_transient</item>
<item name="colorPrimaryTransient">@color/color_primary_transient</item>
<item name="colorErrorTransient">@color/color_error_transient</item>
</style> </style>
</resources> </resources>

11
app/src/main/res/values/styles_md2_appearance.xml
View File

@ -3,7 +3,6 @@
<!--region Display--> <!--region Display-->
<style name="AppearanceFoundation.Display" parent="TextAppearance.AppCompat.Display1"> <style name="AppearanceFoundation.Display" parent="TextAppearance.AppCompat.Display1">
<item name="android:includeFontPadding">false</item>
<item name="android:textColor">?attr/colorOnSurface</item> <item name="android:textColor">?attr/colorOnSurface</item>
</style> </style>
@ -22,8 +21,8 @@
<!--region Title--> <!--region Title-->
<style name="AppearanceFoundation.Title" parent="TextAppearance.AppCompat.Title"> <style name="AppearanceFoundation.Title" parent="TextAppearance.AppCompat.Title">
<item name="android:includeFontPadding">false</item>
<item name="android:textColor">?attr/colorOnSurface</item> <item name="android:textColor">?attr/colorOnSurface</item>
<item name="android:textStyle">bold</item>
</style> </style>
<style name="AppearanceFoundation.Title.Variant"> <style name="AppearanceFoundation.Title.Variant">
@ -41,7 +40,6 @@
<!--region Body--> <!--region Body-->
<style name="AppearanceFoundation.Body" parent="TextAppearance.AppCompat.Body1"> <style name="AppearanceFoundation.Body" parent="TextAppearance.AppCompat.Body1">
<item name="android:includeFontPadding">false</item>
<item name="android:textColor">?attr/colorOnSurface</item> <item name="android:textColor">?attr/colorOnSurface</item>
</style> </style>
@ -60,7 +58,6 @@
<!--region Caption--> <!--region Caption-->
<style name="AppearanceFoundation.Caption" parent="TextAppearance.AppCompat.Caption"> <style name="AppearanceFoundation.Caption" parent="TextAppearance.AppCompat.Caption">
<item name="android:includeFontPadding">false</item>
<item name="android:textColor">?attr/colorOnSurface</item> <item name="android:textColor">?attr/colorOnSurface</item>
</style> </style>
@ -79,10 +76,12 @@
<!--region Tiny--> <!--region Tiny-->
<style name="AppearanceFoundation.Tiny" parent="TextAppearance.AppCompat.Caption"> <style name="AppearanceFoundation.Tiny" parent="TextAppearance.AppCompat.Caption">
<item name="android:includeFontPadding">false</item>
<item name="android:textColor">?attr/colorOnSurface</item> <item name="android:textColor">?attr/colorOnSurface</item>
<item name="android:textSize">11sp</item> <item name="android:textSize">11sp</item>
<item name="android:fontFamily">sans-serif-medium</item> </style>
<style name="AppearanceFoundation.Tiny.Bold">
<item name="android:textStyle">bold</item>
</style> </style>
<style name="AppearanceFoundation.Tiny.Variant"> <style name="AppearanceFoundation.Tiny.Variant">

33
app/src/main/res/values/styles_md2_impl.xml
View File

@ -27,18 +27,18 @@ variant. Make sure to use style referenced by attribute defined it attrs.xml.
<item name="android:gravity">start</item> <item name="android:gravity">start</item>
<item name="android:layout_gravity">center</item> <item name="android:layout_gravity">center</item>
<item name="android:lines">1</item> <item name="android:lines">1</item>
<item name="android:padding">?l1</item> <item name="android:padding">@dimen/l1</item>
</style> </style>
<style name="WidgetFoundation.Card" parent="Widget.MaterialComponents.CardView"> <style name="WidgetFoundation.Card" parent="Widget.MaterialComponents.CardView">
<item name="cardBackgroundColor">?attr/colorSurface</item> <item name="cardBackgroundColor">?attr/colorSurface</item>
<item name="cardCornerRadius">?l_50</item> <item name="cardCornerRadius">@dimen/l_50</item>
<item name="cardElevation">4dp</item> <item name="cardElevation">4dp</item>
</style> </style>
<style name="WidgetFoundation.Card.OnPrimary" parent="Widget.MaterialComponents.CardView"> <style name="WidgetFoundation.Card.OnPrimary" parent="Widget.MaterialComponents.CardView">
<item name="cardCornerRadius">?l_50</item> <item name="cardCornerRadius">@dimen/l_50</item>
<item name="cardElevation">0dp</item> <item name="cardElevation">0dp</item>
<item name="strokeColor">?attr/colorOnPrimaryVariant</item> <item name="strokeColor">?attr/colorOnPrimaryVariant</item>
<item name="strokeWidth">1dp</item> <item name="strokeWidth">1dp</item>
@ -47,15 +47,38 @@ variant. Make sure to use style referenced by attribute defined it attrs.xml.
<style name="WidgetFoundation.Button" parent="Widget.MaterialComponents.Button"> <style name="WidgetFoundation.Button" parent="Widget.MaterialComponents.Button">
<item name="android:textStyle">bold</item>
</style> </style>
<style name="WidgetFoundation.Button.Flat" parent="Widget.MaterialComponents.Button.UnelevatedButton"> <style name="WidgetFoundation.Button.Flat" parent="Widget.MaterialComponents.Button.UnelevatedButton">
<item name="android:textStyle">bold</item>
</style> </style>
<style name="WidgetFoundation.Button.Text" parent="Widget.MaterialComponents.Button.TextButton"> <style name="WidgetFoundation.Button.Text" parent="Widget.MaterialComponents.Button.TextButton">
<item name="android:textStyle">bold</item>
</style>
<style name="WidgetFoundation.Button.Error" parent="WidgetFoundation.Button.Text">
<item name="rippleColor">?colorError</item>
<item name="android:textColor">?colorError</item>
<item name="iconTint">?colorError</item>
</style>
<style name="WidgetFoundation.Icon">
<item name="android:layout_width">48dp</item>
<item name="android:layout_height">48dp</item>
<item name="android:padding">@dimen/l_75</item>
<item name="android:background">?selectableItemBackgroundBorderless</item>
<item name="tint">?colorTextTransient</item>
</style>
<style name="WidgetFoundation.Icon.Primary">
<item name="tint">?colorPrimaryTransient</item>
</style>
<style name="WidgetFoundation.Icon.Error">
<item name="tint">?colorErrorTransient</item>
</style> </style>
</resources> </resources>