[app] Update home cards style
This commit is contained in:
tehcneko
Wang Han
parent
6493989ce4
commit
122601463c
|
|
@ -74,7 +74,7 @@
|
|||
android:id="@+id/status"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/HomeItem.Primary">
|
||||
style="@style/HomeCard.Primary">
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
|
|
@ -88,7 +88,7 @@
|
|||
android:layout_height="24dp"
|
||||
android:layout_centerVertical="true"
|
||||
app:srcCompat="@drawable/ic_round_check_circle_24"
|
||||
app:tint="?android:attr/textColorPrimaryInverse" />
|
||||
app:tint="@color/primary_card_primary_text" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/status_title"
|
||||
|
|
@ -99,7 +99,7 @@
|
|||
android:fontFamily="sans-serif-medium"
|
||||
android:textSize="16sp"
|
||||
android:textAppearance="?android:attr/textAppearanceListItem"
|
||||
android:textColor="?android:attr/textColorPrimaryInverse" />
|
||||
android:textColor="@color/primary_card_primary_text" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/status_summary"
|
||||
|
|
@ -108,7 +108,7 @@
|
|||
android:layout_below="@id/status_title"
|
||||
android:layout_alignStart="@id/status_title"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textColor="?android:attr/textColorSecondaryInverse" />
|
||||
android:textColor="@color/primary_card_secondary_text" />
|
||||
</RelativeLayout>
|
||||
</com.google.android.material.card.MaterialCardView>
|
||||
|
||||
|
|
@ -116,7 +116,7 @@
|
|||
android:id="@+id/modules"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/HomeItem.Secondary">
|
||||
style="@style/HomeCard.Secondary">
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
|
|
@ -155,7 +155,7 @@
|
|||
android:id="@+id/download"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/HomeItem.Secondary">
|
||||
style="@style/HomeCard.Secondary">
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
|
|
@ -191,67 +191,91 @@
|
|||
</RelativeLayout>
|
||||
</com.google.android.material.card.MaterialCardView>
|
||||
|
||||
<LinearLayout
|
||||
<com.google.android.material.card.MaterialCardView
|
||||
android:id="@+id/logs"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/HomeItem.Tertiary">
|
||||
style="@style/HomeCard.Tertiary">
|
||||
|
||||
<ImageView
|
||||
android:layout_width="24dp"
|
||||
android:layout_height="24dp"
|
||||
android:contentDescription="@string/Logs"
|
||||
app:srcCompat="@drawable/ic_round_assignment_24" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="24dp"
|
||||
android:text="@string/Logs"
|
||||
android:textSize="16sp"
|
||||
android:textAppearance="?android:attr/textAppearanceListItem" />
|
||||
</LinearLayout>
|
||||
android:padding="16dp"
|
||||
android:orientation="horizontal"
|
||||
android:layout_gravity="center_vertical">
|
||||
|
||||
<LinearLayout
|
||||
<ImageView
|
||||
android:layout_width="24dp"
|
||||
android:layout_height="24dp"
|
||||
android:contentDescription="@string/Logs"
|
||||
app:srcCompat="@drawable/ic_round_assignment_24" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="24dp"
|
||||
android:text="@string/Logs"
|
||||
android:textSize="16sp"
|
||||
android:textAppearance="?android:attr/textAppearanceListItem" />
|
||||
</LinearLayout>
|
||||
</com.google.android.material.card.MaterialCardView>
|
||||
|
||||
<com.google.android.material.card.MaterialCardView
|
||||
android:id="@+id/settings"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/HomeItem.Tertiary">
|
||||
style="@style/HomeCard.Tertiary">
|
||||
|
||||
<ImageView
|
||||
android:layout_width="24dp"
|
||||
android:layout_height="24dp"
|
||||
android:contentDescription="@string/Settings"
|
||||
app:srcCompat="@drawable/ic_round_settings_24" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="24dp"
|
||||
android:text="@string/Settings"
|
||||
android:textAppearance="?android:attr/textAppearanceListItem" />
|
||||
</LinearLayout>
|
||||
android:padding="16dp"
|
||||
android:orientation="horizontal"
|
||||
android:layout_gravity="center_vertical">
|
||||
|
||||
<LinearLayout
|
||||
<ImageView
|
||||
android:layout_width="24dp"
|
||||
android:layout_height="24dp"
|
||||
android:contentDescription="@string/Settings"
|
||||
app:srcCompat="@drawable/ic_round_settings_24" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="24dp"
|
||||
android:text="@string/Settings"
|
||||
android:textAppearance="?android:attr/textAppearanceListItem" />
|
||||
</LinearLayout>
|
||||
</com.google.android.material.card.MaterialCardView>
|
||||
|
||||
<com.google.android.material.card.MaterialCardView
|
||||
android:id="@+id/issue"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/HomeItem.Tertiary">
|
||||
style="@style/HomeCard.Tertiary">
|
||||
|
||||
<ImageView
|
||||
android:layout_width="24dp"
|
||||
android:layout_height="24dp"
|
||||
android:contentDescription="@string/report_issue"
|
||||
app:srcCompat="@drawable/ic_round_bug_report_24" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="24dp"
|
||||
android:text="@string/report_issue"
|
||||
android:textSize="16sp"
|
||||
android:textAppearance="?android:attr/textAppearanceListItem" />
|
||||
</LinearLayout>
|
||||
android:padding="16dp"
|
||||
android:orientation="horizontal"
|
||||
android:layout_gravity="center_vertical">
|
||||
|
||||
<ImageView
|
||||
android:layout_width="24dp"
|
||||
android:layout_height="24dp"
|
||||
android:contentDescription="@string/report_issue"
|
||||
app:srcCompat="@drawable/ic_round_bug_report_24" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="24dp"
|
||||
android:text="@string/report_issue"
|
||||
android:textSize="16sp"
|
||||
android:textAppearance="?android:attr/textAppearanceListItem" />
|
||||
</LinearLayout>
|
||||
</com.google.android.material.card.MaterialCardView>
|
||||
|
||||
</LinearLayout>
|
||||
</rikka.widget.borderview.BorderNestedScrollView>
|
||||
|
|
|
|||
|
|
@ -25,4 +25,7 @@
|
|||
|
||||
<color name="home_secondary_outline_ambient_shadow_color">@color/material_grey_700</color>
|
||||
<color name="home_secondary_outline_spot_shadow_color">@color/material_grey_600</color>
|
||||
|
||||
<color name="primary_card_primary_text">@color/abc_primary_text_material_light</color>
|
||||
<color name="primary_card_secondary_text">@color/abc_secondary_text_material_light</color>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -28,4 +28,7 @@
|
|||
|
||||
<color name="home_secondary_outline_ambient_shadow_color">@color/material_grey_500</color>
|
||||
<color name="home_secondary_outline_spot_shadow_color">@color/material_grey_300</color>
|
||||
|
||||
<color name="primary_card_primary_text">@color/abc_primary_text_material_dark</color>
|
||||
<color name="primary_card_secondary_text">@color/abc_secondary_text_material_dark</color>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -77,21 +77,20 @@
|
|||
<item name="android:paddingBottom">24dp</item>
|
||||
</style>
|
||||
|
||||
<style name="HomeItem">
|
||||
<style name="HomeCard" parent="Widget.Material3.CardView.Elevated">
|
||||
<item name="android:layout_marginHorizontal">16dp</item>
|
||||
<item name="android:layout_marginBottom">8dp</item>
|
||||
<item name="android:clickable">true</item>
|
||||
<item name="android:focusable">true</item>
|
||||
<item name="cardCornerRadius">8dp</item>
|
||||
<item name="cardPreventCornerOverlap">false</item>
|
||||
</style>
|
||||
|
||||
<style name="HomeItem.Primary" parent="Widget.Material3.CardView.Elevated">
|
||||
<style name="HomeCard.Primary">
|
||||
<item name="android:layout_marginTop">16dp</item>
|
||||
<item name="cardElevation">@dimen/home_primary_elevation</item>
|
||||
</style>
|
||||
|
||||
<style name="HomeItem.Secondary" parent="Widget.Material3.CardView.Elevated">
|
||||
<style name="HomeCard.Secondary">
|
||||
<item name="cardElevation">@dimen/home_secondary_elevation</item>
|
||||
<item name="android:outlineAmbientShadowColor" tools:targetApi="p">
|
||||
@color/home_secondary_outline_ambient_shadow_color
|
||||
|
|
@ -101,11 +100,10 @@
|
|||
</item>
|
||||
</style>
|
||||
|
||||
<style name="HomeItem.Tertiary">
|
||||
<item name="android:gravity">center_vertical</item>
|
||||
<item name="android:background">@drawable/item_background_round_nopadding</item>
|
||||
<item name="android:orientation">horizontal</item>
|
||||
<item name="android:padding">16dp</item>
|
||||
<style name="HomeCard.Tertiary">
|
||||
<item name="android:stateListAnimator">@null</item>
|
||||
<item name="cardBackgroundColor">@android:color/transparent</item>
|
||||
<item name="cardElevation">0dp</item>
|
||||
</style>
|
||||
|
||||
<style name="Widget.App.Button.OutlinedButton.IconOnly" parent="Widget.Material3.Button.OutlinedButton">
|
||||
|
|
|
|||
Loading…
Reference in New Issue