From 52d16417821a716fa403c5d63de019380153db7e Mon Sep 17 00:00:00 2001
From: Rikka <rikka@xing.moe>
Date: Tue, 24 May 2016 15:09:53 +0800
Subject: [PATCH] Fix some RTL layout

---
 .../main/res/layout/list_item_edit_sites.xml  | 11 ++--
 .../layout/list_item_edit_sites_header.xml    | 15 +++---
 .../main/res/layout/list_item_iqdb_result.xml | 33 ++++++------
 .../res/layout/list_item_post_form_add.xml    |  3 +-
 .../main/res/layout/preference_material.xml   | 52 -------------------
 5 files changed, 33 insertions(+), 81 deletions(-)
 delete mode 100644 app/src/main/res/layout/preference_material.xml

diff --git a/app/src/main/res/layout/list_item_edit_sites.xml b/app/src/main/res/layout/list_item_edit_sites.xml
index 6f2a049..21bb311 100644
--- a/app/src/main/res/layout/list_item_edit_sites.xml
+++ b/app/src/main/res/layout/list_item_edit_sites.xml
@@ -36,6 +36,7 @@
                 android:layout_height="32dp"
                 android:layout_marginBottom="2dp"
                 android:paddingLeft="16dp"
+                android:paddingRight="16dp"
                 android:fontFamily="sans-serif-medium"
                 android:gravity="bottom"
                 android:text="@{LayoutStyle.headText}"
@@ -54,7 +55,7 @@
                 android:onLongClick="@{Listener.viewOnLongClick}"
                 android:orientation="horizontal"
                 android:paddingLeft="16dp"
-                android:paddingRight="0dp">
+                android:paddingRight="16dp">
 
                 <ImageView
                     android:id="@+id/item_icon"
@@ -67,16 +68,16 @@
 
                 <LinearLayout
                     android:id="@+id/linearLayout"
-                    android:layout_width="match_parent"
+                    android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_alignParentEnd="false"
                     android:layout_alignParentStart="false"
                     android:layout_alignParentTop="true"
                     android:layout_marginLeft="26dp"
+                    android:layout_marginStart="26dp"
                     android:layout_toEndOf="@id/item_icon"
                     android:layout_toRightOf="@id/item_icon"
-                    android:orientation="vertical"
-                    android:paddingRight="56dp">
+                    android:orientation="vertical">
 
                     <TextView
                         android:layout_width="match_parent"
@@ -108,7 +109,6 @@
                     android:layout_alignParentEnd="true"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
-                    android:layout_marginRight="12dp"
                     android:checked="@{engine.enabled==1?true:false}"
                     app:OnCheckedChangeListener="@{Listener.switchCheckedChangeListener}" />
             </RelativeLayout>
@@ -118,6 +118,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
                 android:layout_marginLeft="74dp"
+                android:layout_marginStart="74dp"
                 android:background="@color/dividerSearchEngineList"
                 android:visibility="@{LayoutStyle.needDivider?View.VISIBLE:View.GONE}" />
 
diff --git a/app/src/main/res/layout/list_item_edit_sites_header.xml b/app/src/main/res/layout/list_item_edit_sites_header.xml
index 04493d1..1cadefd 100644
--- a/app/src/main/res/layout/list_item_edit_sites_header.xml
+++ b/app/src/main/res/layout/list_item_edit_sites_header.xml
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="32dp"
-    android:background="@android:color/white"
-    android:elevation="0dp">
+              xmlns:tools="http://schemas.android.com/tools"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="32dp"
+              android:background="@android:color/white"
+              android:elevation="0dp">
 
     <TextView
         android:id="@+id/item_header"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:text="New Text"
+        tools:text="New Text"
         android:gravity="bottom"
-        android:layout_marginLeft="16dp"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
         android:layout_marginBottom="2dp"
         android:textSize="14sp"
         android:fontFamily="sans-serif-medium"/>
diff --git a/app/src/main/res/layout/list_item_iqdb_result.xml b/app/src/main/res/layout/list_item_iqdb_result.xml
index 2ec7004..ea90ed6 100644
--- a/app/src/main/res/layout/list_item_iqdb_result.xml
+++ b/app/src/main/res/layout/list_item_iqdb_result.xml
@@ -14,14 +14,15 @@
   limitations under the License.
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="96dp"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:focusable="true"
-    android:clickable="true"
-    android:background="?attr/selectableItemBackground"
-    android:id="@+id/view">
+                android:layout_width="match_parent"
+                android:layout_height="96dp"
+                xmlns:tools="http://schemas.android.com/tools"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:focusable="true"
+                android:clickable="true"
+                android:background="?attr/selectableItemBackground"
+                android:id="@+id/view">
 
     <ImageView
         android:layout_width="84dp"
@@ -32,27 +33,25 @@
         android:layout_alignParentTop="true"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
-        android:layout_marginLeft="8dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:layout_marginRight="8dp" />
+        android:layout_margin="8dp" />
 
     <TextView
         android:id="@+id/item_text_url"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:singleLine="true"
-        android:text="Item"
+        tools:text="Item"
         android:textSize="16sp"
         android:layout_alignTop="@+id/item_image"
         android:layout_toRightOf="@+id/item_image"
         android:layout_toEndOf="@+id/item_image"
-        android:layout_marginRight="8dp" />
+        android:layout_marginRight="8dp"
+        android:layout_marginEnd="8dp" />
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="New Text"
+        tools:text="title"
         android:id="@+id/item_text_size"
         android:layout_above="@+id/item_text_similarity"
         android:layout_alignLeft="@+id/item_text_url"
@@ -61,7 +60,7 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="New Text"
+        tools:text="New Text"
         android:id="@+id/item_text_similarity"
         android:layout_alignBottom="@+id/item_image"
         android:layout_alignLeft="@+id/item_text_size"
diff --git a/app/src/main/res/layout/list_item_post_form_add.xml b/app/src/main/res/layout/list_item_post_form_add.xml
index ef6f229..a07794c 100644
--- a/app/src/main/res/layout/list_item_post_form_add.xml
+++ b/app/src/main/res/layout/list_item_post_form_add.xml
@@ -23,7 +23,8 @@
         android:text="@string/upload_form_add"
         android:id="@+id/textView"
         android:layout_gravity="center_vertical"
-        android:layout_marginLeft="8dp"
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp"
         android:textSize="18sp"
         android:textColor="#aeaeae" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/preference_material.xml b/app/src/main/res/layout/preference_material.xml
deleted file mode 100644
index 945cd41..0000000
--- a/app/src/main/res/layout/preference_material.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:tool="http://schemas.android.com/tools"
-    android:minHeight="?android:attr/listPreferredItemHeightSmall"
-    android:gravity="center_vertical"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp">
-
-    <RelativeLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:paddingTop="16dp"
-        android:paddingBottom="16dp">
-
-        <TextView android:id="@android:id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textColor="?android:attr/textColorPrimary"
-            android:ellipsize="marquee"
-            android:fadingEdge="horizontal"
-            android:textSize="16sp"
-            tool:text="Title"/>
-
-        <TextView android:id="@android:id/summary"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@android:id/title"
-            android:layout_alignStart="@android:id/title"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorSecondary"
-            android:maxLines="4"
-            android:textSize="14sp"
-            tool:text="Summary"/>
-
-    </RelativeLayout>
-
-    <!-- Preference should place its actual preference widget here. -->
-    <LinearLayout android:id="@android:id/widget_frame"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:gravity="center_vertical"
-        android:orientation="vertical" />
-
-</LinearLayout>
\ No newline at end of file