MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-11-29 13:26:50 +01:00
Code Releases Wiki Activity

Fix cards background color

Browse Source
This commit is contained in:
Arjan Schrijver 2023-07-31 23:02:13 +02:00 committed by Arjan Schrijver
parent ed83071c33
commit b0aecf6cbe
5 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/res/layout/device_itemv2.xml
View File

@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:card_view="http://schemas.android.com/apk/res-auto" xmlns:card_view="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -14,7 +16,7 @@
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:foreground="?android:attr/selectableItemBackground" android:foreground="?android:attr/selectableItemBackground"
card_view:cardCornerRadius="3dp" app:cardBackgroundColor="?attr/cardview_background_color"
card_view:cardElevation="3dp" card_view:cardElevation="3dp"
card_view:contentPadding="8dp"> card_view:contentPadding="8dp">

9
app/src/main/res/layout/item_alarm.xml
View File

@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
@ -8,7 +10,10 @@
android:id="@+id/card_view" android:id="@+id/card_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="8dp"> android:layout_margin="8dp"
android:foreground="?android:attr/selectableItemBackground"
app:cardBackgroundColor="?attr/cardview_background_color"
app:cardElevation="3dp">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"

2
app/src/main/res/layout/item_appmanager_watchapp.xml
View File

@ -7,7 +7,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="8dp" android:layout_margin="8dp"
android:foreground="?android:attr/selectableItemBackground" android:foreground="?android:attr/selectableItemBackground"
app:cardCornerRadius="3dp" app:cardBackgroundColor="?attr/cardview_background_color"
app:cardElevation="3dp" app:cardElevation="3dp"
app:contentPadding="8dp"> app:contentPadding="8dp">

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

@ -5,6 +5,7 @@
<attr name="textColorTertiary" format="color" /> <attr name="textColorTertiary" format="color" />
<attr name="drawer_header_color" format="color" /> <attr name="drawer_header_color" format="color" />
<attr name="cardview_background_color" format="color" />
<attr name="chart_deep_sleep" format="color" /> <attr name="chart_deep_sleep" format="color" />
<attr name="chart_light_sleep" format="color" /> <attr name="chart_light_sleep" format="color" />

4
app/src/main/res/values/styles.xml
View File

@ -17,6 +17,7 @@
<item name="toolbarNavigationButtonStyle">@style/GadgetbridgeTheme.NavigationButtonStyle</item> <item name="toolbarNavigationButtonStyle">@style/GadgetbridgeTheme.NavigationButtonStyle</item>
<item name="drawer_header_color">?attr/colorPrimaryDark</item> <item name="drawer_header_color">?attr/colorPrimaryDark</item>
<item name="cardview_background_color">@color/cardview_light_background</item>
<item name="chart_deep_sleep">@color/chart_deep_sleep_light</item> <item name="chart_deep_sleep">@color/chart_deep_sleep_light</item>
<item name="chart_light_sleep">@color/chart_light_sleep_light</item> <item name="chart_light_sleep">@color/chart_light_sleep_light</item>
<item name="chart_rem_sleep">@color/chart_rem_sleep_light</item> <item name="chart_rem_sleep">@color/chart_rem_sleep_light</item>
@ -42,6 +43,7 @@
<item name="actionBarStyle">@style/GadgetbridgeTheme.RedActionBar</item> <item name="actionBarStyle">@style/GadgetbridgeTheme.RedActionBar</item>
<item name="drawer_header_color">?attr/colorPrimaryDark</item> <item name="drawer_header_color">?attr/colorPrimaryDark</item>
<item name="cardview_background_color">@color/cardview_dark_background</item>
<item name="chart_deep_sleep">@color/chart_deep_sleep_dark</item> <item name="chart_deep_sleep">@color/chart_deep_sleep_dark</item>
<item name="chart_light_sleep">@color/chart_light_sleep_dark</item> <item name="chart_light_sleep">@color/chart_light_sleep_dark</item>
<item name="chart_rem_sleep">@color/chart_rem_sleep_dark</item> <item name="chart_rem_sleep">@color/chart_rem_sleep_dark</item>
@ -63,6 +65,7 @@
<item name="android:statusBarColor">?attr/colorSurface</item> <item name="android:statusBarColor">?attr/colorSurface</item>
<item name="android:windowLightStatusBar" tools:targetApi="23">true</item> <item name="android:windowLightStatusBar" tools:targetApi="23">true</item>
<item name="drawer_header_color">?attr/colorSurface</item> <item name="drawer_header_color">?attr/colorSurface</item>
<item name="cardview_background_color">?attr/colorSurface</item>
<item name="alternate_row_background">?attr/colorSecondaryContainer</item> <item name="alternate_row_background">?attr/colorSecondaryContainer</item>
</style> </style>
<style name="GadgetbridgeThemeDynamicDark" parent="Theme.Material3.DynamicColors.Dark"> <style name="GadgetbridgeThemeDynamicDark" parent="Theme.Material3.DynamicColors.Dark">
@ -70,6 +73,7 @@
<item name="android:statusBarColor">?attr/colorSurface</item> <item name="android:statusBarColor">?attr/colorSurface</item>
<item name="android:windowLightStatusBar" tools:targetApi="23">false</item> <item name="android:windowLightStatusBar" tools:targetApi="23">false</item>
<item name="drawer_header_color">?attr/colorSurface</item> <item name="drawer_header_color">?attr/colorSurface</item>
<item name="cardview_background_color">?attr/colorSurface</item>
<item name="alternate_row_background">?attr/colorSecondaryContainer</item> <item name="alternate_row_background">?attr/colorSecondaryContainer</item>
</style> </style>
<style name="GadgetbridgeThemeDynamicDarkAmoled" parent="GadgetbridgeThemeDynamicDark"> <style name="GadgetbridgeThemeDynamicDarkAmoled" parent="GadgetbridgeThemeDynamicDark">