Added player fragment to main activity

3 files changed, 81 insertions, 61 deletions

diff --git a/res/layout/external_player_fragment.xml b/res/layout/external_player_fragment.xml
index c7ad901a1..7e3be4b78 100644
--- a/res/layout/external_player_fragment.xml
+++ b/res/layout/external_player_fragment.xml
@@ -1,55 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/fragmentLayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/ics_gray" >
-
-    <ImageButton
-        android:id="@+id/butPlay"
-        android:background="@drawable/borderless_button"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true" />
-
-    <RelativeLayout
-        android:id="@+id/layoutInfo"
-        android:layout_width="0dp"
+    android:orientation="vertical" >
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        android:background="#AAAAAA" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="#D2D2D2" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_toLeftOf="@id/butPlay"
-        android:background="@drawable/borderless_button" >
-
-        <ImageView
-            android:id="@+id/imgvCover"
-            android:layout_width="55dp"
-            android:layout_height="55dp"
-            android:layout_alignParentLeft="true"
-            android:layout_centerVertical="true"
-            android:layout_margin="8dp"
-            android:adjustViewBounds="true"
-            android:cropToPadding="true"
-            android:scaleType="fitXY" />
-
-        <TextView
-            android:id="@+id/txtvTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:layout_marginRight="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_toRightOf="@id/imgvCover"
-            android:textStyle="bold" />
-
-        <TextView
-            android:id="@+id/txtvPosition"
-            android:layout_width="wrap_content"
+        android:background="@color/actionbar_gray" >
+
+        <RelativeLayout
+            android:id="@+id/layoutInfo"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_marginRight="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_toRightOf="@id/imgvCover" />
-    </RelativeLayout>
+            android:layout_weight="1"
+            android:background="@drawable/borderless_button" >
+
+            <ImageView
+                android:id="@+id/imgvCover"
+                android:layout_width="@dimen/external_player_height"
+                android:layout_height="@dimen/external_player_height"
+                android:layout_alignParentLeft="true"
+                android:adjustViewBounds="true"
+                android:cropToPadding="true"
+                android:scaleType="fitXY" />
+
+            <TextView
+                android:id="@+id/txtvTitle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="8dp"
+                android:layout_marginTop="8dp"
+                android:layout_toRightOf="@id/imgvCover"
+                android:maxLines="1"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/txtvPosition"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/txtvTitle"
+                android:layout_margin="8dp"
+                android:layout_toRightOf="@id/imgvCover"
+                android:textSize="14dp" />
+        </RelativeLayout>
+
+        <ImageButton
+            android:id="@+id/butPlay"
+            android:layout_width="@dimen/external_player_height"
+            android:layout_height="@dimen/external_player_height"
+            android:background="@drawable/borderless_button" />
+    </LinearLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 1ab614050..41b37eac6 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -1,21 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/main_view"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
+    android:layout_height="match_parent" >
 
     <com.viewpagerindicator.TabPageIndicator
         android:id="@+id/tabs"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        />
-	
-	<android.support.v4.view.ViewPager
-		android:id="@+id/viewpager"
-		android:layout_width="match_parent"
-		android:layout_height="0px"
-		android:layout_weight="1">
-	</android.support.v4.view.ViewPager>
-	
-</LinearLayout>
+        android:layout_alignParentTop="true" />
+
+    <FrameLayout
+        android:id="@+id/playerFragment"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true" />
+
+    <android.support.v4.view.ViewPager
+        android:id="@+id/viewpager"
+        android:layout_width="match_parent"
+        android:layout_height="0px"
+        android:layout_above="@id/playerFragment"
+        android:layout_below="@id/tabs" >
+    </android.support.v4.view.ViewPager>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index d7941cd41..da3732752 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -2,5 +2,6 @@
 <resources>
     <dimen name="widget_margin">8dp</dimen>
     <dimen name="thumbnail_length">55dp</dimen>
+    <dimen name="external_player_height">55dp</dimen>
     
 </resources>
\ No newline at end of file