Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4138 from ByteHamster/theme-darker 

Made dark theme darker
This commit is contained in:
H. Lehmann 2020-05-14 16:52:59 +02:00 committed by GitHub
parent c2c6364826 735fc51bc6
commit 92033f8373
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 24 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/de/danoeh/antennapod/view/viewholder/EpisodeItemViewHolder.java
View File

@ -106,7 +106,7 @@ public class EpisodeItemViewHolder extends RecyclerView.ViewHolder {
isNew.setVisibility(item.isNew() ? View.VISIBLE : View.GONE); isNew.setVisibility(item.isNew() ? View.VISIBLE : View.GONE);
isFavorite.setVisibility(item.isTagged(FeedItem.TAG_FAVORITE) ? 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); 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); ItemActionButton actionButton = ItemActionButton.forItem(item, true, true);
actionButton.configure(secondaryActionButton, secondaryActionIcon, activity); actionButton.configure(secondaryActionButton, secondaryActionIcon, activity);

32
app/src/main/res/layout/audioplayer_fragment.xml
View File

@ -30,9 +30,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:background="?android:attr/windowBackground" android:background="?attr/background_elevated"
tools:layout_height="@dimen/external_player_height" tools:layout_height="@dimen/external_player_height"
tools:background="@android:color/holo_green_light"
android:elevation="8dp"/> android:elevation="8dp"/>
<androidx.viewpager2.widget.ViewPager2 <androidx.viewpager2.widget.ViewPager2
@ -42,7 +41,6 @@
android:layout_above="@id/playtime_layout" android:layout_above="@id/playtime_layout"
android:layout_below="@id/toolbar" android:layout_below="@id/toolbar"
android:foreground="?android:windowContentOverlay" android:foreground="?android:windowContentOverlay"
tools:background="@android:color/holo_orange_light"
android:layout_marginBottom="12dp"/> android:layout_marginBottom="12dp"/>
<SeekBar <SeekBar
@ -54,8 +52,7 @@
android:layout_above="@id/playtime_layout" android:layout_above="@id/playtime_layout"
android:layout_marginLeft="8dp" android:layout_marginLeft="8dp"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:layoutDirection="ltr" android:layoutDirection="ltr" />
tools:background="@android:color/holo_green_dark"/>
<LinearLayout <LinearLayout
android:id="@+id/playtime_layout" android:id="@+id/playtime_layout"
@ -83,8 +80,7 @@
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:text="@string/position_default_label" android:text="@string/position_default_label"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:textSize="@dimen/text_size_micro" android:textSize="@dimen/text_size_micro"/>
tools:background="@android:color/holo_green_dark"/>
<TextView <TextView
android:id="@+id/txtvLength" android:id="@+id/txtvLength"
@ -97,8 +93,7 @@
android:text="@string/position_default_label" android:text="@string/position_default_label"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:textSize="@dimen/text_size_micro" android:textSize="@dimen/text_size_micro"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"/>
tools:background="@android:color/holo_green_dark"/>
</RelativeLayout> </RelativeLayout>
@ -106,8 +101,7 @@
android:id="@+id/player_control" android:id="@+id/player_control"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="24dp" android:layout_marginBottom="24dp">
tools:background="@android:color/holo_purple">
<ImageButton <ImageButton
android:id="@+id/butPlay" android:id="@+id/butPlay"
@ -124,8 +118,7 @@
android:contentDescription="@string/pause_label" android:contentDescription="@string/pause_label"
app:srcCompat="?attr/av_play" app:srcCompat="?attr/av_play"
android:scaleType="fitCenter" android:scaleType="fitCenter"
tools:srcCompat="@drawable/ic_av_play_white_24dp" tools:srcCompat="@drawable/ic_av_play_white_24dp"/>
tools:background="@android:color/holo_green_dark"/>
<de.danoeh.antennapod.view.CircularProgressBar <de.danoeh.antennapod.view.CircularProgressBar
android:layout_width="@dimen/audioplayer_playercontrols_length_big" android:layout_width="@dimen/audioplayer_playercontrols_length_big"
@ -159,8 +152,7 @@
android:contentDescription="@string/rewind_label" android:contentDescription="@string/rewind_label"
app:srcCompat="?attr/av_rewind" app:srcCompat="?attr/av_rewind"
android:scaleType="fitCenter" android:scaleType="fitCenter"
tools:srcCompat="@drawable/ic_av_fast_rewind_white_48dp" tools:srcCompat="@drawable/ic_av_fast_rewind_white_48dp"/>
tools:background="@android:color/holo_blue_dark"/>
<TextView <TextView
android:id="@+id/txtvRev" android:id="@+id/txtvRev"
@ -186,9 +178,7 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:background="?attr/selectableItemBackgroundBorderless" android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/set_playback_speed_label" android:contentDescription="@string/set_playback_speed_label"
tools:srcCompat="@drawable/ic_playback_speed_white" tools:srcCompat="@drawable/ic_playback_speed_white"/>
tools:visibility="gone"
tools:background="@android:color/holo_green_dark"/>
<TextView <TextView
android:id="@+id/txtvPlaybackSpeed" android:id="@+id/txtvPlaybackSpeed"
@ -218,8 +208,7 @@
android:contentDescription="@string/fast_forward_label" android:contentDescription="@string/fast_forward_label"
app:srcCompat="?attr/av_fast_forward" app:srcCompat="?attr/av_fast_forward"
android:scaleType="fitCenter" android:scaleType="fitCenter"
tools:srcCompat="@drawable/ic_av_fast_forward_white_48dp" tools:srcCompat="@drawable/ic_av_fast_forward_white_48dp"/>
tools:background="@android:color/holo_blue_dark"/>
<TextView <TextView
android:id="@+id/txtvFF" android:id="@+id/txtvFF"
@ -247,8 +236,7 @@
android:scaleType="fitCenter" android:scaleType="fitCenter"
app:srcCompat="?attr/av_skip" app:srcCompat="?attr/av_skip"
android:contentDescription="@string/skip_episode_label" android:contentDescription="@string/skip_episode_label"
tools:srcCompat="@drawable/ic_av_skip_white_48dp" tools:srcCompat="@drawable/ic_av_skip_white_48dp"/>
tools:background="@android:color/holo_green_dark"/>
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>

6
app/src/main/res/layout/external_player_fragment.xml
View File

@ -9,11 +9,6 @@
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:orientation="vertical"> android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?android:attr/dividerHorizontal" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
@ -29,6 +24,7 @@
android:cropToPadding="true" android:cropToPadding="true"
android:maxWidth="96dp" android:maxWidth="96dp"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:background="@color/non_square_icon_background"
tools:src="@tools:sample/avatars"/> tools:src="@tools:sample/avatars"/>

2
app/src/main/res/layout/statistics_listitem.xml
View File

@ -20,7 +20,7 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:cropToPadding="true" android:cropToPadding="true"
android:scaleType="centerCrop" android:scaleType="fitCenter"
tools:src="@drawable/ic_antenna" tools:src="@drawable/ic_antenna"
tools:background="@android:color/holo_green_dark"/> tools:background="@android:color/holo_green_dark"/>

1
core/src/main/res/values/attrs.xml
View File

@ -56,6 +56,7 @@
<attr name="batch_edit_fab_icon" format="reference"/> <attr name="batch_edit_fab_icon" format="reference"/>
<attr name="action_icon_color" format="color"/> <attr name="action_icon_color" format="color"/>
<attr name="scrollbar_thumb" format="reference"/> <attr name="scrollbar_thumb" format="reference"/>
<attr name="background_elevated" format="color"/>
<declare-styleable name="SquareImageView"> <declare-styleable name="SquareImageView">
<attr name="direction" format="enum"> <attr name="direction" format="enum">

12
core/src/main/res/values/colors.xml
View File

@ -13,14 +13,16 @@
<!-- Theme colors --> <!-- Theme colors -->
<color name="background_light">#FFFFFF</color> <color name="background_light">#FFFFFF</color>
<color name="background_darktheme">#303030</color> <color name="background_elevated_light">#EFEEEE</color>
<color name="highlight_light">#DDDDDD</color> <color name="background_darktheme">#21272b</color>
<color name="highlight_dark">#414141</color> <color name="background_elevated_darktheme">#2D3337</color>
<color name="highlight_trueblack">#414141</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="non_square_icon_background">#22777777</color>
<color name="accent_light">#0078C2</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="ic_launcher_background">#008AB8</color>
<color name="master_switch_background_light">#DDDDDD</color> <color name="master_switch_background_light">#DDDDDD</color>

3
core/src/main/res/values/styles.xml
View File

@ -14,6 +14,7 @@
<item name="colorPrimaryDark">@color/accent_light</item> <item name="colorPrimaryDark">@color/accent_light</item>
<item name="android:windowBackground">@color/background_light</item> <item name="android:windowBackground">@color/background_light</item>
<item name="actionBarStyle">@style/Widget.AntennaPod.ActionBar.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="master_switch_background">@color/master_switch_background_light</item>
<item name="currently_playing_background">@color/highlight_light</item> <item name="currently_playing_background">@color/highlight_light</item>
<item name="action_icon_color">@color/black</item> <item name="action_icon_color">@color/black</item>
@ -85,6 +86,7 @@
<item name="colorPrimaryDark">@color/background_darktheme</item> <item name="colorPrimaryDark">@color/background_darktheme</item>
<item name="android:windowBackground">@color/background_darktheme</item> <item name="android:windowBackground">@color/background_darktheme</item>
<item name="actionBarStyle">@style/Widget.AntennaPod.ActionBar.Dark</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="colorControlNormal">@color/white</item>
<item name="progressBarTheme">@style/ProgressBarDark</item> <item name="progressBarTheme">@style/ProgressBarDark</item>
<item name="drawer_activated_color">@color/highlight_dark</item> <item name="drawer_activated_color">@color/highlight_dark</item>
@ -159,6 +161,7 @@
<item name="android:colorBackground">@color/black</item> <item name="android:colorBackground">@color/black</item>
<item name="android:windowBackground">@color/black</item> <item name="android:windowBackground">@color/black</item>
<item name="android:actionBarStyle">@color/black</item> <item name="android:actionBarStyle">@color/black</item>
<item name="background_elevated">@color/black</item>
</style> </style>
<style name="Theme.AntennaPod.Light.NoTitle" parent="Theme.AntennaPod.Light"> <style name="Theme.AntennaPod.Light.NoTitle" parent="Theme.AntennaPod.Light">