From 735fc51bc6a66f6c3cb79c063d07bc1cdfc6c0b0 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Mon, 11 May 2020 12:01:32 +0200
Subject: [PATCH] Made dark theme darker

---
 .../viewholder/EpisodeItemViewHolder.java     |  2 +-
 .../main/res/layout/audioplayer_fragment.xml  | 32 ++++++-------------
 .../res/layout/external_player_fragment.xml   |  6 +---
 .../main/res/layout/statistics_listitem.xml   |  2 +-
 core/src/main/res/values/attrs.xml            |  1 +
 core/src/main/res/values/colors.xml           | 12 ++++---
 core/src/main/res/values/styles.xml           |  3 ++
 7 files changed, 24 insertions(+), 34 deletions(-)

diff --git a/app/src/main/java/de/danoeh/antennapod/view/viewholder/EpisodeItemViewHolder.java b/app/src/main/java/de/danoeh/antennapod/view/viewholder/EpisodeItemViewHolder.java
index 29378b148..8584befbc 100644
--- a/app/src/main/java/de/danoeh/antennapod/view/viewholder/EpisodeItemViewHolder.java
+++ b/app/src/main/java/de/danoeh/antennapod/view/viewholder/EpisodeItemViewHolder.java
@@ -106,7 +106,7 @@ public class EpisodeItemViewHolder extends RecyclerView.ViewHolder {
         isNew.setVisibility(item.isNew() ? View.VISIBLE : View.GONE);
         isFavorite.setVisibility(item.isTagged(FeedItem.TAG_FAVORITE) ? View.VISIBLE : View.GONE);
         isInQueue.setVisibility(item.isTagged(FeedItem.TAG_QUEUE) ? View.VISIBLE : View.GONE);
-        itemView.setAlpha(item.isPlayed() ? 0.5f : 1.0f);
+        itemView.setAlpha(item.isPlayed() ? 0.6f : 1.0f);
 
         ItemActionButton actionButton = ItemActionButton.forItem(item, true, true);
         actionButton.configure(secondaryActionButton, secondaryActionIcon, activity);
diff --git a/app/src/main/res/layout/audioplayer_fragment.xml b/app/src/main/res/layout/audioplayer_fragment.xml
index f66c16582..1935ce36c 100644
--- a/app/src/main/res/layout/audioplayer_fragment.xml
+++ b/app/src/main/res/layout/audioplayer_fragment.xml
@@ -30,9 +30,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
-            android:background="?android:attr/windowBackground"
+            android:background="?attr/background_elevated"
             tools:layout_height="@dimen/external_player_height"
-            tools:background="@android:color/holo_green_light"
             android:elevation="8dp"/>
 
     <androidx.viewpager2.widget.ViewPager2
@@ -42,7 +41,6 @@
             android:layout_above="@id/playtime_layout"
             android:layout_below="@id/toolbar"
             android:foreground="?android:windowContentOverlay"
-            tools:background="@android:color/holo_orange_light"
             android:layout_marginBottom="12dp"/>
 
     <SeekBar
@@ -54,8 +52,7 @@
             android:layout_above="@id/playtime_layout"
             android:layout_marginLeft="8dp"
             android:layout_marginRight="8dp"
-            android:layoutDirection="ltr"
-            tools:background="@android:color/holo_green_dark"/>
+            android:layoutDirection="ltr" />
 
     <LinearLayout
             android:id="@+id/playtime_layout"
@@ -83,8 +80,7 @@
                     android:layout_marginStart="16dp"
                     android:text="@string/position_default_label"
                     android:textColor="?android:attr/textColorSecondary"
-                    android:textSize="@dimen/text_size_micro"
-                    tools:background="@android:color/holo_green_dark"/>
+                    android:textSize="@dimen/text_size_micro"/>
 
             <TextView
                     android:id="@+id/txtvLength"
@@ -97,8 +93,7 @@
                     android:text="@string/position_default_label"
                     android:textColor="?android:attr/textColorSecondary"
                     android:textSize="@dimen/text_size_micro"
-                    android:background="?android:attr/selectableItemBackground"
-                    tools:background="@android:color/holo_green_dark"/>
+                    android:background="?android:attr/selectableItemBackground"/>
 
         </RelativeLayout>
 
@@ -106,8 +101,7 @@
                 android:id="@+id/player_control"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="24dp"
-                tools:background="@android:color/holo_purple">
+                android:layout_marginBottom="24dp">
 
             <ImageButton
                     android:id="@+id/butPlay"
@@ -124,8 +118,7 @@
                     android:contentDescription="@string/pause_label"
                     app:srcCompat="?attr/av_play"
                     android:scaleType="fitCenter"
-                    tools:srcCompat="@drawable/ic_av_play_white_24dp"
-                    tools:background="@android:color/holo_green_dark"/>
+                    tools:srcCompat="@drawable/ic_av_play_white_24dp"/>
 
             <de.danoeh.antennapod.view.CircularProgressBar
                     android:layout_width="@dimen/audioplayer_playercontrols_length_big"
@@ -159,8 +152,7 @@
                     android:contentDescription="@string/rewind_label"
                     app:srcCompat="?attr/av_rewind"
                     android:scaleType="fitCenter"
-                    tools:srcCompat="@drawable/ic_av_fast_rewind_white_48dp"
-                    tools:background="@android:color/holo_blue_dark"/>
+                    tools:srcCompat="@drawable/ic_av_fast_rewind_white_48dp"/>
 
             <TextView
                     android:id="@+id/txtvRev"
@@ -186,9 +178,7 @@
                     android:layout_centerVertical="true"
                     android:background="?attr/selectableItemBackgroundBorderless"
                     android:contentDescription="@string/set_playback_speed_label"
-                    tools:srcCompat="@drawable/ic_playback_speed_white"
-                    tools:visibility="gone"
-                    tools:background="@android:color/holo_green_dark"/>
+                    tools:srcCompat="@drawable/ic_playback_speed_white"/>
 
             <TextView
                     android:id="@+id/txtvPlaybackSpeed"
@@ -218,8 +208,7 @@
                     android:contentDescription="@string/fast_forward_label"
                     app:srcCompat="?attr/av_fast_forward"
                     android:scaleType="fitCenter"
-                    tools:srcCompat="@drawable/ic_av_fast_forward_white_48dp"
-                    tools:background="@android:color/holo_blue_dark"/>
+                    tools:srcCompat="@drawable/ic_av_fast_forward_white_48dp"/>
 
             <TextView
                     android:id="@+id/txtvFF"
@@ -247,8 +236,7 @@
                     android:scaleType="fitCenter"
                     app:srcCompat="?attr/av_skip"
                     android:contentDescription="@string/skip_episode_label"
-                    tools:srcCompat="@drawable/ic_av_skip_white_48dp"
-                    tools:background="@android:color/holo_green_dark"/>
+                    tools:srcCompat="@drawable/ic_av_skip_white_48dp"/>
         </RelativeLayout>
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/external_player_fragment.xml b/app/src/main/res/layout/external_player_fragment.xml
index 43b777d99..f36baec26 100644
--- a/app/src/main/res/layout/external_player_fragment.xml
+++ b/app/src/main/res/layout/external_player_fragment.xml
@@ -9,11 +9,6 @@
         android:background="?attr/selectableItemBackground"
         android:orientation="vertical">
 
-    <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="?android:attr/dividerHorizontal" />
-
     <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
@@ -29,6 +24,7 @@
                 android:cropToPadding="true"
                 android:maxWidth="96dp"
                 android:scaleType="fitCenter"
+                android:background="@color/non_square_icon_background"
                 tools:src="@tools:sample/avatars"/>
 
 
diff --git a/app/src/main/res/layout/statistics_listitem.xml b/app/src/main/res/layout/statistics_listitem.xml
index 0b2f464d4..c41ace58b 100644
--- a/app/src/main/res/layout/statistics_listitem.xml
+++ b/app/src/main/res/layout/statistics_listitem.xml
@@ -20,7 +20,7 @@
             android:layout_centerVertical="true"
             android:adjustViewBounds="true"
             android:cropToPadding="true"
-            android:scaleType="centerCrop"
+            android:scaleType="fitCenter"
             tools:src="@drawable/ic_antenna"
             tools:background="@android:color/holo_green_dark"/>
 
diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index f8b545ac0..2d8cbb4cb 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -56,6 +56,7 @@
     <attr name="batch_edit_fab_icon" format="reference"/>
     <attr name="action_icon_color" format="color"/>
     <attr name="scrollbar_thumb" format="reference"/>
+    <attr name="background_elevated" format="color"/>
 
     <declare-styleable name="SquareImageView">
         <attr name="direction" format="enum">
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
index cc04db2dd..a86d61eba 100644
--- a/core/src/main/res/values/colors.xml
+++ b/core/src/main/res/values/colors.xml
@@ -13,14 +13,16 @@
 
     <!-- Theme colors -->
     <color name="background_light">#FFFFFF</color>
-    <color name="background_darktheme">#303030</color>
-    <color name="highlight_light">#DDDDDD</color>
-    <color name="highlight_dark">#414141</color>
-    <color name="highlight_trueblack">#414141</color>
+    <color name="background_elevated_light">#EFEEEE</color>
+    <color name="background_darktheme">#21272b</color>
+    <color name="background_elevated_darktheme">#2D3337</color>
+    <color name="highlight_light">#46C6C6C6</color>
+    <color name="highlight_dark">#43707070</color>
+    <color name="highlight_trueblack">#43707070</color>
     <color name="non_square_icon_background">#22777777</color>
 
     <color name="accent_light">#0078C2</color>
-    <color name="accent_dark">#5C9DFF</color>
+    <color name="accent_dark">#3D8BFF</color>
     <color name="ic_launcher_background">#008AB8</color>
 
     <color name="master_switch_background_light">#DDDDDD</color>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 2b7be1713..c72cd3e53 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -14,6 +14,7 @@
         <item name="colorPrimaryDark">@color/accent_light</item>
         <item name="android:windowBackground">@color/background_light</item>
         <item name="actionBarStyle">@style/Widget.AntennaPod.ActionBar.Light</item>
+        <item name="background_elevated">@color/background_elevated_light</item>
         <item name="master_switch_background">@color/master_switch_background_light</item>
         <item name="currently_playing_background">@color/highlight_light</item>
         <item name="action_icon_color">@color/black</item>
@@ -85,6 +86,7 @@
         <item name="colorPrimaryDark">@color/background_darktheme</item>
         <item name="android:windowBackground">@color/background_darktheme</item>
         <item name="actionBarStyle">@style/Widget.AntennaPod.ActionBar.Dark</item>
+        <item name="background_elevated">@color/background_elevated_darktheme</item>
         <item name="colorControlNormal">@color/white</item>
         <item name="progressBarTheme">@style/ProgressBarDark</item>
         <item name="drawer_activated_color">@color/highlight_dark</item>
@@ -159,6 +161,7 @@
         <item name="android:colorBackground">@color/black</item>
         <item name="android:windowBackground">@color/black</item>
         <item name="android:actionBarStyle">@color/black</item>
+        <item name="background_elevated">@color/black</item>
     </style>
 
     <style name="Theme.AntennaPod.Light.NoTitle" parent="Theme.AntennaPod.Light">