diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2013-11-08 19:10:40 -0800 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2013-11-08 19:10:40 -0800 |
| commit | b7a29c6058b9e0f1ddb493f55e933062b913484e (patch) | |
| tree | 7e0992e615c6d56b9a4d44e46ab8c9ec3707dbfe /res | |
| parent | 423b719ad2fde340ed013abfbca57f29d0b78f81 (diff) | |
| download | dsub-b7a29c6058b9e0f1ddb493f55e933062b913484e.tar.gz dsub-b7a29c6058b9e0f1ddb493f55e933062b913484e.tar.bz2 dsub-b7a29c6058b9e0f1ddb493f55e933062b913484e.zip | |
Removed some duplicate layouts
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/abstract_list_fragment.xml (renamed from res/layout/select_podcasts.xml) | 58 | ||||
| -rw-r--r-- | res/layout/basic_list_item.xml (renamed from res/layout/artist_list_item.xml) | 74 | ||||
| -rw-r--r-- | res/layout/play_video.xml | 11 | ||||
| -rw-r--r-- | res/layout/playlist_list_item.xml | 26 | ||||
| -rw-r--r-- | res/layout/search.xml | 22 | ||||
| -rw-r--r-- | res/layout/select_artist.xml | 22 | ||||
| -rw-r--r-- | res/layout/select_genres.xml | 30 | ||||
| -rw-r--r-- | res/layout/select_playlist.xml | 30 | ||||
| -rw-r--r-- | res/values/strings.xml | 5 |
9 files changed, 67 insertions, 211 deletions
diff --git a/res/layout/select_podcasts.xml b/res/layout/abstract_list_fragment.xml index ea4fb07c..bfce4792 100644 --- a/res/layout/select_podcasts.xml +++ b/res/layout/abstract_list_fragment.xml @@ -1,29 +1,29 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/select_podcasts_layout" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" > - - <View - android:layout_width="fill_parent" - android:layout_height="1px" - android:background="@color/dividerColor"/> - - <include layout="@layout/tab_progress" /> - - <TextView - android:id="@+id/select_podcasts_empty" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:padding="10dip" - android:text="@string/select_podcasts.empty" - android:visibility="gone" /> - - <ListView - android:id="@+id/select_podcasts_list" - android:layout_width="fill_parent" - android:layout_height="0dip" - android:layout_weight="1.0" - android:fastScrollEnabled="true"/> -</LinearLayout> +<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/fragment_list_layout"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:orientation="vertical" >
+
+ <View
+ android:layout_width="fill_parent"
+ android:layout_height="1px"
+ android:background="@color/dividerColor"/>
+
+ <include layout="@layout/tab_progress" />
+
+ <TextView
+ android:id="@+id/fragment_list_empty"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:padding="10dip"
+ android:text="@string/common.empty"
+ android:visibility="gone" />
+
+ <ListView
+ android:id="@+id/fragment_list"
+ android:layout_width="fill_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1.0"
+ android:fastScrollEnabled="true"/>
+</LinearLayout>
diff --git a/res/layout/artist_list_item.xml b/res/layout/basic_list_item.xml index 64512e99..a9d77abb 100644 --- a/res/layout/artist_list_item.xml +++ b/res/layout/basic_list_item.xml @@ -1,38 +1,38 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="horizontal" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:background="@android:color/transparent"> - - <TextView - android:id="@+id/artist_name" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:textAppearance="?android:attr/textAppearanceMedium" - android:gravity="left|center_vertical" - android:paddingLeft="6dip" - android:paddingRight="6dip" - android:minHeight="50dip" - android:background="@android:color/transparent"/> - - <ImageButton - android:id="@+id/artist_star" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right|center_vertical" - android:src="@drawable/ic_stat_star" - android:background="@android:color/transparent" - android:focusable="false" - android:visibility="gone"/> - - <ImageView - android:id="@+id/artist_more" - android:src="?attr/download_none" - android:layout_width="wrap_content" - android:layout_height="fill_parent" - android:layout_gravity="right|center_vertical" - android:paddingRight="6dip" - android:background="@drawable/menubar_button"/> +<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="horizontal"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:background="@android:color/transparent">
+
+ <TextView
+ android:id="@+id/item_name"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:gravity="left|center_vertical"
+ android:paddingLeft="6dip"
+ android:paddingRight="6dip"
+ android:minHeight="50dip"
+ android:background="@android:color/transparent"/>
+
+ <ImageButton
+ android:id="@+id/item_star"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="right|center_vertical"
+ android:src="@drawable/ic_stat_star"
+ android:background="@android:color/transparent"
+ android:focusable="false"
+ android:visibility="gone"/>
+
+ <ImageView
+ android:id="@+id/item_more"
+ android:src="?attr/download_none"
+ android:layout_width="wrap_content"
+ android:layout_height="fill_parent"
+ android:layout_gravity="right|center_vertical"
+ android:paddingRight="6dip"
+ android:background="@drawable/menubar_button"/>
</LinearLayout>
\ No newline at end of file diff --git a/res/layout/play_video.xml b/res/layout/play_video.xml deleted file mode 100644 index 6a9f3f74..00000000 --- a/res/layout/play_video.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> - - <WebView - android:id="@+id/play_video_contents" - android:layout_width="fill_parent" - android:layout_height="fill_parent"/> - -</FrameLayout> diff --git a/res/layout/playlist_list_item.xml b/res/layout/playlist_list_item.xml deleted file mode 100644 index 80c350f6..00000000 --- a/res/layout/playlist_list_item.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="horizontal" - android:layout_width="fill_parent" - android:layout_height="wrap_content"> - - <TextView - android:id="@+id/playlist_name" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:textAppearance="?android:attr/textAppearanceMedium" - android:gravity="left|center_vertical" - android:paddingLeft="6dip" - android:paddingRight="6dip" - android:minHeight="50dip"/> - - <ImageView - android:id="@+id/playlist_more" - android:src="?attr/download_none" - android:layout_width="wrap_content" - android:layout_height="fill_parent" - android:layout_gravity="right|center_vertical" - android:paddingRight="6dip" - android:background="@drawable/menubar_button"/> -</LinearLayout>
\ No newline at end of file diff --git a/res/layout/search.xml b/res/layout/search.xml deleted file mode 100644 index d1c5c84c..00000000 --- a/res/layout/search.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/search_layout"
- android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
-
- <View
- android:layout_width="fill_parent"
- android:layout_height="1px"
- android:background="@color/dividerColor"/>
-
- <include layout="@layout/tab_progress"/>
-
- <ListView
- android:id="@+id/search_list"
- android:layout_width="fill_parent"
- android:layout_height="0dip"
- android:layout_weight="1.0"
- android:fastScrollEnabled="true"
- />
-</LinearLayout>
\ No newline at end of file diff --git a/res/layout/select_artist.xml b/res/layout/select_artist.xml deleted file mode 100644 index fef51d3c..00000000 --- a/res/layout/select_artist.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/select_artist_layout"
- android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
-
- <View
- android:layout_width="fill_parent"
- android:layout_height="1px"
- android:background="@color/dividerColor"/>
-
- <include layout="@layout/tab_progress"/>
-
- <ListView android:id="@+id/select_artist_list"
- android:textFilterEnabled="true"
- android:fastScrollEnabled="true"
- android:layout_width="fill_parent"
- android:layout_height="0dip"
- android:layout_weight="1.0"/>
-</LinearLayout>
-
diff --git a/res/layout/select_genres.xml b/res/layout/select_genres.xml deleted file mode 100644 index 95f9d415..00000000 --- a/res/layout/select_genres.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/select_genre_layout" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" > - - <include layout="@layout/tab_progress" /> - - <TextView - android:id="@+id/select_genre_empty" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:padding="10dip" - android:text="@string/select_genre.empty" - android:visibility="gone" /> - - <ListView - android:id="@+id/select_genre_list" - android:layout_width="fill_parent" - android:layout_height="0dip" - android:layout_weight="1.0" - android:textFilterEnabled="true" - android:fastScrollEnabled="true"/> - </LinearLayout> -</FrameLayout>
\ No newline at end of file diff --git a/res/layout/select_playlist.xml b/res/layout/select_playlist.xml deleted file mode 100644 index e18283bd..00000000 --- a/res/layout/select_playlist.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/select_playlist_layout"
- android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
-
- <View
- android:layout_width="fill_parent"
- android:layout_height="1px"
- android:background="@color/dividerColor"/>
-
- <include layout="@layout/tab_progress"/>
-
- <TextView
- android:id="@+id/select_playlist_empty"
- android:text="@string/select_playlist.empty"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:padding="10dip"
- android:visibility="gone"/>
-
- <ListView android:id="@+id/select_playlist_list"
- android:layout_width="fill_parent"
- android:layout_height="0dip"
- android:layout_weight="1.0"
- android:fastScrollEnabled="true"/>
-
-</LinearLayout>
-
diff --git a/res/values/strings.xml b/res/values/strings.xml index 863fe2ec..d162cd81 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -22,6 +22,7 @@ <string name="common.stream_external">Stream Video</string>
<string name="common.confirm">Confirm</string>
<string name="common.confirm_message">Do you want to %1$s %2$s?</string>
+ <string name="common.empty">None found</string>
<string name="button_bar.home">Home</string>
<string name="button_bar.browse">Library</string>
@@ -130,10 +131,8 @@ <string name="offline.sync_partial">Successfully synced %1$d of %2$d songs</string>
<string name="offline.sync_error">Failed to sync songs</string>
- <string name="select_genre.empty">No genres found</string>
<string name="select_genre.blank">Blank</string>
- <string name="select_podcasts.empty">No podcasts found</string>
<string name="select_podcasts.error">This podcast had an error while downloading on the server. The server must download it first.</string>
<string name="select_podcasts.skipped">This podcast has not been downloaded on the server. The server must download it first.</string>
<string name="select_podcasts.initializing">This podcast channel is being initialized on the server. Please reload after a moment.</string>
@@ -147,8 +146,6 @@ <string name="select_podcasts.created_error">Failed to add podcast</string>
<string name="select_podcasts.invalid_podcast_channel">Invalid podcast channel: %s</string>
- <string name="select_playlist.empty">No saved playlists on server</string>
-
<string name="download.empty">Playlist is empty</string>
<string name="download.shuffle_loading">Shuffle list is loading...</string>
<string name="download.playerstate_downloading">Downloading - %s</string>
|