Minor tweaks to improve the login experience:

- lightened up the popover images
  - now clicking passes through to underlying thing
  - code cleanup

astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java

@@ -184,7 +184,8 @@ public class TagViewActivity extends TaskListActivity implements OnTabChangeList
         tabHost.setup();
 
         taskListView = super.getListBody(parent);
-        ((TextView)taskListView.findViewById(android.R.id.empty)).setText(R.string.DLG_loading);
+        if(actFmPreferenceService.isLoggedIn())
+            ((TextView)taskListView.findViewById(android.R.id.empty)).setText(R.string.DLG_loading);
         tabContent.addView(taskListView);
 
         addTab(taskListView.getId(), "tasks", tabLabels[0]);

astrid/res/values/strings-intro.xml

@@ -12,45 +12,31 @@
 
   <!-- Task 1 Note -->
   <string name="intro_task_1_note">Two ways to add a task:\n
-  \n
   1) Quick Add: Type the task into the quick entry box at bottom of screen and press the + button on the right.\n
-  \n
   2) Regular Add: Press the + button of the quick entry box. Add as much detail as you want. Then press \"Save\" or use your phone\'s back button.\n
-  \n
   </string>
   
-  <!-- Task 1 due date setting. Corresponds to Task.URGENCY_TOMORROW -->
-  <string name="intro_task_1_due_setting">2</string>
-  
   <!-- Task 2 Summary  -->
   <string name="intro_task_2_summary">Add a widget to your desktop</string>
 
   <!-- Task 2 Note -->
-  <string name="intro_task_2_note">\n
+  <string name="intro_task_2_note">
   1) Long Press on your phone\'s desktop\n
-  2) Choose \"Widget\"\n
-  3) Choose the Astrid widget\n
-  4) Select the list you want and press OK.\n
-  \n
+  &#160;&#160;&#160;&#160;&#160;2) Choose \"Widget\"\n
+  &#160;&#160;&#160;&#160;&#160;3) Choose the Astrid widget\n
+  &#160;&#160;&#160;&#160;&#160;4) Select the list you want and press OK.\n
   </string>
   
-  <!-- Task 2 due date setting. Corresponds to Task.URGENCY_DAY_AFTER -->
-  <string name="intro_task_2_due_setting">3</string>
-  
     <!-- Task 3 Summary  -->
   <string name="intro_task_3_summary">Setup sync with Astrid.com</string>
 
   <!-- Task 3 Note -->
-  <string name="intro_task_3_note">\n
+  <string name="intro_task_3_note">
     1) Press your Menu button\n
-    2) Choose \"Sync Now\"\n
-    3) Select \"Astrid.com\"\n
-    4) Log In &amp; Synchronize!\n
-    \n
+    &#160;&#160;&#160;&#160;&#160;2) Choose \"Sync Now\"\n
+    &#160;&#160;&#160;&#160;&#160;3) Select \"Astrid.com\"\n
+    &#160;&#160;&#160;&#160;&#160;4) Log In &amp; Synchronize!\n
   </string>
-  
-  <!-- Task 1 due date setting. Corresponds to Task.URGENCY_NONE -->
-  <string name="intro_task_3_due_setting">0</string>
  
   <!-- NEW USER EXPERIENCE -->
   
@@ -86,6 +72,8 @@
   
   <string name="welcome_login_confirm_later_cancel">No thanks</string>
   
-  <string name="welcome_login_confirm_later_dialog">Sign-in to get the most out of Astrid! For free you get online backup, full synchronization with with Astrid.com the ability to add tasks via email and you can even share tasks lists with friends!</string>
+  <string name="welcome_login_confirm_later_dialog">Sign-in to get the most out of Astrid! 
+  For free you get online backup, full synchronization with with Astrid.com the 
+  ability to add tasks via email and you can even share tasks lists with friends!</string>
   
 </resources>

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

@@ -43,6 +43,7 @@ import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
 import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.AbsListView;
 import android.widget.AbsListView.OnScrollListener;
 import android.widget.AdapterView.AdapterContextMenuInfo;
@@ -786,10 +787,12 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
 
     private void showHelpPopover() {
         if (!Preferences.getBoolean(R.string.p_showed_tap_task_help, false)) {
+            InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+            imm.hideSoftInputFromWindow(quickAddBox.getWindowToken(), 0);
             getListView().postDelayed(new Runnable() {
                 public void run() {
-                    View view = getListView().getChildAt(getListView().getChildCount() - 1);
-                    HelpInfoPopover.showPopover(TaskListActivity.this, view, R.string.help_popover_tap_task);
+                    final View view = getListView().getChildAt(getListView().getChildCount() - 1);
+                    HelpInfoPopover popover = HelpInfoPopover.showPopover(TaskListActivity.this, view, R.string.help_popover_tap_task);
                 }
             }, 1000L);
 

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

@@ -220,21 +220,18 @@ public class StartupService {
     private static final int[] INTRO_TASKS = new int[] {
         R.string.intro_task_2_summary,
         R.string.intro_task_2_note,
-        R.string.intro_task_2_due_setting,
+        Task.URGENCY_DAY_AFTER,
         R.string.intro_task_3_summary,
         R.string.intro_task_3_note,
-        R.string.intro_task_3_due_setting,
+        Task.URGENCY_NONE,
     };
     public static final int INTRO_TASK_SIZE = INTRO_TASKS.length / 3;
 
     private void addIntroTask(Resources r, int summary, int note, int dueSetting) {
         Task task = new Task();
         task.setValue(Task.TITLE, r.getString(summary));
-        //task.setValue(Task.DETAILS, r.getString(R.string.intro_click_prompt));
-        //task.setValue(Task.DETAILS_DATE, 2*DateUtilities.now());
         task.setValue(Task.NOTES, r.getString(note));
-        int dueSettingParse = Integer.parseInt(r.getString(dueSetting));
-        long dueDate = Task.createDueDate(dueSettingParse, 0);
+        long dueDate = Task.createDueDate(dueSetting, 0);
         task.setValue(Task.DUE_DATE, dueDate);
         taskService.save(task);
     }

astrid/src/com/todoroo/astrid/welcome/HelpInfoPopover.java

@@ -16,16 +16,24 @@ import android.widget.TextView;
 
 import com.timsu.astrid.R;
 
+/**
+ * Displays a popover with some help text for first time users.
+ *
+ * @author Sam Bosley <sam@astrid.com>
+ *
+ */
 public class HelpInfoPopover extends QuickActionWidget {
 
-    public static void showPopover(final Activity activity, final View parent, final int textId) {
+    public static HelpInfoPopover showPopover(final Activity activity, final View parent,
+            final int textId) {
+        final HelpInfoPopover toShow = new HelpInfoPopover(activity, textId);
         parent.post(new Runnable() {
             @Override
             public void run() {
-                HelpInfoPopover toShow = new HelpInfoPopover(activity, textId);
                 toShow.show(parent);
             }
         });
+        return toShow;
     }
 
     public HelpInfoPopover(Context context, int textId) {
@@ -33,6 +41,8 @@ public class HelpInfoPopover extends QuickActionWidget {
         setContentView(R.layout.help_popover);
         TextView message = (TextView)getContentView().findViewById(R.id.gdi_message);
         message.setText(textId);
+        setFocusable(false);
+        setTouchable(true);
     }
 
     @Override