#259 Bunch of fixes/improvements to swipe up bar

6 files changed, 29 insertions, 11 deletions

diff --git a/app/src/main/res/layout-large-land/abstract_fragment_container.xml b/app/src/main/res/layout-large-land/abstract_fragment_container.xml
index 5e3b1561..3901710f 100644
--- a/app/src/main/res/layout-large-land/abstract_fragment_container.xml
+++ b/app/src/main/res/layout-large-land/abstract_fragment_container.xml
@@ -2,8 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:orientation="horizontal"
 	android:layout_width="match_parent"
-	android:layout_height="0px"
-	android:layout_weight="1">
+	android:layout_height="match_parent"
+	android:layout_marginTop="?attr/actionBarSize">
 
 	<FrameLayout
 		android:id="@+id/fragment_container"
diff --git a/app/src/main/res/layout/abstract_fragment_activity.xml b/app/src/main/res/layout/abstract_fragment_activity.xml
index 3aa6374f..29fbc3b1 100644
--- a/app/src/main/res/layout/abstract_fragment_activity.xml
+++ b/app/src/main/res/layout/abstract_fragment_activity.xml
@@ -19,11 +19,7 @@
 			android:layout_height="?attr/actionBarSize"
 			android:layout_width="match_parent"/>
 
-		<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-					 android:id="@+id/fragment_container"
-					 android:layout_width="match_parent"
-					 android:layout_height="match_parent"
-					 android:layout_marginTop="?attr/actionBarSize"/>
+		<include layout="@layout/abstract_fragment_container"/>
 	</FrameLayout>
 
 	<LinearLayout
@@ -72,8 +68,18 @@
 						android:textColor="?android:textColorPrimary"
 						android:singleLine="true"
 						android:textAppearance="?android:attr/textAppearanceSmall"
-						android:textSize="13sp"
-						android:text="@string/search.artists"/>
+						android:textSize="@dimen/BottomBar.Text.Major"
+						android:text="@string/main.title"
+						android:ellipsize="marquee"
+						android:marqueeRepeatLimit="marquee_forever"
+						android:scrollHorizontally="true"
+						android:focusable="true"
+						android:focusableInTouchMode="true">
+
+						<requestFocus android:focusable="true"
+							android:focusableInTouchMode="true"
+							android:duplicateParentState="true" />
+					</TextView>
 
 					<TextView
 						android:id="@+id/artist_name"
@@ -82,8 +88,8 @@
 						android:textColor="?android:textColorSecondary"
 						android:singleLine="true"
 						android:textAppearance="?android:attr/textAppearanceSmall"
-						android:textSize="12sp"
-						android:text="@string/search.albums"/>
+						android:textSize="@dimen/BottomBar.Text.Minor"
+						android:text="@string/main.artist"/>
 				</LinearLayout>
 
 
diff --git a/app/src/main/res/layout/abstract_fragment_container.xml b/app/src/main/res/layout/abstract_fragment_container.xml
new file mode 100644
index 00000000..f13356c4
--- /dev/null
+++ b/app/src/main/res/layout/abstract_fragment_container.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/fragment_container"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:layout_marginTop="?attr/actionBarSize"/>
\ No newline at end of file
diff --git a/app/src/main/res/values-large/dimens.xml b/app/src/main/res/values-large/dimens.xml
index b08dda86..fe8f1a6c 100644
--- a/app/src/main/res/values-large/dimens.xml
+++ b/app/src/main/res/values-large/dimens.xml
@@ -4,4 +4,6 @@
 	<dimen name="Button.Small">54dip</dimen>
 	<dimen name="AlbumArt.Small">96dip</dimen>
 	<dimen name="AlbumArt.Header">210dip</dimen>
+	<dimen name="BottomBar.Text.Major">18sp</dimen>
+	<dimen name="BottomBar.Text.Minor">16sp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index be3e843d..9759e1c2 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -4,4 +4,6 @@
 	<dimen name="Button.Small">46dip</dimen>
 	<dimen name="AlbumArt.Small">78dip</dimen>
 	<dimen name="AlbumArt.Header">120dip</dimen>
+	<dimen name="BottomBar.Text.Major">13sp</dimen>
+	<dimen name="BottomBar.Text.Minor">12sp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b897cad6..8e7ae537 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -79,6 +79,8 @@
 	<string name="main.songs_genres">@string/main.albums_genres</string>
 	<string name="main.back_confirm">Press back again to exit</string>
 	<string name="main.scan_complete">Completed scan of Server</string>
+	<string name="main.artist">Artist</string>
+	<string name="main.title">Title</string>
 
 	<string name="menu.search">Search</string>
 	<string name="menu.shuffle">Shuffle</string>