1 files changed, 27 insertions, 24 deletions
diff --git a/app/src/main/res/layout/activity_picker.xml b/app/src/main/res/layout/activity_picker.xml
index db4a044..39d8d94 100644
--- a/app/src/main/res/layout/activity_picker.xml
+++ b/app/src/main/res/layout/activity_picker.xml
@@ -7,11 +7,10 @@
 
     <include layout="@layout/app_toolbar" />
 
-    <LinearLayout
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
-        android:orientation="vertical"
         android:padding="@dimen/space_m">
 
         <TextView
@@ -19,43 +18,47 @@
             style="@style/Widget.Rsend.Card"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
             android:textAppearance="@style/TextAppearance.Rsend.Mono"
             android:textSize="12sp" />
 
-        <ScrollView
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1">
-
-            <LinearLayout
-                android:id="@+id/list"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical" />
-        </ScrollView>
-
         <LinearLayout
+            android:id="@+id/pickerActions"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:layout_marginTop="@dimen/space_m">
+            android:layout_alignParentBottom="true"
+            android:layout_marginTop="@dimen/space_m"
+            android:orientation="horizontal">
 
             <Button
-                android:id="@+id/use"
-                style="@style/Widget.Rsend.Button.Primary"
+                android:id="@+id/cancel"
+                style="@style/Widget.Rsend.Button.Secondary"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
                 android:layout_marginEnd="@dimen/space_s"
-                android:text="Use this folder" />
+                android:layout_weight="1"
+                android:text="Cancel" />
 
             <Button
-                android:id="@+id/cancel"
-                style="@style/Widget.Rsend.Button.Secondary"
+                android:id="@+id/use"
+                style="@style/Widget.Rsend.Button.Primary"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="Cancel" />
+                android:text="Use this folder" />
         </LinearLayout>
-    </LinearLayout>
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_above="@id/pickerActions"
+            android:layout_below="@id/currentPath">
+
+            <LinearLayout
+                android:id="@+id/list"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical" />
+        </ScrollView>
+    </RelativeLayout>
 </LinearLayout>