diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2013-10-19 11:25:55 -0700 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2013-10-19 11:25:55 -0700 |
| commit | 1a492b89eab3acc1d05bae102537a6fa3141d739 (patch) | |
| tree | 8466601de7842e184ba5af60d9070304249d5aee /res | |
| parent | 80d5c75a6ef79fda1040df9c89036d24f3d54780 (diff) | |
| download | dsub-1a492b89eab3acc1d05bae102537a6fa3141d739.tar.gz dsub-1a492b89eab3acc1d05bae102537a6fa3141d739.tar.bz2 dsub-1a492b89eab3acc1d05bae102537a6fa3141d739.zip | |
#162 More work on converting to pull out drawer
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/abstract_fragment_activity.xml (renamed from res/layout/main.xml) | 159 | ||||
| -rw-r--r-- | res/values/arrays.xml | 2 |
2 files changed, 81 insertions, 80 deletions
diff --git a/res/layout/main.xml b/res/layout/abstract_fragment_activity.xml index f1509db6..d9f178c5 100644 --- a/res/layout/main.xml +++ b/res/layout/abstract_fragment_activity.xml @@ -1,81 +1,80 @@ -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:gravity="center_horizontal" - android:orientation="vertical" > - - <android.support.v4.view.ViewPager - android:id="@+id/pager" - android:layout_width="fill_parent" - android:layout_height="0px" - android:layout_weight="1" > - </android.support.v4.view.ViewPager> - - <View - android:layout_width="fill_parent" - android:layout_height="1px" - android:background="@color/dividerColor"/> - - <LinearLayout - android:id="@+id/bottom_bar" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:background="@drawable/media_button" - android:orientation="horizontal"> - - <ImageView - android:id="@+id/album_art" - android:layout_width="50dip" - android:layout_height="50dip" - android:layout_gravity="left|center" - android:scaleType="fitStart" - android:src="@drawable/unknown_album"/> - - <LinearLayout - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_weight="1" - android:orientation="vertical" - android:paddingLeft="8dip"> - - <TextView - android:id="@+id/track_name" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:textColor="?android:textColorPrimary" - android:singleLine="true" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textSize="13sp" - android:text="@string/search.artists"/> - - <TextView - android:id="@+id/artist_name" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:textColor="?android:textColorSecondary" - android:singleLine="true" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textSize="12sp" - android:text="@string/search.albums"/> - </LinearLayout> - - <ImageButton - style="@style/PlaybackControl.Small" - android:id="@+id/download_previous" - android:src="?attr/media_button_backward" - android:layout_centerVertical="true"/> - - <ImageButton - style="@style/PlaybackControl.Small" - android:id="@+id/download_start" - android:src="?attr/media_button_start" - android:layout_centerVertical="true"/> - - <ImageButton - style="@style/PlaybackControl.Small" - android:id="@+id/download_next" - android:src="?attr/media_button_forward" - android:layout_centerVertical="true"/> - </LinearLayout> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center_horizontal"
+ android:orientation="vertical" >
+
+ <FrameLayout
+ android:id="@+id/fragment_container"
+ android:layout_width="match_parent"
+ android:layout_height="0px"
+ android:layout_weight="1"/>
+
+ <View
+ android:layout_width="fill_parent"
+ android:layout_height="1px"
+ android:background="@color/dividerColor"/>
+
+ <LinearLayout
+ android:id="@+id/bottom_bar"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:background="@drawable/media_button"
+ android:orientation="horizontal">
+
+ <ImageView
+ android:id="@+id/album_art"
+ android:layout_width="50dip"
+ android:layout_height="50dip"
+ android:layout_gravity="left|center"
+ android:scaleType="fitStart"
+ android:src="@drawable/unknown_album"/>
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ android:paddingLeft="8dip">
+
+ <TextView
+ android:id="@+id/track_name"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:textColor="?android:textColorPrimary"
+ android:singleLine="true"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textSize="13sp"
+ android:text="@string/search.artists"/>
+
+ <TextView
+ android:id="@+id/artist_name"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:textColor="?android:textColorSecondary"
+ android:singleLine="true"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textSize="12sp"
+ android:text="@string/search.albums"/>
+ </LinearLayout>
+
+ <ImageButton
+ style="@style/PlaybackControl.Small"
+ android:id="@+id/download_previous"
+ android:src="?attr/media_button_backward"
+ android:layout_centerVertical="true"/>
+
+ <ImageButton
+ style="@style/PlaybackControl.Small"
+ android:id="@+id/download_start"
+ android:src="?attr/media_button_start"
+ android:layout_centerVertical="true"/>
+
+ <ImageButton
+ style="@style/PlaybackControl.Small"
+ android:id="@+id/download_next"
+ android:src="?attr/media_button_forward"
+ android:layout_centerVertical="true"/>
+ </LinearLayout>
</LinearLayout>
\ No newline at end of file diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 0e856e08..0d33ddf5 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -2,6 +2,8 @@ <resources> <string-array name="drawerItems"> <item>@string/button_bar.home</item> + <item>@string/button_bar.browse</item> + <item>@string/button_bar.playlists</item> <item>@string/button_bar.podcasts</item> <item>@string/button_bar.chat</item> <item>@string/button_bar.now_playing</item> |