From f8508940a8bc2486b06a22a76a8a20c7aa647de2 Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Thu, 14 Jul 2016 08:35:48 -0500
Subject: [PATCH] Set layout direction on widget

---
 src/main/java/org/tasks/locale/Locale.java    |  4 +++
 .../java/org/tasks/widget/TasksWidget.java    |  6 ++++
 src/main/res/layout/scrollable_widget.xml     | 30 ++++++++++---------
 src/main/res/layout/widget_loading.xml        |  1 -
 src/main/res/layout/widget_row.xml            |  2 ++
 5 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/tasks/locale/Locale.java b/src/main/java/org/tasks/locale/Locale.java
index b10be0921..c7a190760 100644
--- a/src/main/java/org/tasks/locale/Locale.java
+++ b/src/main/java/org/tasks/locale/Locale.java
@@ -71,6 +71,10 @@ public class Locale {
         return directionality == View.LAYOUT_DIRECTION_RTL ? RIGHT_TO_LEFT_MARK : LEFT_TO_RIGHT_MARK;
     }
 
+    public int getDirectionality() {
+        return appDirectionality;
+    }
+
     public String getOverride() {
         return override;
     }
diff --git a/src/main/java/org/tasks/widget/TasksWidget.java b/src/main/java/org/tasks/widget/TasksWidget.java
index 201f15b55..0bff36dd6 100644
--- a/src/main/java/org/tasks/widget/TasksWidget.java
+++ b/src/main/java/org/tasks/widget/TasksWidget.java
@@ -18,6 +18,7 @@ import org.tasks.R;
 import org.tasks.injection.BroadcastComponent;
 import org.tasks.injection.InjectingAppWidgetProvider;
 import org.tasks.intents.TaskIntents;
+import org.tasks.locale.Locale;
 import org.tasks.preferences.DefaultFilterProvider;
 import org.tasks.preferences.Preferences;
 import org.tasks.themes.ThemeBase;
@@ -30,6 +31,7 @@ import timber.log.Timber;
 
 import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+import static com.todoroo.andlib.utility.AndroidUtilities.atLeastJellybeanMR1;
 import static com.todoroo.astrid.api.AstridApiConstants.BROADCAST_EVENT_REFRESH;
 import static org.tasks.intents.TaskIntents.getEditTaskIntent;
 
@@ -41,6 +43,7 @@ public class TasksWidget extends InjectingAppWidgetProvider {
     @Inject Preferences preferences;
     @Inject DefaultFilterProvider defaultFilterProvider;
     @Inject ThemeCache themeCache;
+    @Inject Locale locale;
 
     public static final String COMPLETE_TASK = "COMPLETE_TASK";
     public static final String EDIT_TASK = "EDIT_TASK";
@@ -100,6 +103,9 @@ public class TasksWidget extends InjectingAppWidgetProvider {
         ThemeBase theme = themeCache.getThemeBase(preferences.getInt(WidgetConfigActivity.PREF_THEME + id, 0));
         ThemeColor color = themeCache.getThemeColor(preferences.getInt(WidgetConfigActivity.PREF_COLOR + id, 0));
         RemoteViews remoteViews = new RemoteViews(context.getPackageName(), R.layout.scrollable_widget);
+        if (atLeastJellybeanMR1()) {
+            remoteViews.setInt(R.id.widget, "setLayoutDirection", locale.getDirectionality());
+        }
         if (preferences.getBoolean(WidgetConfigActivity.PREF_HIDE_HEADER + id, false)) {
             remoteViews.setViewVisibility(R.id.widget_header, View.GONE);
         } else {
diff --git a/src/main/res/layout/scrollable_widget.xml b/src/main/res/layout/scrollable_widget.xml
index a0e08ba56..cff82b975 100644
--- a/src/main/res/layout/scrollable_widget.xml
+++ b/src/main/res/layout/scrollable_widget.xml
@@ -3,9 +3,11 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/widget"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_height="fill_parent"
+    android:orientation="vertical">
 
     <RelativeLayout
         android:id="@+id/widget_header"
@@ -17,43 +19,43 @@
             android:id="@+id/widget_header_background"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
-            android:scaleType="fitXY"/>
+            android:scaleType="fitXY" />
 
         <ImageButton
             android:id="@+id/widget_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
             android:background="@android:color/transparent"
-            android:scaleType="fitCenter"
-            android:src="@drawable/ic_add_24dp"
             android:paddingEnd="10dp"
             android:paddingRight="10dp"
+            android:scaleType="fitCenter"
+            android:src="@drawable/ic_add_24dp"
             android:tint="@android:color/white" />
 
         <TextView
             android:id="@+id/widget_title"
             android:layout_width="0dp"
             android:layout_height="match_parent"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_centerVertical="true"
             android:layout_toLeftOf="@id/widget_button"
             android:layout_toStartOf="@id/widget_button"
-            android:layout_centerVertical="true"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentLeft="true"
-            android:gravity="center_vertical"
             android:ellipsize="end"
+            android:gravity="center_vertical"
             android:maxLines="2"
             android:paddingLeft="10dp"
             android:paddingStart="10dp"
+            android:textAlignment="viewStart"
             android:textColor="@android:color/white"
-            android:textSize="18sp"/>
+            android:textSize="18sp" />
 
     </RelativeLayout>
 
     <RelativeLayout
-        android:layout_below="@id/widget_header"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content">
 
@@ -61,7 +63,7 @@
             android:id="@+id/widget_background"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
-            android:scaleType="fitXY"/>
+            android:scaleType="fitXY" />
 
         <ListView
             android:id="@+id/list_view"
@@ -76,4 +78,4 @@
 
     </RelativeLayout>
 
-</RelativeLayout>
+</LinearLayout>
diff --git a/src/main/res/layout/widget_loading.xml b/src/main/res/layout/widget_loading.xml
index 09d241053..9007265df 100644
--- a/src/main/res/layout/widget_loading.xml
+++ b/src/main/res/layout/widget_loading.xml
@@ -5,7 +5,6 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/widget"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:orientation="vertical"
diff --git a/src/main/res/layout/widget_row.xml b/src/main/res/layout/widget_row.xml
index b48e05c02..3a2b67a08 100644
--- a/src/main/res/layout/widget_row.xml
+++ b/src/main/res/layout/widget_row.xml
@@ -38,6 +38,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:singleLine="true"
+            android:textAlignment="viewStart"
             android:textSize="16sp" />
 
         <TextView
@@ -47,6 +48,7 @@
             android:ellipsize="end"
             android:gravity="center_vertical"
             android:singleLine="true"
+            android:textAlignment="viewStart"
             android:textSize="12sp"
             android:visibility="gone" />