move selection checkbox to the bottom left of headline row

5 files changed, 54 insertions, 55 deletions

diff --git a/res/layout/headlines_row.xml b/res/layout/headlines_row.xml
index 937f02fc..ac371724 100644
--- a/res/layout/headlines_row.xml
+++ b/res/layout/headlines_row.xml
@@ -21,8 +21,7 @@
             android:layout_width="match_parent"

             android:layout_height="wrap_content"

             android:gravity="center_vertical"

-            android:orientation="horizontal"

-            android:paddingLeft="6dp" >

+            android:orientation="horizontal" >

 

             <TextView

                 android:id="@+id/title"

@@ -43,14 +42,8 @@
             android:layout_height="wrap_content"

             android:layout_weight="1"

             android:gravity="center_vertical"

-            android:orientation="horizontal" >

-

-            <CheckBox

-                android:id="@+id/selected"

-                android:layout_width="wrap_content"

-                android:layout_height="wrap_content"

-                android:layout_weight="0"

-                android:focusable="false" />

+            android:orientation="horizontal"

+            android:paddingTop="3dp" >

 

             <TextView

                 android:id="@+id/feed_title"

@@ -79,7 +72,7 @@
             android:id="@+id/excerpt"

             android:layout_width="match_parent"

             android:layout_height="match_parent"

-            android:paddingLeft="6dp"

+            android:paddingTop="3dp"

             android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."

             android:textColor="?headlineExcerptTextColor"

             android:textSize="13sp" />

@@ -87,8 +80,15 @@
         <LinearLayout

             android:layout_width="match_parent"

             android:layout_height="wrap_content"

-            android:gravity="center_vertical"

-            android:paddingLeft="6dp" >

+            android:gravity="center_vertical" >

+

+            <CheckBox

+                android:id="@+id/selected"

+                android:layout_width="wrap_content"

+                android:layout_height="wrap_content"

+                android:layout_marginLeft="-6dp"

+                android:layout_weight="0"

+                android:focusable="false" />

 

             <TextView

                 android:id="@+id/author"

diff --git a/res/layout/headlines_row_selected.xml b/res/layout/headlines_row_selected.xml
index dedb8ad6..e370d32f 100644
--- a/res/layout/headlines_row_selected.xml
+++ b/res/layout/headlines_row_selected.xml
@@ -21,8 +21,7 @@
             android:layout_width="match_parent"

             android:layout_height="wrap_content"

             android:gravity="center_vertical"

-            android:orientation="horizontal"

-            android:paddingLeft="6dp" >

+            android:orientation="horizontal" >

 

             <TextView

                 android:id="@+id/title"

@@ -34,8 +33,7 @@
                 android:singleLine="false"

                 android:text="Sample entry title"

                 android:textColor="?attr/headlineSelectedTextColor"

-                android:textSize="16sp"

-                android:textStyle="bold" />

+                android:textSize="16sp" />

         </LinearLayout>

 

         <LinearLayout

@@ -44,14 +42,8 @@
             android:layout_height="wrap_content"

             android:layout_weight="1"

             android:gravity="center_vertical"

-            android:orientation="horizontal" >

-

-            <CheckBox

-                android:id="@+id/selected"

-                android:layout_width="wrap_content"

-                android:layout_height="wrap_content"

-                android:layout_weight="0"

-                android:focusable="false" />

+            android:orientation="horizontal"

+            android:paddingTop="3dp" >

 

             <TextView

                 android:id="@+id/feed_title"

@@ -80,7 +72,7 @@
             android:id="@+id/excerpt"

             android:layout_width="match_parent"

             android:layout_height="match_parent"

-            android:paddingLeft="6dp"

+            android:paddingTop="3dp"

             android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."

             android:textColor="?headlineSelectedExcerptTextColor"

             android:textSize="13sp" />

@@ -88,8 +80,15 @@
         <LinearLayout

             android:layout_width="match_parent"

             android:layout_height="wrap_content"

-            android:gravity="center_vertical"

-            android:paddingLeft="6dp" >

+            android:gravity="center_vertical" >

+

+            <CheckBox

+                android:id="@+id/selected"

+                android:layout_width="wrap_content"

+                android:layout_height="wrap_content"

+                android:layout_marginLeft="-6dp"

+                android:layout_weight="0"

+                android:focusable="false" />

 

             <TextView

                 android:id="@+id/author"

diff --git a/res/layout/headlines_row_selected_unread.xml b/res/layout/headlines_row_selected_unread.xml
index befa408f..2305a4f3 100644
--- a/res/layout/headlines_row_selected_unread.xml
+++ b/res/layout/headlines_row_selected_unread.xml
@@ -21,8 +21,7 @@
             android:layout_width="match_parent"

             android:layout_height="wrap_content"

             android:gravity="center_vertical"

-            android:orientation="horizontal"

-            android:paddingLeft="6dp" >

+            android:orientation="horizontal" >

 

             <TextView

                 android:id="@+id/title"

@@ -44,14 +43,8 @@
             android:layout_height="wrap_content"

             android:layout_weight="1"

             android:gravity="center_vertical"

-            android:orientation="horizontal" >

-

-            <CheckBox

-                android:id="@+id/selected"

-                android:layout_width="wrap_content"

-                android:layout_height="wrap_content"

-                android:layout_weight="0"

-                android:focusable="false" />

+            android:orientation="horizontal"

+            android:paddingTop="3dp" >

 

             <TextView

                 android:id="@+id/feed_title"

@@ -80,7 +73,7 @@
             android:id="@+id/excerpt"

             android:layout_width="match_parent"

             android:layout_height="match_parent"

-            android:paddingLeft="6dp"

+            android:paddingTop="3dp"

             android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."

             android:textColor="?headlineSelectedExcerptTextColor"

             android:textSize="13sp" />

@@ -88,8 +81,15 @@
         <LinearLayout

             android:layout_width="match_parent"

             android:layout_height="wrap_content"

-            android:gravity="center_vertical"

-            android:paddingLeft="6dp" >

+            android:gravity="center_vertical" >

+

+            <CheckBox

+                android:id="@+id/selected"

+                android:layout_width="wrap_content"

+                android:layout_height="wrap_content"

+                android:layout_marginLeft="-6dp"

+                android:layout_weight="0"

+                android:focusable="false" />

 

             <TextView

                 android:id="@+id/author"

diff --git a/res/layout/headlines_row_unread.xml b/res/layout/headlines_row_unread.xml
index 50eb582e..22f9c452 100644
--- a/res/layout/headlines_row_unread.xml
+++ b/res/layout/headlines_row_unread.xml
@@ -21,8 +21,7 @@
             android:layout_width="match_parent"

             android:layout_height="wrap_content"

             android:gravity="center_vertical"

-            android:orientation="horizontal"

-            android:paddingLeft="6dp" >

+            android:orientation="horizontal" >

 

             <TextView

                 android:id="@+id/title"

@@ -44,14 +43,8 @@
             android:layout_height="wrap_content"

             android:layout_weight="1"

             android:gravity="center_vertical"

-            android:orientation="horizontal" >

-

-            <CheckBox

-                android:id="@+id/selected"

-                android:layout_width="wrap_content"

-                android:layout_height="wrap_content"

-                android:layout_weight="0"

-                android:focusable="false" />

+            android:orientation="horizontal"

+            android:paddingTop="3dp" >

 

             <TextView

                 android:id="@+id/feed_title"

@@ -80,7 +73,7 @@
             android:id="@+id/excerpt"

             android:layout_width="match_parent"

             android:layout_height="match_parent"

-            android:paddingLeft="6dp"

+            android:paddingTop="3dp"

             android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."

             android:textColor="?headlineExcerptTextColor"

             android:textSize="13sp" />

@@ -88,8 +81,15 @@
         <LinearLayout

             android:layout_width="match_parent"

             android:layout_height="wrap_content"

-            android:gravity="center_vertical"

-            android:paddingLeft="6dp" >

+            android:gravity="center_vertical" >

+

+            <CheckBox

+                android:id="@+id/selected"

+                android:layout_width="wrap_content"

+                android:layout_height="wrap_content"

+                android:layout_marginLeft="-6dp"

+                android:layout_weight="0"

+                android:focusable="false" />

 

             <TextView

                 android:id="@+id/author"

diff --git a/res/values/resources.xml b/res/values/resources.xml
index f32ec5b7..7e1b097e 100644
--- a/res/values/resources.xml
+++ b/res/values/resources.xml
@@ -10,5 +10,5 @@
 	<color name="unread_counter_background_dark">#303030</color>

 	<color name="unread_counter_background_sepia">#C46262</color>

 	<color name="unread_counter_background_selected_light">#4684ff</color>

-	<color name="feeds_dark_gray">#1c1d1e</color>

+	<color name="feeds_dark_gray">#1c1d1e</color>	

 </resources>
\ No newline at end of file