Added new icons to repeat control set, fixed a color

astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java

@@ -16,7 +16,6 @@ import android.app.Activity;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.text.TextUtils;
-import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.AdapterView;
@@ -42,6 +41,7 @@ import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.service.StatisticsConstants;
 import com.todoroo.astrid.service.StatisticsService;
 import com.todoroo.astrid.service.TaskService;
+import com.todoroo.astrid.service.ThemeService;
 import com.todoroo.astrid.ui.DateAndTimeDialog;
 import com.todoroo.astrid.ui.DateAndTimeDialog.DateAndTimeDialogListener;
 import com.todoroo.astrid.ui.DateAndTimePicker;
@@ -400,19 +400,16 @@ public class RepeatControlSet extends PopupControlSet {
     @Override
     protected void refreshDisplayView() {
         TextView repeatDisplay = (TextView) getDisplayView().findViewById(R.id.display_row_edit);
-        ImageView repeatImage = (ImageView) getDisplayView().findViewById(R.id.repeat_image_icon);
+        ImageView repeatImage = (ImageView) getDisplayView().findViewById(R.id.display_row_icon);
         if (doRepeat) {
             repeatDisplay.setText(getRepeatString(true));
-
-            TypedValue repeatIcon = new TypedValue();
-            activity.getTheme().resolveAttribute(R.attr.asRepeatIcon, repeatIcon, false);
-            repeatImage.setImageResource(repeatIcon.data);
             repeatDisplay.setTextColor(themeColor);
+            repeatImage.setImageResource(ThemeService.getTaskEditDrawable(R.drawable.tea_icn_repeat, R.drawable.tea_icn_repeat));
 
         } else {
             repeatDisplay.setTextColor(unsetColor);
             repeatDisplay.setText(R.string.repeat_never);
-            repeatImage.setImageResource(R.drawable.icn_edit_repeats);
+            repeatImage.setImageResource(R.drawable.tea_icn_repeat_gray);
         }
     }
 

astrid/res/layout/control_set_repeat_display.xml

@@ -16,10 +16,11 @@
       android:layout_width="fill_parent"
       android:layout_height="50dip"
       android:gravity="center_vertical">
-      <ImageView 
-        style="@style/EditRowImage"
-        android:id="@+id/repeat_image_icon"
-        android:src="@drawable/icn_edit_repeats"/>
+      <ImageView android:id="@+id/display_row_icon"
+             android:layout_marginRight="10dip"
+             android:layout_width="20dip"
+             android:layout_height="20dip"
+             android:scaleType="fitCenter"/>
 	  <TextView
 	      android:id="@+id/display_row_edit"
 	      android:layout_width="fill_parent"

astrid/res/values/attrs.xml

@@ -36,7 +36,6 @@
   <attr name="asMicButtonImg" format="reference" />
   <attr name="asCommentButtonImg" format="reference" />
   <attr name="asFilledCommentButtonImg" format="reference" />
-  <attr name="asRepeatIcon" format="reference" />
   <attr name="asMainMenu" format="reference" />
   <attr name="asPeopleMenu" format="reference" />
   <attr name="asAbBackgroundColor" format="color"/>

astrid/res/values/colors.xml

@@ -23,6 +23,7 @@
     <color name="tablet_list_bg">#292929</color>
     <color name="tablet_list_selected">#000000</color>
     <color name="reminder_background">#262626</color>
+    <color name="task_edit_selected">#385487</color>
     
     <color name="widget_text_color_light">#535353</color>
     <color name="widget_text_color_dark">#ffffff</color>

astrid/res/values/styles.xml

@@ -37,7 +37,6 @@
         <item name="asListsDisclosure">@drawable/lists_disclosure_blue</item>
         <item name="asAbBackgroundColor">#000000</item>
         <item name="asQuickaddBackgroundColor">?attr/asAbBackgroundColor</item>
-        <item name="asRepeatIcon">@drawable/icn_edit_repeats_blue</item>
         <item name="asListPopoverBg">@drawable/list_popover_bg_white</item>
         <item name="asListArrowUp">@drawable/list_arrow_up_white</item>
         <item name="asFilterSelectedIcon">@drawable/filter_selected_icon</item>
@@ -110,7 +109,6 @@
         <item name="asPeopleMenu">@drawable/people_menu_button_red</item>
         <item name="asThemeTextColor">@color/red_theme_color</item>
         <item name="asListsDisclosure">@drawable/lists_disclosure_red</item>
-        <item name="asRepeatIcon">@drawable/icn_edit_repeats_red</item>
         <item name="asAbBackgroundColor">#ffffff</item>
         <item name="asListPopoverBg">@drawable/list_popover_bg</item>
         <item name="asListArrowUp">@drawable/list_arrow_up</item>
@@ -144,7 +142,6 @@
         <item name="asPeopleMenu">@drawable/people_menu_button_dark_blue</item>
         <item name="asThemeTextColor">@color/dark_blue_theme_color</item>
         <item name="asListsDisclosure">@drawable/lists_disclosure_dark_blue</item>
-        <item name="asRepeatIcon">@drawable/icn_edit_repeats_dark_blue</item>
         <item name="asAbBackgroundColor">#e9e9e9</item>
         <item name="asEditTabBackground">@drawable/custom_tab_indicator_dark_blue</item>
         <item name="android:actionBarStyle">@style/AstridV11ActionBarStyle.White.Blue</item>
@@ -171,7 +168,6 @@
         <item name="asListsDisclosure">@drawable/lists_disclosure_blue_alt</item>
         <item name="asEditTabBackground">@drawable/custom_tab_indicator_alt</item>
         <item name="asThemeTextColor">@color/blue_theme_color</item>
-        <item name="asRepeatIcon">@drawable/icn_edit_repeats_blue</item>
         <item name="asAbBackgroundColor">#eee</item>
         <item name="asHeaderTextColor">@android:color/white</item>
         <item name="asHeaderTextColorInverse">?attr/asThemeTextColor</item>

astrid/src/com/todoroo/astrid/service/ThemeService.java

@@ -268,7 +268,7 @@ public class ThemeService {
         if (theme == R.style.Theme || theme == R.style.Theme_White_Alt || theme == R.style.Theme_TransparentWhite) {
             return R.color.blue_theme_color;
         } else {
-            return R.color.dark_blue_theme_color;
+            return R.color.task_edit_selected;
         }
     }