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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Karim Abou Zeid 2015-04-17 01:39:47 +02:00
commit 7abd29fdac
16 changed files with 204 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -33,7 +33,7 @@
android:paddingRight="16dp"
android:paddingTop="8dp">
<EditText
<com.kabouzeid.gramophone.views.DynamicEditText
android:id="@+id/album_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -69,7 +69,7 @@
android:text="@string/album_artist"
android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
<EditText
<com.kabouzeid.gramophone.views.DynamicEditText
android:id="@+id/album_artist"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -80,6 +80,7 @@
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="?attr/title_text_color" />
</LinearLayout>
<LinearLayout
@ -95,7 +96,7 @@
android:text="@string/genre"
android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
<EditText
<com.kabouzeid.gramophone.views.DynamicEditText
android:id="@+id/genre"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -106,6 +107,7 @@
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="?attr/title_text_color" />
</LinearLayout>
<LinearLayout
@ -121,7 +123,7 @@
android:text="@string/year"
android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
<EditText
<com.kabouzeid.gramophone.views.DynamicEditText
android:id="@+id/year"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -133,6 +135,7 @@
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="?attr/title_text_color" />
</LinearLayout>
</LinearLayout>
@ -140,13 +143,12 @@
</RelativeLayout>
</com.github.ksoichiro.android.observablescrollview.ObservableScrollView>
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
style="@style/Toolbar"
android:gravity="start|left|top"
android:gravity="start|left"
android:background="#00000000"
tools:ignore="RtlHardcoded" />

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

@ -33,7 +33,7 @@
android:paddingRight="16dp"
android:paddingTop="8dp">
<EditText
<com.kabouzeid.gramophone.views.DynamicEditText
android:id="@+id/title1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -46,7 +46,7 @@
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/white" />
<EditText
<com.kabouzeid.gramophone.views.DynamicEditText
android:id="@+id/title2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -82,7 +82,7 @@
android:text="@string/artist"
android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
<EditText
<com.kabouzeid.gramophone.views.DynamicEditText
android:id="@+id/artist"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -108,7 +108,7 @@
android:text="@string/genre"
android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
<EditText
<com.kabouzeid.gramophone.views.DynamicEditText
android:id="@+id/genre"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -134,7 +134,7 @@
android:text="@string/year"
android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
<EditText
<com.kabouzeid.gramophone.views.DynamicEditText
android:id="@+id/year"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -161,7 +161,7 @@
android:text="@string/track"
android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
<EditText
<com.kabouzeid.gramophone.views.DynamicEditText
android:id="@+id/track_number"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -186,7 +186,7 @@
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
style="@style/Toolbar"
android:layout_gravity="start|left|top"
android:layout_gravity="start|left"
android:background="#00000000"
tools:ignore="RtlHardcoded" />

8
app/src/main/res/values/strings.xml
View file

@ -97,5 +97,13 @@
<string name="accent_color">Accent Color</string>
<string name="primary_color_desc">The primary theme color, defaults to indigo.</string>
<string name="accent_color_desc">The accent theme color, defaults to pink.</string>
<string name="update_image">Update Image</string>
<string-array name="update_albumcover_options">
<item>Download from LastFM</item>
<item>Pick from Local Storage</item>
<item>Web Search</item>
<item>Delete</item>
</string-array>
</resources>