diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2015-01-15 09:52:22 -0800 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2015-01-15 09:52:22 -0800 |
| commit | fcc47d9aaf6694fa4e3a489d459c7f24a1580cdc (patch) | |
| tree | a5fbeedd38dc03ad385d2553dcbd8a8ffcdfc83d /res | |
| parent | f3b12c20a9257f9a8a2f167161b23f08f933410b (diff) | |
| parent | 719811985eee20c0f98f4740347e8e66b490a4f9 (diff) | |
| download | dsub-fcc47d9aaf6694fa4e3a489d459c7f24a1580cdc.tar.gz dsub-fcc47d9aaf6694fa4e3a489d459c7f24a1580cdc.tar.bz2 dsub-fcc47d9aaf6694fa4e3a489d459c7f24a1580cdc.zip | |
Merge branch 'master' into DLNA
Conflicts:
.gitignore
AndroidManifest.xml
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/album_list_item.xml | 3 | ||||
| -rw-r--r-- | res/layout/basic_list_item.xml | 3 | ||||
| -rw-r--r-- | res/layout/complex_list_item.xml | 3 | ||||
| -rw-r--r-- | res/layout/grid_view.xml | 2 | ||||
| -rw-r--r-- | res/layout/select_album_header.xml | 1 | ||||
| -rw-r--r-- | res/layout/song_list_item.xml | 3 | ||||
| -rw-r--r-- | res/layout/user_list_item.xml | 3 | ||||
| -rw-r--r-- | res/menu/select_album.xml | 4 | ||||
| -rw-r--r-- | res/menu/similar_artists.xml | 8 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | res/values/styles.xml | 4 |
11 files changed, 25 insertions, 11 deletions
diff --git a/res/layout/album_list_item.xml b/res/layout/album_list_item.xml index f0d6eb97..202843b6 100644 --- a/res/layout/album_list_item.xml +++ b/res/layout/album_list_item.xml @@ -70,6 +70,5 @@ android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_gravity="right|center_vertical"
- android:paddingRight="10dip"
- style="@style/BasicButton"/>
+ style="@style/MoreButton"/>
</LinearLayout>
diff --git a/res/layout/basic_list_item.xml b/res/layout/basic_list_item.xml index 84526324..f40aef2e 100644 --- a/res/layout/basic_list_item.xml +++ b/res/layout/basic_list_item.xml @@ -33,6 +33,5 @@ android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_gravity="right|center_vertical"
- android:paddingRight="10dip"
- style="@style/BasicButton"/>
+ style="@style/MoreButton"/>
</LinearLayout>
\ No newline at end of file diff --git a/res/layout/complex_list_item.xml b/res/layout/complex_list_item.xml index 421295f2..a36cb2f6 100644 --- a/res/layout/complex_list_item.xml +++ b/res/layout/complex_list_item.xml @@ -45,6 +45,5 @@ android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_gravity="right|center_vertical"
- android:paddingRight="10dip"
- style="@style/BasicButton"/>
+ style="@style/MoreButton"/>
</LinearLayout>
\ No newline at end of file diff --git a/res/layout/grid_view.xml b/res/layout/grid_view.xml index 40674c8d..7690d975 100644 --- a/res/layout/grid_view.xml +++ b/res/layout/grid_view.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?>
-<GridView xmlns:android="http://schemas.android.com/apk/res/android"
+<github.daneren2005.dsub.view.HeaderGridView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/gridview"
android:layout_width="fill_parent"
android:layout_height="0dip"
diff --git a/res/layout/select_album_header.xml b/res/layout/select_album_header.xml index 8b13ee68..abc16e58 100644 --- a/res/layout/select_album_header.xml +++ b/res/layout/select_album_header.xml @@ -15,6 +15,7 @@ android:contentDescription="@null"/> <LinearLayout + android:id="@+id/select_album_text_layout" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_toRightOf="@+id/select_album_art" diff --git a/res/layout/song_list_item.xml b/res/layout/song_list_item.xml index 1ea118ad..67d460f1 100644 --- a/res/layout/song_list_item.xml +++ b/res/layout/song_list_item.xml @@ -122,6 +122,5 @@ android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_gravity="right|center_vertical"
- android:paddingRight="10dip"
- style="@style/BasicButton"/>
+ style="@style/MoreButton"/>
</LinearLayout>
diff --git a/res/layout/user_list_item.xml b/res/layout/user_list_item.xml index c4092894..ac408295 100644 --- a/res/layout/user_list_item.xml +++ b/res/layout/user_list_item.xml @@ -40,6 +40,5 @@ android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_gravity="right|center_vertical"
- android:paddingRight="10dip"
- style="@style/BasicButton"/>
+ style="@style/MoreButton"/>
</LinearLayout>
\ No newline at end of file diff --git a/res/menu/select_album.xml b/res/menu/select_album.xml index fa887c28..39eb2206 100644 --- a/res/menu/select_album.xml +++ b/res/menu/select_album.xml @@ -18,6 +18,10 @@ android:title="@string/menu.top_tracks"/> <item + android:id="@+id/menu_similar_artists" + android:title="@string/menu.similar_artists"/> + + <item android:id="@+id/menu_show_all" android:title="@string/menu.show_all"/> diff --git a/res/menu/similar_artists.xml b/res/menu/similar_artists.xml new file mode 100644 index 00000000..bffa1837 --- /dev/null +++ b/res/menu/similar_artists.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:compat="http://schemas.android.com/apk/res-auto"> + + <item + android:id="@+id/menu_show_missing" + android:title="@string/menu.show_missing"/> +</menu>
\ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 3bcdec17..314fc9bf 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -104,6 +104,8 @@ <string name="menu.rescan">Rescan Server</string>
<string name="menu.rate">Set Rating</string>
<string name="menu.top_tracks">Last.FM Top Tracks</string>
+ <string name="menu.similar_artists">Similar Artists</string>
+ <string name="menu.show_missing">Show missing</string>
<string name="playlist.label">Playlists</string>
<string name="playlist.update_info">Update Information</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml index e32811fa..43271afd 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -4,6 +4,10 @@ <item name="android:background">@drawable/abc_item_background_holo_light</item> </style> + <style name="MoreButton" parent="BasicButton"> + <item name="android:paddingRight">14dip</item> + </style> + <style name="PlaybackControl" parent="@style/BasicButton"> <item name="android:scaleType">fitCenter</item> <item name="android:padding">6dip</item> |