X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=res%2Flayout%2Fdictionary_activity.xml;h=ca812d18f4083a923e321cf6356acb0dd6f15f47;hb=25425d0c98914bc805cc12fb82a978223c451eea;hp=640d9749ebdc9b3c39354642a69f68d8489d8cac;hpb=9659e5225209056c22d589ee40832ee2c0212954;p=Dictionary.git

diff --git a/res/layout/dictionary_activity.xml b/res/layout/dictionary_activity.xml
index 640d974..ca812d1 100644
--- a/res/layout/dictionary_activity.xml
+++ b/res/layout/dictionary_activity.xml
@@ -1,9 +1,11 @@
 <?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:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical" >
 
+    <!--
+
     <LinearLayout
         android:id="@+id/SearchBarLinearLayout"
         android:layout_width="fill_parent"
@@ -31,24 +33,12 @@
             style="@style/BorderlessButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="@dimen/default_padding"
             android:src="@drawable/ic_input_delete" />
 
-        <ImageButton
-            android:id="@+id/DownButton"
-            style="@style/BorderlessButton"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:src="@drawable/arrow_down_float" />
-
-        <ImageButton
-            android:id="@+id/UpButton"
-            style="@style/BorderlessButton"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:src="@drawable/arrow_up_float" />
     </LinearLayout>
 
+ -->
+
     <ListView
         android:id="@id/android:list"
         android:layout_width="fill_parent"
@@ -59,10 +49,26 @@
         android:focusable="true"
         android:focusableInTouchMode="true" />
 
+     <android.support.design.widget.FloatingActionButton
+        android:id="@+id/floatSwapButton"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_swap_horiz_black_24dp" />
+
+     <android.support.design.widget.FloatingActionButton
+        android:id="@+id/floatSearchButton"
+        android:layout_toLeftOf="@+id/floatSwapButton"
+        android:layout_alignParentBottom="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_search_black_24dp" />
+
     <TextView
         android:id="@android:id/empty"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:text="@string/noSearchResults" />
 
-</LinearLayout>
\ No newline at end of file
+</RelativeLayout>