Skip to content

Commit 2daf76e

Browse files
style(status): Change cards styling to be more M3 card view aligned
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
1 parent f8cec63 commit 2daf76e

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

app/src/main/java/com/owncloud/android/utils/theme/FilesSpecificViewThemeUtils.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,16 +192,15 @@ class FilesSpecificViewThemeUtils @Inject constructor(
192192

193193
fun themeStatusCardView(cardView: MaterialCardView) {
194194
withScheme(cardView) { scheme ->
195-
val background = cardView.context.getColor(R.color.grey_200)
196195
cardView.backgroundTintList =
197196
ColorStateList(
198197
arrayOf(
199198
intArrayOf(android.R.attr.state_checked),
200199
intArrayOf(-android.R.attr.state_checked)
201200
),
202201
intArrayOf(
203-
scheme.secondaryContainer,
204-
background
202+
scheme.surfaceContainerHighest,
203+
scheme.surface
205204
)
206205
)
207206
cardView.setStrokeColor(
@@ -212,7 +211,7 @@ class FilesSpecificViewThemeUtils @Inject constructor(
212211
),
213212
intArrayOf(
214213
scheme.onSecondaryContainer,
215-
scheme.surface
214+
scheme.outlineVariant
216215
)
217216
)
218217
)

app/src/main/res/layout/set_online_status_bottom_sheet.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@
122122
android:layout_weight="1"
123123
android:checkable="true"
124124
android:orientation="horizontal"
125-
app:cardBackgroundColor="@color/grey_200"
126125
app:cardCornerRadius="@dimen/status_corner_radius"
127126
app:cardElevation="0dp"
128127
app:checkedIcon="@null">
@@ -192,7 +191,6 @@
192191
android:layout_weight="1"
193192
android:checkable="true"
194193
android:orientation="horizontal"
195-
app:cardBackgroundColor="@color/grey_200"
196194
app:cardCornerRadius="@dimen/status_corner_radius"
197195
app:cardElevation="0dp"
198196
app:checkedIcon="@null">
@@ -263,7 +261,6 @@
263261
android:layout_weight="1"
264262
android:checkable="true"
265263
android:orientation="horizontal"
266-
app:cardBackgroundColor="@color/grey_200"
267264
app:cardCornerRadius="@dimen/status_corner_radius"
268265
app:cardElevation="0dp"
269266
app:checkedIcon="@null">
@@ -329,7 +326,6 @@
329326
android:layout_weight="1"
330327
android:checkable="true"
331328
android:orientation="horizontal"
332-
app:cardBackgroundColor="@color/grey_200"
333329
app:cardCornerRadius="@dimen/status_corner_radius"
334330
app:cardElevation="0dp"
335331
app:checkedIcon="@null">

0 commit comments

Comments
 (0)