Changes for RTL support in static ODK Collect layouts (build 1055)

katakeynii · Sep 10, 2015 · 7b0f6ef · 7b0f6ef
1 parent de0e7bd
commit 7b0f6ef
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 4 deletions.
diff --git a/collect_app/build.gradle b/collect_app/build.gradle
@@ -23,7 +23,7 @@ android {
         applicationId("org.odk.collect.android")
         minSdkVersion(8)
         targetSdkVersion(8)
-        versionCode(1054)
+        versionCode(1055)
         versionName("1.4.7")
     }
 

diff --git a/collect_app/src/main/AndroidManifest.xml b/collect_app/src/main/AndroidManifest.xml
@@ -55,6 +55,7 @@
 
     <application
         android:name="org.odk.collect.android.application.Collect"
+		android:supportsRtl="true" 
         android:largeHeap="true"
         android:installLocation="auto"
         android:icon="@drawable/notes"

diff --git a/collect_app/src/main/res/layout/chooser_list_layout.xml b/collect_app/src/main/res/layout/chooser_list_layout.xml
@@ -24,7 +24,9 @@ the License.
 			android:layout_height="wrap_content"
 			android:text="@string/form_scan_starting"
 			android:textSize="14sp"
+			android:paddingStart="8dip"
 			android:paddingLeft="8dip"
+			android:paddingEnd="8dip"
 			android:paddingRight="8dip"
 			android:paddingBottom="4dip"
 			android:paddingTop="4dip"
@@ -39,7 +41,9 @@ the License.
 			android:layout_height="fill_parent"
 			android:text="@string/no_items_display_forms"
 			android:textSize="21sp"
+			android:paddingStart="20dip"
 			android:paddingLeft="20dp"
+			android:paddingEnd="20dip"
 			android:paddingRight="20dp"
 			android:gravity="center"
 			android:background="@drawable/white"

diff --git a/collect_app/src/main/res/layout/drive_layout.xml b/collect_app/src/main/res/layout/drive_layout.xml
@@ -66,7 +66,9 @@ the License.
 
         <EditText
                 android:imeOptions="actionSearch"
+				android:paddingStart="8dip"
                 android:paddingLeft="8dip"
+				android:paddingEnd="8dip"
                 android:paddingRight="8dip"
                 android:paddingBottom="0dip"
                 android:minHeight="50dp"

diff --git a/collect_app/src/main/res/layout/form_entry.xml b/collect_app/src/main/res/layout/form_entry.xml
@@ -36,7 +36,9 @@ the License.
         android:background="#FFFFFF"
         android:orientation="horizontal"
         android:paddingBottom="0dip"
+        android:paddingStart="4dip"
         android:paddingLeft="4dip"
+        android:paddingEnd="4dip"
         android:paddingRight="4dip"
         android:paddingTop="4dip" >
 

diff --git a/collect_app/src/main/res/layout/instance_uploader_list.xml b/collect_app/src/main/res/layout/instance_uploader_list.xml
@@ -53,7 +53,9 @@ the License.
 		android:layout_height="fill_parent"
 		android:text="@string/no_items_display_instances"
 		android:textSize="21sp"
+		android:paddingStart="20dp"
 		android:paddingLeft="20dp"
+		android:paddingEnd="20dp"
 		android:paddingRight="20dp"
 		android:gravity="center"
 		android:background="@drawable/white"

diff --git a/collect_app/src/main/res/layout/main_menu.xml b/collect_app/src/main/res/layout/main_menu.xml
@@ -48,7 +48,9 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
+			android:paddingStart="10dp"
             android:paddingLeft="10dp"
+			android:paddingEnd="10dp"
             android:paddingRight="10dp" >
 
             <View

diff --git a/collect_app/src/main/res/layout/splash_screen.xml b/collect_app/src/main/res/layout/splash_screen.xml
@@ -44,7 +44,9 @@
 				android:background="@android:color/transparent"
 				android:textSize="22sp"
 				android:textStyle="bold"
+				android:paddingStart="7dip"
 				android:paddingLeft="7dip"
+				android:paddingEnd="7dip"
 				android:paddingRight="7dip" />
 			<TextView
 				android:id="@+id/url"
@@ -53,7 +55,9 @@
 				android:layout_height="fill_parent"
 				android:background="@android:color/transparent"
 				android:textSize="14sp"
+				android:paddingStart="7dip"
 				android:paddingLeft="7dip"
+				android:paddingEnd="7dip"
 				android:paddingRight="7dip" />
 		</LinearLayout>
 	</LinearLayout>

diff --git a/collect_app/src/main/res/layout/two_item_image.xml b/collect_app/src/main/res/layout/two_item_image.xml
@@ -3,8 +3,10 @@
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
+        android:paddingStart="8dip"
+		android:paddingLeft="8dip"
+        android:paddingEnd="8dip"
         android:paddingRight="8dip"
-        android:paddingLeft="8dip"
         android:paddingTop="4dip"
         android:paddingBottom="8dip"
         android:minHeight="?android:attr/listPreferredItemHeight">
@@ -15,7 +17,8 @@
             android:layout_height="wrap_content"
             android:src="@drawable/ic_menu_forward"
             android:paddingTop="6dip"
-            android:paddingRight="8dip"/>
+			android:paddingEnd="8dip"
+			android:paddingRight="8dip"/>
     <TextView
             android:id="@+id/text1"
             android:layout_width="fill_parent"

diff --git a/collect_app/src/main/res/layout/two_item_multiple_choice.xml b/collect_app/src/main/res/layout/two_item_multiple_choice.xml
@@ -11,8 +11,10 @@
 	android:orientation="horizontal"
 	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
-	android:paddingRight="8dip"
+	android:paddingStart="8dip"
 	android:paddingLeft="8dip"
+	android:paddingEnd="8dip"
+	android:paddingRight="8dip"
 	android:paddingTop="4dip"
 	android:paddingBottom="8dip"
 	android:minHeight="?android:attr/listPreferredItemHeight">