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

Merged fastscroller from cabinet. Temporary fixed the wrong fab margins on KitKat and below caused by the google support design library. Added empty screens to Album Song and Artist views.

Browse source
This commit is contained in:
Karim Abou Zeid 2015-06-02 21:27:02 +02:00
commit 3082ed1187
30 changed files with 483 additions and 195 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,12 +1,12 @@
<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">
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<FrameLayout
android:background="?android:colorBackground"
android:layout_width="match_parent"
android:layout_height="@dimen/header_image_height">
android:layout_height="@dimen/header_image_height"
android:background="?android:colorBackground">
<ImageView
android:id="@+id/album_art_background"
@ -98,6 +98,6 @@
android:id="@+id/fab"
style="@style/PlayPauseFab"
android:layout_gravity="end|right|bottom"
android:layout_margin="16dp" />
android:layout_margin="@dimen/fab_margin" />
</FrameLayout>

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

@ -1,10 +1,10 @@
<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:fitsSystemWindows="true"
android:focusable="true"
android:focusableInTouchMode="true">
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:focusable="true"
android:focusableInTouchMode="true">
<com.github.ksoichiro.android.observablescrollview.ObservableScrollView
android:id="@+id/observableScrollView"
@ -26,6 +26,7 @@
android:id="@+id/header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/image"
android:elevation="@dimen/toolbar_elevation"
android:minHeight="@dimen/title_view_height"
android:orientation="vertical"
@ -33,8 +34,7 @@
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingTop="8dp"
tools:ignore="UnusedAttribute"
android:layout_below="@+id/image">
tools:ignore="UnusedAttribute">
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
@ -139,7 +139,7 @@
android:id="@+id/fab"
style="@style/PlayPauseFab"
android:layout_gravity="bottom|right|end"
android:layout_margin="16dp"
android:layout_margin="@dimen/fab_margin"
android:src="@drawable/ic_done_white_24dp"
tools:ignore="RtlHardcoded" />

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

@ -1,13 +1,13 @@
<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">
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<FrameLayout
android:background="?android:colorBackground"
android:layout_width="match_parent"
android:layout_height="@dimen/header_image_height">
android:layout_height="@dimen/header_image_height"
android:background="?android:colorBackground">
<ImageView
android:id="@+id/artist_image_background"
@ -99,6 +99,6 @@
android:id="@+id/fab"
style="@style/PlayPauseFab"
android:layout_gravity="end|right|bottom"
android:layout_margin="16dp" />
android:layout_margin="@dimen/fab_margin" />
</FrameLayout>

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

@ -1,8 +1,8 @@
<android.support.v4.widget.DrawerLayout
android:id="@+id/drawer_layout"
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:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
@ -19,9 +19,9 @@
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
<FrameLayout
app:layout_scrollFlags="scroll|enterAlways"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
app:layout_scrollFlags="scroll|enterAlways">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
@ -59,7 +59,7 @@
android:id="@+id/fab"
style="@style/PlayPauseFab"
android:layout_gravity="end|bottom"
android:layout_margin="16dp" />
android:layout_margin="@dimen/fab_margin" />
</android.support.design.widget.CoordinatorLayout>

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

@ -1,18 +1,18 @@
<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"
tools:context="com.kabouzeid.gramophone.ui.activities.MusicControllerActivity">
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.kabouzeid.gramophone.ui.activities.MusicControllerActivity">
<!-- BOTTOM-->
<LinearLayout
android:background="?android:colorBackground"
android:id="@+id/footer_frame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:background="?android:colorBackground"
android:orientation="vertical">
<RelativeLayout
@ -166,7 +166,8 @@
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
style="@style/PlayPauseFab"
android:layout_centerInParent="true" />
android:layout_centerInParent="true"
android:layout_margin="@dimen/tmp_no_fab_margin" />
</RelativeLayout>

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

@ -1,6 +1,6 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
@ -49,6 +49,6 @@
android:id="@+id/fab"
style="@style/PlayPauseFab"
android:layout_gravity="bottom|end"
android:layout_margin="16dp" />
android:layout_margin="@dimen/fab_margin" />
</FrameLayout>

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

@ -1,10 +1,10 @@
<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:fitsSystemWindows="true"
android:focusable="true"
android:focusableInTouchMode="true">
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:focusable="true"
android:focusableInTouchMode="true">
<com.github.ksoichiro.android.observablescrollview.ObservableScrollView
android:id="@+id/observableScrollView"
@ -85,8 +85,7 @@
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
android:layout_height="wrap_content">
<EditText
android:id="@+id/artist"
@ -105,8 +104,7 @@
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
android:layout_height="wrap_content">
<EditText
android:id="@+id/genre"
@ -125,8 +123,7 @@
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
android:layout_height="wrap_content">
<EditText
android:id="@+id/year"
@ -146,8 +143,7 @@
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
android:layout_height="wrap_content">
<EditText
android:id="@+id/track_number"
@ -181,7 +177,7 @@
android:id="@+id/fab"
style="@style/PlayPauseFab"
android:layout_gravity="bottom|right|end"
android:layout_margin="16dp"
android:layout_margin="@dimen/fab_margin"
android:src="@drawable/ic_done_white_24dp"
tools:ignore="RtlHardcoded" />

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

@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
android:id="@+id/fragment_album_view"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v7.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:scrollbars="vertical" />
</LinearLayout>

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

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
android:id="@+id/fragment_album_view"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v7.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:scrollbars="vertical" />
</LinearLayout>

20
app/src/main/res/layout/fragment_playlist_view.xml → app/src/main/res/layout/fragment_main_activity_recycler_view.xml
View file

@ -1,18 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
android:id="@+id/fragment_song_view"
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v7.widget.RecyclerView
android:paddingTop="@dimen/list_padding_vertical"
android:paddingBottom="@dimen/bottom_offset_fab_activity"
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:dividerHeight="0px"
android:divider="@null"
android:scrollbars="vertical" />
android:scrollbars="none" />
<TextView
android:id="@android:id/empty"
@ -21,7 +19,13 @@
android:textSize="@dimen/empty_text_size"
android:textColor="?android:textColorSecondary"
android:fontFamily="sans-serif-light"
android:text="@string/no_playlists"
android:text="@string/nothing_here"
android:layout_gravity="center" />
</FrameLayout>
<com.kabouzeid.gramophone.views.FastScroller
android:id="@+id/fast_scroller"
android:layout_gravity="end"
android:layout_width="wrap_content"
android:layout_height="match_parent" />
</FrameLayout>

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

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
android:id="@+id/fragment_song_view"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v7.widget.RecyclerView
android:listSelector="?rect_selector"
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:dividerHeight="0px"
android:divider="@null"
android:scrollbars="vertical" />
</LinearLayout>

21
app/src/main/res/layout/vertical_recycler_fast_scroller_layout.xml Normal file
View file

@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="48dp"
android:layout_height="match_parent"
tools:layout_gravity="end">
<View
android:id="@+id/scroll_bar"
android:layout_width="48dp"
android:layout_height="match_parent"
android:layout_gravity="end"
android:alpha="0.22352941176" />
<View
android:id="@+id/scroll_handle"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_gravity="end" />
</FrameLayout>