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

Added floating labels to all EditTexts. Added accent color in parent themes so EditTexts no longer use the material green as indicator. An artist's albums are now sorted by year.

Browse source
This commit is contained in:
Karim Abou Zeid 2015-05-31 15:59:44 +02:00
commit ed9524a25d
7 changed files with 107 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -36,19 +36,23 @@
android:paddingTop="8dp"
tools:ignore="UnusedAttribute">
<com.kabouzeid.gramophone.views.DynamicEditText
android:id="@+id/album_title"
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="sans-serif-medium"
android:gravity="center_vertical"
android:hint="@string/album"
android:inputType="text|textCapWords"
android:paddingBottom="8dp"
android:paddingTop="8dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/white" />
android:layout_height="wrap_content">
<com.kabouzeid.gramophone.views.DynamicEditText
android:id="@+id/album_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="sans-serif-medium"
android:gravity="center_vertical"
android:hint="@string/album"
android:inputType="text|textCapWords"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/white" />
</android.support.design.widget.TextInputLayout>
</LinearLayout>
@ -61,18 +65,9 @@
android:orientation="vertical"
android:padding="16dp">
<LinearLayout
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="64dp"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="sans-serif"
android:singleLine="true"
android:text="@string/album_artist"
android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
android:layout_height="wrap_content">
<com.kabouzeid.gramophone.views.DynamicEditText
android:id="@+id/album_artist"
@ -87,20 +82,11 @@
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="?attr/title_text_color" />
</LinearLayout>
</android.support.design.widget.TextInputLayout>
<LinearLayout
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="64dp"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="sans-serif"
android:singleLine="true"
android:text="@string/genre"
android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
android:layout_height="wrap_content">
<com.kabouzeid.gramophone.views.DynamicEditText
android:id="@+id/genre"
@ -115,20 +101,11 @@
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="?attr/title_text_color" />
</LinearLayout>
</android.support.design.widget.TextInputLayout>
<LinearLayout
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="64dp"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="sans-serif"
android:singleLine="true"
android:text="@string/year"
android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
android:layout_height="wrap_content">
<com.kabouzeid.gramophone.views.DynamicEditText
android:id="@+id/year"
@ -143,11 +120,10 @@
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="?attr/title_text_color" />
</LinearLayout>
</android.support.design.widget.TextInputLayout>
</LinearLayout>
</RelativeLayout>
</com.github.ksoichiro.android.observablescrollview.ObservableScrollView>

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

@ -36,33 +36,40 @@
android:paddingTop="8dp"
tools:ignore="UnusedAttribute">
<com.kabouzeid.gramophone.views.DynamicEditText
android:id="@+id/title1"
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="sans-serif-medium"
android:gravity="center_vertical"
android:hint="@string/song"
android:inputType="text|textCapWords"
android:paddingBottom="8dp"
android:paddingTop="8dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/white" />
android:layout_height="wrap_content">
<com.kabouzeid.gramophone.views.DynamicEditText
android:id="@+id/title2"
<com.kabouzeid.gramophone.views.DynamicEditText
android:id="@+id/title1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="sans-serif-medium"
android:gravity="center_vertical"
android:hint="@string/song"
android:inputType="text|textCapWords"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/white" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="sans-serif-medium"
android:gravity="center_vertical"
android:hint="@string/album"
android:inputType="text|textCapWords"
android:paddingBottom="8dp"
android:paddingTop="8dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/white" />
android:layout_height="wrap_content">
<com.kabouzeid.gramophone.views.DynamicEditText
android:id="@+id/title2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="sans-serif-medium"
android:gravity="center_vertical"
android:hint="@string/album"
android:inputType="text|textCapWords"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/white" />
</android.support.design.widget.TextInputLayout>
</LinearLayout>
@ -75,18 +82,11 @@
android:orientation="vertical"
android:padding="16dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="64dp"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="sans-serif"
android:singleLine="true"
android:text="@string/artist"
android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
<com.kabouzeid.gramophone.views.DynamicEditText
android:id="@+id/artist"
@ -98,23 +98,15 @@
android:hint="@string/artist"
android:inputType="text|textCapWords"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="?attr/title_text_color" />
</LinearLayout>
<LinearLayout
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="64dp"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="sans-serif"
android:inputType="text|textCapWords"
android:singleLine="true"
android:text="@string/genre"
android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
android:layout_height="wrap_content"
>
<com.kabouzeid.gramophone.views.DynamicEditText
android:id="@+id/genre"
@ -125,22 +117,16 @@
android:gravity="center_vertical"
android:hint="@string/genre"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="?attr/title_text_color" />
</LinearLayout>
<LinearLayout
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="64dp"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="sans-serif"
android:singleLine="true"
android:text="@string/year"
android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
android:layout_height="wrap_content"
>
<com.kabouzeid.gramophone.views.DynamicEditText
android:id="@+id/year"
@ -152,22 +138,16 @@
android:hint="@string/year"
android:inputType="text|number"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="?attr/title_text_color" />
</LinearLayout>
<LinearLayout
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="64dp"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="sans-serif"
android:singleLine="true"
android:text="@string/track"
android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
android:layout_height="wrap_content"
>
<com.kabouzeid.gramophone.views.DynamicEditText
android:id="@+id/track_number"
@ -179,13 +159,12 @@
android:hint="@string/track_hint"
android:inputType="text|number"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="?attr/title_text_color" />
</LinearLayout>
</android.support.design.widget.TextInputLayout>
</LinearLayout>
</RelativeLayout>

25
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"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="72dp"
android:background="?rect_selector">
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"
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">
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"
@ -58,7 +58,8 @@
style="@style/OverFlowButton"
android:layout_gravity="center_vertical"
android:layout_marginLeft="2dp"
android:layout_marginRight="2dp" />
android:layout_marginRight="2dp"
tools:ignore="ContentDescription" />
</LinearLayout>
<View

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

@ -11,7 +11,7 @@
android:descendantFocusability="blocksDescendants"
android:orientation="horizontal"
android:paddingLeft="16dp"
android:paddingRight="16dp">
android:paddingStart="16dp">
<com.kabouzeid.gramophone.views.WidthFitSquareImageView
android:id="@+id/album_art"