diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2012-10-31 19:32:17 -0700 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2012-10-31 19:32:17 -0700 |
| commit | d384dec4b12e7c71c5058e9858e46aac617c1a8a (patch) | |
| tree | 10b6147e8bded4c3ab89b39c42f6c6ec7c8320a2 /subsonic-android/res | |
| parent | f06b69ae21d0fad0431395c7fe98b816826484ed (diff) | |
| download | dsub-d384dec4b12e7c71c5058e9858e46aac617c1a8a.tar.gz dsub-d384dec4b12e7c71c5058e9858e46aac617c1a8a.tar.bz2 dsub-d384dec4b12e7c71c5058e9858e46aac617c1a8a.zip | |
Changed from tab icons to tab text
Diffstat (limited to 'subsonic-android/res')
| -rw-r--r-- | subsonic-android/res/layout/button_bar.xml | 53 | ||||
| -rw-r--r-- | subsonic-android/res/values/strings.xml | 6 | ||||
| -rw-r--r-- | subsonic-android/res/values/styles.xml | 9 |
3 files changed, 28 insertions, 40 deletions
diff --git a/subsonic-android/res/layout/button_bar.xml b/subsonic-android/res/layout/button_bar.xml index 52c78ba1..8f49c99a 100644 --- a/subsonic-android/res/layout/button_bar.xml +++ b/subsonic-android/res/layout/button_bar.xml @@ -1,48 +1,27 @@ <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/button_bar"
- android:orientation="vertical"
android:layout_gravity="bottom"
+ android:orientation="horizontal"
android:layout_width="fill_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:gravity="center_horizontal"
+ android:background="@android:color/transparent">
- <LinearLayout android:orientation="horizontal"
- android:layout_width="fill_parent"
- android:layout_height="48dp"
- android:gravity="center_horizontal">
+ <Button style="@style/MenuBarButton"
+ android:id="@+id/button_bar_home"
+ android:text="@string/button_bar.home"/>
- <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"/>
+ <Button style="@style/MenuBarButton"
+ android:id="@+id/button_bar_music"
+ android:text="@string/button_bar.browse"/>
- <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"/>
+ <Button style="@style/MenuBarButton"
+ android:id="@+id/button_bar_playlists"
+ android:text="@string/button_bar.playlists"/>
- <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"/>
-
- <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"/>
-
- </LinearLayout>
+ <Button style="@style/MenuBarButton"
+ android:id="@+id/button_bar_now_playing"
+ android:text="@string/button_bar.now_playing"/>
</LinearLayout>
diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml index 57a91515..264bf973 100644 --- a/subsonic-android/res/values/strings.xml +++ b/subsonic-android/res/values/strings.xml @@ -18,11 +18,11 @@ <string name="common.name">Name</string>
<string name="common.comment">Comment</string>
- <string name="button_bar.home">DSub home</string>
- <string name="button_bar.browse">Media library</string>
+ <string name="button_bar.home">Home</string>
+ <string name="button_bar.browse">Library</string>
<string name="button_bar.search">Search</string>
<string name="button_bar.playlists">Playlists</string>
- <string name="button_bar.now_playing">Now playing</string>
+ <string name="button_bar.now_playing">Playing</string>
<string name="main.welcome_title">Welcome!</string>
<string name="main.welcome_text">Welcome to DSub! The app is currently configured to use the Subsonic demo server. After you\'ve
diff --git a/subsonic-android/res/values/styles.xml b/subsonic-android/res/values/styles.xml index 5ebabba3..1ba1e820 100644 --- a/subsonic-android/res/values/styles.xml +++ b/subsonic-android/res/values/styles.xml @@ -15,4 +15,13 @@ <item name="android:layout_width">46dip</item> <item name="android:layout_height">46dip</item> </style> + + <style name="MenuBarButton"> + <item name="android:layout_width">0dip</item> + <item name="android:layout_height">45dip</item> + <item name="android:layout_weight">1</item> + <item name="android:textSize">14sp</item> + <item name="android:textStyle">bold</item> + <item name="android:background">@drawable/menubar_button</item> + </style> </resources>
\ No newline at end of file |