diff options
| author | Harsh Shandilya <me@msfjarvis.dev> | 2023-03-27 16:22:40 +0530 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2023-03-27 16:10:24 +0200 |
| commit | 4fcb8c47923a6ef76d606ca03aebf2a8531136fa (patch) | |
| tree | 40cdec3d885d20f8070eb2d9c41f63080ca3fd84 /ui/src/main/res/layout | |
| parent | fb05b358c07d8dca44ee472dbd0edbfa0a564336 (diff) | |
ui: introduce a fresh set of Material3 themes and migrate to them
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
Diffstat (limited to 'ui/src/main/res/layout')
4 files changed, 5 insertions, 5 deletions
diff --git a/ui/src/main/res/layout/tunnel_detail_fragment.xml b/ui/src/main/res/layout/tunnel_detail_fragment.xml index 96829e3c..751088f6 100644 --- a/ui/src/main/res/layout/tunnel_detail_fragment.xml +++ b/ui/src/main/res/layout/tunnel_detail_fragment.xml @@ -25,7 +25,7 @@ <ScrollView android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/colorBackground" + android:background="?attr/colorSurface" android:clickable="true" android:focusable="true"> diff --git a/ui/src/main/res/layout/tunnel_editor_fragment.xml b/ui/src/main/res/layout/tunnel_editor_fragment.xml index 59572b32..4443c003 100644 --- a/ui/src/main/res/layout/tunnel_editor_fragment.xml +++ b/ui/src/main/res/layout/tunnel_editor_fragment.xml @@ -28,7 +28,7 @@ android:id="@+id/main_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/colorBackground"> + android:background="?attr/colorSurface"> <ScrollView android:layout_width="match_parent" diff --git a/ui/src/main/res/layout/tunnel_list_fragment.xml b/ui/src/main/res/layout/tunnel_list_fragment.xml index 42a6ced7..8fc5d523 100644 --- a/ui/src/main/res/layout/tunnel_list_fragment.xml +++ b/ui/src/main/res/layout/tunnel_list_fragment.xml @@ -24,7 +24,7 @@ android:id="@+id/main_container" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/colorBackground" + android:background="?attr/colorSurface" android:clipChildren="false"> <androidx.recyclerview.widget.RecyclerView diff --git a/ui/src/main/res/layout/tv_tunnel_list_item.xml b/ui/src/main/res/layout/tv_tunnel_list_item.xml index 15615536..87367af5 100644 --- a/ui/src/main/res/layout/tv_tunnel_list_item.xml +++ b/ui/src/main/res/layout/tv_tunnel_list_item.xml @@ -34,10 +34,10 @@ android:layout_margin="8dp" android:layout_marginTop="4dp" android:layout_marginBottom="0dp" - android:backgroundTint="@{(item.state == State.UP && !isDeleting) ? @color/secondary_dark_color : (isDeleting && isFocused) ? @color/tv_card_delete_background : @color/tv_card_background}" android:checkable="true" android:focusable="true" - app:contentPadding="8dp"> + app:contentPadding="8dp" + android:backgroundTint="@{(item.state == State.UP && !isDeleting) ? @color/tv_secondary_dark_color : (isDeleting && isFocused) ? @color/tv_card_delete_background : @color/tv_card_background}"> <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" |