Improve: Theming Again (What did u expect?!)

This commit is contained in:
LooKeR
2021-10-17 20:15:08 +05:30
parent e8d1331faf
commit 95d1c6954f
11 changed files with 68 additions and 52 deletions

View File

@ -4,7 +4,7 @@
<translate
android:duration="400"
android:fromXDelta="0%"
android:fromYDelta="-100%"
android:fromYDelta="-50%"
android:toXDelta="0%"
android:toYDelta="0%" />
</set>

View File

@ -4,7 +4,7 @@
<translate
android:duration="400"
android:fromXDelta="0%"
android:fromYDelta="100%"
android:fromYDelta="50%"
android:toXDelta="0%"
android:toYDelta="0%" />
</set>

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="10dp" />
<corners android:radius="@dimen/shape_medium_corner" />
</shape>

View File

@ -21,14 +21,13 @@
android:id="@+id/icon"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_marginStart="1.667dp"
android:layout_marginEnd="1.667dp"
app:shapeAppearanceOverlay="@style/Shape.Medium"
tools:ignore="ContentDescription" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginStart="@dimen/text_margin"
android:layout_weight="1"
android:orientation="vertical">
@ -82,19 +81,17 @@
<com.google.android.material.progressindicator.LinearProgressIndicator
android:id="@+id/progress"
style="@style/Theme.Progress"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginBottom="2dp"
app:trackCornerRadius="2dp" />
android:layout_gravity="center_vertical" />
</LinearLayout>
<com.google.android.material.button.MaterialButton
android:id="@+id/action"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
app:cornerRadius="8dp" />
android:layout_height="56dp"
app:shapeAppearanceOverlay="@style/Shape.Medium" />
</LinearLayout>

View File

@ -5,10 +5,11 @@
android:layout_width="match_parent"
android:layout_height="72dp"
android:layout_marginHorizontal="10dp"
app:cardBackgroundColor="@null"
app:cardCornerRadius="12dp"
android:orientation="horizontal"
app:cardBackgroundColor="?android:attr/colorBackground"
app:cardElevation="0dp"
app:strokeColor="@null"
app:cardCornerRadius="@dimen/shape_medium_corner"
app:strokeWidth="0dp">
<LinearLayout
@ -19,8 +20,9 @@
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/icon"
android:layout_width="44dp"
android:layout_height="44dp"
android:layout_width="56dp"
android:layout_height="56dp"
app:shapeAppearanceOverlay="@style/Shape.Small"
tools:ignore="ContentDescription" />
<LinearLayout

View File

@ -3,11 +3,10 @@
<color name="green50">#E8F5E9</color>
<color name="green100">#A3EBB7</color>
<color name="green200">#6EC898</color>
<color name="green300">#58C189</color>
<color name="green400">#3EDA86</color>
<color name="green300">#51DF93</color>
<color name="red200">#EF9A9A</color>
<color name="red300">#E57373</color>
<color name="red300">#EF8A8A</color>
<color name="pitch_black">#000000</color>
<color name="black">#1E1E1E</color>

View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="text_margin">16dp</dimen>
<dimen name="shape_margin">8dp</dimen>
<dimen name="shape_small_corner">4dp</dimen>
<dimen name="shape_medium_corner">12dp</dimen>
<dimen name="shape_large_corner">16dp</dimen>
</resources>

View File

@ -6,7 +6,7 @@
</style>
<style name="Theme.Main.Light" parent="Theme.Material3.Light.NoActionBar">
<item name="colorPrimary">@color/green400</item>
<item name="colorPrimary">@color/green300</item>
<item name="colorOnPrimary">@color/black</item>
<item name="colorSurface">@color/green50</item>
<item name="colorOnSurface">@color/black</item>
@ -79,9 +79,27 @@
<item name="colorOnSurfaceVariant">?attr/colorOnSurface</item>
</style>
<style name="Theme.Progress" parent="Widget.Material3.LinearProgressIndicator">
<item name="trackColor">?attr/colorSurface</item>
<item name="trackThickness">8dp</item>
<item name="trackCornerRadius">4dp</item>
</style>
<style name="Theme.Switch" parent="Widget.Material3.CompoundButton.Switch">
<item name="trackTint">@color/switch_track_color</item>
<item name="thumbTint">@color/switch_thumb_tint</item>
</style>
<style name="Shape.Small" parent="ShapeAppearance.Material3.SmallComponent">
<item name="cornerSize">@dimen/shape_small_corner</item>
</style>
<style name="Shape.Medium" parent="ShapeAppearance.Material3.MediumComponent">
<item name="cornerSize">@dimen/shape_medium_corner</item>
</style>
<style name="Shape.Large" parent="ShapeAppearance.Material3.LargeComponent">
<item name="cornerSize">@dimen/shape_large_corner</item>
</style>
</resources>