Finished visual design of waiting on me controls

astrid/res/drawable/wom_edit_background.xml

@@ -1,24 +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. 
--->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <!-- Bottom 2dp Shadow -->
-    <item>
-        <shape android:shape="rectangle" >
-            <solid
-                android:color="#222"/>
-            <corners android:radius="2dp" />
-        </shape>
-    </item>
-    <item android:bottom="2px" android:right="1px" android:top="1px" android:left="1px">
-        <shape android:shape="rectangle" >
-            <solid android:color="#171717" />
-            <corners android:radius="2dp" />
-        </shape>
-    </item>
-
-</layer-list>

astrid/res/layout/task_edit_activity.xml

@@ -61,7 +61,6 @@
 		            android:paddingTop="1dip"
 		            android:paddingBottom="1dip"
 		            android:textColor="@android:color/white"
-		            android:background="?attr/asThemeTextColor"
 		            android:text="@string/wom_acknowledge"/>
 		        
 		        <TextView 
@@ -76,7 +75,6 @@
 		            android:paddingTop="1dip"
 		            android:paddingBottom="1dip"
 		            android:textColor="@android:color/white"
-		            android:background="#707070"
 		            android:text="@string/wom_dismiss"/>
 		        
 		    </RelativeLayout>

astrid/res/values/styles.xml

@@ -30,7 +30,7 @@
         <item name="asEditTextBackground">@null</item>
         <item name="asEditBackground">#101010</item>
         <item name="asEditRowBackground">@drawable/task_edit_background</item>
-        <item name="asWomEditRowBackground">@drawable/wom_edit_background</item>
+        <item name="asWomEditRowBackground">@drawable/task_edit_background</item>
         <item name="asEditTabBackground">@drawable/custom_tab_indicator_dark</item>
         <item name="asMainMenu">@drawable/menu_button_blue</item>
         <item name="asPeopleMenu">@drawable/people_menu_button_blue</item>

astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java

@@ -21,6 +21,8 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.Resources.Theme;
 import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
 import android.os.Handler;
 import android.speech.RecognizerIntent;
@@ -800,7 +802,11 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
             if (wom != null) {
                 final View waitingOnMe = getView().findViewById(R.id.waiting_on_me);
                 waitingOnMe.setVisibility(View.VISIBLE);
-                waitingOnMe.findViewById(R.id.wom_dismiss).setOnClickListener(new OnClickListener() {
+
+                int themeColor = getResources().getColor(ThemeService.getTaskEditThemeColor());
+
+                TextView dismiss = (TextView) waitingOnMe.findViewById(R.id.wom_dismiss);
+                dismiss.setOnClickListener(new OnClickListener() {
                     @Override
                     public void onClick(View v) {
                         WaitingOnMe template = new WaitingOnMe();
@@ -809,7 +815,14 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
                         waitingOnMe.setVisibility(View.GONE);
                     }
                 });
-                waitingOnMe.findViewById(R.id.wom_acknowledge).setOnClickListener(new OnClickListener() {
+                dismiss.setTextColor(getResources().getColor(R.color.task_edit_deadline_gray));
+                GradientDrawable gd = new GradientDrawable();
+                gd.setColor(ThemeService.getDarkVsLight(Color.rgb(0xee, 0xee, 0xee), Color.rgb(0x22, 0x22, 0x22), false));
+                gd.setCornerRadius(4.0f);
+                dismiss.setBackgroundDrawable(gd);
+
+                TextView ack = (TextView) waitingOnMe.findViewById(R.id.wom_acknowledge);
+                ack.setOnClickListener(new OnClickListener() {
                     @Override
                     public void onClick(View v) {
                         WaitingOnMe template = new WaitingOnMe();
@@ -818,10 +831,15 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
                         waitingOnMe.setVisibility(View.GONE);
                     }
                 });
+                ack.setTextColor(themeColor);
+                gd = new GradientDrawable();
+                gd.setColor(ThemeService.getDarkVsLight(Color.WHITE, Color.rgb(0x22, 0x22, 0x22), false));
+                gd.setCornerRadius(4.0f);
+                ack.setBackgroundDrawable(gd);
 
                 TextView womText = (TextView) waitingOnMe.findViewById(R.id.wom_message);
                 womText.setText(getWomText(wom));
-                womText.setTextColor(getResources().getColor(ThemeService.getTaskEditThemeColor()));
+                womText.setTextColor(themeColor);
 
                 ImageView womIcon = (ImageView) waitingOnMe.findViewById(R.id.wom_icon);
                 womIcon.setImageResource(ThemeService.getTaskEditDrawable(R.drawable.tea_icn_waiting, R.drawable.tea_icn_waiting_lightblue));

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

@@ -254,20 +254,20 @@ public class ThemeService {
                 ContextManager.getResources().getResourceName(lightDrawable));
     }
 
-    public static int getDarkVsLight(int resForWhite, int resForDark) {
+    public static int getDarkVsLight(int resForWhite, int resForDark, boolean altIsDark) {
         int theme = getTheme();
-        if (theme == R.style.Theme || theme == R.style.Theme_White_Alt || theme == R.style.Theme_TransparentWhite) {
+        if (theme == R.style.Theme || (theme == R.style.Theme_White_Alt && altIsDark) || theme == R.style.Theme_TransparentWhite) {
             return resForDark;
         } else {
             return resForWhite;
         }
     }
     public static int getTaskEditDrawable(int regularDrawable, int lightBlueDrawable) {
-        return getDarkVsLight(regularDrawable, lightBlueDrawable);
+        return getDarkVsLight(regularDrawable, lightBlueDrawable, true);
     }
 
     public static int getTaskEditThemeColor() {
-        return getDarkVsLight(R.color.task_edit_selected, R.color.blue_theme_color);
+        return getDarkVsLight(R.color.task_edit_selected, R.color.blue_theme_color, true);
     }
 
     public static void forceTheme(int theme) {

astrid/src/com/todoroo/astrid/ui/ImportanceControlSet.java

@@ -46,10 +46,7 @@ public class ImportanceControlSet extends TaskEditControlSet {
             if(b.getTag() == i) {
                 b.setTextSize(getTextSize());
                 b.setChecked(true);
-                int resource = ThemeService.getDarkVsLight(R.drawable.importance_background_selected, R.drawable.importance_background_selected_dark);
-                if (ThemeService.getTheme() == R.style.Theme_White_Alt)
-                    resource = R.drawable.importance_background_selected;
-                b.setBackgroundResource(resource);
+                b.setBackgroundResource(ThemeService.getDarkVsLight(R.drawable.importance_background_selected, R.drawable.importance_background_selected_dark, false));
             } else {
                 b.setTextSize(getTextSize());
                 b.setChecked(false);