From 73b6025c6baa5270e656d3d2012e42a4ae841078 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Fri, 13 Jul 2012 11:14:06 -0700
Subject: [PATCH] Cleanup and minor conflict resolution

---
 astrid/res/layout/billing_activity.xml         | 18 ++++++------------
 astrid/res/values/colors.xml                   |  1 -
 astrid/res/values/styles.xml                   |  6 ++++++
 .../astrid/billing/BillingActivity.java        |  4 ++--
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/astrid/res/layout/billing_activity.xml b/astrid/res/layout/billing_activity.xml
index eb68e20fc..6642fb33d 100644
--- a/astrid/res/layout/billing_activity.xml
+++ b/astrid/res/layout/billing_activity.xml
@@ -48,9 +48,8 @@
 		        android:layout_width="wrap_content"
 		        android:layout_gravity="left"
 		        android:text="@string/premium_description_1"
-		        android:textSize="14dip"
 		        android:layout_marginBottom="12dip"
-		        android:textColor="@color/black"/>
+		        style="@style/TextAppearance.Premium_Billing"/>
 		</LinearLayout>
 		<LinearLayout 
             android:layout_width="fill_parent"
@@ -66,9 +65,8 @@
 		        android:layout_width="wrap_content"
 		        android:layout_gravity="left"
 		        android:text="@string/premium_description_2"
-		        android:textSize="14dip"
 		        android:layout_marginBottom="12dip"
-		        android:textColor="@color/black"/>
+		        style="@style/TextAppearance.Premium_Billing"/>
 		</LinearLayout>
 		<LinearLayout 
             android:layout_width="fill_parent"
@@ -84,9 +82,8 @@
 		        android:layout_width="wrap_content"
 		        android:layout_gravity="left"
 		        android:text="@string/premium_description_3"
-		        android:textSize="14dip"
 		        android:layout_marginBottom="12dip"
-		        android:textColor="@color/black"/>
+                style="@style/TextAppearance.Premium_Billing"/>
 		</LinearLayout>
 		<LinearLayout 
             android:layout_width="fill_parent"
@@ -102,9 +99,8 @@
 		        android:layout_width="wrap_content"
 		        android:layout_gravity="left"
 		        android:text="@string/premium_description_4"
-		        android:textSize="14dip"
 		        android:layout_marginBottom="12dip"
-		        android:textColor="@color/black"/>
+		        style="@style/TextAppearance.Premium_Billing"/>
 		</LinearLayout>
 		<LinearLayout 
             android:layout_width="fill_parent"
@@ -120,9 +116,8 @@
 		        android:layout_width="wrap_content"
 		        android:layout_gravity="left"
 		        android:text="@string/premium_description_5"
-		        android:textSize="14dip"
 		        android:layout_marginBottom="12dip"
-		        android:textColor="@color/black"/>
+		        style="@style/TextAppearance.Premium_Billing"/>
 		</LinearLayout>
 		<LinearLayout 
             android:layout_width="fill_parent"
@@ -138,9 +133,8 @@
 		        android:layout_width="wrap_content"
 		        android:layout_gravity="left"
 		        android:text="@string/premium_description_6"
-		        android:textSize="14dip"
 		        android:layout_marginBottom="12dip"
-		        android:textColor="@color/black"/>
+		        style="@style/TextAppearance.Premium_Billing"/>
 		</LinearLayout>
     </LinearLayout>
         
diff --git a/astrid/res/values/colors.xml b/astrid/res/values/colors.xml
index e4ee1377d..ab82f46ed 100644
--- a/astrid/res/values/colors.xml
+++ b/astrid/res/values/colors.xml
@@ -42,7 +42,6 @@
     <color name="widget_header_legacy_start">#fc1c2334</color>
     <color name="widget_header_legacy_end">#fc243455</color>
     <color name="widget_body_legacy">#fc1c1c1c</color>
-    <color name="black">#000</color>
         
 </resources>
 
diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml
index ec0c54261..29999aa26 100644
--- a/astrid/res/values/styles.xml
+++ b/astrid/res/values/styles.xml
@@ -437,4 +437,10 @@
         <item name="android:layout_marginRight">0dip</item>
     </style>
     
+    <!-- ========================================================= Premium == -->
+    <style name="TextAppearance.Premium_Billing">
+        <item name="android:textSize">14dip</item>                                                                                                                                                                    
+        <item name="android:textColor">@android:color/black</item> 
+    </style>
+    
 </resources>
diff --git a/astrid/src/com/todoroo/astrid/billing/BillingActivity.java b/astrid/src/com/todoroo/astrid/billing/BillingActivity.java
index 276163e68..a28dbef50 100644
--- a/astrid/src/com/todoroo/astrid/billing/BillingActivity.java
+++ b/astrid/src/com/todoroo/astrid/billing/BillingActivity.java
@@ -69,8 +69,8 @@ public class BillingActivity extends Activity {
     }
 
     private void setupButtons() {
-        buyMonth = (Button) findViewById(R.id.buy_month);
-        buyYear = (Button) findViewById(R.id.buy_year);
+        buyMonth = (Button) findViewById(R.id.premium_buy_month);
+        buyYear = (Button) findViewById(R.id.premium_buy_year);
 
         buyMonth.setEnabled(false);
         buyYear.setEnabled(false);