From 0d30d9e546f56e657dbb1599c124e7064e7a0f08 Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Wed, 18 Jun 2014 10:01:14 -0500
Subject: [PATCH] Add widget margin to pre-ics devices

Closes #108
---
 .../res/layout-land/widget_initialized.xml    | 61 -------------------
 .../layout-xlarge-land/widget_initialized.xml | 60 ------------------
 .../main/res/layout/widget_initialized.xml    | 18 +++---
 .../res/layout/widget_initialized_dark.xml    | 16 ++---
 astrid/src/main/res/values-v14/dimens.xml     |  4 ++
 astrid/src/main/res/values/dimens.xml         |  4 ++
 6 files changed, 27 insertions(+), 136 deletions(-)
 delete mode 100644 astrid/src/main/res/layout-land/widget_initialized.xml
 delete mode 100644 astrid/src/main/res/layout-xlarge-land/widget_initialized.xml
 create mode 100644 astrid/src/main/res/values-v14/dimens.xml
 create mode 100644 astrid/src/main/res/values/dimens.xml

diff --git a/astrid/src/main/res/layout-land/widget_initialized.xml b/astrid/src/main/res/layout-land/widget_initialized.xml
deleted file mode 100644
index 9b5ad80fc..000000000
--- a/astrid/src/main/res/layout-land/widget_initialized.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** 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="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:background="@android:color/transparent">
-
-    <LinearLayout 
-        android:id="@+id/widget_header"
-        android:layout_width="fill_parent"
-        android:layout_height="39dip"
-        android:orientation="horizontal"
-        android:padding="3dp"
-        android:background="@color/widget_header_light">
-        
-        <TextView
-            android:id="@+id/widget_title"
-            android:layout_width="fill_parent" 
-            android:layout_height="39dip"
-            android:layout_gravity="left|center_vertical" 
-            android:paddingLeft="2dip"
-            android:textColor="@color/widget_text_color_light"
-            android:textSize="16sp"
-            android:textStyle="bold"
-            android:maxLines="2"
-            android:layout_weight="1"
-            android:gravity="left|center_vertical" 
-            android:ellipsize="end" />
-    
-        <ImageButton
-            android:id="@+id/widget_button"
-            android:layout_width="33dip"
-            android:layout_height="39dip"
-            android:layout_gravity="right|center_vertical"
-            android:background="@android:color/transparent"
-            android:src="@drawable/ic_action_new"
-            android:scaleType="fitCenter"/>
-      
-    </LinearLayout>
-    
-    <ImageView
-        android:id="@+id/widget_header_separator"
-        android:layout_width="fill_parent"
-        android:layout_height="1px"
-        android:background="@color/dark_blue_theme_color"/>
-
-    <LinearLayout android:id="@+id/taskbody"
-    	android:layout_width="fill_parent"
-    	android:layout_height="fill_parent"
-    	android:background="@color/widget_body_light"
-	    android:orientation="vertical">
-
-    </LinearLayout>
-</LinearLayout>
diff --git a/astrid/src/main/res/layout-xlarge-land/widget_initialized.xml b/astrid/src/main/res/layout-xlarge-land/widget_initialized.xml
deleted file mode 100644
index a18eb73e9..000000000
--- a/astrid/src/main/res/layout-xlarge-land/widget_initialized.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** 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="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:background="@android:color/transparent">
-
-    <LinearLayout
-        android:id="@+id/widget_header"
-        android:layout_width="fill_parent"
-        android:layout_height="39dip"
-        android:orientation="horizontal"
-        android:padding="3dp"
-        android:background="@color/widget_header_light">
-        
-        <TextView
-            android:id="@+id/widget_title"
-            android:layout_width="fill_parent" 
-            android:layout_height="39dip"
-            android:layout_gravity="left|center_vertical" 
-            android:paddingLeft="2dip"
-            android:textColor="@color/widget_text_color_light"
-            android:textSize="16sp"
-            android:textStyle="bold"
-            android:maxLines="2"
-            android:layout_weight="1"
-            android:gravity="left|center_vertical" 
-            android:ellipsize="end" />
-    
-        <ImageButton
-            android:id="@+id/widget_button"
-            android:layout_width="33dip"
-            android:layout_height="39dip"
-            android:layout_gravity="right|center_vertical"
-            android:background="@android:color/transparent"
-            android:src="@drawable/ic_action_new"
-            android:scaleType="fitCenter"/>
-      
-    </LinearLayout>
-    
-    <ImageView
-        android:id="@+id/widget_header_separator"
-        android:layout_width="fill_parent"
-        android:layout_height="1px"
-        android:background="@color/dark_blue_theme_color"/>
-
-    <LinearLayout android:id="@+id/taskbody"
-    	android:layout_width="fill_parent"
-    	android:layout_height="fill_parent"
-    	android:background="@color/widget_body_light"
-	    android:orientation="vertical">
-    </LinearLayout>
-</LinearLayout>
diff --git a/astrid/src/main/res/layout/widget_initialized.xml b/astrid/src/main/res/layout/widget_initialized.xml
index 17a3b5f33..7320e2c63 100644
--- a/astrid/src/main/res/layout/widget_initialized.xml
+++ b/astrid/src/main/res/layout/widget_initialized.xml
@@ -6,11 +6,12 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/widget"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:background="@android:color/transparent">
+              android:id="@+id/widget"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:orientation="vertical"
+              android:padding="@dimen/widget_margin"
+              android:background="@android:color/transparent">
 
     <LinearLayout
         android:id="@+id/widget_header"
@@ -32,7 +33,7 @@
             android:maxLines="2"
             android:layout_weight="1"
             android:gravity="left|center_vertical"
-            android:ellipsize="end" />
+            android:ellipsize="end"/>
 
         <ImageButton
             android:id="@+id/widget_button"
@@ -44,14 +45,15 @@
             android:scaleType="fitCenter"/>
 
     </LinearLayout>
-    
+
     <ImageView
         android:id="@+id/widget_header_separator"
         android:layout_width="fill_parent"
         android:layout_height="1px"
         android:background="@color/dark_blue_theme_color"/>
 
-    <LinearLayout android:id="@+id/taskbody"
+    <LinearLayout
+        android:id="@+id/taskbody"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:background="@color/widget_body_light"
diff --git a/astrid/src/main/res/layout/widget_initialized_dark.xml b/astrid/src/main/res/layout/widget_initialized_dark.xml
index 111608d5c..131ed0d02 100644
--- a/astrid/src/main/res/layout/widget_initialized_dark.xml
+++ b/astrid/src/main/res/layout/widget_initialized_dark.xml
@@ -6,11 +6,12 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/widget"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:background="@android:color/transparent">
+              android:id="@+id/widget"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:orientation="vertical"
+              android:padding="@dimen/widget_margin"
+              android:background="@android:color/transparent">
 
     <LinearLayout
         android:id="@+id/widget_header"
@@ -32,7 +33,7 @@
             android:maxLines="2"
             android:layout_weight="1"
             android:gravity="left|center_vertical"
-            android:ellipsize="end" />
+            android:ellipsize="end"/>
 
         <ImageButton
             android:id="@+id/widget_button"
@@ -51,7 +52,8 @@
         android:layout_height="1px"
         android:background="@color/dark_blue_theme_color"/>
 
-    <LinearLayout android:id="@+id/taskbody"
+    <LinearLayout
+        android:id="@+id/taskbody"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:background="@color/widget_body_dark"
diff --git a/astrid/src/main/res/values-v14/dimens.xml b/astrid/src/main/res/values-v14/dimens.xml
new file mode 100644
index 000000000..378aaaf52
--- /dev/null
+++ b/astrid/src/main/res/values-v14/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="widget_margin">0dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/astrid/src/main/res/values/dimens.xml b/astrid/src/main/res/values/dimens.xml
new file mode 100644
index 000000000..e56a13c6f
--- /dev/null
+++ b/astrid/src/main/res/values/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="widget_margin">8dp</dimen>
+</resources>
\ No newline at end of file