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

Color tweaks

This commit is contained in:
ByteHamster 2020-03-13 23:52:30 +01:00
parent 63222f38cc
commit 0ef66fef54
6 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
View File

@ -202,17 +202,13 @@ public class NavListAdapter extends BaseAdapter
v = getFeedView(position, convertView, parent);
}
if (v != null && viewType != VIEW_TYPE_SECTION_DIVIDER) {
TextView txtvTitle = v.findViewById(R.id.txtvTitle);
TypedValue typedValue = new TypedValue();
if (position == itemAccess.getSelectedItemIndex()) {
txtvTitle.setTypeface(null, Typeface.BOLD);
v.getContext().getTheme().resolveAttribute(de.danoeh.antennapod.core.R.attr.drawer_activated_color, typedValue, true);
v.getContext().getTheme().resolveAttribute(R.attr.drawer_activated_color, typedValue, true);
v.setBackgroundResource(typedValue.resourceId);
} else {
txtvTitle.setTypeface(null, Typeface.NORMAL);
v.getContext().getTheme().resolveAttribute(de.danoeh.antennapod.core.R.attr.nav_drawer_background, typedValue, true);
v.getContext().getTheme().resolveAttribute(android.R.attr.windowBackground, typedValue, true);
v.setBackgroundResource(typedValue.resourceId);
}
}
@ -356,11 +352,6 @@ public class NavListAdapter extends BaseAdapter
if(counter > 0) {
holder.count.setVisibility(View.VISIBLE);
holder.count.setText(String.valueOf(counter));
if (itemAccess.getSelectedItemIndex() == position) {
holder.count.setTypeface(null, Typeface.BOLD);
} else {
holder.count.setTypeface(null, Typeface.NORMAL);
}
} else {
holder.count.setVisibility(View.GONE);
}

4
app/src/main/res/layout/audio_controls.xml
View File

@ -43,7 +43,7 @@
android:gravity="center"
android:text="-"
android:textStyle="bold"
android:textColor="@color/status_progress"
android:textColor="?attr/colorAccent"
android:textSize="24sp"
android:background="?attr/selectableItemBackgroundBorderless" />
@ -62,7 +62,7 @@
android:gravity="center"
android:text="+"
android:textStyle="bold"
android:textColor="@color/status_progress"
android:textColor="?attr/colorAccent"
android:textSize="24sp"
android:background="?attr/selectableItemBackgroundBorderless" />
</LinearLayout>

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

@ -5,7 +5,7 @@
android:layout_width="@dimen/drawer_width"
android:layout_height="match_parent"
android:layout_gravity="start"
android:background="?attr/nav_drawer_background"
android:background="?android:attr/windowBackground"
android:orientation="vertical">
<LinearLayout

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

@ -58,7 +58,6 @@
<attr name="currently_playing_background" format="color"/>
<attr name="ic_bookmark" format="reference"/>
<attr name="ic_settings_speed" format="reference" />
<attr name="nav_drawer_background" format="color"/>
<attr name="drawer_activated_color" format="color"/>
<attr name="batch_edit_fab_icon" format="reference"/>
<attr name="action_icon_color" format="color"/>

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

@ -9,18 +9,13 @@
<color name="holo_blue_dark">#0099CC</color>
<color name="download_success_green">#248800</color>
<color name="download_failed_red">#B00020</color>
<color name="status_progress">#E033B5E5</color>
<color name="overlay_dark">#2C2C2C</color>
<color name="overlay_light">#FFFFFF</color>
<color name="new_indicator_green">#669900</color>
<color name="image_readability_tint">#80000000</color>
<color name="feed_image_bg">#50000000</color>
<!-- Theme colors -->
<color name="primary_light">#FFFFFF</color>
<color name="primary_darktheme">#212121</color>
<color name="nav_drawer_background_dark">#3B3B3B</color>
<color name="nav_drawer_highlighted_dark">#212121</color>
<color name="primary_darktheme">#303030</color>
<color name="highlight_light">#DDDDDD</color>
<color name="highlight_dark">#414141</color>
<color name="highlight_trueblack">#414141</color>

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

@ -10,6 +10,7 @@
<item name="colorAccent">@color/holo_blue_light</item>
<item name="progressBarTheme">@style/ProgressBarLight</item>
<item name="buttonStyle">@style/Widget.AntennaPod.Button</item>
<item name="android:windowBackground">@color/primary_light</item>
<item name="alertDialogTheme">@style/AntennaPod.Dialog.Light</item>
<item name="action_bar_icon_color">@color/grey600</item>
<item name="storage">@drawable/ic_sd_grey600_24dp</item>
@ -41,7 +42,6 @@
<item name="stat_playlist">@drawable/ic_list_grey600_24dp</item>
<item name="type_video">@drawable/ic_videocam_grey600_24dp</item>
<item name="dragview_background">@drawable/ic_drag_vertical_grey600_48dp</item>
<item name="nav_drawer_background">@color/white</item>
<item name="drawer_activated_color">@color/highlight_light</item>
<item name="ic_history">@drawable/ic_history_grey600_24dp</item>
<item name="ic_folder">@drawable/ic_folder_grey600_24dp</item>
@ -82,6 +82,7 @@
<item name="colorAccent">@color/holo_blue_dark</item>
<item name="colorPrimary">@color/primary_darktheme</item>
<item name="colorPrimaryDark">@color/primary_darktheme</item>
<item name="android:windowBackground">@color/primary_darktheme</item>
<item name="colorControlNormal">@color/white</item>
<item name="buttonStyle">@style/Widget.AntennaPod.Button</item>
<item name="progressBarTheme">@style/ProgressBarDark</item>
@ -116,8 +117,7 @@
<item name="stat_playlist">@drawable/ic_list_white_24dp</item>
<item name="type_video">@drawable/ic_videocam_white_24dp</item>
<item name="dragview_background">@drawable/ic_drag_vertical_white_48dp</item>
<item name="nav_drawer_background">@color/nav_drawer_background_dark</item>
<item name="drawer_activated_color">@color/nav_drawer_highlighted_dark</item>
<item name="drawer_activated_color">@color/highlight_dark</item>
<item name="ic_history">@drawable/ic_history_white_24dp</item>
<item name="ic_folder">@drawable/ic_folder_white_24dp</item>
<item name="ic_settings_playback">@drawable/ic_av_play_white_24dp</item>
@ -157,7 +157,6 @@
<item name="progressBarTheme">@style/ProgressBarTrueBlack</item>
<item name="dragview_background">@drawable/ic_drag_vertical_white_48dp</item>
<item name="batch_edit_fab_icon">@drawable/ic_fab_edit_black</item>
<item name="nav_drawer_background">@color/black</item>
<item name="drawer_activated_color">@color/highlight_trueblack</item>
<item name="android:textColorPrimary">@color/white</item>
<item name="android:color">@color/white</item>