tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Massive clean up of attrs, colors and styles. Also icon and divider colors matching better the guidelines now.

Browse source
This commit is contained in:
Karim Abou Zeid 2015-08-10 21:21:03 +02:00
commit 7fd4226685
94 changed files with 160 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/res/layout/activity_album_detail.xml
View file

@ -60,7 +60,6 @@
android:paddingRight="72dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="?attr/title_text_color"
tools:ignore="UnusedAttribute" />
<View

13
app/src/main/res/layout/activity_album_tag_editor.xml
View file

@ -16,12 +16,12 @@
android:layout_height="match_parent">
<com.kabouzeid.gramophone.views.WidthFitSquareImageView
android:transitionName="@string/transition_album_art"
android:id="@+id/image"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@drawable/default_album_art"
android:transitionName="@string/transition_album_art"
tools:ignore="UnusedAttribute" />
<LinearLayout
@ -52,7 +52,7 @@
android:inputType="text|textCapWords"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/white" />
android:textColor="@color/primary_text_default_material_dark" />
</android.support.design.widget.TextInputLayout>
@ -81,8 +81,7 @@
android:hint="@string/album_artist"
android:inputType="text|textCapWords"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="?attr/title_text_color" />
android:textAppearance="@style/TextAppearance.AppCompat.Title" />
</android.support.design.widget.TextInputLayout>
@ -100,8 +99,7 @@
android:hint="@string/genre"
android:inputType="text|textCapWords"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="?attr/title_text_color" />
android:textAppearance="@style/TextAppearance.AppCompat.Title" />
</android.support.design.widget.TextInputLayout>
@ -119,8 +117,7 @@
android:hint="@string/year"
android:inputType="text|number"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="?attr/title_text_color" />
android:textAppearance="@style/TextAppearance.AppCompat.Title" />
</android.support.design.widget.TextInputLayout>

1
app/src/main/res/layout/activity_artist_detail.xml
View file

@ -60,7 +60,6 @@
android:paddingRight="72dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="?attr/title_text_color"
tools:ignore="UnusedAttribute" />
<View

15
app/src/main/res/layout/activity_song_tag_editor.xml
View file

@ -50,7 +50,7 @@
android:inputType="text|textCapWords"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/white" />
android:textColor="@color/primary_text_default_material_dark" />
</android.support.design.widget.TextInputLayout>
@ -68,7 +68,7 @@
android:inputType="text|textCapWords"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/white" />
android:textColor="@color/primary_text_default_material_dark" />
</android.support.design.widget.TextInputLayout>
</LinearLayout>
@ -97,11 +97,10 @@
android:hint="@string/artist"
android:inputType="text|textCapWords"
android:singleLine="true"
android:textColor="?attr/title_text_color" />
android:textAppearance="@style/TextAppearance.AppCompat.Title" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
@ -115,8 +114,7 @@
android:gravity="center_vertical"
android:hint="@string/genre"
android:singleLine="true"
android:textColor="?attr/title_text_color" />
android:textAppearance="@style/TextAppearance.AppCompat.Title" />
</android.support.design.widget.TextInputLayout>
@ -135,8 +133,7 @@
android:hint="@string/year"
android:inputType="text|number"
android:singleLine="true"
android:textColor="?attr/title_text_color" />
android:textAppearance="@style/TextAppearance.AppCompat.Title" />
</android.support.design.widget.TextInputLayout>
@ -155,7 +152,7 @@
android:hint="@string/track_hint"
android:inputType="text|number"
android:singleLine="true"
android:textColor="?attr/title_text_color" />
android:textAppearance="@style/TextAppearance.AppCompat.Title" />
</android.support.design.widget.TextInputLayout>

6
app/src/main/res/layout/artist_detail_header.xml
View file

@ -11,9 +11,9 @@
android:scrollbars="none" />
<View
android:layout_marginTop="-8dp"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?separator_color" />
android:layout_height="wrap_content"
android:layout_marginTop="-8dp"
android:background="?dividerHorizontal" />
</LinearLayout>

2
app/src/main/res/layout/dialog_sleep_timer.xml
View file

@ -16,7 +16,7 @@
seekarc:rotation="180"
seekarc:startAngle="30"
seekarc:sweepAngle="300"
seekarc:thumb="?seek_arc_thumb_drawable" />
seekarc:thumb="@drawable/traditional_slider_thumb" />
<TextView
android:id="@+id/timer_display"

13
app/src/main/res/layout/item_grid.xml
View file

@ -19,12 +19,10 @@
android:layout_height="match_parent"
android:scaleType="centerCrop" />
<LinearLayout
android:id="@+id/palette_color_container"
android:layout_width="match_parent"
android:layout_height="68dp"
android:background="?default_bar_color"
android:gravity="center_vertical"
android:orientation="vertical"
android:paddingLeft="16dp"
@ -36,16 +34,14 @@
android:layout_height="wrap_content"
android:fontFamily="sans-serif-medium"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:textColor="?title_text_color" />
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
<TextView
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Caption"
android:textColor="?caption_text_color" />
android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
</LinearLayout>
@ -58,7 +54,8 @@
android:layout_gravity="center"
android:paddingBottom="68dp"
android:src="@drawable/ic_check_white_96dp"
android:tint="?check_mark_color"
android:visibility="gone" />
android:tint="?android:textColorPrimary"
android:visibility="gone"
tools:ignore="ContentDescription" />
</FrameLayout>

4
app/src/main/res/layout/item_grid_card_horizontal.xml
View file

@ -6,7 +6,7 @@
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:foreground="?rect_selector"
app:cardBackgroundColor="?card_color"
app:cardBackgroundColor="?cardBackgroundColor"
app:elevation="@dimen/card_elevation">
<LinearLayout
@ -40,7 +40,6 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:textColor="?title_text_color"
android:textSize="14sp" />
<TextView
@ -49,7 +48,6 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Caption"
android:textColor="?caption_text_color"
android:textSize="12sp" />
</LinearLayout>

10
app/src/main/res/layout/item_list.xml
View file

@ -36,7 +36,6 @@
android:gravity="center"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:textColor="?title_text_color"
android:visibility="gone" />
</FrameLayout>
@ -58,8 +57,7 @@
android:layout_height="wrap_content"
android:fontFamily="sans-serif"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:textColor="?title_text_color" />
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
<TextView
android:id="@+id/text"
@ -68,7 +66,7 @@
android:fontFamily="sans-serif"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="?caption_text_color" />
android:textColor="?android:textColorSecondary" />
</LinearLayout>
<ImageView
@ -88,7 +86,7 @@
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_gravity="bottom"
android:background="?separator_color"
android:background="?dividerHorizontal"
android:visibility="gone" />
<View
@ -98,6 +96,6 @@
android:layout_gravity="bottom"
android:layout_marginLeft="72dp"
android:layout_marginStart="72dp"
android:background="?separator_color" />
android:background="?dividerHorizontal" />
</FrameLayout>

8
app/src/main/res/layout/item_list_single_row.xml
View file

@ -37,7 +37,6 @@
android:gravity="center"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:textColor="?title_text_color"
android:visibility="gone" />
</FrameLayout>
@ -54,8 +53,7 @@
android:layout_weight="1"
android:fontFamily="sans-serif"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:textColor="?title_text_color" />
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
<ImageView
android:id="@+id/menu"
@ -74,7 +72,7 @@
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_gravity="bottom"
android:background="?separator_color"
android:background="?dividerHorizontal"
android:visibility="gone" />
<View
@ -84,6 +82,6 @@
android:layout_gravity="bottom"
android:layout_marginLeft="72dp"
android:layout_marginStart="72dp"
android:background="?separator_color" />
android:background="?dividerHorizontal" />
</FrameLayout>

17
app/src/main/res/layout/notification.xml
View file

@ -24,10 +24,10 @@
internal:layout_minHeight="64dp">
<LinearLayout
android:id="@+id/root"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:internal="http://schemas.android.com/apk/prv/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/root"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#00000000"
@ -36,9 +36,9 @@
tools:ignore="UselessParent">
<FrameLayout
android:id="@+id/icon_group"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:internal="http://schemas.android.com/apk/prv/res/android"
android:id="@+id/icon_group"
android:layout_width="@dimen/notification_large_icon_width"
android:layout_height="@dimen/notification_large_icon_height"
android:layout_weight="0">
@ -73,7 +73,6 @@
android:gravity="bottom"
android:singleLine="true"
android:textAppearance="@style/Theme.MaterialMusic.Notification.Title"
android:textColor="@color/notification_content_color"
tools:ignore="NestedWeights" />
<TextView
@ -85,8 +84,7 @@
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:singleLine="true"
android:textAppearance="@style/Theme.MaterialMusic.Notification"
android:textColor="@color/notification_secondary_content_color" />
android:textAppearance="@style/Theme.MaterialMusic.Notification" />
</LinearLayout>
<LinearLayout
@ -100,10 +98,9 @@
android:orientation="horizontal"
tools:ignore="UnusedAttribute">
<!-- media buttons will be added here -->
<ImageButton
<ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/action_prev"
style="@style/Widget.AppCompat.Button.Borderless"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="48dp"
android:layout_height="match_parent"
android:layout_marginLeft="2dp"
@ -116,10 +113,9 @@
android:src="@drawable/ic_skip_previous_white_36dp"
tools:ignore="ContentDescription" />
<ImageButton
<ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/action_play_pause"
style="@style/Widget.AppCompat.Button.Borderless"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="48dp"
android:layout_height="match_parent"
android:layout_marginLeft="2dp"
@ -132,10 +128,9 @@
android:src="@drawable/ic_play_arrow_white_36dp"
tools:ignore="ContentDescription" />
<ImageButton
<ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/action_next"
style="@style/Widget.AppCompat.Button.Borderless"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="48dp"
android:layout_height="match_parent"
android:layout_marginLeft="2dp"

21
app/src/main/res/layout/notification_big.xml
View file

@ -36,10 +36,9 @@
android:scaleType="centerCrop"
tools:ignore="ContentDescription" />
<ImageButton
<ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/action_quit"
style="@style/Widget.AppCompat.Button.Borderless"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_alignParentEnd="true"
@ -74,8 +73,7 @@
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:singleLine="true"
android:textAppearance="@style/Theme.MaterialMusic.Notification.Title"
android:textColor="@color/notification_content_color" />
android:textAppearance="@style/Theme.MaterialMusic.Notification.Title" />
<TextView
android:id="@+id/text"
@ -87,8 +85,7 @@
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:singleLine="true"
android:textAppearance="@style/Theme.MaterialMusic.Notification"
android:textColor="@color/notification_secondary_content_color" />
android:textAppearance="@style/Theme.MaterialMusic.Notification" />
<TextView
android:id="@+id/text2"
@ -99,8 +96,7 @@
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:singleLine="true"
android:textAppearance="@style/Theme.MaterialMusic.Notification"
android:textColor="@color/notification_secondary_content_color" />
android:textAppearance="@style/Theme.MaterialMusic.Notification" />
</LinearLayout>
<LinearLayout
@ -116,10 +112,9 @@
android:orientation="horizontal"
tools:ignore="UnusedAttribute">
<!-- media buttons will be added here -->
<ImageButton
<ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/action_prev"
style="@style/Widget.AppCompat.Button.Borderless"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="48dp"
android:layout_height="match_parent"
android:layout_marginLeft="2dp"
@ -132,10 +127,9 @@
android:src="@drawable/ic_skip_previous_white_36dp"
tools:ignore="ContentDescription" />
<ImageButton
<ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/action_play_pause"
style="@style/Widget.AppCompat.Button.Borderless"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="48dp"
android:layout_height="match_parent"
android:layout_marginLeft="2dp"
@ -148,10 +142,9 @@
android:src="@drawable/ic_play_arrow_white_36dp"
tools:ignore="ContentDescription" />
<ImageButton
<ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/action_next"
style="@style/Widget.AppCompat.Button.Borderless"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="48dp"
android:layout_height="match_parent"
android:layout_marginLeft="2dp"

12
app/src/main/res/layout/player.xml
View file

@ -33,7 +33,7 @@
android:paddingLeft="8dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="?themed_drawable_color"
android:textColor="?android:textColorSecondary"
android:textSize="10sp"
tools:ignore="RtlHardcoded,RtlSymmetry,SmallSp" />
@ -47,7 +47,7 @@
android:paddingRight="8dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="?themed_drawable_color"
android:textColor="?android:textColorSecondary"
android:textSize="10sp"
tools:ignore="RtlHardcoded,RtlSymmetry,SmallSp" />
@ -80,8 +80,7 @@
android:layout_height="wrap_content"
android:fontFamily="sans-serif-medium"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="?attr/title_text_color" />
android:textAppearance="@style/TextAppearance.AppCompat.Title" />
<TextView
android:id="@+id/player_text"
@ -89,8 +88,7 @@
android:layout_height="wrap_content"
android:fontFamily="sans-serif"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Caption"
android:textColor="?attr/caption_text_color" />
android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
</LinearLayout>
@ -188,7 +186,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/player_footer_frame"
android:background="@color/black">
android:background="@android:color/black">
<ImageView
android:id="@+id/player_album_art_background"

6
app/src/main/res/layout/widget_medium.xml
View file

@ -30,7 +30,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/notification_selector"
android:src="@drawable/ic_skip_previous_black_36dp" />
android:src="@drawable/ic_skip_previous_dark_36dp" />
<ImageButton
android:id="@+id/button_toggle_play_pause"
@ -38,7 +38,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/notification_selector"
android:src="@drawable/ic_play_arrow_black_36dp" />
android:src="@drawable/ic_play_arrow_dark_36dp" />
<ImageButton
android:id="@+id/button_next"
@ -46,7 +46,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/notification_selector"
android:src="@drawable/ic_skip_next_black_36dp" />
android:src="@drawable/ic_skip_next_dark_36dp" />
</LinearLayout>