Apply colors for themes

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

@@ -90,6 +90,7 @@
             android:layout_height="wrap_content"
             app:layout_constraintEnd_toEndOf="parent"
             android:layout_marginStart="4dp"
+            style="?attr/cardStyle"
             app:layout_constraintStart_toEndOf="@id/reply_indicator_dot"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintTop_toTopOf="parent">
@@ -102,7 +103,7 @@
                     android:id="@+id/status_boosted_by_info"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="#3E7A81"
+                    android:background="?boostcolor"
                     android:padding="5dp"
                     android:visibility="gone"
                     app:layout_constraintTop_toTopOf="parent">

app/src/main/res/values/styles.xml

@@ -3,6 +3,8 @@
     <attr format="reference" name="shapeBorder" />
     <attr format="reference" name="imgbd" />
     <attr format="color" name="actionBarTextColor" />
+    <attr format="reference" name="cardStyle"/>
+    <attr format="reference" name="cardStyleOver"/>
     <attr format="color" name="color_in_account_header" />
     <attr format="reference" name="popupOverlay" />
     <attr format="reference" name="appTheme" />
@@ -10,6 +12,7 @@
     <attr format="reference" name="borderlessColored" />
     <attr format="color" name="textColor" />
     <attr format="color" name="cardBorder" />
+    <attr format="color" name="boostcolor" />
 
     <!-- Light theme -->
     <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
@@ -17,7 +20,10 @@
         <item name="colorPrimary">@color/white</item>
         <item name="colorPrimaryDark">@color/mastodonC2</item>
         <item name="colorAccent">@color/mastodonC4</item>
+        <item name="cardStyle">@style/CardViewStyle.Light</item>
+        <item name="cardStyleOver">@style/CardViewStyleOver.Light</item>
         <item name="cardBorder">@color/cardBorderLight</item>
+        <item name="boostcolor">@color/mastodonC2</item>
         <item name="textColor">@color/black</item>
         <item name="android:buttonStyle">@style/ButtonColor</item>
         <item name="headerbg">@style/Header.Light</item>
@@ -59,7 +65,10 @@
         <item name="android:textColor">@color/light_black</item>
         <item name="android:scrollbarThumbVertical">@color/transparent</item>
         <item name="colorPrimary">@color/white</item>
+        <item name="cardStyle">@style/CardViewStyle.Light</item>
+        <item name="cardStyleOver">@style/CardViewStyleOver.Light</item>
         <item name="cardBorder">@color/cardBorderLight</item>
+        <item name="boostcolor">@color/mastodonC2</item>
         <item name="textColor">@color/black</item>
         <item name="colorPrimaryDark">@color/mastodonC2</item>
         <item name="colorAccent">@color/mastodonC4</item>
@@ -85,7 +94,12 @@
         <item name="colorBackgroundFloating">@color/white</item>
         <item name="android:colorBackground">@color/white</item>
     </style>
-
+    <style name="CardViewStyle.Light" parent="CardView">
+        <item name="cardBackgroundColor">@color/white</item>
+    </style>
+    <style name="CardViewStyleOver.Light" parent="CardView">
+        <item name="cardBackgroundColor">@color/mastodonC2</item>
+    </style>
     <style name="borderLessLightStyle" parent="Base.Widget.AppCompat.Button.Borderless">
         <item name="android:textColor">?attr/colorAccent</item>
     </style>
@@ -187,7 +201,10 @@
         <item name="colorPrimary">@color/black</item>
         <item name="colorPrimaryDark">@color/black</item>
         <item name="colorAccent">@color/dark_icon</item>
+        <item name="cardStyle">@style/CardViewStyle.Black</item>
+        <item name="cardStyleOver">@style/CardViewStyleOver.Black</item>
         <item name="cardBorder">@color/cardBorderBlack</item>
+        <item name="boostcolor">@color/mastodonC1_</item>
         <item name="textColor">@color/light_grey</item>
         <item name="android:buttonStyle">@style/BlackButtonColor</item>
         <item name="headerbg">@style/Header.Black</item>
@@ -216,7 +233,10 @@
         <item name="colorPrimary">@color/black</item>
         <item name="colorPrimaryDark">@color/black</item>
         <item name="colorAccent">@color/dark_icon</item>
+        <item name="cardStyle">@style/CardViewStyle.Black</item>
+        <item name="cardStyleOver">@style/CardViewStyleOver.Black</item>
         <item name="cardBorder">@color/cardBorderBlack</item>
+        <item name="boostcolor">@color/mastodonC1_</item>
         <item name="textColor">@color/light_grey</item>
         <item name="android:buttonStyle">@style/BlackButtonColor</item>
         <item name="headerbg">@style/Header.Black</item>
@@ -241,6 +261,13 @@
         <item name="android:colorBackground">@color/black</item>
     </style>
 
+    <style name="CardViewStyle.Black" parent="CardView">
+        <item name="cardBackgroundColor">@color/black</item>
+    </style>
+    <style name="CardViewStyleOver.Black" parent="CardView">
+        <item name="cardBackgroundColor">@color/mastodonC1_</item>
+    </style>
+
     <style name="BlackActionBarTheme" parent="Base.Widget.AppCompat.ActionBar">
         <item name="android:background">@color/black_3</item>
     </style>
@@ -303,10 +330,13 @@
         <item name="colorPrimary">@color/mastodonC1</item>
         <item name="colorPrimaryDark">@color/mastodonC1</item>
         <item name="colorAccent">@color/mastodonC4</item>
+        <item name="cardStyle">@style/CardViewStyle.Dark</item>
+        <item name="cardStyleOver">@style/CardViewStyleOver.Dark</item>
         <item name="textColor">@color/light_grey</item>
         <item name="android:buttonStyle">@style/DarkButtonColor</item>
         <item name="headerbg">@style/Header.Dark</item>
         <item name="cardBorder">@color/cardBorderDark</item>
+        <item name="boostcolor">@color/mastodonC1___</item>
         <item name="android:windowBackground">@color/mastodonC1</item>
         <item name="borderless">@style/borderLessLightStyle</item>
         <item name="borderlessColored">@style/borderlessColoredStyle</item>
@@ -332,9 +362,12 @@
         <item name="colorPrimary">@color/mastodonC1</item>
         <item name="colorPrimaryDark">@color/mastodonC1</item>
         <item name="colorAccent">@color/mastodonC4</item>
+        <item name="cardStyle">@style/CardViewStyle.Dark</item>
+        <item name="cardStyleOver">@style/CardViewStyleOver.Dark</item>
         <item name="textColor">@color/light_grey</item>
         <item name="android:buttonStyle">@style/DarkButtonColor</item>
         <item name="cardBorder">@color/cardBorderDark</item>
+        <item name="boostcolor">@color/mastodonC1___</item>
         <item name="headerbg">@style/Header.Dark</item>
         <item name="android:windowBackground">@color/mastodonC1</item>
         <item name="borderless">@style/borderLessLightStyle</item>
@@ -356,6 +389,13 @@
         <item name="android:colorBackground">@color/mastodonC1</item>
     </style>
 
+    <style name="CardViewStyle.Dark" parent="CardView">
+        <item name="cardBackgroundColor">@color/mastodonC1_</item>
+    </style>
+    <style name="CardViewStyleOver.Dark" parent="CardView">
+        <item name="cardBackgroundColor">@color/mastodonC1___</item>
+    </style>
+
     <style name="DarkdropDownListViewStyle" parent="Base.Widget.AppCompat.ListView.DropDown">
         <item name="android:background">@color/mastodonC1</item>
     </style>