Merge branch 'feat/genres' of git://github.com/arkon/Phonograph into arkon-feat/genres
This commit is contained in:
commit
441b64fce4
15 changed files with 694 additions and 14 deletions
55
app/src/main/res/layout/activity_genre_detail.xml
Normal file
55
app/src/main/res/layout/activity_genre_detail.xml
Normal file
|
|
@ -0,0 +1,55 @@
|
|||
<?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="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:transitionGroup="true"
|
||||
tools:ignore="UnusedAttribute">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<include layout="@layout/status_bar" />
|
||||
|
||||
<FrameLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="?colorPrimary"
|
||||
android:elevation="@dimen/toolbar_elevation"
|
||||
tools:ignore="UnusedAttribute">
|
||||
|
||||
<android.support.v7.widget.Toolbar
|
||||
android:id="@+id/toolbar"
|
||||
style="@style/Toolbar"
|
||||
android:background="@android:color/transparent" />
|
||||
|
||||
<ViewStub
|
||||
android:id="@+id/cab_stub"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="?attr/actionBarSize" />
|
||||
|
||||
</FrameLayout>
|
||||
|
||||
<com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
|
||||
android:id="@+id/recycler_view"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:clipToPadding="false"
|
||||
android:scrollbars="none" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<TextView
|
||||
android:id="@android:id/empty"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:fontFamily="sans-serif-light"
|
||||
android:text="@string/playlist_empty_text"
|
||||
android:textColor="?android:textColorSecondary"
|
||||
android:textSize="@dimen/empty_text_size"
|
||||
android:visibility="gone" />
|
||||
|
||||
</FrameLayout>
|
||||
29
app/src/main/res/layout/item_list_simple.xml
Normal file
29
app/src/main/res/layout/item_list_simple.xml
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<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="64dp"
|
||||
android:foreground="?attr/rectSelector"
|
||||
tools:ignore="UnusedAttribute">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:layout_marginLeft="16dp"
|
||||
android:layout_marginRight="16dp"
|
||||
android:layout_marginStart="16dp"
|
||||
android:fontFamily="sans-serif"
|
||||
android:singleLine="true"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
|
||||
|
||||
<View
|
||||
android:id="@+id/separator"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:layout_gravity="bottom"
|
||||
android:background="?attr/dividerColor" />
|
||||
|
||||
</RelativeLayout>
|
||||
12
app/src/main/res/menu/menu_genre_detail.xml
Normal file
12
app/src/main/res/menu/menu_genre_detail.xml
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
<menu 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"
|
||||
tools:context="com.kabouzeid.gramophone.ui.activities.GenreDetailActivity">
|
||||
|
||||
<item
|
||||
android:id="@+id/action_shuffle_genre"
|
||||
android:icon="@drawable/ic_shuffle_white_24dp"
|
||||
android:title="@string/action_shuffle_all"
|
||||
app:showAsAction="ifRoom" />
|
||||
|
||||
</menu>
|
||||
|
|
@ -30,6 +30,7 @@
|
|||
<string name="action_set_as_start_directory">Set as start directory</string>
|
||||
<string name="albums">Albums</string>
|
||||
<string name="artists">Artists</string>
|
||||
<string name="genres">Genres</string>
|
||||
<string name="songs">Songs</string>
|
||||
<string name="playlists">Playlists</string>
|
||||
<string name="unplayable_file">Couldn\u2019t play this song.</string>
|
||||
|
|
@ -41,6 +42,7 @@
|
|||
<string name="album">Album</string>
|
||||
<string name="artist">Artist</string>
|
||||
<string name="genre">Genre</string>
|
||||
<string name="unknown_genre">Unknown genre</string>
|
||||
<string name="album_artist">Album artist</string>
|
||||
<string name="year">Year</string>
|
||||
<string name="track_hint">"Track (2 for track 2 or 3004 for CD3 track 4)"</string>
|
||||
|
|
@ -151,6 +153,7 @@
|
|||
<string name="no_albums">No albums</string>
|
||||
<string name="no_songs">No songs</string>
|
||||
<string name="no_artists">No artists</string>
|
||||
<string name="no_genres">No genres</string>
|
||||
<string name="empty">Empty</string>
|
||||
<string name="playlist_name_empty">Playlist name</string>
|
||||
<string name="song">Song</string>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue