From 468f825dc061ce6ea68701d91dfc24536f0f8957 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Sun, 4 Dec 2022 15:49:38 +0100
Subject: Release 3.9.4

---
 app/src/main/res/layout/drawer_account.xml              | 13 ++++++++-----
 app/src/main/res/layout/drawer_account_list.xml         | 14 ++++++++------
 app/src/main/res/layout/drawer_admin_account.xml        | 14 ++++++++------
 app/src/main/res/layout/drawer_announcement.xml         | 13 ++++++++-----
 app/src/main/res/layout/drawer_conversation.xml         | 13 ++++++++-----
 app/src/main/res/layout/drawer_domain_block.xml         | 12 +++++++-----
 app/src/main/res/layout/drawer_follow.xml               | 13 ++++++++-----
 app/src/main/res/layout/drawer_instance_reg.xml         | 12 +++++++-----
 app/src/main/res/layout/drawer_status.xml               | 14 ++++++++------
 app/src/main/res/layout/drawer_status_draft.xml         | 12 +++++++-----
 app/src/main/res/layout/drawer_status_filtered.xml      | 12 +++++++-----
 app/src/main/res/layout/drawer_status_filtered_hide.xml | 12 +++++++-----
 app/src/main/res/layout/drawer_status_history.xml       | 13 +++++++------
 app/src/main/res/layout/drawer_status_scheduled.xml     | 12 +++++++-----
 app/src/main/res/layout/drawer_status_simple.xml        | 15 ++++++++-------
 app/src/main/res/layout/drawer_suggestion.xml           | 12 +++++++-----
 app/src/main/res/layout/drawer_tag.xml                  | 13 +++++++------
 app/src/main/res/values-night/themes.xml                | 14 +++++++-------
 18 files changed, 134 insertions(+), 99 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/drawer_account.xml b/app/src/main/res/layout/drawer_account.xml
index 25b46fc54..75a4731a8 100644
--- a/app/src/main/res/layout/drawer_account.xml
+++ b/app/src/main/res/layout/drawer_account.xml
@@ -14,16 +14,19 @@
     You should have received a copy of the GNU General Public License along with Fedilab; if not,
     see <http://www.gnu.org/licenses>
 -->
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
 
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="6dp"
-    android:layout_marginTop="6dp"
-    app:cardElevation="5dp"
-    app:strokeWidth="0dp">
+    android:layout_marginTop="6dp">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="?colorOutline" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -151,4 +154,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</com.google.android.material.card.MaterialCardView>
+</RelativeLayout>
diff --git a/app/src/main/res/layout/drawer_account_list.xml b/app/src/main/res/layout/drawer_account_list.xml
index 32c86a302..06c946949 100644
--- a/app/src/main/res/layout/drawer_account_list.xml
+++ b/app/src/main/res/layout/drawer_account_list.xml
@@ -14,16 +14,18 @@
     You should have received a copy of the GNU General Public License along with Fedilab; if not,
     see <http://www.gnu.org/licenses>
 -->
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-
     android:layout_marginHorizontal="12dp"
-    android:layout_marginTop="12dp"
-    app:cardElevation="5dp"
-    app:strokeWidth="0dp">
+    android:layout_marginTop="12dp">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="?colorOutline" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -84,4 +86,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</com.google.android.material.card.MaterialCardView>
+</RelativeLayout>
diff --git a/app/src/main/res/layout/drawer_admin_account.xml b/app/src/main/res/layout/drawer_admin_account.xml
index 7faf4ef50..11be13127 100644
--- a/app/src/main/res/layout/drawer_admin_account.xml
+++ b/app/src/main/res/layout/drawer_admin_account.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/admin_account_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="6dp"
-    android:layout_marginTop="6dp"
-    app:cardElevation="5dp"
-    app:strokeWidth="0dp">
+    android:layout_marginTop="6dp">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="?colorOutline" />
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
@@ -138,5 +140,5 @@
             </androidx.appcompat.widget.LinearLayoutCompat>
         </androidx.appcompat.widget.LinearLayoutCompat>
     </androidx.appcompat.widget.LinearLayoutCompat>
-</androidx.cardview.widget.CardView>
+</RelativeLayout>
 
diff --git a/app/src/main/res/layout/drawer_announcement.xml b/app/src/main/res/layout/drawer_announcement.xml
index 2ba338a14..b7fe36219 100644
--- a/app/src/main/res/layout/drawer_announcement.xml
+++ b/app/src/main/res/layout/drawer_announcement.xml
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU General Public License along with Fedilab; if not,
     see <http://www.gnu.org/licenses>
 -->
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/cardview_container"
@@ -24,9 +24,12 @@
     android:layout_marginHorizontal="@dimen/card_margin"
     android:layout_marginTop="@dimen/card_margin"
     android:clipChildren="false"
-    android:clipToPadding="false"
-    app:cardElevation="5dp"
-    app:strokeWidth="0dp">
+    android:clipToPadding="false">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="?colorOutline" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/card_status_container"
@@ -93,4 +96,4 @@
         </androidx.appcompat.widget.LinearLayoutCompat>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</com.google.android.material.card.MaterialCardView>
+</RelativeLayout>
diff --git a/app/src/main/res/layout/drawer_conversation.xml b/app/src/main/res/layout/drawer_conversation.xml
index 41e0f0d3b..3fa599d23 100644
--- a/app/src/main/res/layout/drawer_conversation.xml
+++ b/app/src/main/res/layout/drawer_conversation.xml
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU General Public License along with Fedilab; if not,
     see <http://www.gnu.org/licenses>
 -->
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/container"
@@ -22,9 +22,12 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
 
-    android:layout_marginTop="6dp"
-    app:cardElevation="5dp"
-    app:strokeWidth="0dp">
+    android:layout_marginTop="6dp">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="?colorOutline" />
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
@@ -112,4 +115,4 @@
             tools:visibility="visible" />
     </androidx.appcompat.widget.LinearLayoutCompat>
 
-</com.google.android.material.card.MaterialCardView>
+</RelativeLayout>
diff --git a/app/src/main/res/layout/drawer_domain_block.xml b/app/src/main/res/layout/drawer_domain_block.xml
index 0de61977a..81edbc780 100644
--- a/app/src/main/res/layout/drawer_domain_block.xml
+++ b/app/src/main/res/layout/drawer_domain_block.xml
@@ -14,14 +14,16 @@
     You should have received a copy of the GNU General Public License along with Fedilab; if not,
     see <http://www.gnu.org/licenses>.
 -->
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout 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_height="wrap_content"
-    android:layout_margin="12dp"
+    android:layout_margin="12dp">
 
-    app:cardElevation="5dp"
-    app:strokeWidth="0dp">
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="?colorOutline" />
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
@@ -49,4 +51,4 @@
             android:padding="6dp"
             app:icon="@drawable/ic_baseline_delete_24" />
     </androidx.appcompat.widget.LinearLayoutCompat>
-</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/drawer_follow.xml b/app/src/main/res/layout/drawer_follow.xml
index 22d6f8bf1..0fcc8e74a 100644
--- a/app/src/main/res/layout/drawer_follow.xml
+++ b/app/src/main/res/layout/drawer_follow.xml
@@ -14,15 +14,18 @@
     You should have received a copy of the GNU General Public License along with Fedilab; if not,
     see <http://www.gnu.org/licenses>
 -->
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="@dimen/card_margin"
-    app:cardElevation="5dp"
-    android:layout_marginTop="@dimen/card_margin"
-    app:strokeWidth="0dp">
+    android:layout_marginTop="@dimen/card_margin">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="?colorOutline" />
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
@@ -125,4 +128,4 @@
 
     </androidx.appcompat.widget.LinearLayoutCompat>
 
-</com.google.android.material.card.MaterialCardView>
+</RelativeLayout>
diff --git a/app/src/main/res/layout/drawer_instance_reg.xml b/app/src/main/res/layout/drawer_instance_reg.xml
index 430c1dd0c..0f97003ab 100644
--- a/app/src/main/res/layout/drawer_instance_reg.xml
+++ b/app/src/main/res/layout/drawer_instance_reg.xml
@@ -14,15 +14,17 @@
     You should have received a copy of the GNU General Public License along with Fedilab; if not,
     see <http://www.gnu.org/licenses>.
 -->
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="12dp"
+    android:layout_margin="12dp">
 
-    app:cardElevation="5dp"
-    app:strokeWidth="0dp">
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="?colorOutline" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -97,4 +99,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml
index 9c22561f6..3a741fe3f 100644
--- a/app/src/main/res/layout/drawer_status.xml
+++ b/app/src/main/res/layout/drawer_status.xml
@@ -14,19 +14,21 @@
     You should have received a copy of the GNU General Public License along with Fedilab; if not,
     see <http://www.gnu.org/licenses>
 -->
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/cardview_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-
     android:layout_marginHorizontal="@dimen/card_margin"
     android:layout_marginTop="@dimen/card_margin"
     android:clipToPadding="false"
-    app:cardElevation="5dp"
-    android:clipChildren="false"
-    app:strokeWidth="0dp">
+    android:clipChildren="false">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="?colorOutline" />
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:id="@+id/main_container"
@@ -732,4 +734,4 @@
 
     </androidx.appcompat.widget.LinearLayoutCompat>
 
-</com.google.android.material.card.MaterialCardView>
+</RelativeLayout>
diff --git a/app/src/main/res/layout/drawer_status_draft.xml b/app/src/main/res/layout/drawer_status_draft.xml
index a51911c4c..1eb24ce4b 100644
--- a/app/src/main/res/layout/drawer_status_draft.xml
+++ b/app/src/main/res/layout/drawer_status_draft.xml
@@ -14,16 +14,18 @@
     You should have received a copy of the GNU General Public License along with Fedilab; if not,
     see <http://www.gnu.org/licenses>
 -->
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="12dp"
+    android:layout_margin="12dp">
 
-    app:cardElevation="5dp"
-    app:strokeWidth="0dp">
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="?colorOutline" />
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
@@ -104,4 +106,4 @@
         </HorizontalScrollView>
     </androidx.appcompat.widget.LinearLayoutCompat>
 
-</com.google.android.material.card.MaterialCardView>
+</RelativeLayout>
diff --git a/app/src/main/res/layout/drawer_status_filtered.xml b/app/src/main/res/layout/drawer_status_filtered.xml
index 7eee092e2..69154e28a 100644
--- a/app/src/main/res/layout/drawer_status_filtered.xml
+++ b/app/src/main/res/layout/drawer_status_filtered.xml
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU General Public License along with Fedilab; if not,
     see <http://www.gnu.org/licenses>
 -->
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/cardview_container"
@@ -23,10 +23,12 @@
     android:layout_marginHorizontal="@dimen/card_margin"
     android:layout_marginTop="@dimen/card_margin"
     android:clipChildren="false"
+    android:clipToPadding="false">
 
-    android:clipToPadding="false"
-    app:cardElevation="5dp"
-    app:strokeWidth="0dp">
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="?colorOutline" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -76,4 +78,4 @@
                 tools:visibility="visible" />
         </androidx.appcompat.widget.LinearLayoutCompat>
     </androidx.constraintlayout.widget.ConstraintLayout>
-</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/drawer_status_filtered_hide.xml b/app/src/main/res/layout/drawer_status_filtered_hide.xml
index 19385238a..4b7b32232 100644
--- a/app/src/main/res/layout/drawer_status_filtered_hide.xml
+++ b/app/src/main/res/layout/drawer_status_filtered_hide.xml
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU General Public License along with Fedilab; if not,
     see <http://www.gnu.org/licenses>
 -->
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/cardview_container"
@@ -23,10 +23,12 @@
     android:layout_marginHorizontal="@dimen/card_margin"
     android:layout_marginTop="@dimen/card_margin"
     android:clipChildren="false"
+    android:clipToPadding="false">
 
-    android:clipToPadding="false"
-    app:cardElevation="5dp"
-    app:strokeWidth="0dp">
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="?colorOutline" />
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:id="@+id/container_fetchmore"
@@ -45,4 +47,4 @@
             app:layout_constraintTop_toTopOf="parent"
             tools:visibility="visible" />
     </androidx.appcompat.widget.LinearLayoutCompat>
-</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/drawer_status_history.xml b/app/src/main/res/layout/drawer_status_history.xml
index 4507a628c..0522d2c66 100644
--- a/app/src/main/res/layout/drawer_status_history.xml
+++ b/app/src/main/res/layout/drawer_status_history.xml
@@ -14,8 +14,7 @@
     You should have received a copy of the GNU General Public License along with Fedilab; if not,
     see <http://www.gnu.org/licenses>
 -->
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/cardview_container"
     android:layout_width="match_parent"
@@ -23,10 +22,12 @@
     android:layout_marginHorizontal="12dp"
     android:layout_marginTop="12dp"
     android:clipChildren="false"
-    android:clipToPadding="false"
+    android:clipToPadding="false">
 
-    app:cardElevation="5dp"
-    app:strokeWidth="0dp">
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="?colorOutline" />
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
@@ -99,4 +100,4 @@
             tools:text="@tools:sample/lorem/random" />
     </androidx.appcompat.widget.LinearLayoutCompat>
 
-</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/drawer_status_scheduled.xml b/app/src/main/res/layout/drawer_status_scheduled.xml
index c55ba39bc..b22296a2c 100644
--- a/app/src/main/res/layout/drawer_status_scheduled.xml
+++ b/app/src/main/res/layout/drawer_status_scheduled.xml
@@ -14,16 +14,18 @@
     You should have received a copy of the GNU General Public License along with Fedilab; if not,
     see <http://www.gnu.org/licenses>
 -->
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="12dp"
+    android:layout_margin="12dp">
 
-    app:cardElevation="5dp"
-    app:strokeWidth="0dp">
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="?colorOutline" />
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
@@ -94,4 +96,4 @@
         </HorizontalScrollView>
     </androidx.appcompat.widget.LinearLayoutCompat>
 
-</com.google.android.material.card.MaterialCardView>
+</RelativeLayout>
diff --git a/app/src/main/res/layout/drawer_status_simple.xml b/app/src/main/res/layout/drawer_status_simple.xml
index 50d0e3140..f74127091 100644
--- a/app/src/main/res/layout/drawer_status_simple.xml
+++ b/app/src/main/res/layout/drawer_status_simple.xml
@@ -14,19 +14,20 @@
     You should have received a copy of the GNU General Public License along with Fedilab; if not,
     see <http://www.gnu.org/licenses>
 -->
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/cardview_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="12dp"
     android:layout_marginTop="12dp"
-
     android:clipChildren="false"
-    android:clipToPadding="false"
-    app:cardElevation="5dp"
-    app:strokeWidth="0dp">
+    android:clipToPadding="false">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="?colorOutline" />
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
@@ -97,4 +98,4 @@
             tools:text="@tools:sample/lorem/random" />
     </androidx.appcompat.widget.LinearLayoutCompat>
 
-</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/drawer_suggestion.xml b/app/src/main/res/layout/drawer_suggestion.xml
index 966c2eeaf..8ed647a55 100644
--- a/app/src/main/res/layout/drawer_suggestion.xml
+++ b/app/src/main/res/layout/drawer_suggestion.xml
@@ -14,16 +14,18 @@
     You should have received a copy of the GNU General Public License along with Fedilab; if not,
     see <http://www.gnu.org/licenses>
 -->
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="6dp"
-    android:layout_marginTop="6dp"
+    android:layout_marginTop="6dp">
 
-    app:cardElevation="5dp"
-    app:strokeWidth="0dp">
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="?colorOutline" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -105,4 +107,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</com.google.android.material.card.MaterialCardView>
+</RelativeLayout>
diff --git a/app/src/main/res/layout/drawer_tag.xml b/app/src/main/res/layout/drawer_tag.xml
index bcc24c412..966671041 100644
--- a/app/src/main/res/layout/drawer_tag.xml
+++ b/app/src/main/res/layout/drawer_tag.xml
@@ -14,14 +14,15 @@
     You should have received a copy of the GNU General Public License along with Fedilab; if not,
     see <http://www.gnu.org/licenses>.
 -->
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="12dp"
+    android:layout_margin="12dp">
 
-    app:cardElevation="5dp"
-    app:strokeWidth="0dp">
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="?colorOutline" />
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
@@ -63,4 +64,4 @@
             android:layout_width="100dp"
             android:layout_height="50dp" />
     </androidx.appcompat.widget.LinearLayoutCompat>
-</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 159f0a791..031cb493f 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -218,9 +218,9 @@
     </style>
 
     <style name="BlackAppTheme" parent="AppTheme">
-        <item name="colorPrimary">@color/md_theme_dark_primaryContainer</item>
-        <item name="colorOnPrimary">@color/white</item>
-        <item name="colorPrimaryContainer">@color/md_theme_dark_primary</item>
+        <item name="colorPrimary">@color/md_theme_dark_primary</item>
+        <item name="colorOnPrimary">@color/md_theme_dark_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/md_theme_dark_primaryContainer</item>
         <item name="colorOnPrimaryContainer">@color/white</item>
         <item name="colorSecondary">@color/md_theme_dark_secondary</item>
         <item name="colorOnSecondary">@color/md_theme_dark_onSecondary</item>
@@ -247,9 +247,9 @@
     </style>
 
     <style name="BlackAppThemeBar" parent="AppThemeBar">
-        <item name="colorPrimary">@color/md_theme_dark_primaryContainer</item>
-        <item name="colorOnPrimary">@color/white</item>
-        <item name="colorPrimaryContainer">@color/md_theme_dark_primary</item>
+        <item name="colorPrimary">@color/md_theme_dark_primary</item>
+        <item name="colorOnPrimary">@color/md_theme_dark_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/md_theme_dark_primaryContainer</item>
         <item name="colorOnPrimaryContainer">@color/white</item>
         <item name="colorSecondary">@color/md_theme_dark_secondary</item>
         <item name="colorOnSecondary">@color/md_theme_dark_onSecondary</item>
@@ -286,7 +286,7 @@
 
     <style name="BlackAlertDialog" parent="Theme.Material3.Dark.Dialog.Alert">
         <item name="colorPrimary">@color/md_theme_dark_primary</item>
-        <item name="colorOnPrimary">@color/white</item>
+        <item name="colorOnPrimary">@color/md_theme_dark_onPrimary</item>
         <item name="colorPrimaryContainer">@color/md_theme_dark_primaryContainer</item>
         <item name="colorOnPrimaryContainer">@color/white</item>
         <item name="colorSecondary">@color/md_theme_dark_secondary</item>
-- 
cgit v1.2.3