From e66e252f62cc54033f525e3c5dee5457b5d79d93 Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Fri, 30 Jul 2010 17:50:41 -0700
Subject: [PATCH] Timer control set pulled out now power pack window

---
 .../astrid/timers/TimerControlSet.java        |  82 +++++++++++++
 astrid/res/drawable/icon_pp.png               | Bin 0 -> 15789 bytes
 astrid/res/layout/task_edit_activity.xml      |  22 ----
 astrid/res/layout/timer_control.xml           |  28 +++++
 astrid/res/values/strings-core.xml            |   7 +-
 .../astrid/activity/TaskEditActivity.java     |  55 ++-------
 .../astrid/activity/TaskListActivity.java     |  55 +--------
 .../todoroo/astrid/service/AddonService.java  | 113 +++++++++++++++++-
 8 files changed, 241 insertions(+), 121 deletions(-)
 create mode 100644 astrid/plugin-src/com/todoroo/astrid/timers/TimerControlSet.java
 create mode 100644 astrid/res/drawable/icon_pp.png
 create mode 100644 astrid/res/layout/timer_control.xml

diff --git a/astrid/plugin-src/com/todoroo/astrid/timers/TimerControlSet.java b/astrid/plugin-src/com/todoroo/astrid/timers/TimerControlSet.java
new file mode 100644
index 000000000..361f45dac
--- /dev/null
+++ b/astrid/plugin-src/com/todoroo/astrid/timers/TimerControlSet.java
@@ -0,0 +1,82 @@
+package com.todoroo.astrid.timers;
+
+import android.app.Activity;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import com.timsu.astrid.R;
+import com.todoroo.andlib.data.Property.IntegerProperty;
+import com.todoroo.andlib.service.DependencyInjectionService;
+import com.todoroo.astrid.activity.TaskEditActivity.TaskEditControlSet;
+import com.todoroo.astrid.model.Task;
+import com.todoroo.astrid.ui.TimeDurationControlSet;
+import com.todoroo.astrid.ui.TimeDurationControlSet.TimeDurationType;
+
+/**
+ * Control Set for managing repeats
+ *
+ * @author Tim Su <tim@todoroo.com>
+ *
+ */
+public class TimerControlSet implements TaskEditControlSet {
+
+    private final Activity activity;
+
+    TaskEditControlSet estimated, elapsed;
+
+    public TimerControlSet(final Activity activity, ViewGroup parent) {
+        DependencyInjectionService.getInstance().inject(this);
+
+        this.activity = activity;
+        LayoutInflater.from(activity).inflate(R.layout.gcal_control, parent, true);
+
+        estimated = new TimeDurationTaskEditControlSet(Task.ESTIMATED_SECONDS,
+                R.id.estimatedDuration, 0, R.string.DLG_hour_minutes,
+                TimeDurationType.HOURS_MINUTES);
+        elapsed = new TimeDurationTaskEditControlSet(Task.ELAPSED_SECONDS, R.id.elapsedDuration,
+                0, R.string.DLG_hour_minutes,
+                TimeDurationType.HOURS_MINUTES);
+    }
+
+    @Override
+    public void readFromTask(Task task) {
+        estimated.readFromTask(task);
+        elapsed.readFromTask(task);
+    }
+
+    @Override
+    public void writeToModel(Task task) {
+        estimated.writeToModel(task);
+        elapsed.writeToModel(task);
+    }
+
+    // --- TimeDurationTaskEditControlSet
+
+    /**
+     * Control set for mapping a Property to a TimeDurationControlSet
+     * @author Tim Su <tim@todoroo.com>
+     *
+     */
+    public class TimeDurationTaskEditControlSet implements TaskEditControlSet {
+        private final TimeDurationControlSet controlSet;
+        private final IntegerProperty property;
+
+        public TimeDurationTaskEditControlSet(IntegerProperty property, int timeButtonId,
+                int prefixResource, int titleResource, TimeDurationType type) {
+            this.property = property;
+            this.controlSet = new TimeDurationControlSet(activity,
+                    timeButtonId, prefixResource, titleResource, type);
+        }
+
+        @Override
+        public void readFromTask(Task task) {
+            controlSet.setTimeDuration(task.getValue(property));
+        }
+
+        @Override
+        public void writeToModel(Task task) {
+            task.setValue(property, controlSet.getTimeDurationInSeconds());
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/astrid/res/drawable/icon_pp.png b/astrid/res/drawable/icon_pp.png
new file mode 100644
index 0000000000000000000000000000000000000000..df0637a7ad70e3b401e2908bcb2fcb16066871be
GIT binary patch
literal 15789
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

literal 0
HcmV?d00001

diff --git a/astrid/res/layout/task_edit_activity.xml b/astrid/res/layout/task_edit_activity.xml
index 09c4f764d..60a1a1b8c 100644
--- a/astrid/res/layout/task_edit_activity.xml
+++ b/astrid/res/layout/task_edit_activity.xml
@@ -246,28 +246,6 @@
       android:orientation="vertical"
       android:layout_width="fill_parent"
       android:layout_height="fill_parent">
-                            
-      <!-- estimated time -->
-      <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/TEA_estimatedDuration_label"
-        style="@style/TextAppearance.GEN_EditLabel" />
-      <Button
-        android:id="@+id/estimatedDuration"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" />
-        
-      <!-- elapsed time -->
-      <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/TEA_elapsedDuration_label"
-        style="@style/TextAppearance.GEN_EditLabel" />
-      <Button
-        android:id="@+id/elapsedDuration"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" />
                 
       <!-- add-ons -->
       <LinearLayout android:id="@+id/tab_addons_addons"
diff --git a/astrid/res/layout/timer_control.xml b/astrid/res/layout/timer_control.xml
new file mode 100644
index 000000000..ba181ca83
--- /dev/null
+++ b/astrid/res/layout/timer_control.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See the file "LICENSE" for the full license governing this code. -->
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+    
+    <!-- estimated time -->
+    <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/TEA_estimatedDuration_label"
+      style="@style/TextAppearance.GEN_EditLabel" />
+    <Button
+      android:id="@+id/estimatedDuration"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content" />
+      
+    <!-- elapsed time -->
+    <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/TEA_elapsedDuration_label"
+      style="@style/TextAppearance.GEN_EditLabel" />
+    <Button
+      android:id="@+id/elapsedDuration"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content" />
+  
+</merge>
+
diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml
index 3bc6320ec..c1e1226ce 100644
--- a/astrid/res/values/strings-core.xml
+++ b/astrid/res/values/strings-core.xml
@@ -126,11 +126,16 @@
   <!-- Title for dialog selecting a time (hours and minutes) -->
   <string name="DLG_hour_minutes">Time (hours : minutes)</string>
   
-  <!-- Dialog when Astrid needs to be updated -->
+  <!-- Dialog for Astrid having a critical update -->
   <string name="DLG_please_update">Astrid should to be updated to the latest
   version in the Android market! Please do that before continuing, or wait a 
   few seconds.</string>
   
+    <!-- Dialog for Astrid Power Pack -->
+  <string name="DLG_power_pack">Support Astrid and get more productive with 
+  the Astrid Power Pack backup, widgets, no ads, and calendar integration. 
+  Power up today!</string>
+  
   <!-- Button for going to Market -->
   <string name="DLG_to_market">Go To Market</string>
   
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
index b8b418e31..d9734f370 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
@@ -27,22 +27,24 @@ import java.util.List;
 
 import android.app.AlertDialog;
 import android.app.DatePickerDialog;
-import android.app.TabActivity;
 import android.app.DatePickerDialog.OnDateSetListener;
+import android.app.TabActivity;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.DialogInterface.OnCancelListener;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.DialogInterface.OnCancelListener;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.View.OnClickListener;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemSelectedListener;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.CheckBox;
@@ -57,11 +59,9 @@ import android.widget.TabHost;
 import android.widget.TimePicker;
 import android.widget.Toast;
 import android.widget.ToggleButton;
-import android.widget.AdapterView.OnItemSelectedListener;
 
 import com.flurry.android.FlurryAgent;
 import com.timsu.astrid.R;
-import com.todoroo.andlib.data.Property.IntegerProperty;
 import com.todoroo.andlib.data.Property.StringProperty;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
@@ -77,10 +77,9 @@ import com.todoroo.astrid.service.AddonService;
 import com.todoroo.astrid.service.StartupService;
 import com.todoroo.astrid.service.TaskService;
 import com.todoroo.astrid.tags.TagsControlSet;
+import com.todoroo.astrid.timers.TimerControlSet;
 import com.todoroo.astrid.ui.DeadlineTimePickerDialog;
-import com.todoroo.astrid.ui.TimeDurationControlSet;
 import com.todoroo.astrid.ui.DeadlineTimePickerDialog.OnDeadlineTimeSetListener;
-import com.todoroo.astrid.ui.TimeDurationControlSet.TimeDurationType;
 import com.todoroo.astrid.utility.Constants;
 
 /**
@@ -215,16 +214,17 @@ public final class TaskEditActivity extends TabActivity {
         LinearLayout addonsAddons = (LinearLayout) findViewById(R.id.tab_addons_addons);
         if(AddonService.isPowerPack()) {
             controls.add(new GCalControlSet(this, addonsAddons));
-            controls.add(new TimeDurationTaskEditControlSet(Task.ESTIMATED_SECONDS,
-                    R.id.estimatedDuration, 0, R.string.DLG_hour_minutes,
-                    TimeDurationType.HOURS_MINUTES));
-            controls.add(new TimeDurationTaskEditControlSet(Task.ELAPSED_SECONDS, R.id.elapsedDuration,
-                    0, R.string.DLG_hour_minutes,
-                    TimeDurationType.HOURS_MINUTES));
+            controls.add(new TimerControlSet(this, addonsAddons));
         } else {
             Button button = new Button(this);
             addonsAddons.addView(button);
-
+            button.setText(AddonService.POWER_PACK_LABEL);
+            button.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    AddonService.displayPowerPackHelp(TaskEditActivity.this);
+                }
+            });
         }
 
         // read data
@@ -583,35 +583,6 @@ public final class TaskEditActivity extends TabActivity {
         }
     }
 
-    // --- TimeDurationTaskEditControlSet
-
-    /**
-     * Control set for mapping a Property to a TimeDurationControlSet
-     * @author Tim Su <tim@todoroo.com>
-     *
-     */
-    public class TimeDurationTaskEditControlSet implements TaskEditControlSet {
-        private final TimeDurationControlSet controlSet;
-        private final IntegerProperty property;
-
-        public TimeDurationTaskEditControlSet(IntegerProperty property, int timeButtonId,
-                int prefixResource, int titleResource, TimeDurationType type) {
-            this.property = property;
-            this.controlSet = new TimeDurationControlSet(TaskEditActivity.this,
-                    timeButtonId, prefixResource, titleResource, type);
-        }
-
-        @Override
-        public void readFromTask(Task task) {
-            controlSet.setTimeDuration(task.getValue(property));
-        }
-
-        @Override
-        public void writeToModel(Task task) {
-            task.setValue(property, controlSet.getTimeDurationInSeconds());
-        }
-    }
-
     // --- ImportanceControlSet
 
     /**
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index afbc79173..c189db4d8 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -3,9 +3,6 @@ package com.todoroo.astrid.activity;
 import java.util.Date;
 import java.util.List;
 import java.util.Map.Entry;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.concurrent.atomic.AtomicInteger;
 
 import android.app.AlertDialog;
 import android.app.ListActivity;
@@ -18,7 +15,6 @@ import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.database.Cursor;
-import android.net.Uri;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextUtils;
@@ -68,6 +64,7 @@ import com.todoroo.astrid.model.Task;
 import com.todoroo.astrid.reminders.Notifications;
 import com.todoroo.astrid.reminders.ReminderService;
 import com.todoroo.astrid.reminders.ReminderService.AlarmScheduler;
+import com.todoroo.astrid.service.AddonService;
 import com.todoroo.astrid.service.MetadataService;
 import com.todoroo.astrid.service.StartupService;
 import com.todoroo.astrid.service.TaskService;
@@ -161,7 +158,7 @@ public class TaskListActivity extends ListActivity implements OnScrollListener {
         if(database == null)
             return;
 
-        checkForUpgrades();
+        AddonService.checkForUpgrades(this);
 
         database.openForWriting();
         setUpUiComponents();
@@ -177,54 +174,6 @@ public class TaskListActivity extends ListActivity implements OnScrollListener {
         }).start();
     }
 
-    private void checkForUpgrades() {
-        final AtomicInteger countdown = new AtomicInteger(10);
-        if(DateUtilities.now() > Constants.UPGRADE.getTime()) {
-            DialogInterface.OnClickListener okListener = new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface arg0, int arg1) {
-                    startActivity(new Intent(Intent.ACTION_VIEW,
-                            Uri.parse("market://search?q=pname:" + //$NON-NLS-1$
-                                    getPackageName())));
-                    finish();
-                }
-            };
-
-            final AlertDialog dialog = new AlertDialog.Builder(this)
-            .setTitle(R.string.DLG_information_title)
-            .setMessage(R.string.DLG_please_update)
-            .setIcon(android.R.drawable.ic_dialog_alert)
-            .setPositiveButton(R.string.DLG_to_market, okListener)
-            .setNegativeButton(countdown.toString(), null)
-            .setCancelable(false)
-            .show();
-            dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setEnabled(false);
-
-            final Timer timer = new Timer();
-            timer.scheduleAtFixedRate(new TimerTask() {
-                @Override
-                public void run() {
-                    final int number = countdown.addAndGet(-1);
-                    if(number == 0)
-                        timer.cancel();
-
-                    runOnUiThread(new Runnable() {
-                        public void run() {
-                            if(number == 0) {
-                                dialog.setCancelable(true);
-                                dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setText(
-                                        android.R.string.ok);
-                                dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setEnabled(true);
-                            } else {
-                                dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setText(
-                                        Integer.toString(number));
-                            }
-                        }
-                    });
-                }
-            }, 0L, 1000L);
-        }
-    }
 
     /**
      * Create options menu (displayed when user presses menu key)
diff --git a/astrid/src/com/todoroo/astrid/service/AddonService.java b/astrid/src/com/todoroo/astrid/service/AddonService.java
index 43b6eb3e1..98f71a67e 100644
--- a/astrid/src/com/todoroo/astrid/service/AddonService.java
+++ b/astrid/src/com/todoroo/astrid/service/AddonService.java
@@ -1,9 +1,25 @@
 package com.todoroo.astrid.service;
 
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import android.app.Activity;
+import android.app.AlertDialog;
 import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 
+import com.timsu.astrid.R;
 import com.todoroo.andlib.service.ContextManager;
+import com.todoroo.andlib.utility.DateUtilities;
+import com.todoroo.astrid.utility.Constants;
 import com.todoroo.astrid.utility.Preferences;
 
 /**
@@ -21,8 +37,11 @@ public class AddonService {
     /** Astrid Power Pack package */
     private static final String POWER_PACK_PACKAGE = "com.todoroo.astrid.ppack";
 
+    /** Astrid Power Pack label */
+    public static final String POWER_PACK_LABEL = "Astrid Power Pack";
+
     /** cached is power pack value */
-    private static Boolean isPowerPack = true;
+    private static Boolean isPowerPack = null;
 
     /** Checks whether power pack should be enabled */
     public static boolean isPowerPack() {
@@ -35,9 +54,10 @@ public class AddonService {
         else {
             try {
                 Context context = ContextManager.getContext();
-                context.getPackageManager().getApplicationInfo(
+                ApplicationInfo applicationInfo = context.getPackageManager().getApplicationInfo(
                         POWER_PACK_PACKAGE, 0);
-                isPowerPack = true;
+                if(applicationInfo.uid == context.getApplicationInfo().uid)
+                    isPowerPack = true;
             } catch (PackageManager.NameNotFoundException e) {
                 // not found
             }
@@ -45,6 +65,93 @@ public class AddonService {
         return isPowerPack;
     }
 
+    /** Displays power pack help */
+    public static void displayPowerPackHelp(Activity activity) {
+        LinearLayout layout = new LinearLayout(activity);
+        layout.setOrientation(LinearLayout.HORIZONTAL);
+        ImageView imageView = new ImageView(activity);
+        imageView.setImageResource(R.drawable.icon_pp);
+        layout.addView(imageView);
+        TextView textView = new TextView(activity);
+        textView.setText(R.string.DLG_power_pack);
+        textView.setTextSize(16);
+        layout.addView(textView);
+
+        new AlertDialog.Builder(activity)
+        .setTitle(POWER_PACK_LABEL)
+        .setView(layout)
+        .setIcon(android.R.drawable.ic_dialog_info)
+        .setPositiveButton(R.string.DLG_to_market, new MarketClickListener(activity,
+                POWER_PACK_PACKAGE))
+        .show();
+    }
+
+    /**
+     * Takes users to the market
+     *
+     * @author Tim Su <tim@todoroo.com>
+     *
+     */
+    public static class MarketClickListener implements DialogInterface.OnClickListener {
+        private final Context context;
+        private final String packageName;
+
+        public MarketClickListener(Context activity, String packageName) {
+            this.context = activity;
+            this.packageName = packageName;
+        }
+
+        @Override
+        public void onClick(DialogInterface arg0, int arg1) {
+            context.startActivity(new Intent(Intent.ACTION_VIEW,
+                    Uri.parse("market://search?q=pname:" + //$NON-NLS-1$
+                            packageName)));
+            if(context instanceof Activity)
+                ((Activity)context).finish();
+        }
+    };
+
+    public static void checkForUpgrades(final Activity activity) {
+        final AtomicInteger countdown = new AtomicInteger(10);
+        if(DateUtilities.now() > Constants.UPGRADE.getTime()) {
+
+            final AlertDialog dialog = new AlertDialog.Builder(activity)
+            .setTitle(R.string.DLG_information_title)
+            .setMessage(R.string.DLG_please_update)
+            .setIcon(android.R.drawable.ic_dialog_alert)
+            .setPositiveButton(R.string.DLG_to_market,
+                    new MarketClickListener(activity, activity.getPackageName()))
+            .setNegativeButton(countdown.toString(), null)
+            .setCancelable(false)
+            .show();
+            dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setEnabled(false);
+
+            final Timer timer = new Timer();
+            timer.scheduleAtFixedRate(new TimerTask() {
+                @Override
+                public void run() {
+                    final int number = countdown.addAndGet(-1);
+                    if(number == 0)
+                        timer.cancel();
+
+                    activity.runOnUiThread(new Runnable() {
+                        public void run() {
+                            if(number == 0) {
+                                dialog.setCancelable(true);
+                                dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setText(
+                                        android.R.string.ok);
+                                dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setEnabled(true);
+                            } else {
+                                dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setText(
+                                        Integer.toString(number));
+                            }
+                        }
+                    });
+                }
+            }, 0L, 1000L);
+        }
+    }
+
     /**
      * Record that a version was an OEM install
      */