Fixed layout alignments, especially for KitKat

This commit is contained in:
Karim Abou Zeid 2015-04-22 14:06:11 +02:00
commit a8f342fe39
2 changed files with 18 additions and 16 deletions

View file

@ -82,8 +82,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:background="?default_bar_color" android:background="?default_bar_color"
android:orientation="vertical"
android:elevation="@dimen/toolbar_elevation" android:elevation="@dimen/toolbar_elevation"
android:orientation="vertical"
tools:ignore="UnusedAttribute"> tools:ignore="UnusedAttribute">
<LinearLayout <LinearLayout
@ -149,8 +149,8 @@
android:layout_width="56dp" android:layout_width="56dp"
android:layout_height="56dp" android:layout_height="56dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginRight="-4dp"
android:layout_marginEnd="-4dp" android:layout_marginEnd="-4dp"
android:layout_marginRight="-4dp"
android:layout_toLeftOf="@+id/fab" android:layout_toLeftOf="@+id/fab"
android:layout_toStartOf="@+id/fab" android:layout_toStartOf="@+id/fab"
android:background="?round_selector" android:background="?round_selector"
@ -165,8 +165,8 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginLeft="-4dp" android:layout_marginLeft="-4dp"
android:layout_marginStart="-4dp" android:layout_marginStart="-4dp"
android:layout_toRightOf="@+id/fab"
android:layout_toEndOf="@+id/fab" android:layout_toEndOf="@+id/fab"
android:layout_toRightOf="@+id/fab"
android:background="?round_selector" android:background="?round_selector"
android:padding="14dp" android:padding="14dp"
android:scaleType="fitCenter" android:scaleType="fitCenter"
@ -190,11 +190,11 @@
android:id="@+id/shuffle_button" android:id="@+id/shuffle_button"
android:layout_width="56dp" android:layout_width="56dp"
android:layout_height="56dp" android:layout_height="56dp"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginRight="8dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:background="?round_selector" android:background="?round_selector"
android:padding="14dp" android:padding="14dp"
android:scaleType="fitCenter" android:scaleType="fitCenter"
@ -220,6 +220,7 @@
<android.support.v7.widget.Toolbar <android.support.v7.widget.Toolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"
style="@style/Toolbar" style="@style/Toolbar"
android:layout_marginTop="@dimen/statusMargin"
android:background="@android:color/transparent" /> android:background="@android:color/transparent" />
</FrameLayout> </FrameLayout>

View file

@ -6,7 +6,8 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical"
android:paddingTop="@dimen/main_toolbar_padding_top">
<android.support.v7.widget.Toolbar <android.support.v7.widget.Toolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"
@ -28,11 +29,11 @@
android:id="@android:id/empty" android:id="@android:id/empty"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="@dimen/empty_text_size" android:layout_gravity="center"
android:textColor="?android:textColorSecondary"
android:fontFamily="sans-serif-light" android:fontFamily="sans-serif-light"
android:text="@string/playlist_empty_text" android:text="@string/playlist_empty_text"
android:layout_gravity="center" /> android:textColor="?android:textColorSecondary"
android:textSize="@dimen/empty_text_size" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"