From 1a492b89eab3acc1d05bae102537a6fa3141d739 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Sat, 19 Oct 2013 11:25:55 -0700
Subject: #162 More work on converting to pull out drawer

---
 res/layout/abstract_fragment_activity.xml | 80 ++++++++++++++++++++++++++++++
 res/layout/main.xml                       | 81 -------------------------------
 2 files changed, 80 insertions(+), 81 deletions(-)
 create mode 100644 res/layout/abstract_fragment_activity.xml
 delete mode 100644 res/layout/main.xml

(limited to 'res/layout')

diff --git a/res/layout/abstract_fragment_activity.xml b/res/layout/abstract_fragment_activity.xml
new file mode 100644
index 00000000..d9f178c5
--- /dev/null
+++ b/res/layout/abstract_fragment_activity.xml
@@ -0,0 +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" >
+
+	<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/layout/main.xml b/res/layout/main.xml
deleted file mode 100644
index f1509db6..00000000
--- a/res/layout/main.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<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>
\ No newline at end of file
-- 
cgit v1.2.3