Switched back to white notification. Added back ripple to notification.
This commit is contained in:
parent
1072a3bf85
commit
27e56754e3
8 changed files with 38 additions and 21 deletions
|
|
@ -116,7 +116,7 @@ public final class PreferenceUtils {
|
||||||
}
|
}
|
||||||
|
|
||||||
public final boolean coloredNotification() {
|
public final boolean coloredNotification() {
|
||||||
return mPreferences.getBoolean(COLORED_NOTIFICATION, true);
|
return mPreferences.getBoolean(COLORED_NOTIFICATION, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
public final boolean coloredNavigationBarAlbum() {
|
public final boolean coloredNavigationBarAlbum() {
|
||||||
|
|
|
||||||
9
app/src/main/res/drawable/notification_selector.xml
Normal file
9
app/src/main/res/drawable/notification_selector.xml
Normal file
|
|
@ -0,0 +1,9 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
|
||||||
|
<item android:state_activated="true" android:state_pressed="true" android:drawable="@color/activated_selected_dark" />
|
||||||
|
<item android:state_activated="true" android:drawable="@color/ripple_material_dark" />
|
||||||
|
<item android:state_pressed="true" android:drawable="@color/ripple_material_dark" />
|
||||||
|
<item android:drawable="@android:color/transparent" />
|
||||||
|
|
||||||
|
</selector>
|
||||||
|
|
@ -63,7 +63,7 @@
|
||||||
android:gravity="bottom"
|
android:gravity="bottom"
|
||||||
android:singleLine="true"
|
android:singleLine="true"
|
||||||
android:textAppearance="@style/Theme.MaterialMusic.Notification.Title"
|
android:textAppearance="@style/Theme.MaterialMusic.Notification.Title"
|
||||||
android:textColor="@color/abc_primary_text_material_dark"
|
android:textColor="@color/notification_default_content_color"
|
||||||
tools:ignore="NestedWeights" />
|
tools:ignore="NestedWeights" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
|
@ -76,7 +76,7 @@
|
||||||
android:fadingEdge="horizontal"
|
android:fadingEdge="horizontal"
|
||||||
android:singleLine="true"
|
android:singleLine="true"
|
||||||
android:textAppearance="@style/Theme.MaterialMusic.Notification"
|
android:textAppearance="@style/Theme.MaterialMusic.Notification"
|
||||||
android:textColor="@color/abc_secondary_text_material_dark" />
|
android:textColor="@color/notification_default_secondary_content_color" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
|
|
@ -98,8 +98,10 @@
|
||||||
android:layout_marginLeft="2dp"
|
android:layout_marginLeft="2dp"
|
||||||
android:layout_marginRight="2dp"
|
android:layout_marginRight="2dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:background="@drawable/notification_selector"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:src="@drawable/ic_skip_previous_white_36dp"
|
android:src="@drawable/ic_skip_previous_white_36dp"
|
||||||
|
android:tint="@color/notification_default_content_color"
|
||||||
tools:ignore="ContentDescription" />
|
tools:ignore="ContentDescription" />
|
||||||
|
|
||||||
<ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
|
<ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
|
@ -110,8 +112,10 @@
|
||||||
android:layout_marginLeft="2dp"
|
android:layout_marginLeft="2dp"
|
||||||
android:layout_marginRight="2dp"
|
android:layout_marginRight="2dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:background="@drawable/notification_selector"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:src="@drawable/ic_play_arrow_white_36dp"
|
android:src="@drawable/ic_play_arrow_white_36dp"
|
||||||
|
android:tint="@color/notification_default_content_color"
|
||||||
tools:ignore="ContentDescription" />
|
tools:ignore="ContentDescription" />
|
||||||
|
|
||||||
<ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
|
<ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
|
@ -122,8 +126,10 @@
|
||||||
android:layout_marginLeft="2dp"
|
android:layout_marginLeft="2dp"
|
||||||
android:layout_marginRight="2dp"
|
android:layout_marginRight="2dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:background="@drawable/notification_selector"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:src="@drawable/ic_skip_next_white_36dp"
|
android:src="@drawable/ic_skip_next_white_36dp"
|
||||||
|
android:tint="@color/notification_default_content_color"
|
||||||
tools:ignore="ContentDescription" />
|
tools:ignore="ContentDescription" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
|
||||||
|
|
@ -36,9 +36,12 @@
|
||||||
android:layout_height="36dp"
|
android:layout_height="36dp"
|
||||||
android:layout_alignParentEnd="true"
|
android:layout_alignParentEnd="true"
|
||||||
android:layout_alignParentRight="true"
|
android:layout_alignParentRight="true"
|
||||||
android:layout_marginLeft="2dp"
|
android:layout_marginEnd="2dp"
|
||||||
android:layout_marginRight="2dp"
|
android:layout_marginRight="2dp"
|
||||||
|
android:layout_marginTop="2dp"
|
||||||
|
android:background="@drawable/notification_selector"
|
||||||
android:src="@drawable/ic_close_white_24dp"
|
android:src="@drawable/ic_close_white_24dp"
|
||||||
|
android:tint="@color/notification_default_content_color"
|
||||||
tools:ignore="ContentDescription" />
|
tools:ignore="ContentDescription" />
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
|
|
@ -63,7 +66,7 @@
|
||||||
android:fadingEdge="horizontal"
|
android:fadingEdge="horizontal"
|
||||||
android:singleLine="true"
|
android:singleLine="true"
|
||||||
android:textAppearance="@style/Theme.MaterialMusic.Notification.Title"
|
android:textAppearance="@style/Theme.MaterialMusic.Notification.Title"
|
||||||
android:textColor="@color/abc_primary_text_material_dark" />
|
android:textColor="@color/notification_default_content_color" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/text"
|
android:id="@+id/text"
|
||||||
|
|
@ -76,7 +79,7 @@
|
||||||
android:fadingEdge="horizontal"
|
android:fadingEdge="horizontal"
|
||||||
android:singleLine="true"
|
android:singleLine="true"
|
||||||
android:textAppearance="@style/Theme.MaterialMusic.Notification"
|
android:textAppearance="@style/Theme.MaterialMusic.Notification"
|
||||||
android:textColor="@color/abc_secondary_text_material_dark" />
|
android:textColor="@color/notification_default_secondary_content_color" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/text2"
|
android:id="@+id/text2"
|
||||||
|
|
@ -88,7 +91,7 @@
|
||||||
android:fadingEdge="horizontal"
|
android:fadingEdge="horizontal"
|
||||||
android:singleLine="true"
|
android:singleLine="true"
|
||||||
android:textAppearance="@style/Theme.MaterialMusic.Notification"
|
android:textAppearance="@style/Theme.MaterialMusic.Notification"
|
||||||
android:textColor="@color/abc_secondary_text_material_dark" />
|
android:textColor="@color/notification_default_secondary_content_color" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
|
|
@ -112,8 +115,10 @@
|
||||||
android:layout_marginLeft="2dp"
|
android:layout_marginLeft="2dp"
|
||||||
android:layout_marginRight="2dp"
|
android:layout_marginRight="2dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:background="@drawable/notification_selector"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:src="@drawable/ic_skip_previous_white_36dp"
|
android:src="@drawable/ic_skip_previous_white_36dp"
|
||||||
|
android:tint="@color/notification_default_content_color"
|
||||||
tools:ignore="ContentDescription" />
|
tools:ignore="ContentDescription" />
|
||||||
|
|
||||||
<ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
|
<ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
|
@ -124,8 +129,10 @@
|
||||||
android:layout_marginLeft="2dp"
|
android:layout_marginLeft="2dp"
|
||||||
android:layout_marginRight="2dp"
|
android:layout_marginRight="2dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:background="@drawable/notification_selector"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:src="@drawable/ic_play_arrow_white_36dp"
|
android:src="@drawable/ic_play_arrow_white_36dp"
|
||||||
|
android:tint="@color/notification_default_content_color"
|
||||||
tools:ignore="ContentDescription" />
|
tools:ignore="ContentDescription" />
|
||||||
|
|
||||||
<ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
|
<ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
|
@ -136,18 +143,10 @@
|
||||||
android:layout_marginLeft="2dp"
|
android:layout_marginLeft="2dp"
|
||||||
android:layout_marginRight="2dp"
|
android:layout_marginRight="2dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:background="@drawable/notification_selector"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:src="@drawable/ic_skip_next_white_36dp"
|
android:src="@drawable/ic_skip_next_white_36dp"
|
||||||
|
android:tint="@color/notification_default_content_color"
|
||||||
tools:ignore="ContentDescription" />
|
tools:ignore="ContentDescription" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/action_divider"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="1dp"
|
|
||||||
android:layout_above="@id/media_actions"
|
|
||||||
android:layout_toEndOf="@id/icon"
|
|
||||||
android:layout_toRightOf="@id/icon"
|
|
||||||
android:background="@drawable/notification_template_divider_media"
|
|
||||||
tools:ignore="ContentDescription" />
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<resources>
|
||||||
<color name="notification_buttons_tint">#de000000</color>
|
<color name="notification_default_content_color">#de000000</color>
|
||||||
|
<color name="notification_default_secondary_content_color">#aa000000</color>
|
||||||
|
|
||||||
<!--must be solid colors so the ripple will not be semi transparent. Note: the color have no effect on the ripple-->
|
<!--must be solid colors so the ripple will not be semi transparent. Note: the color have no effect on the ripple-->
|
||||||
<!--<color name="button_selected">#FFFFFFFF</color>-->
|
<!--<color name="button_selected">#FFFFFFFF</color>-->
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@
|
||||||
|
|
||||||
<style name="NotificationButton" parent="NotificationButtonParent">
|
<style name="NotificationButton" parent="NotificationButtonParent">
|
||||||
<item name="android:background">@drawable/notification_selector</item>
|
<item name="android:background">@drawable/notification_selector</item>
|
||||||
<item name="android:tint">@color/notification_buttons_tint</item>
|
<item name="android:tint">@color/notification_default_content_color</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="MusicProgressSlider" parent="MusicProgressSliderParent">
|
<style name="MusicProgressSlider" parent="MusicProgressSliderParent">
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,9 @@
|
||||||
<color name="sliding_tabs_activated">#FFFFFF</color>
|
<color name="sliding_tabs_activated">#FFFFFF</color>
|
||||||
<color name="sliding_tabs_deactivated">#99FFFFFF</color>
|
<color name="sliding_tabs_deactivated">#99FFFFFF</color>
|
||||||
|
|
||||||
<color name="default_notification_color">@color/grey_800</color>
|
<color name="default_notification_color">@android:color/transparent</color>
|
||||||
|
<color name="notification_default_content_color">#deFFFFFF</color>
|
||||||
|
<color name="notification_default_secondary_content_color">#aaFFFFFF</color>
|
||||||
|
|
||||||
<!--notification-->
|
<!--notification-->
|
||||||
<drawable name="notification_template_divider_media">#29ffffff</drawable>
|
<drawable name="notification_template_divider_media">#29ffffff</drawable>
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@
|
||||||
|
|
||||||
<CheckBoxPreference
|
<CheckBoxPreference
|
||||||
android:layout="@layout/preference_custom"
|
android:layout="@layout/preference_custom"
|
||||||
android:defaultValue="true"
|
android:defaultValue="false"
|
||||||
android:key="colored_notification"
|
android:key="colored_notification"
|
||||||
android:title="@string/pref_title_colored_notification"
|
android:title="@string/pref_title_colored_notification"
|
||||||
android:summary="@string/pref_summary_colored_notification"
|
android:summary="@string/pref_summary_colored_notification"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue