diff options
| author | daneren2005 <daneren2005@gmail.com> | 2012-09-22 09:17:03 -0700 |
|---|---|---|
| committer | daneren2005 <daneren2005@gmail.com> | 2012-09-22 09:17:03 -0700 |
| commit | df6d8f15ebe74709d5cbc4feb54e04395c5f48b8 (patch) | |
| tree | c6458c22b1a95766f90c23cc99ef87caca034c90 /subsonic-android/res | |
| parent | 1f330ce8e20e55937a012176d748867fd7e36320 (diff) | |
| parent | ced61cfa8b3de426c16596208479c97df8485a09 (diff) | |
| download | dsub-df6d8f15ebe74709d5cbc4feb54e04395c5f48b8.tar.gz dsub-df6d8f15ebe74709d5cbc4feb54e04395c5f48b8.tar.bz2 dsub-df6d8f15ebe74709d5cbc4feb54e04395c5f48b8.zip | |
Merge pull request #23 from daneren2005/ICS_UI
Ics ui
Diffstat (limited to 'subsonic-android/res')
71 files changed, 261 insertions, 305 deletions
diff --git a/subsonic-android/res/drawable-hdpi-v4/action_browse.png b/subsonic-android/res/drawable-hdpi-v4/action_browse.png Binary files differnew file mode 100644 index 00000000..54296909 --- /dev/null +++ b/subsonic-android/res/drawable-hdpi-v4/action_browse.png diff --git a/subsonic-android/res/drawable-hdpi-v4/action_compass.png b/subsonic-android/res/drawable-hdpi-v4/action_compass.png Binary files differnew file mode 100644 index 00000000..39760f89 --- /dev/null +++ b/subsonic-android/res/drawable-hdpi-v4/action_compass.png diff --git a/subsonic-android/res/drawable-hdpi-v4/action_exit.png b/subsonic-android/res/drawable-hdpi-v4/action_exit.png Binary files differnew file mode 100644 index 00000000..09e18dee --- /dev/null +++ b/subsonic-android/res/drawable-hdpi-v4/action_exit.png diff --git a/subsonic-android/res/drawable-hdpi-v4/action_moreoverflow.png b/subsonic-android/res/drawable-hdpi-v4/action_moreoverflow.png Binary files differnew file mode 100644 index 00000000..cb6ebdaf --- /dev/null +++ b/subsonic-android/res/drawable-hdpi-v4/action_moreoverflow.png diff --git a/subsonic-android/res/drawable-hdpi-v4/action_offline.png b/subsonic-android/res/drawable-hdpi-v4/action_offline.png Binary files differnew file mode 100644 index 00000000..a85f0931 --- /dev/null +++ b/subsonic-android/res/drawable-hdpi-v4/action_offline.png diff --git a/subsonic-android/res/drawable-hdpi-v4/action_remove_all.png b/subsonic-android/res/drawable-hdpi-v4/action_remove_all.png Binary files differnew file mode 100644 index 00000000..97b88837 --- /dev/null +++ b/subsonic-android/res/drawable-hdpi-v4/action_remove_all.png diff --git a/subsonic-android/res/drawable-hdpi-v4/action_save.png b/subsonic-android/res/drawable-hdpi-v4/action_save.png Binary files differnew file mode 100644 index 00000000..7bda97d6 --- /dev/null +++ b/subsonic-android/res/drawable-hdpi-v4/action_save.png diff --git a/subsonic-android/res/drawable-hdpi-v4/action_screen_on_off.png b/subsonic-android/res/drawable-hdpi-v4/action_screen_on_off.png Binary files differnew file mode 100644 index 00000000..c7168563 --- /dev/null +++ b/subsonic-android/res/drawable-hdpi-v4/action_screen_on_off.png diff --git a/subsonic-android/res/drawable-hdpi-v4/action_select.png b/subsonic-android/res/drawable-hdpi-v4/action_select.png Binary files differnew file mode 100644 index 00000000..e9e83e3d --- /dev/null +++ b/subsonic-android/res/drawable-hdpi-v4/action_select.png diff --git a/subsonic-android/res/drawable-hdpi-v4/action_share.png b/subsonic-android/res/drawable-hdpi-v4/action_share.png Binary files differnew file mode 100644 index 00000000..28376157 --- /dev/null +++ b/subsonic-android/res/drawable-hdpi-v4/action_share.png diff --git a/subsonic-android/res/drawable-hdpi-v4/btn_check_buttonless_off.png b/subsonic-android/res/drawable-hdpi-v4/btn_check_buttonless_off.png Binary files differnew file mode 100644 index 00000000..d705b420 --- /dev/null +++ b/subsonic-android/res/drawable-hdpi-v4/btn_check_buttonless_off.png diff --git a/subsonic-android/res/drawable-hdpi-v4/btn_check_buttonless_on.png b/subsonic-android/res/drawable-hdpi-v4/btn_check_buttonless_on.png Binary files differnew file mode 100644 index 00000000..a2612d7d --- /dev/null +++ b/subsonic-android/res/drawable-hdpi-v4/btn_check_buttonless_on.png diff --git a/subsonic-android/res/drawable-hdpi-v4/ic_menu_exit.png b/subsonic-android/res/drawable-hdpi-v4/ic_menu_exit.png Binary files differdeleted file mode 100644 index 28cad85e..00000000 --- a/subsonic-android/res/drawable-hdpi-v4/ic_menu_exit.png +++ /dev/null diff --git a/subsonic-android/res/drawable-hdpi-v4/ic_menu_help.png b/subsonic-android/res/drawable-hdpi-v4/ic_menu_help.png Binary files differdeleted file mode 100644 index 7e14e95d..00000000 --- a/subsonic-android/res/drawable-hdpi-v4/ic_menu_help.png +++ /dev/null diff --git a/subsonic-android/res/drawable-hdpi-v4/ic_menu_remove_all.png b/subsonic-android/res/drawable-hdpi-v4/ic_menu_remove_all.png Binary files differdeleted file mode 100644 index 112196be..00000000 --- a/subsonic-android/res/drawable-hdpi-v4/ic_menu_remove_all.png +++ /dev/null diff --git a/subsonic-android/res/drawable-hdpi-v4/ic_menu_save.png b/subsonic-android/res/drawable-hdpi-v4/ic_menu_save.png Binary files differdeleted file mode 100644 index 34f6e01a..00000000 --- a/subsonic-android/res/drawable-hdpi-v4/ic_menu_save.png +++ /dev/null diff --git a/subsonic-android/res/drawable-hdpi-v4/ic_menu_screen_on_off.png b/subsonic-android/res/drawable-hdpi-v4/ic_menu_screen_on_off.png Binary files differdeleted file mode 100644 index db9235fc..00000000 --- a/subsonic-android/res/drawable-hdpi-v4/ic_menu_screen_on_off.png +++ /dev/null diff --git a/subsonic-android/res/drawable-hdpi-v4/ic_menu_settings.png b/subsonic-android/res/drawable-hdpi-v4/ic_menu_settings.png Binary files differdeleted file mode 100644 index 2ffcec52..00000000 --- a/subsonic-android/res/drawable-hdpi-v4/ic_menu_settings.png +++ /dev/null diff --git a/subsonic-android/res/drawable-hdpi-v4/list_item_artist.9.png b/subsonic-android/res/drawable-hdpi-v4/list_item_artist.9.png Binary files differdeleted file mode 100644 index 7bddbcef..00000000 --- a/subsonic-android/res/drawable-hdpi-v4/list_item_artist.9.png +++ /dev/null diff --git a/subsonic-android/res/drawable-hdpi-v4/list_item_more.9.png b/subsonic-android/res/drawable-hdpi-v4/list_item_more.9.png Binary files differnew file mode 100644 index 00000000..79ca860d --- /dev/null +++ b/subsonic-android/res/drawable-hdpi-v4/list_item_more.9.png diff --git a/subsonic-android/res/drawable-hdpi-v4/list_item_playlist.9.png b/subsonic-android/res/drawable-hdpi-v4/list_item_playlist.9.png Binary files differdeleted file mode 100644 index 7bddbcef..00000000 --- a/subsonic-android/res/drawable-hdpi-v4/list_item_playlist.9.png +++ /dev/null diff --git a/subsonic-android/res/drawable-hdpi-v4/main_exit.png b/subsonic-android/res/drawable-hdpi-v4/main_exit.png Binary files differdeleted file mode 100644 index 9a8b2a5e..00000000 --- a/subsonic-android/res/drawable-hdpi-v4/main_exit.png +++ /dev/null diff --git a/subsonic-android/res/drawable-hdpi-v4/main_help.png b/subsonic-android/res/drawable-hdpi-v4/main_help.png Binary files differdeleted file mode 100644 index cb063b00..00000000 --- a/subsonic-android/res/drawable-hdpi-v4/main_help.png +++ /dev/null diff --git a/subsonic-android/res/drawable-hdpi-v4/main_select_server.png b/subsonic-android/res/drawable-hdpi-v4/main_select_server.png Binary files differindex ccecc1d9..c2cefead 100644 --- a/subsonic-android/res/drawable-hdpi-v4/main_select_server.png +++ b/subsonic-android/res/drawable-hdpi-v4/main_select_server.png diff --git a/subsonic-android/res/drawable-hdpi-v4/main_settings.png b/subsonic-android/res/drawable-hdpi-v4/main_settings.png Binary files differdeleted file mode 100644 index 81bca4ae..00000000 --- a/subsonic-android/res/drawable-hdpi-v4/main_settings.png +++ /dev/null diff --git a/subsonic-android/res/drawable-hdpi-v4/main_shuffle.png b/subsonic-android/res/drawable-hdpi-v4/main_shuffle.png Binary files differdeleted file mode 100644 index 22ee1d50..00000000 --- a/subsonic-android/res/drawable-hdpi-v4/main_shuffle.png +++ /dev/null diff --git a/subsonic-android/res/drawable-hdpi-v4/menu_browse.png b/subsonic-android/res/drawable-hdpi-v4/menu_browse.png Binary files differindex 70a59154..54296909 100644 --- a/subsonic-android/res/drawable-hdpi-v4/menu_browse.png +++ b/subsonic-android/res/drawable-hdpi-v4/menu_browse.png diff --git a/subsonic-android/res/drawable-hdpi-v4/menu_home.png b/subsonic-android/res/drawable-hdpi-v4/menu_home.png Binary files differindex 35cb52aa..3cec6246 100644 --- a/subsonic-android/res/drawable-hdpi-v4/menu_home.png +++ b/subsonic-android/res/drawable-hdpi-v4/menu_home.png diff --git a/subsonic-android/res/drawable-hdpi-v4/menu_now_playing.png b/subsonic-android/res/drawable-hdpi-v4/menu_now_playing.png Binary files differindex 10af07fe..6ce5629a 100644 --- a/subsonic-android/res/drawable-hdpi-v4/menu_now_playing.png +++ b/subsonic-android/res/drawable-hdpi-v4/menu_now_playing.png diff --git a/subsonic-android/res/drawable-hdpi-v4/menu_playlists.png b/subsonic-android/res/drawable-hdpi-v4/menu_playlists.png Binary files differindex 59345d5b..e9e83e3d 100644 --- a/subsonic-android/res/drawable-hdpi-v4/menu_playlists.png +++ b/subsonic-android/res/drawable-hdpi-v4/menu_playlists.png diff --git a/subsonic-android/res/drawable-hdpi-v4/menu_search.png b/subsonic-android/res/drawable-hdpi-v4/menu_search.png Binary files differdeleted file mode 100644 index f78234e4..00000000 --- a/subsonic-android/res/drawable-hdpi-v4/menu_search.png +++ /dev/null diff --git a/subsonic-android/res/drawable-hdpi-v4/menubar_button_pressed.9.png b/subsonic-android/res/drawable-hdpi-v4/menubar_button_pressed.9.png Binary files differindex 4dff0907..e4b33935 100644 --- a/subsonic-android/res/drawable-hdpi-v4/menubar_button_pressed.9.png +++ b/subsonic-android/res/drawable-hdpi-v4/menubar_button_pressed.9.png diff --git a/subsonic-android/res/drawable-hdpi-v4/select_artist_folder.png b/subsonic-android/res/drawable-hdpi-v4/select_artist_folder.png Binary files differdeleted file mode 100644 index ccecc1d9..00000000 --- a/subsonic-android/res/drawable-hdpi-v4/select_artist_folder.png +++ /dev/null diff --git a/subsonic-android/res/drawable/action_help.png b/subsonic-android/res/drawable/action_help.png Binary files differdeleted file mode 100644 index aaf8304c..00000000 --- a/subsonic-android/res/drawable/action_help.png +++ /dev/null diff --git a/subsonic-android/res/drawable/action_play_all.png b/subsonic-android/res/drawable/action_play_all.png Binary files differdeleted file mode 100644 index 6ce5629a..00000000 --- a/subsonic-android/res/drawable/action_play_all.png +++ /dev/null diff --git a/subsonic-android/res/drawable/action_refresh.png b/subsonic-android/res/drawable/action_refresh.png Binary files differdeleted file mode 100644 index 9f30dc95..00000000 --- a/subsonic-android/res/drawable/action_refresh.png +++ /dev/null diff --git a/subsonic-android/res/drawable/action_search.png b/subsonic-android/res/drawable/action_search.png Binary files differdeleted file mode 100644 index 6bc3d426..00000000 --- a/subsonic-android/res/drawable/action_search.png +++ /dev/null diff --git a/subsonic-android/res/drawable/action_settings.png b/subsonic-android/res/drawable/action_settings.png Binary files differdeleted file mode 100644 index 1ab7722b..00000000 --- a/subsonic-android/res/drawable/action_settings.png +++ /dev/null diff --git a/subsonic-android/res/drawable/action_shuffle.png b/subsonic-android/res/drawable/action_shuffle.png Binary files differdeleted file mode 100644 index 0613965c..00000000 --- a/subsonic-android/res/drawable/action_shuffle.png +++ /dev/null diff --git a/subsonic-android/res/drawable/btn_check.xml b/subsonic-android/res/drawable/btn_check.xml new file mode 100644 index 00000000..f363a2d2 --- /dev/null +++ b/subsonic-android/res/drawable/btn_check.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2008 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + + <item android:state_checked="true" + android:drawable="@drawable/btn_check_buttonless_on" /> + + <item android:state_checked="false" + android:drawable="@drawable/btn_check_buttonless_off" /> + + <item + android:drawable="@drawable/btn_check_buttonless_off" /> + +</selector> diff --git a/subsonic-android/res/drawable/menu_browse.png b/subsonic-android/res/drawable/menu_browse.png Binary files differdeleted file mode 100644 index 3f1de60d..00000000 --- a/subsonic-android/res/drawable/menu_browse.png +++ /dev/null diff --git a/subsonic-android/res/drawable/menu_home.png b/subsonic-android/res/drawable/menu_home.png Binary files differdeleted file mode 100644 index 34943f66..00000000 --- a/subsonic-android/res/drawable/menu_home.png +++ /dev/null diff --git a/subsonic-android/res/drawable/menu_now_playing.png b/subsonic-android/res/drawable/menu_now_playing.png Binary files differdeleted file mode 100644 index 22f203a8..00000000 --- a/subsonic-android/res/drawable/menu_now_playing.png +++ /dev/null diff --git a/subsonic-android/res/drawable/menu_playlists.png b/subsonic-android/res/drawable/menu_playlists.png Binary files differdeleted file mode 100644 index c01733d9..00000000 --- a/subsonic-android/res/drawable/menu_playlists.png +++ /dev/null diff --git a/subsonic-android/res/drawable/menu_search.png b/subsonic-android/res/drawable/menu_search.png Binary files differdeleted file mode 100644 index 94446db9..00000000 --- a/subsonic-android/res/drawable/menu_search.png +++ /dev/null diff --git a/subsonic-android/res/drawable/menubar_button.xml b/subsonic-android/res/drawable/menubar_button.xml index 06c2c8e7..7a717780 100644 --- a/subsonic-android/res/drawable/menubar_button.xml +++ b/subsonic-android/res/drawable/menubar_button.xml @@ -2,7 +2,7 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_pressed="true" - android:drawable="@drawable/menubar_button_pressed"/> + android:drawable="@color/background_holo_light"/> <item android:state_enabled="true" android:drawable="@drawable/menubar_button_normal"/> diff --git a/subsonic-android/res/layout/action_bar.xml b/subsonic-android/res/layout/action_bar.xml deleted file mode 100644 index 2aaa4116..00000000 --- a/subsonic-android/res/layout/action_bar.xml +++ /dev/null @@ -1,97 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="45dp"
- android:background="@drawable/menubar_button_disabled">
-
- <ImageView
- android:id="@+id/actionbar_home_icon"
- android:src="@drawable/main_header_icon2"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:layout_alignParentTop="true"
- android:layout_alignParentLeft="true"
- android:layout_alignParentBottom="true"
- android:paddingLeft="4dip"
- android:paddingRight="4dip"
- android:paddingTop="2dip"
- android:paddingBottom="2dip"
- android:scaleType="centerInside"
- />
-
- <ImageButton
- android:id="@+id/action_button_4"
- android:src="@drawable/action_settings"
- android:layout_width="44dip"
- android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_alignParentTop="true"
- android:layout_alignParentBottom="true"
- android:scaleType="fitCenter"
- android:padding="5dp"
- android:background="@drawable/actionbar_button"
- />
-
- <ImageButton
- android:id="@+id/action_button_3"
- android:src="@drawable/action_help"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:layout_alignParentBottom="true"
- android:layout_toLeftOf="@id/action_button_4"
- android:scaleType="center"
- android:padding="5dp"
- android:background="@drawable/actionbar_button"
- />
-
- <ImageButton
- android:id="@+id/action_button_2"
- android:src="@drawable/action_search"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:layout_alignParentBottom="true"
- android:layout_toLeftOf="@id/action_button_3"
- android:scaleType="center"
- android:padding="5dp"
- android:background="@drawable/actionbar_button"
- />
-
- <ImageButton
- android:id="@+id/action_button_1"
- android:src="@drawable/action_shuffle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:layout_alignParentBottom="true"
- android:layout_toLeftOf="@id/action_button_2"
- android:scaleType="center"
- android:padding="5dp"
- android:background="@drawable/actionbar_button"
- />
-
- <TextView
- android:id="@+id/actionbar_title_text"
- android:text="Subsonic"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:layout_alignParentBottom="true"
- android:layout_toLeftOf="@id/action_button_1"
- android:layout_toRightOf="@id/actionbar_home_icon"
- android:gravity="center_vertical"
- android:textColor="#FFFFFF"
- android:textSize="18sp"
- android:textStyle="bold"
- android:shadowColor="#000000"
- android:shadowDx="1"
- android:shadowDy="1"
- android:shadowRadius="1"
- android:lineSpacingMultiplier="0.85"
- android:ellipsize="middle"
- android:inputType="none"
- />
-
-</RelativeLayout>
diff --git a/subsonic-android/res/layout/album_list_item.xml b/subsonic-android/res/layout/album_list_item.xml index 15d999c3..2e74390f 100644 --- a/subsonic-android/res/layout/album_list_item.xml +++ b/subsonic-android/res/layout/album_list_item.xml @@ -38,7 +38,7 @@ </LinearLayout>
<ImageView
- android:src="@drawable/list_item_artist"
+ android:src="@drawable/list_item_more"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right|center_vertical"
diff --git a/subsonic-android/res/layout/artist_list_item.xml b/subsonic-android/res/layout/artist_list_item.xml index 8aaa42d0..3c99ccbd 100644 --- a/subsonic-android/res/layout/artist_list_item.xml +++ b/subsonic-android/res/layout/artist_list_item.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1" - android:drawableRight="@drawable/list_item_artist" + android:drawableRight="@drawable/list_item_more" android:drawablePadding="6dip" android:layout_width="fill_parent" android:layout_height="wrap_content" diff --git a/subsonic-android/res/layout/button_bar.xml b/subsonic-android/res/layout/button_bar.xml index 1d576775..52c78ba1 100644 --- a/subsonic-android/res/layout/button_bar.xml +++ b/subsonic-android/res/layout/button_bar.xml @@ -6,47 +6,42 @@ android:layout_width="fill_parent"
android:layout_height="wrap_content">
- <View
- android:layout_width="fill_parent"
- android:layout_height="1px"
- android:background="@color/dividerColor"/>
-
<LinearLayout android:orientation="horizontal"
android:layout_width="fill_parent"
- android:layout_height="wrap_content"
+ android:layout_height="48dp"
android:gravity="center_horizontal">
<ImageButton android:id="@+id/button_bar_home"
android:src="@drawable/menu_home"
android:contentDescription="@string/button_bar.home"
android:background="@drawable/menubar_button"
+ android:layout_height="match_parent"
android:layout_weight="1"
- android:layout_width="0dp"
- android:layout_height="wrap_content"/>
+ android:layout_width="0dp"/>
<ImageButton android:id="@+id/button_bar_music"
android:src="@drawable/menu_browse"
android:contentDescription="@string/button_bar.browse"
android:background="@drawable/menubar_button"
+ android:layout_height="match_parent"
android:layout_weight="1"
- android:layout_width="0dp"
- android:layout_height="wrap_content"/>
+ android:layout_width="0dp"/>
<ImageButton android:id="@+id/button_bar_playlists"
android:src="@drawable/menu_playlists"
android:contentDescription="@string/button_bar.playlists"
android:background="@drawable/menubar_button"
+ android:layout_height="match_parent"
android:layout_weight="1"
- android:layout_width="0dp"
- android:layout_height="wrap_content"/>
+ android:layout_width="0dp"/>
<ImageButton android:id="@+id/button_bar_now_playing"
android:src="@drawable/menu_now_playing"
android:contentDescription="@string/button_bar.now_playing"
android:background="@drawable/menubar_button"
+ android:layout_height="match_parent"
android:layout_weight="1"
- android:layout_width="0dp"
- android:layout_height="wrap_content"/>
+ android:layout_width="0dp"/>
</LinearLayout>
</LinearLayout>
diff --git a/subsonic-android/res/layout/main.xml b/subsonic-android/res/layout/main.xml index e151f319..56b013fe 100644 --- a/subsonic-android/res/layout/main.xml +++ b/subsonic-android/res/layout/main.xml @@ -4,12 +4,6 @@ android:layout_width="fill_parent"
android:layout_height="fill_parent">
- <include
- layout="@layout/action_bar"
- android:layout_width="fill_parent"
- android:layout_height="45dp"
- />
-
<View
android:layout_width="fill_parent"
android:layout_height="1px"
diff --git a/subsonic-android/res/layout/main_buttons.xml b/subsonic-android/res/layout/main_buttons.xml index 969ad99e..655854be 100644 --- a/subsonic-android/res/layout/main_buttons.xml +++ b/subsonic-android/res/layout/main_buttons.xml @@ -48,16 +48,17 @@ android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="#EFEFEF"
- android:textStyle="bold"
- android:background="#A5A5A5"
+ android:textColor="@color/cyan"
android:gravity="center_vertical"
- android:paddingLeft="4dp"/>
+ android:paddingLeft="6dp"
+ android:textAllCaps="true"
+ android:textStyle="bold"
+ android:textSize="16sp"/>
<TextView
android:id="@+id/main_albums_newest"
android:text="@string/main.albums_newest"
- android:drawableRight="@drawable/list_item_artist"
+ android:drawableRight="@drawable/list_item_more"
android:drawablePadding="6dip"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@@ -69,7 +70,7 @@ <TextView
android:id="@+id/main_albums_recent"
android:text="@string/main.albums_recent"
- android:drawableRight="@drawable/list_item_artist"
+ android:drawableRight="@drawable/list_item_more"
android:drawablePadding="6dip"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@@ -81,7 +82,7 @@ <TextView
android:id="@+id/main_albums_frequent"
android:text="@string/main.albums_frequent"
- android:drawableRight="@drawable/list_item_artist"
+ android:drawableRight="@drawable/list_item_more"
android:drawablePadding="6dip"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@@ -93,7 +94,7 @@ <TextView
android:id="@+id/main_albums_highest"
android:text="@string/main.albums_highest"
- android:drawableRight="@drawable/list_item_artist"
+ android:drawableRight="@drawable/list_item_more"
android:drawablePadding="6dip"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@@ -105,7 +106,7 @@ <TextView
android:id="@+id/main_albums_random"
android:text="@string/main.albums_random"
- android:drawableRight="@drawable/list_item_artist"
+ android:drawableRight="@drawable/list_item_more"
android:drawablePadding="6dip"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
diff --git a/subsonic-android/res/layout/playlist_list_item.xml b/subsonic-android/res/layout/playlist_list_item.xml index 20706dc9..3c99ccbd 100644 --- a/subsonic-android/res/layout/playlist_list_item.xml +++ b/subsonic-android/res/layout/playlist_list_item.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1" - android:drawableRight="@drawable/list_item_playlist" + android:drawableRight="@drawable/list_item_more" android:drawablePadding="6dip" android:layout_width="fill_parent" android:layout_height="wrap_content" diff --git a/subsonic-android/res/layout/search.xml b/subsonic-android/res/layout/search.xml index f65bcb36..5f5c26e0 100644 --- a/subsonic-android/res/layout/search.xml +++ b/subsonic-android/res/layout/search.xml @@ -4,8 +4,6 @@ android:layout_width="fill_parent"
android:layout_height="fill_parent">
- <include layout="@layout/action_bar"/>
-
<View
android:layout_width="fill_parent"
android:layout_height="1px"
diff --git a/subsonic-android/res/layout/select_album.xml b/subsonic-android/res/layout/select_album.xml index 2c9a00aa..a5802246 100644 --- a/subsonic-android/res/layout/select_album.xml +++ b/subsonic-android/res/layout/select_album.xml @@ -4,8 +4,6 @@ android:layout_width="fill_parent"
android:layout_height="fill_parent">
- <include layout="@layout/action_bar"/>
-
<View
android:layout_width="fill_parent"
android:layout_height="1px"
@@ -28,93 +26,6 @@ android:layout_weight="1.0"
android:fastScrollEnabled="true"
/>
-
- <LinearLayout android:orientation="horizontal"
- android:layout_marginTop="6dp"
- android:layout_marginBottom="3dp"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content">
-
- <Button android:id="@+id/select_album_pin"
- android:text="@string/common.pin"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:layout_marginLeft="6dp"
- android:layout_marginRight="3dp"
- android:layout_weight="1"
- android:layout_width="0dp"
- android:layout_height="fill_parent"
- android:visibility="gone"/>
-
- <Button android:id="@+id/select_album_unpin"
- android:text="@string/common.unpin"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:layout_marginLeft="3dp"
- android:layout_marginRight="3dp"
- android:layout_weight="1"
- android:layout_width="0dp"
- android:layout_height="fill_parent"
- android:visibility="gone"/>
-
- <Button android:id="@+id/select_album_delete"
- android:text="@string/common.delete"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:layout_marginLeft="3dp"
- android:layout_marginRight="6dp"
- android:layout_weight="1"
- android:layout_width="0dp"
- android:layout_height="fill_parent"
- android:visibility="gone"/>
-
- </LinearLayout>
-
- <LinearLayout android:orientation="horizontal"
- android:layout_marginTop="6dp"
- android:layout_marginBottom="3dp"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content">
-
- <Button android:id="@+id/select_album_select"
- android:text="@string/select_album.select"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:visibility="gone"
- android:layout_marginLeft="6dp"
- android:layout_marginRight="3dp"
- android:layout_weight="1"
- android:layout_width="0dp"
- android:layout_height="fill_parent"/>
-
- <Button android:id="@+id/select_album_play_now"
- android:text="@string/common.play_now"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:visibility="gone"
- android:layout_marginLeft="3dp"
- android:layout_marginRight="3dp"
- android:layout_weight="1"
- android:layout_width="0dp"
- android:layout_height="fill_parent"/>
-
- <Button android:id="@+id/select_album_play_shuffled"
- android:text="@string/common.play_shuffled"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:visibility="gone"
- android:layout_marginLeft="3dp"
- android:layout_marginRight="3dp"
- android:layout_weight="1"
- android:layout_width="0dp"
- android:layout_height="fill_parent"/>
-
-
- <Button android:id="@+id/select_album_play_last"
- android:text="@string/common.play_last"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:visibility="gone"
- android:layout_marginLeft="3dp"
- android:layout_marginRight="6dp"
- android:layout_weight="1"
- android:layout_width="0dp"
- android:layout_height="fill_parent"/>
-
- </LinearLayout>
<include layout="@layout/button_bar"/>
diff --git a/subsonic-android/res/layout/select_artist.xml b/subsonic-android/res/layout/select_artist.xml index 7cf6fc77..bebfdec4 100644 --- a/subsonic-android/res/layout/select_artist.xml +++ b/subsonic-android/res/layout/select_artist.xml @@ -4,8 +4,6 @@ android:layout_width="fill_parent"
android:layout_height="fill_parent">
- <include layout="@layout/action_bar"/>
-
<View
android:layout_width="fill_parent"
android:layout_height="1px"
diff --git a/subsonic-android/res/layout/select_artist_header.xml b/subsonic-android/res/layout/select_artist_header.xml index 247eb806..50e10742 100644 --- a/subsonic-android/res/layout/select_artist_header.xml +++ b/subsonic-android/res/layout/select_artist_header.xml @@ -10,7 +10,7 @@ android:minHeight="?android:attr/listPreferredItemHeight">
<ImageView
- android:src="@drawable/select_artist_folder"
+ android:src="@drawable/main_select_server"
android:layout_gravity="center_vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
diff --git a/subsonic-android/res/layout/select_playlist.xml b/subsonic-android/res/layout/select_playlist.xml index c23e764b..2555687d 100644 --- a/subsonic-android/res/layout/select_playlist.xml +++ b/subsonic-android/res/layout/select_playlist.xml @@ -4,8 +4,6 @@ android:layout_width="fill_parent"
android:layout_height="fill_parent">
- <include layout="@layout/action_bar"/>
-
<View
android:layout_width="fill_parent"
android:layout_height="1px"
diff --git a/subsonic-android/res/layout/song_list_item.xml b/subsonic-android/res/layout/song_list_item.xml index 2163ef72..f8d518ad 100644 --- a/subsonic-android/res/layout/song_list_item.xml +++ b/subsonic-android/res/layout/song_list_item.xml @@ -9,7 +9,7 @@ android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:gravity="center_vertical"
- android:checkMark="?android:attr/textCheckMark"
+ android:checkMark="@drawable/btn_check"
android:paddingLeft="3dip"/>
<LinearLayout android:orientation="vertical"
diff --git a/subsonic-android/res/menu/main.xml b/subsonic-android/res/menu/main.xml index 27698f81..8edf5304 100644 --- a/subsonic-android/res/menu/main.xml +++ b/subsonic-android/res/menu/main.xml @@ -1,22 +1,30 @@ <?xml version="1.0" encoding="utf-8"?> <menu xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:id="@+id/menu_search" + android:icon="@drawable/action_search" + android:title="@string/menu.search" + android:showAsAction="always|withText"/> + + <item + android:id="@+id/menu_shuffle" + android:icon="@drawable/action_shuffle" + android:title="@string/menu.shuffle" + android:showAsAction="always|withText"/> - <item - android:id="@+id/menu_exit" - android:icon="@drawable/ic_menu_exit" - android:title="@string/menu.exit" - /> + <item + android:id="@+id/menu_help" + android:icon="@drawable/action_help" + android:title="@string/menu.help"/> - <item - android:id="@+id/menu_settings" - android:icon="@drawable/ic_menu_settings" - android:title="@string/menu.settings" - /> + <item + android:id="@+id/menu_settings" + android:icon="@drawable/action_settings" + android:title="@string/menu.settings"/> - <item - android:id="@+id/menu_help" - android:icon="@drawable/ic_menu_help" - android:title="@string/menu.help" - /> + <item + android:id="@+id/menu_exit" + android:icon="@drawable/action_exit" + android:title="@string/menu.exit"/> </menu> diff --git a/subsonic-android/res/menu/nowplaying.xml b/subsonic-android/res/menu/nowplaying.xml index 28bcb5ef..a880438e 100644 --- a/subsonic-android/res/menu/nowplaying.xml +++ b/subsonic-android/res/menu/nowplaying.xml @@ -3,25 +3,25 @@ <item android:id="@+id/menu_shuffle" - android:icon="@drawable/ic_menu_shuffle" + android:icon="@drawable/action_shuffle" android:title="@string/download.menu_shuffle" - /> + android:showAsAction="always|withText"/> + + <item + android:id="@+id/menu_remove_all" + android:icon="@drawable/action_remove_all" + android:title="@string/download.menu_remove_all" + android:showAsAction="always|withText"/> <item android:id="@+id/menu_save_playlist" - android:icon="@drawable/ic_menu_save" + android:icon="@drawable/action_save" android:title="@string/download.menu_save" - /> - - <item - android:id="@+id/menu_remove_all" - android:icon="@drawable/ic_menu_remove_all" - android:title="@string/download.menu_remove_all" - /> + android:showAsAction="ifRoom|withText"/> <item android:id="@+id/menu_screen_on_off" - android:icon="@drawable/ic_menu_screen_on_off" + android:icon="@drawable/action_screen_on_off" android:title="@string/download.menu_screen_on" - /> + android:showAsAction="ifRoom|withText"/> </menu> diff --git a/subsonic-android/res/menu/nowplaying_context.xml b/subsonic-android/res/menu/nowplaying_context.xml index 04e56e1a..eeb49a26 100644 --- a/subsonic-android/res/menu/nowplaying_context.xml +++ b/subsonic-android/res/menu/nowplaying_context.xml @@ -1,39 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <menu xmlns:android="http://schemas.android.com/apk/res/android"> - <item - android:id="@+id/menu_show_album" - android:title="@string/download.menu_show_album" - /> - - <item - android:id="@+id/menu_lyrics" - android:title="@string/download.menu_lyrics" - /> - - <item - android:id="@+id/menu_remove" - android:title="@string/download.menu_remove" - /> - <item - android:id="@+id/menu_delete" - android:title="@string/download.menu_delete" - /> + android:id="@+id/menu_show_album" + android:title="@string/download.menu_show_album"/> - <item - android:id="@+id/menu_remove_all" - android:title="@string/download.menu_remove_all" - /> + <item + android:id="@+id/menu_lyrics" + android:title="@string/download.menu_lyrics"/> - <item - android:id="@+id/menu_shuffle" - android:title="@string/download.menu_shuffle" - /> + <item + android:id="@+id/menu_remove" + android:title="@string/download.menu_remove"/> - <item - android:id="@+id/menu_save_playlist" - android:title="@string/download.menu_save" - /> - + <item + android:id="@+id/menu_delete" + android:title="@string/download.menu_delete"/> </menu> diff --git a/subsonic-android/res/menu/search.xml b/subsonic-android/res/menu/search.xml new file mode 100644 index 00000000..b9cdecac --- /dev/null +++ b/subsonic-android/res/menu/search.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:id="@+id/menu_search" + android:icon="@drawable/action_search" + android:title="@string/menu.search" + android:showAsAction="ifRoom|withText"/> + + <item + android:id="@+id/menu_help" + android:icon="@drawable/ic_menu_help" + android:title="@string/menu.help"/> + + <item + android:id="@+id/menu_settings" + android:icon="@drawable/ic_menu_settings" + android:title="@string/menu.settings"/> + + <item + android:id="@+id/menu_exit" + android:icon="@drawable/ic_menu_exit" + android:title="@string/menu.exit"/> + +</menu> diff --git a/subsonic-android/res/menu/select_album.xml b/subsonic-android/res/menu/select_album.xml new file mode 100644 index 00000000..0d7fed68 --- /dev/null +++ b/subsonic-android/res/menu/select_album.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:id="@+id/menu_play_now" + android:icon="@drawable/action_play_all" + android:title="@string/menu.play" + android:showAsAction="always|withText"/> + + <item + android:id="@+id/menu_refresh" + android:icon="@drawable/action_refresh" + android:title="@string/menu.refresh" + android:showAsAction="always|withText"/> + + <item + android:id="@+id/menu_shuffle" + android:icon="@drawable/action_shuffle" + android:title="@string/menu.shuffle" + android:showAsAction="ifRoom|withText"/> + + <item + android:id="@+id/menu_select" + android:icon="@drawable/action_select" + android:title="@string/menu.select" + android:showAsAction="ifRoom|withText"/> + + <item + android:id="@+id/menu_cache" + android:icon="@drawable/action_save" + android:title="@string/common.pin" + android:showAsAction="ifRoom|withText"/> + + <item + android:id="@+id/menu_delete" + android:icon="@drawable/action_remove_all" + android:title="@string/common.delete" + android:showAsAction="ifRoom|withText"/> + + <item + android:id="@+id/menu_play_last" + android:icon="@drawable/action_play_all" + android:title="@string/menu.play_last" + android:showAsAction="ifRoom|withText"/> +</menu> diff --git a/subsonic-android/res/menu/select_artist.xml b/subsonic-android/res/menu/select_artist.xml new file mode 100644 index 00000000..71672710 --- /dev/null +++ b/subsonic-android/res/menu/select_artist.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:id="@+id/menu_refresh" + android:icon="@drawable/action_refresh" + android:title="@string/menu.refresh" + android:showAsAction="always|withText"/> + + <item + android:id="@+id/menu_shuffle" + android:icon="@drawable/action_shuffle" + android:title="@string/menu.shuffle" + android:showAsAction="always|withText"/> + + <item + android:id="@+id/menu_help" + android:icon="@drawable/action_help" + android:title="@string/menu.help"/> + + <item + android:id="@+id/menu_settings" + android:icon="@drawable/action_settings" + android:title="@string/menu.settings"/> + + <item + android:id="@+id/menu_exit" + android:icon="@drawable/action_exit" + android:title="@string/menu.exit"/> +</menu> diff --git a/subsonic-android/res/menu/select_playlist.xml b/subsonic-android/res/menu/select_playlist.xml new file mode 100644 index 00000000..fb5e678b --- /dev/null +++ b/subsonic-android/res/menu/select_playlist.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:id="@+id/menu_refresh" + android:icon="@drawable/action_refresh" + android:title="@string/menu.refresh" + android:showAsAction="always|withText"/> + + <item + android:id="@+id/menu_help" + android:icon="@drawable/action_help" + android:title="@string/menu.help"/> + + <item + android:id="@+id/menu_settings" + android:icon="@drawable/action_settings" + android:title="@string/menu.settings"/> + + <item + android:id="@+id/menu_exit" + android:icon="@drawable/action_exit" + android:title="@string/menu.exit"/> +</menu> diff --git a/subsonic-android/res/values/arrays.xml b/subsonic-android/res/values/arrays.xml index 17ea4b6a..e9b66161 100644 --- a/subsonic-android/res/values/arrays.xml +++ b/subsonic-android/res/values/arrays.xml @@ -2,15 +2,17 @@ <resources> <string-array name="themeValues"> - <item>wheat</item> <item>light</item> <item>dark</item> + <item>light_fullscreen</item> + <item>dark_fullscreen</item> </string-array> <string-array name="themeNames"> - <item>@string/settings.theme_wheat</item> <item>@string/settings.theme_light</item> <item>@string/settings.theme_dark</item> + <item>@string/settings.theme_light_fullscreen</item> + <item>@string/settings.theme_dark_fullscreen</item> </string-array> <string-array name="preloadCountValues"> diff --git a/subsonic-android/res/values/colors.xml b/subsonic-android/res/values/colors.xml index 69ab22a1..841acdb8 100644 --- a/subsonic-android/res/values/colors.xml +++ b/subsonic-android/res/values/colors.xml @@ -6,10 +6,7 @@ <color name="appwidget_text">#FFFFFF</color> <color name="notificationArtist">#434343</color> <color name="notificationTitle">#000000</color> - - <color name="wheatBackground">#F1F0E6</color> - <color name="wheatForeground1">#494B26</color> - <color name="wheatForeground2">#830009</color> + <color name="background_holo_light">#ff33b5e5</color> <color name="ics_opaque">#8033b5e5</color> <color name="cyan">#ff0099cc</color> diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml index 7f9f6728..b183c95c 100644 --- a/subsonic-android/res/values/strings.xml +++ b/subsonic-android/res/values/strings.xml @@ -9,8 +9,7 @@ <string name="common.play_shuffled">Play shuffled</string>
<string name="common.play_next">Play next</string>
<string name="common.play_last">Play last</string>
- <string name="common.pin">Pin</string>
- <string name="common.unpin">Unpin</string>
+ <string name="common.pin">Cache</string>
<string name="common.delete">Delete</string>
<string name="button_bar.home">DSub home</string>
@@ -33,6 +32,12 @@ <string name="main.albums_highest">Top rated</string>
<string name="main.albums_random">Random</string>
+ <string name="menu.search">Search</string>
+ <string name="menu.shuffle">Shuffle</string>
+ <string name="menu.refresh">Refresh</string>
+ <string name="menu.select">Select All</string>
+ <string name="menu.play">Play</string>
+ <string name="menu.play_last">Play Last</string>
<string name="menu.exit">Exit</string>
<string name="menu.settings">Settings</string>
<string name="menu.help">Help</string>
@@ -143,6 +148,8 @@ <string name="settings.theme_wheat">Wheat</string>
<string name="settings.theme_light">Light</string>
<string name="settings.theme_dark">Dark</string>
+ <string name="settings.theme_light_fullscreen">Light Fullscreen</string>
+ <string name="settings.theme_dark_fullscreen">Dark Fullscreen</string>
<string name="settings.network_title">Network</string>
<string name="settings.max_bitrate_wifi">Max bitrate - Wi-Fi</string>
<string name="settings.max_bitrate_mobile">Max bitrate - Mobile</string>
diff --git a/subsonic-android/res/values/styles.xml b/subsonic-android/res/values/styles.xml index a970fe1b..383c9195 100644 --- a/subsonic-android/res/values/styles.xml +++ b/subsonic-android/res/values/styles.xml @@ -1,14 +1,30 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <style name="Wheat" parent="android:Theme.Light"> - <item name="android:windowBackground">@color/wheatBackground</item> - <item name="android:textColorPrimary">@color/wheatForeground1</item> - <item name="android:textColorSecondary">@color/wheatForeground2</item> - <item name="android:listViewStyle">@style/WheatListView</item> - </style> - - <style name="WheatListView" parent="android:style/Widget.ListView.White"> - <item name="android:cacheColorHint">@color/wheatBackground</item> - </style> - + <style name="Theme.DSub.Light" parent="Theme.Sherlock.Light"> + <item name="actionBarStyle">@style/Widget.DSub.ActionBarStyle.Light</item> + <item name="android:actionBarStyle">@style/Widget.DSub.ActionBarStyle.Light</item> + <item name="android:textColorSecondary">@color/cyan</item> + </style> + <style name="Theme.DSub.Dark" parent="Theme.Sherlock"> + <item name="actionBarStyle">@style/Widget.DSub.ActionBarStyle.Dark</item> + <item name="android:actionBarStyle">@style/Widget.DSub.ActionBarStyle.Dark</item> + <item name="android:textColorSecondary">@color/cyan</item> + </style> + + <style name="Theme.DSub.Light.Fullscreen" parent="Theme.DSub.Light"> + <item name="android:windowFullscreen">true</item> + </style> + <style name="Theme.DSub.Dark.Fullscreen" parent="Theme.DSub.Dark"> + <item name="android:windowFullscreen">true</item> + </style> + + <style name="Widget.DSub.ActionBarStyle.Light" parent="Widget.Sherlock.Light.ActionBar.Solid.Inverse"> + <item name="background">@drawable/menubar_button_normal</item> + <item name="android:background">@drawable/menubar_button_normal</item> + </style> + + <style name="Widget.DSub.ActionBarStyle.Dark" parent="Widget.Sherlock.Light.ActionBar.Solid.Inverse"> + <item name="background">@drawable/menubar_button_normal</item> + <item name="android:background">@drawable/menubar_button_normal</item> + </style> </resources> diff --git a/subsonic-android/res/xml/settings.xml b/subsonic-android/res/xml/settings.xml index daa98b90..455a9dc0 100644 --- a/subsonic-android/res/xml/settings.xml +++ b/subsonic-android/res/xml/settings.xml @@ -109,7 +109,7 @@ <ListPreference android:title="@string/settings.theme_title" android:key="theme" - android:defaultValue="wheat" + android:defaultValue="light" android:entryValues="@array/themeValues" android:entries="@array/themeNames"/> |
