diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2015-04-28 17:31:59 -0700 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2015-04-28 17:31:59 -0700 |
| commit | a72e12ae06fafe1885aa763ffa04faa84afb9523 (patch) | |
| tree | 6efc75e383dfa2453e1a2b1633a9826a83075b41 /app/src/main/res/layout | |
| parent | 366b3d35ae8d3a410678e90f3382e457c7d9445e (diff) | |
| download | dsub-a72e12ae06fafe1885aa763ffa04faa84afb9523.tar.gz dsub-a72e12ae06fafe1885aa763ffa04faa84afb9523.tar.bz2 dsub-a72e12ae06fafe1885aa763ffa04faa84afb9523.zip | |
#259 Bunch of fixes/improvements to swipe up bar
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/abstract_fragment_activity.xml | 24 | ||||
| -rw-r--r-- | app/src/main/res/layout/abstract_fragment_container.xml | 6 |
2 files changed, 21 insertions, 9 deletions
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 |