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

Lots of progress with dynamic theming, the nav drawer now uses a RecyclerView, AboutDeveloperDialogHelper is now a DialogFragment, RTL support (to suppress Lint warnings), other various small fixes, cleaned up and formatted lot of code (and removed un-used resources), R.string.ok > android.R.string.ok, R.string.cancel > android.R.string.cancel, switched dialog helpers to DialogFragments.

Browse source
This commit is contained in:
Aidan Follestad 2015-04-16 16:47:02 -05:00
commit 7ce86afd74
265 changed files with 2853 additions and 2292 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
app/src/main/res/drawable-hdpi/ic_check.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
app/src/main/res/drawable-hdpi/ic_drawer.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.8 KiB

BIN
app/src/main/res/drawable-hdpi/ic_drawer_about.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 726 B

BIN
app/src/main/res/drawable-hdpi/ic_drawer_settings.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 591 B

BIN
app/src/main/res/drawable-hdpi/ic_more_vert_black_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 214 B

BIN
app/src/main/res/drawable-hdpi/ic_my_library_music_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 330 B

BIN
app/src/main/res/drawable-hdpi/ic_pause_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 188 B

BIN
app/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 282 B

BIN
app/src/main/res/drawable-hdpi/ic_queue_music_black_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 262 B

BIN
app/src/main/res/drawable-hdpi/ic_settings_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 561 B

BIN
app/src/main/res/drawable-mdpi/ic_check.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 613 B

BIN
app/src/main/res/drawable-mdpi/ic_drawer.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.8 KiB

BIN
app/src/main/res/drawable-mdpi/ic_drawer_about.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 451 B

BIN
app/src/main/res/drawable-mdpi/ic_drawer_settings.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 368 B

BIN
app/src/main/res/drawable-mdpi/ic_more_vert_black_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 189 B

BIN
app/src/main/res/drawable-mdpi/ic_my_library_music_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 262 B

BIN
app/src/main/res/drawable-mdpi/ic_pause_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 174 B

BIN
app/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 257 B

BIN
app/src/main/res/drawable-mdpi/ic_queue_music_black_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 214 B

BIN
app/src/main/res/drawable-mdpi/ic_settings_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 420 B

6
app/src/main/res/drawable-v21/list_ripple_selector.xml Normal file
View file

@ -0,0 +1,6 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?android:colorControlHighlight">
<item android:drawable="@drawable/list_selector" />
</ripple>

6
app/src/main/res/drawable-v21/list_ripple_selector_dark.xml Normal file
View file

@ -0,0 +1,6 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?android:colorControlHighlight">
<item android:drawable="@drawable/list_selector_dark" />
</ripple>

4
app/src/main/res/drawable-v21/notification_selector.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/grey_500">
android:color="@color/grey_500">
<item android:id="@android:id/mask">
<color android:color="@color/white"/>
<color android:color="@color/white" />
</item>
</ripple>

7
app/src/main/res/drawable-v21/rect_ripple_selector.xml
View file

@ -1,9 +1,6 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?android:colorControlHighlight">
android:color="?android:colorControlHighlight">
<item
android:id="@android:id/mask"
android:drawable="@drawable/rect_selected"/>
<item android:drawable="@drawable/rect_selector"/>
<item android:drawable="@drawable/rect_selector" />
</ripple>

7
app/src/main/res/drawable-v21/rect_ripple_selector_dark.xml
View file

@ -1,9 +1,6 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?android:colorControlHighlight">
android:color="#333333">
<item
android:id="@android:id/mask"
android:drawable="@drawable/rect_selected_dark"/>
<item android:drawable="@drawable/rect_selector_dark"/>
<item android:drawable="@drawable/rect_selector_dark" />
</ripple>

7
app/src/main/res/drawable-v21/rect_selector.xml
View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true" android:drawable="@drawable/rect_selected" />
<item android:drawable="@drawable/transparent" />
</selector>

7
app/src/main/res/drawable-v21/rect_selector_dark.xml
View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true" android:drawable="@drawable/rect_selected_dark" />
<item android:drawable="@drawable/transparent" />
</selector>

10
app/src/main/res/drawable-v21/round_ripple_selector.xml
View file

@ -1,9 +1,7 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?android:colorControlHighlight">
<ripple
android:color="?android:colorControlHighlight"
xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@android:id/mask"
android:drawable="@drawable/round_selected"/>
<item android:drawable="@drawable/round_selector"/>
android:drawable="@drawable/round_ripple_selector_mask" />
</ripple>

7
app/src/main/res/drawable-v21/round_ripple_selector_dark.xml
View file

@ -1,9 +1,6 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?android:colorControlHighlight">
android:color="?android:colorControlHighlight">
<item
android:id="@android:id/mask"
android:drawable="@drawable/round_selected_dark"/>
<item android:drawable="@drawable/round_selector_dark"/>
<item android:drawable="@drawable/round_selector_dark" />
</ripple>

5
app/src/main/res/drawable-v21/round_ripple_selector_mask.xml Normal file
View file

@ -0,0 +1,5 @@
<shape
android:shape="oval"
xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@android:color/white" />
</shape>

7
app/src/main/res/drawable-v21/round_selector.xml
View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true" android:drawable="@drawable/round_selected" />
<item android:drawable="@drawable/transparent" />
</selector>

7
app/src/main/res/drawable-v21/round_selector_dark.xml
View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true" android:drawable="@drawable/round_selected_dark" />
<item android:drawable="@drawable/transparent" />
</selector>

BIN
app/src/main/res/drawable-xhdpi/ic_check.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_drawer.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.8 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_drawer_about.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 959 B

BIN
app/src/main/res/drawable-xhdpi/ic_drawer_settings.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 796 B

BIN
app/src/main/res/drawable-xhdpi/ic_more_vert_black_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 239 B

BIN
app/src/main/res/drawable-xhdpi/ic_my_library_music_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 421 B

BIN
app/src/main/res/drawable-xhdpi/ic_pause_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 193 B

BIN
app/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 318 B

BIN
app/src/main/res/drawable-xhdpi/ic_queue_music_black_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 281 B

BIN
app/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 737 B

BIN
app/src/main/res/drawable-xxhdpi/ic_check.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
app/src/main/res/drawable-xxhdpi/ic_drawer.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 202 B

BIN
app/src/main/res/drawable-xxhdpi/ic_drawer_about.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
app/src/main/res/drawable-xxhdpi/ic_drawer_settings.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
app/src/main/res/drawable-xxhdpi/ic_more_vert_black_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 296 B

BIN
app/src/main/res/drawable-xxhdpi/ic_my_library_music_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 577 B

BIN
app/src/main/res/drawable-xxhdpi/ic_pause_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 215 B

BIN
app/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 399 B

BIN
app/src/main/res/drawable-xxhdpi/ic_queue_music_black_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 345 B

BIN
app/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 974 B

BIN
app/src/main/res/drawable-xxxhdpi/ic_more_vert_black_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 393 B

BIN
app/src/main/res/drawable-xxxhdpi/ic_my_library_music_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 739 B

BIN
app/src/main/res/drawable-xxxhdpi/ic_pause_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 256 B

BIN
app/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 477 B

BIN
app/src/main/res/drawable-xxxhdpi/ic_queue_music_black_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 483 B

BIN
app/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.2 KiB

5
app/src/main/res/drawable/list_activated.xml Normal file
View file

@ -0,0 +1,5 @@
<shape
android:shape="rectangle"
xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#26000000" />
</shape>

5
app/src/main/res/drawable/list_activated_dark.xml Normal file
View file

@ -0,0 +1,5 @@
<shape
android:shape="rectangle"
xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#26FFFFFF" />
</shape>

25
app/src/main/res/drawable/list_divider.xml
View file

@ -1,25 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:bottom="3px">
<shape android:shape="line">
<stroke
android:color="#161616"
android:width="3px"
/>
<size
android:height="6px"
/>
</shape>
</item>
<item android:top="3px">
<shape android:shape="line">
<stroke
android:color="#444444"
android:width="3px"
/>
<size
android:height="6px"
/>
</shape>
</item>
</layer-list>

5
app/src/main/res/drawable/list_item_activated.xml
View file

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/list_item_selector_activated"/>
</shape>

5
app/src/main/res/drawable/list_item_activated_dark.xml
View file

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/list_item_selector_activated_dark"/>
</shape>

10
app/src/main/res/drawable/list_selector.xml
View file

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/list_item_activated" android:state_activated="true"/>
<item android:drawable="@drawable/transparent"/>
<selector android:exitFadeDuration="@android:integer/config_mediumAnimTime" xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/list_activated" android:state_activated="true" />
<item android:drawable="@drawable/rect_selected" android:state_pressed="true" />
<item android:drawable="@drawable/transparent" />
</selector>

10
app/src/main/res/drawable/list_selector_dark.xml
View file

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/list_item_activated_dark" android:state_activated="true"/>
<item android:drawable="@drawable/transparent"/>
<selector android:exitFadeDuration="@android:integer/config_mediumAnimTime" xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/list_activated_dark" android:state_activated="true" />
<item android:drawable="@drawable/rect_selected_dark" android:state_pressed="true" />
<item android:drawable="@drawable/transparent" />
</selector>

2
app/src/main/res/drawable/rect_selected.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/button_selected" />
<solid android:color="#B3E4E4E4" />
</shape>

2
app/src/main/res/drawable/rect_selected_dark.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/button_selected_dark" />
<solid android:color="#26FFFFFF" />
</shape>

8
app/src/main/res/drawable/round_selected.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="@color/button_selected" />
<shape
android:shape="oval"
xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/ripple_material_light" />
</shape>

8
app/src/main/res/drawable/round_selected_dark.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="@color/button_selected_dark" />
<shape
android:shape="oval"
xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/ripple_material_dark" />
</shape>

7
app/src/main/res/drawable/round_selector.xml
View file

@ -1,7 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<selector android:exitFadeDuration="@android:integer/config_shortAnimTime" xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:drawable="@drawable/round_selected" />
<item android:drawable="@drawable/transparent" />
<item android:drawable="@android:color/transparent" />
</selector>

7
app/src/main/res/drawable/round_selector_dark.xml
View file

@ -1,7 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<selector android:exitFadeDuration="@android:integer/config_shortAnimTime" xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:drawable="@drawable/round_selected_dark" />
<item android:drawable="@drawable/transparent" />
<item android:drawable="@android:color/transparent" />
</selector>

86
app/src/main/res/layout-land/activity_music_controller.xml
View file

@ -1,14 +1,14 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.kabouzeid.gramophone.ui.activities.AlbumDetailActivity$PlaceholderFragment">
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.kabouzeid.gramophone.ui.activities.AlbumDetailActivity$PlaceholderFragment">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
>
android:orientation="horizontal">
<ImageView
android:id="@+id/album_art"
@ -17,7 +17,8 @@
android:layout_weight="1"
android:scaleType="centerCrop"
android:src="@drawable/default_album_art"
android:transitionName="@string/transition_album_cover"/>
android:transitionName="@string/transition_album_cover"
tools:ignore="ContentDescription,UnusedAttribute" />
<RelativeLayout
android:layout_width="match_parent"
@ -30,13 +31,14 @@
android:layout_height="match_parent"
android:layout_above="@+id/footer"
android:layout_alignParentTop="true"
android:scaleType="centerCrop"/>
android:scaleType="centerCrop"
tools:ignore="ContentDescription" />
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/footer"
android:background="@drawable/shadow_up"/>
android:background="@drawable/shadow_up" />
<LinearLayout
android:layout_width="match_parent"
@ -44,7 +46,8 @@
android:layout_above="@+id/footer"
android:layout_alignParentTop="true"
android:layout_margin="16dp"
android:orientation="horizontal">
android:orientation="horizontal"
tools:ignore="RtlHardcoded">
<TextView
android:id="@+id/song_current_progress"
@ -52,11 +55,12 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:fontFamily="sans-serif-medium"
android:gravity="bottom|left"
android:gravity="bottom|left|start"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/white"
android:textSize="16sp"/>
android:textSize="16sp"
tools:ignore="RtlHardcoded" />
<TextView
android:id="@+id/song_total_time"
@ -64,11 +68,12 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:fontFamily="sans-serif"
android:gravity="bottom|right"
android:gravity="bottom|right|end"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/white"
android:textSize="16sp"/>
android:textSize="16sp"
tools:ignore="RtlHardcoded" />
</LinearLayout>
@ -78,15 +83,15 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:background="?default_bar_color"
android:orientation="vertical"
>
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:orientation="vertical"
android:transitionName="@string/transition_album_text">
android:transitionName="@string/transition_album_text"
tools:ignore="UnusedAttribute">
<TextView
android:id="@+id/song_title"
@ -95,7 +100,7 @@
android:fontFamily="sans-serif-medium"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="?attr/title_text_color"/>
android:textColor="?attr/title_text_color" />
<TextView
android:id="@+id/song_artist"
@ -104,7 +109,7 @@
android:fontFamily="sans-serif"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Caption"
android:textColor="?attr/caption_text_color"/>
android:textColor="?attr/caption_text_color" />
</LinearLayout>
@ -112,10 +117,11 @@
android:id="@+id/media_controller_placeholder"
android:layout_width="match_parent"
android:layout_height="88dp"
android:layout_alignParentBottom="true"
android:layout_gravity="bottom"
android:layout_margin="16dp"
android:background="?attr/music_controller_container_color"
android:elevation="1dp">
android:elevation="1dp"
tools:ignore="UnusedAttribute">
</RelativeLayout>
@ -128,13 +134,13 @@
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_margin="16dp"
android:background="?attr/music_controller_container_color">
android:background="?attr/music_controller_container_color"
tools:ignore="ContentDescription">
<com.melnykov.fab.FloatingActionButton
android:id="@+id/fab"
style="@style/PlayPauseFab"
android:layout_centerInParent="true"
/>
android:layout_centerInParent="true" />
<ImageButton
android:id="@+id/prev_button"
@ -142,11 +148,13 @@
android:layout_height="56dp"
android:layout_centerVertical="true"
android:layout_marginRight="-4dp"
android:layout_marginEnd="-4dp"
android:layout_toLeftOf="@+id/fab"
android:layout_toStartOf="@+id/fab"
android:background="?round_selector"
android:padding="14dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_skip_previous_white_48dp"/>
android:src="@drawable/ic_skip_previous_white_48dp" />
<ImageButton
android:id="@+id/next_button"
@ -154,35 +162,41 @@
android:layout_height="56dp"
android:layout_centerVertical="true"
android:layout_marginLeft="-4dp"
android:layout_marginStart="-4dp"
android:layout_toRightOf="@+id/fab"
android:layout_toEndOf="@+id/fab"
android:background="?round_selector"
android:padding="14dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_skip_next_white_48dp"/>
android:src="@drawable/ic_skip_next_white_48dp" />
<ImageButton
android:id="@+id/repeat_button"
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:background="?round_selector"
android:padding="14dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_repeat_grey600_48dp"/>
android:src="@drawable/ic_repeat_grey600_48dp" />
<ImageButton
android:id="@+id/shuffle_button"
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginRight="8dp"
android:layout_marginEnd="8dp"
android:background="?round_selector"
android:padding="14dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_shuffle_grey600_48dp"/>
android:src="@drawable/ic_shuffle_grey600_48dp" />
</RelativeLayout>
@ -194,8 +208,8 @@
android:elevation="1dp"
android:padding="0dp"
android:progressTint="@color/materialmusic_accent_color"
android:thumbTint="@color/materialmusic_accent_color_darker"/>
android:thumbTint="@color/materialmusic_accent_color_darker"
tools:ignore="UnusedAttribute" />
</RelativeLayout>
@ -204,20 +218,22 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
app:layout_gravity="top"
android:orientation="vertical">
<ImageView
android:id="@+id/statusBar"
android:layout_width="match_parent"
android:layout_height="@dimen/statusMargin"
android:background="@android:color/transparent"/>
android:background="@android:color/transparent"
tools:ignore="ContentDescription" />
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
style="@style/Toolbar"
android:background="@android:color/transparent"/>
android:background="@android:color/transparent" />
</LinearLayout>
</FrameLayout>
</merge>

132
app/src/main/res/layout-v21/notification_playing.xml
View file

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (C) 2014 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@ -14,83 +13,76 @@
~ See the License for the specific language governing permissions and
~ limitations under the License
-->
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="64dp"
android:orientation="horizontal">
android:layout_height="64dp">
<ImageView
android:id="@+id/album_art"
android:layout_width="@dimen/notification_big_icon_width"
android:layout_height="@dimen/notification_big_icon_height"
android:layout_weight="0"
android:scaleType="centerCrop"
tools:ignore="ContentDescription" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="wrap_content"
android:layout_gravity="fill_vertical"
android:layout_weight="1"
android:gravity="center_vertical"
android:minHeight="@dimen/notification_big_icon_height"
android:orientation="vertical"
android:paddingBottom="@dimen/notification_info_container_padding_bottom"
android:paddingStart="@dimen/notification_info_container_padding_left">
<ImageView
android:id="@+id/album_art"
android:layout_width="@dimen/notification_big_icon_width"
android:layout_height="@dimen/notification_big_icon_height"
android:layout_weight="0"
android:scaleType="centerCrop"
/>
<LinearLayout
<TextView
android:id="@+id/song_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="fill_vertical"
android:layout_weight="1"
android:gravity="center_vertical"
android:minHeight="@dimen/notification_big_icon_height"
android:orientation="vertical"
android:paddingBottom="@dimen/notification_info_container_padding_bottom"
android:paddingLeft="@dimen/notification_info_container_padding_left">
android:singleLine="true"
android:textAppearance="@style/Theme.MaterialMusic.Notification.Title" />
<TextView
android:id="@+id/song_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:textAppearance="@style/Theme.MaterialMusic.Notification.Title"/>
<TextView
android:id="@+id/song_artist"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:textAppearance="@style/Theme.MaterialMusic.Notification" />
<TextView
android:id="@+id/song_artist"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:textAppearance="@style/Theme.MaterialMusic.Notification"/>
</LinearLayout>
<LinearLayout
android:id="@+id/media_actions"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginLeft="6dp"
android:layout_marginRight="6dp"
android:orientation="horizontal"
>
<ImageButton
android:id="@+id/button_toggle_play_pause"
style="@style/NotificationButton"
android:paddingBottom="16dp"
android:paddingTop="16dp"
android:src="@drawable/ic_play_arrow_white_48dp"
/>
<ImageButton
android:id="@+id/button_next"
style="@style/NotificationButton"
android:paddingBottom="16dp"
android:paddingTop="16dp"
android:src="@drawable/ic_skip_next_white_48dp"
/>
<ImageButton
android:id="@+id/button_quit"
style="@style/NotificationButton"
android:padding="8dp"
android:src="@drawable/ic_close_white_24dp"/>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/media_actions"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginLeft="6dp"
android:layout_marginRight="6dp"
android:orientation="horizontal"
tools:ignore="ContentDescription">
</RelativeLayout>
<ImageButton
android:id="@+id/button_toggle_play_pause"
style="@style/NotificationButton"
android:paddingBottom="16dp"
android:paddingTop="16dp"
android:src="@drawable/ic_play_arrow_white_48dp" />
<ImageButton
android:id="@+id/button_next"
style="@style/NotificationButton"
android:paddingBottom="16dp"
android:paddingTop="16dp"
android:src="@drawable/ic_skip_next_white_48dp" />
<ImageButton
android:id="@+id/button_quit"
style="@style/NotificationButton"
android:padding="8dp"
android:src="@drawable/ic_close_white_24dp" />
</LinearLayout>
</LinearLayout>

41
app/src/main/res/layout-v21/notification_playing_expanded.xml
View file

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (C) 2014 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@ -16,40 +15,40 @@
-->
<!-- Layout to be used with only max 3 actions. It has a much larger picture at the left side-->
<RelativeLayout
<RelativeLayout xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/status_bar_latest_event_content"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="128dp">
android:layout_height="128dp"
tools:ignore="ContentDescription">
<ImageView
android:id="@+id/album_art"
android:layout_width="128dp"
android:layout_height="128dp"
android:scaleType="centerCrop"
/>
android:scaleType="centerCrop" />
<ImageButton
android:id="@+id/button_quit"
style="@style/NotificationButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_alignParentTop="true"
android:layout_gravity="center"
android:background="@drawable/notification_selector"
android:padding="8dp"
android:src="@drawable/ic_close_white_24dp"/>
android:src="@drawable/ic_close_white_24dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toLeftOf="@+id/button_quit"
android:layout_toRightOf="@+id/album_art"
android:layout_toStartOf="@+id/button_quit"
android:layout_toEndOf="@+id/album_art"
android:gravity="center"
android:minHeight="@dimen/notification_big_icon_height"
android:orientation="vertical"
android:paddingLeft="16dp"
android:paddingStart="16dp"
android:paddingTop="12dp">
<TextView
@ -57,21 +56,21 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:textAppearance="@style/Theme.MaterialMusic.Notification.Title"/>
android:textAppearance="@style/Theme.MaterialMusic.Notification.Title" />
<TextView
android:id="@+id/song_artist"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:textAppearance="@style/Theme.MaterialMusic.Notification"/>
android:textAppearance="@style/Theme.MaterialMusic.Notification" />
<TextView
android:id="@+id/album_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:textAppearance="@style/Theme.MaterialMusic.Notification"/>
android:textAppearance="@style/Theme.MaterialMusic.Notification" />
</LinearLayout>
<LinearLayout
@ -81,27 +80,27 @@
android:layout_alignParentBottom="true"
android:layout_marginEnd="12dp"
android:layout_marginStart="12dp"
android:layout_toRightOf="@+id/album_art"
android:layout_toEndOf="@+id/album_art"
android:orientation="horizontal">
<ImageButton
android:id="@+id/button_prev"
style="@style/NotificationButton"
android:padding="8dp"
android:src="@drawable/ic_skip_previous_white_48dp"/>
android:src="@drawable/ic_skip_previous_white_48dp" />
<ImageButton
android:id="@+id/button_toggle_play_pause"
style="@style/NotificationButton"
android:padding="8dp"
android:src="@drawable/ic_play_arrow_white_48dp"
/>
android:src="@drawable/ic_play_arrow_white_48dp" />
<ImageButton
android:id="@+id/button_next"
style="@style/NotificationButton"
android:padding="8dp"
android:src="@drawable/ic_skip_next_white_48dp"/>
android:src="@drawable/ic_skip_next_white_48dp" />
</LinearLayout>
<ImageView
@ -109,7 +108,7 @@
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_above="@+id/media_actions"
android:layout_toRightOf="@+id/album_art"
android:background="@drawable/notification_template_divider_media"/>
android:layout_toEndOf="@+id/album_art"
android:background="@drawable/notification_template_divider_media" />
</RelativeLayout>

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

@ -1,7 +1,7 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:id="@+id/album_art"
@ -9,13 +9,14 @@
android:layout_height="@dimen/header_image_height"
android:scaleType="centerCrop"
android:src="@drawable/default_album_art"
android:transitionName="@string/transition_album_cover"/>
android:transitionName="@string/transition_album_cover"
tools:ignore="ContentDescription,UnusedAttribute" />
<View
android:id="@+id/list_background"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/colorBackground"/>
android:background="?android:attr/colorBackground" />
<com.github.ksoichiro.android.observablescrollview.ObservableRecyclerView
android:id="@+id/list"
@ -24,7 +25,7 @@
android:clipToPadding="false"
android:divider="@null"
android:dividerHeight="0dp"
android:scrollbars="none"/>
android:scrollbars="none" />
<LinearLayout
android:layout_width="match_parent"
@ -44,12 +45,13 @@
android:paddingRight="72dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="?attr/title_text_color"/>
android:textColor="?attr/title_text_color"
tools:ignore="UnusedAttribute" />
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/transparent"/>
android:background="@android:color/transparent" />
</LinearLayout>
@ -62,19 +64,20 @@
android:id="@+id/statusBar"
android:layout_width="match_parent"
android:layout_height="@dimen/statusMargin"
android:background="@android:color/transparent"/>
android:background="@android:color/transparent" />
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
style="@style/Toolbar"
android:background="@android:color/transparent"/>
android:background="@android:color/transparent" />
</LinearLayout>
<com.melnykov.fab.FloatingActionButton
android:id="@+id/fab"
style="@style/PlayPauseFab"
android:layout_gravity="right"
android:layout_gravity="right|end"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
/>
</FrameLayout>
tools:ignore="RtlHardcoded" />
</merge>

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

@ -1,5 +1,5 @@
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:focusable="true"
@ -19,7 +19,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@drawable/default_album_art"/>
android:src="@drawable/default_album_art" />
<LinearLayout
android:id="@+id/header"
@ -39,12 +39,12 @@
android:layout_height="wrap_content"
android:fontFamily="sans-serif-medium"
android:gravity="center_vertical"
android:hint="Album"
android:hint="@string/album"
android:paddingBottom="8dp"
android:paddingTop="8dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/white"/>
android:textColor="@color/white" />
</LinearLayout>
@ -67,7 +67,7 @@
android:fontFamily="sans-serif"
android:singleLine="true"
android:text="@string/album_artist"
android:textAppearance="@style/TextAppearance.AppCompat.Body2"/>
android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
<EditText
android:id="@+id/album_artist"
@ -79,7 +79,7 @@
android:hint="@string/album_artist"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="?attr/title_text_color"/>
android:textColor="?attr/title_text_color" />
</LinearLayout>
<LinearLayout
@ -93,7 +93,7 @@
android:fontFamily="sans-serif"
android:singleLine="true"
android:text="@string/genre"
android:textAppearance="@style/TextAppearance.AppCompat.Body2"/>
android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
<EditText
android:id="@+id/genre"
@ -105,7 +105,7 @@
android:hint="@string/genre"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="?attr/title_text_color"/>
android:textColor="?attr/title_text_color" />
</LinearLayout>
<LinearLayout
@ -119,7 +119,7 @@
android:fontFamily="sans-serif"
android:singleLine="true"
android:text="@string/year"
android:textAppearance="@style/TextAppearance.AppCompat.Body2"/>
android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
<EditText
android:id="@+id/year"
@ -132,7 +132,7 @@
android:inputType="numberDecimal"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="?attr/title_text_color"/>
android:textColor="?attr/title_text_color" />
</LinearLayout>
</LinearLayout>
@ -146,16 +146,17 @@
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
style="@style/Toolbar"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:background="#00000000"/>
android:gravity="start|left|top"
android:background="#00000000"
tools:ignore="RtlHardcoded" />
<com.melnykov.fab.FloatingActionButton
android:id="@+id/fab"
style="@style/PlayPauseFab"
android:layout_gravity="bottom|right"
android:layout_gravity="bottom|right|end"
android:layout_margin="16dp"
android:src="@drawable/ic_done_white_24dp"/>
android:src="@drawable/ic_done_white_24dp"
tools:ignore="RtlHardcoded" />
</FrameLayout>

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

@ -1,7 +1,7 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:id="@+id/artist_image"
@ -9,13 +9,14 @@
android:layout_height="@dimen/header_image_height"
android:scaleType="centerCrop"
android:src="@drawable/default_artist_image"
android:transitionName="@string/transition_artist_image"/>
android:transitionName="@string/transition_artist_image"
tools:ignore="ContentDescription,UnusedAttribute" />
<View
android:id="@+id/list_background"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/colorBackground"/>
android:background="?android:attr/colorBackground" />
<com.github.ksoichiro.android.observablescrollview.ObservableListView
android:id="@+id/list"
@ -24,7 +25,7 @@
android:clipToPadding="false"
android:divider="@null"
android:dividerHeight="0dp"
android:scrollbars="none"/>
android:scrollbars="none" />
<LinearLayout
android:layout_width="match_parent"
@ -44,12 +45,13 @@
android:paddingRight="72dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="?attr/title_text_color"/>
android:textColor="?attr/title_text_color"
tools:ignore="UnusedAttribute" />
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/transparent"/>
android:background="@android:color/transparent" />
</LinearLayout>
@ -62,19 +64,22 @@
android:id="@+id/statusBar"
android:layout_width="match_parent"
android:layout_height="@dimen/statusMargin"
android:background="@android:color/transparent"/>
android:background="@android:color/transparent"
tools:ignore="ContentDescription" />
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
style="@style/Toolbar"
android:background="@android:color/transparent"/>
android:background="@android:color/transparent" />
</LinearLayout>
<com.melnykov.fab.FloatingActionButton
android:id="@+id/fab"
style="@style/PlayPauseFab"
android:layout_gravity="right"
android:layout_gravity="right|end"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
/>
</FrameLayout>
tools:ignore="RtlHardcoded" />
</merge>

33
app/src/main/res/layout/activity_main.xml
View file

@ -1,13 +1,11 @@
<!-- A DrawerLayout is intended to be used as the top-level content view using match_parent for both width and height to consume the full space available. -->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v4.widget.DrawerLayout
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
@ -22,8 +20,7 @@
android:id="@+id/pager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
/>
android:clipToPadding="false" />
<LinearLayout
android:layout_width="match_parent"
@ -34,7 +31,8 @@
android:id="@+id/statusBar"
android:layout_width="match_parent"
android:layout_height="@dimen/statusMargin"
android:background="?attr/colorPrimary"/>
android:background="?attr/colorPrimary"
tools:ignore="ContentDescription" />
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
@ -48,10 +46,12 @@
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:fontFamily="sans-serif-medium"
android:gravity="left|center"
android:gravity="left|start|center"
android:text="@string/app_name"
android:textColor="@color/white"
android:textSize="20sp"/>
android:textSize="20sp"
tools:ignore="RtlHardcoded" />
</android.support.v7.widget.Toolbar>
<com.astuetz.PagerSlidingTabStrip
@ -63,27 +63,29 @@
android:background="?colorPrimary"
app:elevation="@dimen/toolbar_elevation"
android:paddingLeft="64dp"
android:paddingStart="64dp"
android:textColor="@color/sliding_tabs_deactivated"
android:textColorPrimary="@color/sliding_tabs_activated"
app:pstsTabPaddingLeftRight="8dp"/>
app:pstsTabPaddingLeftRight="8dp"
tools:ignore="NewApi,RtlSymmetry" />
<View
android:layout_width="match_parent"
android:layout_height="5dp"
android:background="@drawable/shadow_down"/>
android:background="@drawable/shadow_down" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right|bottom"
android:fitsSystemWindows="true">
android:layout_gravity="end|right|bottom"
android:fitsSystemWindows="true"
tools:ignore="RtlHardcoded">
<com.melnykov.fab.FloatingActionButton
android:id="@+id/fab"
style="@style/PlayPauseFab"
android:layout_margin="16dp"
/>
android:layout_margin="16dp" />
</LinearLayout>
@ -95,7 +97,8 @@
android:layout_width="@dimen/navigation_drawer_width"
android:layout_height="match_parent"
android:layout_gravity="start"
tools:layout="@layout/fragment_navigation_drawer"/>
tools:layout="@layout/fragment_navigation_drawer" />
</android.support.v4.widget.DrawerLayout>
</LinearLayout>

70
app/src/main/res/layout/activity_music_controller.xml
View file

@ -1,9 +1,9 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context="com.kabouzeid.gramophone.ui.activities.AlbumDetailActivity$PlaceholderFragment">
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context="com.kabouzeid.gramophone.ui.activities.AlbumDetailActivity$PlaceholderFragment">
<ImageView
android:id="@+id/album_art"
@ -13,33 +13,36 @@
android:background="@color/black"
android:scaleType="centerCrop"
android:src="@drawable/default_album_art"
android:transitionName="@string/transition_album_cover"/>
android:transitionName="@string/transition_album_cover"
tools:ignore="UnusedAttribute" />
<LinearLayout
android:orientation="vertical"
android:id="@+id/dummy_toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<View
android:layout_width="match_parent"
android:layout_height="@dimen/statusMargin"/>
android:layout_height="@dimen/statusMargin" />
<View
android:layout_width="match_parent"
android:layout_height="?actionBarSize"/>
android:layout_height="?actionBarSize" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/shadow_down"
android:layout_alignBottom="@+id/dummy_toolbar"/>
android:layout_alignBottom="@+id/dummy_toolbar" />
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/footer"
android:background="@drawable/shadow_up"
android:layout_alignTop="@+id/progress_container"/>
android:layout_alignTop="@+id/progress_container" />
<LinearLayout
android:id="@+id/progress_container"
@ -55,12 +58,13 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:fontFamily="sans-serif-medium"
android:gravity="bottom|left"
android:gravity="bottom|left|start"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/white"
android:textSize="16sp"
android:textStyle="bold"/>
android:textStyle="bold"
tools:ignore="RtlHardcoded" />
<TextView
android:id="@+id/song_total_time"
@ -68,11 +72,12 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:fontFamily="sans-serif"
android:gravity="bottom|right"
android:gravity="bottom|right|end"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/white"
android:textSize="16sp"/>
android:textSize="16sp"
tools:ignore="RtlHardcoded" />
</LinearLayout>
@ -87,7 +92,8 @@
android:paddingLeft="72dp"
android:paddingRight="72dp"
android:paddingTop="16dp"
android:transitionName="@string/transition_album_text">
android:transitionName="@string/transition_album_text"
tools:ignore="UnusedAttribute">
<TextView
android:id="@+id/song_title"
@ -96,7 +102,7 @@
android:fontFamily="sans-serif-medium"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="?attr/title_text_color"/>
android:textColor="?attr/title_text_color" />
<TextView
android:id="@+id/song_artist"
@ -105,7 +111,7 @@
android:fontFamily="sans-serif"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Caption"
android:textColor="?attr/caption_text_color"/>
android:textColor="?attr/caption_text_color" />
</LinearLayout>
@ -116,7 +122,8 @@
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_margin="16dp"
android:background="?music_controller_container_color">
android:background="?music_controller_container_color"
tools:ignore="ContentDescription">
<ImageButton
android:id="@+id/prev_button"
@ -124,11 +131,13 @@
android:layout_height="72dp"
android:layout_centerVertical="true"
android:layout_marginRight="-8dp"
android:layout_marginEnd="-8dp"
android:layout_toLeftOf="@+id/fab"
android:layout_toStartOf="@+id/fab"
android:background="?round_selector"
android:padding="22dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_skip_previous_white_48dp"/>
android:src="@drawable/ic_skip_previous_white_48dp" />
<ImageButton
android:id="@+id/next_button"
@ -136,40 +145,46 @@
android:layout_height="72dp"
android:layout_centerVertical="true"
android:layout_marginLeft="-8dp"
android:layout_marginStart="-8dp"
android:layout_toRightOf="@+id/fab"
android:layout_toEndOf="@+id/fab"
android:background="?round_selector"
android:padding="22dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_skip_next_white_48dp"/>
android:src="@drawable/ic_skip_next_white_48dp" />
<ImageButton
android:id="@+id/repeat_button"
android:layout_width="72dp"
android:layout_height="72dp"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:background="?round_selector"
android:padding="22dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_repeat_grey600_48dp"/>
android:src="@drawable/ic_repeat_grey600_48dp" />
<ImageButton
android:id="@+id/shuffle_button"
android:layout_width="72dp"
android:layout_height="72dp"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginRight="8dp"
android:layout_marginEnd="8dp"
android:background="?round_selector"
android:padding="22dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_shuffle_grey600_48dp"/>
android:src="@drawable/ic_shuffle_grey600_48dp" />
<com.melnykov.fab.FloatingActionButton
android:id="@+id/fab"
style="@style/PlayPauseFab"
android:layout_centerInParent="true"/>
android:layout_centerInParent="true" />
</RelativeLayout>
@ -177,7 +192,8 @@
android:id="@+id/progress_slider"
style="@style/MusicProgressSlider"
android:layout_above="@+id/footer"
android:elevation="2dp"/>
android:elevation="2dp"
tools:ignore="UnusedAttribute" />
<LinearLayout
android:layout_width="match_parent"
@ -189,12 +205,14 @@
android:id="@+id/statusBar"
android:layout_width="match_parent"
android:layout_height="@dimen/statusMargin"
android:background="@android:color/transparent"/>
android:background="@android:color/transparent"
tools:ignore="ContentDescription" />
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
style="@style/Toolbar"
android:background="@android:color/transparent"/>
android:background="@android:color/transparent" />
</LinearLayout>
</RelativeLayout>

19
app/src/main/res/layout/activity_playlist_detail.xml
View file

@ -1,5 +1,5 @@
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
@ -11,7 +11,7 @@
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
style="@style/Toolbar"
android:background="?colorPrimary"/>
android:background="?colorPrimary" />
<android.support.v7.widget.RecyclerView
android:id="@+id/recycler_view"
@ -20,20 +20,21 @@
android:clipToPadding="false"
android:divider="@null"
android:dividerHeight="0px"
android:scrollbars="vertical"/>
android:scrollbars="vertical" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right|bottom"
android:fitsSystemWindows="true">
android:layout_gravity="right|bottom|end"
android:fitsSystemWindows="true"
tools:ignore="RtlHardcoded">
<com.melnykov.fab.FloatingActionButton
android:id="@+id/fab"
style="@style/PlayPauseFab"
android:layout_margin="16dp"
/>
android:layout_margin="16dp" />
</LinearLayout>
</FrameLayout>
</merge>

5
app/src/main/res/layout/activity_preferences.xml
View file

@ -8,10 +8,11 @@
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
style="@style/Toolbar"
android:background="?colorPrimary"/>
android:background="?colorPrimary" />
<FrameLayout
android:id="@+id/content_frame"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent" />
</LinearLayout>

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

@ -1,5 +1,4 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -9,7 +8,7 @@
android:id="@+id/toolbar"
style="@style/Toolbar"
android:background="?colorPrimary"
app:elevation="@dimen/toolbar_elevation"/>
app:elevation="@dimen/toolbar_elevation" />
<FrameLayout
android:layout_width="match_parent"
@ -18,14 +17,15 @@
<View
android:layout_width="match_parent"
android:layout_height="5dp"
android:background="@drawable/shadow_down"/>
android:background="@drawable/shadow_down" />
<ListView
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:divider="@null"
android:dividerHeight="0px"/>
android:dividerHeight="0px" />
</FrameLayout>
</LinearLayout>

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

@ -1,6 +1,5 @@
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:focusable="true"
@ -20,7 +19,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@drawable/default_album_art"/>
android:src="@drawable/default_album_art" />
<LinearLayout
android:id="@+id/header"
@ -40,12 +39,12 @@
android:layout_height="wrap_content"
android:fontFamily="sans-serif-medium"
android:gravity="center_vertical"
android:hint="Song"
android:hint="@string/song"
android:paddingBottom="8dp"
android:paddingTop="8dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/white"/>
android:textColor="@color/white" />
<EditText
android:id="@+id/title2"
@ -53,12 +52,12 @@
android:layout_height="wrap_content"
android:fontFamily="sans-serif-medium"
android:gravity="center_vertical"
android:hint="Album"
android:hint="@string/album"
android:paddingBottom="8dp"
android:paddingTop="8dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/white"/>
android:textColor="@color/white" />
</LinearLayout>
@ -81,7 +80,7 @@
android:fontFamily="sans-serif"
android:singleLine="true"
android:text="@string/artist"
android:textAppearance="@style/TextAppearance.AppCompat.Body2"/>
android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
<EditText
android:id="@+id/artist"
@ -93,7 +92,7 @@
android:hint="@string/artist"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="?attr/title_text_color"/>
android:textColor="?attr/title_text_color" />
</LinearLayout>
<LinearLayout
@ -107,7 +106,7 @@
android:fontFamily="sans-serif"
android:singleLine="true"
android:text="@string/genre"
android:textAppearance="@style/TextAppearance.AppCompat.Body2"/>
android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
<EditText
android:id="@+id/genre"
@ -119,7 +118,7 @@
android:hint="@string/genre"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="?attr/title_text_color"/>
android:textColor="?attr/title_text_color" />
</LinearLayout>
<LinearLayout
@ -133,7 +132,7 @@
android:fontFamily="sans-serif"
android:singleLine="true"
android:text="@string/year"
android:textAppearance="@style/TextAppearance.AppCompat.Body2"/>
android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
<EditText
android:id="@+id/year"
@ -146,7 +145,7 @@
android:inputType="numberDecimal"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="?attr/title_text_color"/>
android:textColor="?attr/title_text_color" />
</LinearLayout>
<LinearLayout
@ -160,7 +159,7 @@
android:fontFamily="sans-serif"
android:singleLine="true"
android:text="@string/track"
android:textAppearance="@style/TextAppearance.AppCompat.Body2"/>
android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
<EditText
android:id="@+id/track_number"
@ -173,7 +172,7 @@
android:inputType="numberDecimal"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="?attr/title_text_color"/>
android:textColor="?attr/title_text_color" />
</LinearLayout>
</LinearLayout>
@ -187,16 +186,17 @@
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
style="@style/Toolbar"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:background="#00000000"/>
android:layout_gravity="start|left|top"
android:background="#00000000"
tools:ignore="RtlHardcoded" />
<com.melnykov.fab.FloatingActionButton
android:id="@+id/fab"
style="@style/PlayPauseFab"
android:layout_gravity="bottom|right"
android:layout_gravity="bottom|right|end"
android:layout_margin="16dp"
android:src="@drawable/ic_done_white_24dp"/>
android:src="@drawable/ic_done_white_24dp"
tools:ignore="RtlHardcoded" />
</FrameLayout>

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

@ -1,7 +1,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v7.widget.RecyclerView
android:id="@+id/recycler_view"
@ -9,12 +9,12 @@
android:layout_height="164dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:scrollbars="none"/>
android:scrollbars="none" />
<View
android:layout_marginTop="-8dp"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?separator_color"/>
android:background="?separator_color" />
</LinearLayout>

13
app/src/main/res/layout/dialog_color_chooser.xml Normal file
View file

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<GridView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/gridview"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:columnWidth="56dp"
android:numColumns="auto_fit"
android:verticalSpacing="4dp"
android:horizontalSpacing="4dp"
android:padding="16dp"
android:clipToPadding="false"
android:stretchMode="columnWidth"
android:gravity="center" />

9
app/src/main/res/layout/dialog_empty_frame.xml
View file

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="start"
android:paddingLeft="@dimen/md_dialog_frame_margin"
android:paddingRight="@dimen/md_dialog_frame_margin">
</LinearLayout>

36
app/src/main/res/layout/dialog_file_details.xml
View file

@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
tools:ignore="NewApi,RtlSymmetry">
<TextView
android:id="@+id/file_path"
@ -11,10 +12,10 @@
android:layout_height="wrap_content"
android:fontFamily="sans-serif"
android:paddingLeft="16dp"
android:paddingStart="16dp"
android:paddingTop="16dp"
android:textAppearance="?android:textAppearanceMedium"
android:textSize="16sp"/>
android:textSize="16sp" />
<TextView
android:id="@+id/file_name"
@ -22,10 +23,10 @@
android:layout_height="wrap_content"
android:fontFamily="sans-serif"
android:paddingLeft="16dp"
android:paddingStart="16dp"
android:paddingTop="16dp"
android:textAppearance="?android:textAppearanceMedium"
android:textSize="16sp"/>
android:textSize="16sp" />
<TextView
android:id="@+id/file_size"
@ -33,10 +34,10 @@
android:layout_height="wrap_content"
android:fontFamily="sans-serif"
android:paddingLeft="16dp"
android:paddingStart="16dp"
android:paddingTop="16dp"
android:textAppearance="?android:textAppearanceMedium"
android:textSize="16sp"/>
android:textSize="16sp" />
<TextView
android:id="@+id/file_format"
@ -44,10 +45,10 @@
android:layout_height="wrap_content"
android:fontFamily="sans-serif"
android:paddingLeft="16dp"
android:paddingStart="16dp"
android:paddingTop="16dp"
android:textAppearance="?android:textAppearanceMedium"
android:textSize="16sp"/>
android:textSize="16sp" />
<TextView
android:id="@+id/track_length"
@ -55,10 +56,10 @@
android:layout_height="wrap_content"
android:fontFamily="sans-serif"
android:paddingLeft="16dp"
android:paddingStart="16dp"
android:paddingTop="16dp"
android:textAppearance="?android:textAppearanceMedium"
android:textSize="16sp"/>
android:textSize="16sp" />
<TextView
android:id="@+id/bitrate"
@ -66,10 +67,10 @@
android:layout_height="wrap_content"
android:fontFamily="sans-serif"
android:paddingLeft="16dp"
android:paddingStart="16dp"
android:paddingTop="16dp"
android:textAppearance="?android:textAppearanceMedium"
android:textSize="16sp"/>
android:textSize="16sp" />
<TextView
android:id="@+id/sampling_rate"
@ -77,8 +78,9 @@
android:layout_height="wrap_content"
android:fontFamily="sans-serif"
android:paddingLeft="16dp"
android:paddingStart="16dp"
android:paddingTop="16dp"
android:textAppearance="?android:textAppearanceMedium"
android:textSize="16sp"/>
android:textSize="16sp" />
</LinearLayout>

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

@ -9,4 +9,4 @@
app:drag_start_mode="onLongPress"
app:float_alpha="0.5"
app:max_drag_scroll_speed="2"
app:use_default_controller="true"/>
app:use_default_controller="true" />

3
app/src/main/res/layout/fragment_album_view.xml
View file

@ -10,7 +10,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:scrollbars="vertical"/>
android:scrollbars="vertical" />
</LinearLayout>

3
app/src/main/res/layout/fragment_artist_view.xml
View file

@ -10,5 +10,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:scrollbars="vertical"/>
android:scrollbars="vertical" />
</LinearLayout>

16
app/src/main/res/layout/fragment_drawer.xml
View file

@ -1,16 +0,0 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
tools:context=".DrawerActivity$PlaceholderFragment">
<TextView
android:id="@+id/section_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</RelativeLayout>

27
app/src/main/res/layout/fragment_navigation_drawer.xml
View file

@ -1,5 +1,4 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -21,13 +20,14 @@
android:layout_height="@dimen/navigation_drawer_image_height"
android:layout_alignParentTop="true"
android:scaleType="centerCrop"
android:src="@drawable/default_album_art"/>
android:src="@drawable/default_album_art"
tools:ignore="ContentDescription,UnusedAttribute" />
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentBottom="true"
android:background="@drawable/shadow_up"/>
android:background="@drawable/shadow_up" />
<LinearLayout
android:layout_width="match_parent"
@ -47,7 +47,7 @@
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:textColor="@color/white"
android:textSize="14sp"/>
android:textSize="14sp" />
<TextView
android:id="@+id/song_artist"
@ -60,7 +60,8 @@
android:text="@string/nothing_playing"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@android:color/white"
android:textSize="14sp"/>
android:textSize="14sp" />
</LinearLayout>
<Button
@ -69,17 +70,17 @@
android:layout_height="match_parent"
android:background="?selectableItemBackground"
android:clickable="true"
android:soundEffectsEnabled="true"/>
android:soundEffectsEnabled="true" />
</RelativeLayout>
<ListView
<android.support.v7.widget.RecyclerView
android:id="@+id/navigation_drawer_list"
android:scrollbars="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="8dp"
android:divider="@null"
android:dividerHeight="0dp"
android:listSelector="?selectableItemBackground"
tools:context=".NavigationDrawerFragment"/>
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:clipToPadding="false" />
</LinearLayout>

11
app/src/main/res/layout/fragment_place_holder.xml
View file

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView
android:id="@+id/text"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fontFamily="sans-serif-medium"
android:gravity="center"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="?title_text_color"/>

3
app/src/main/res/layout/fragment_playlist_view.xml
View file

@ -12,5 +12,6 @@
android:clipToPadding="false"
android:dividerHeight="0px"
android:divider="@null"
android:scrollbars="vertical"/>
android:scrollbars="vertical" />
</LinearLayout>

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

@ -1,8 +0,0 @@
<com.github.ksoichiro.android.observablescrollview.ObservableRecyclerView
android:id="@+id/scroll"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:divider="@null"
android:dividerHeight="0dp"/>

3
app/src/main/res/layout/fragment_songview.xml
View file

@ -13,5 +13,6 @@
android:clipToPadding="false"
android:dividerHeight="0px"
android:divider="@null"
android:scrollbars="vertical"/>
android:scrollbars="vertical" />
</LinearLayout>

4
app/src/main/res/layout/griditem_color_chooser.xml Normal file
View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<com.kabouzeid.gramophone.views.CircleView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="56dp"
android:layout_height="56dp" />

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

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
@ -12,14 +12,15 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical">
android:orientation="vertical"
tools:ignore="UnusedAttribute,UselessParent">
<com.kabouzeid.gramophone.ui.widget.SquareImageView
android:id="@+id/album_art"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:transitionName="@string/transition_album_cover"/>
android:transitionName="@string/transition_album_cover" />
<LinearLayout
android:id="@+id/footer"
@ -37,7 +38,7 @@
android:fontFamily="sans-serif-medium"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:textColor="?title_text_color"/>
android:textColor="?title_text_color" />
<TextView
android:id="@+id/album_interpret"
@ -46,8 +47,10 @@
android:fontFamily="sans-serif"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="?caption_text_color"/>
android:textColor="?caption_text_color" />
</LinearLayout>
</LinearLayout>
</FrameLayout>

22
app/src/main/res/layout/item_grid_artist_album.xml
View file

@ -1,9 +1,10 @@
<android.support.v7.widget.CardView
xmlns:android="http://schemas.android.com/apk/res/android"
<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="104dp"
android:layout_height="148dp"
android:layout_marginRight="8dp"
android:layout_marginEnd="8dp"
app:elevation="3dp"
android:foreground="?rect_selector">
@ -18,7 +19,8 @@
android:layout_width="104dp"
android:layout_height="104dp"
android:scaleType="centerCrop"
android:transitionName="@string/transition_album_cover"/>
android:transitionName="@string/transition_album_cover"
tools:ignore="UnusedAttribute" />
<LinearLayout
android:id="@+id/footer"
@ -33,7 +35,8 @@
android:orientation="vertical"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:transitionName="@string/transition_album_text">
android:transitionName="@string/transition_album_text"
tools:ignore="UnusedAttribute">
<TextView
android:id="@+id/album_title"
@ -42,8 +45,7 @@
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:textColor="?title_text_color"
android:textSize="14sp"
/>
android:textSize="14sp" />
<TextView
android:id="@+id/album_year"
@ -52,11 +54,11 @@
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="?caption_text_color"
android:textSize="12sp"
/>
</LinearLayout>
</LinearLayout>
android:textSize="12sp" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

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

@ -1,18 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="72dp"
android:background="?rect_selector">
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:descendantFocusability="blocksDescendants"
android:orientation="horizontal"
android:paddingLeft="16dp"
>
android:paddingStart="16dp"
tools:ignore="RtlSymmetry">
<TextView
android:id="@+id/track_number"
@ -23,7 +23,7 @@
android:gravity="center"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:textColor="?title_text_color"/>
android:textColor="?title_text_color" />
<LinearLayout
android:layout_width="0dp"
@ -41,7 +41,7 @@
android:fontFamily="sans-serif"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:textColor="?title_text_color"/>
android:textColor="?title_text_color" />
<TextView
android:id="@+id/song_info"
@ -50,7 +50,7 @@
android:fontFamily="sans-serif"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="?caption_text_color"/>
android:textColor="?caption_text_color" />
</LinearLayout>
<ImageView
@ -58,7 +58,7 @@
style="@style/OverFlowButton"
android:layout_gravity="center_vertical"
android:layout_marginLeft="2dp"
android:layout_marginRight="2dp"/>
android:layout_marginRight="2dp" />
</LinearLayout>
<View
@ -67,5 +67,6 @@
android:layout_height="1dp"
android:layout_gravity="bottom"
android:layout_marginLeft="72dp"
android:background="?separator_color"/>
android:layout_marginStart="72dp"
android:background="?separator_color" />
</FrameLayout>

Some files were not shown because too many files have changed in this diff Show more