From 4477ca55cae57bbfeb27ca8840c8ec9a4d58017a Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Thu, 12 Apr 2012 15:21:47 -0700
Subject: [PATCH] Don't show astrid in reminder dialog when that preference is
 turned off

---
 .../astrid/reminders/ReminderDialog.java      | 23 +++++-
 .../layout/astrid_reminder_view_portrait.xml  | 80 +++++++++++++++++++
 astrid/res/layout/astrid_speech_bubble.xml    |  1 +
 astrid/res/values/strings-reminders.xml       |  3 +
 4 files changed, 103 insertions(+), 4 deletions(-)
 create mode 100644 astrid/res/layout/astrid_reminder_view_portrait.xml

diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderDialog.java b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderDialog.java
index 6cc79189c..279b818fc 100644
--- a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderDialog.java
+++ b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderDialog.java
@@ -6,12 +6,14 @@ import android.app.Dialog;
 import android.app.TimePickerDialog.OnTimeSetListener;
 import android.content.Intent;
 import android.view.View;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.TimePicker;
 import android.widget.Toast;
 
 import com.timsu.astrid.R;
 import com.todoroo.andlib.utility.DateUtilities;
+import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.activity.AstridActivity;
 import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.core.PluginServices;
@@ -28,7 +30,7 @@ import com.todoroo.astrid.service.StatisticsService;
 public class ReminderDialog extends Dialog {
 
     public ReminderDialog(final AstridActivity activity, final long taskId,
-            final String title) {
+            String title) {
         super(activity, R.style.ReminderDialog);
         final SnoozeCallback dialogSnooze = new SnoozeCallback() {
             @Override
@@ -52,7 +54,17 @@ public class ReminderDialog extends Dialog {
                 dialogSnooze.snoozeForTime(alarmTime.getTime());
             }
         };
-        setContentView(R.layout.astrid_reminder_view);
+
+        if (Preferences.getBoolean(R.string.p_rmd_nagging, true)) {
+            setContentView(R.layout.astrid_reminder_view);
+            ((TextView) findViewById(R.id.reminder_message)).setText(
+                    Notifications.getRandomReminder(activity.getResources().getStringArray(R.array.reminder_responses)));
+        } else {
+            setContentView(R.layout.astrid_reminder_view_portrait);
+            title = activity.getString(R.string.rmd_NoA_dlg_title) + " " + title; //$NON-NLS-1$
+            removeSpeechBubble();
+        }
+
 
         // set up listeners
         findViewById(R.id.dismiss).setOnClickListener(new View.OnClickListener() {
@@ -92,10 +104,13 @@ public class ReminderDialog extends Dialog {
         });
 
         ((TextView) findViewById(R.id.reminder_title)).setText(title);
-        ((TextView) findViewById(R.id.reminder_message)).setText(
-                Notifications.getRandomReminder(activity.getResources().getStringArray(R.array.reminder_responses)));
 
         setOwnerActivity(activity);
     }
 
+
+    private void removeSpeechBubble() {
+        LinearLayout container = (LinearLayout) findViewById(R.id.speech_bubble_container);
+        container.setVisibility(View.GONE);
+    }
 }
diff --git a/astrid/res/layout/astrid_reminder_view_portrait.xml b/astrid/res/layout/astrid_reminder_view_portrait.xml
new file mode 100644
index 000000000..739ee19e5
--- /dev/null
+++ b/astrid/res/layout/astrid_reminder_view_portrait.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/reminder_root"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingLeft="10dip"
+    android:paddingRight="10dip"
+    android:orientation="vertical">
+    
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginTop="5dip"
+        android:layout_marginRight="5dip"
+        android:layout_marginBottom="20dip"
+        android:layout_marginLeft="5dip">
+        
+        <TextView 
+            android:id="@+id/reminder_title"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textSize="20sp"
+            android:textColor="@android:color/white"
+            android:layout_weight="1"/>
+        <ImageView
+            android:id="@+id/dismiss"
+            android:layout_width="25dip"
+            android:layout_height="25dip"
+            android:scaleType="fitCenter"
+            android:src="@android:drawable/ic_menu_close_clear_cancel"/>
+    
+    </LinearLayout>
+    
+    <include layout="@layout/astrid_speech_bubble"/>
+    
+    <CheckBox 
+        android:id="@+id/reminders_should_show"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="5dip"
+        android:layout_marginBottom="10dip"
+        android:text="@string/TLA_quickadd_confirm_hide_helpers" 
+        android:visibility="gone"/>
+    
+    <Button
+        android:id="@+id/reminder_edit"
+        android:layout_width="fill_parent"
+        android:layout_height="35dip"
+        android:layout_marginLeft="5dip"
+        android:layout_marginRight="5dip"
+        android:layout_marginBottom="10dip"
+        android:textColor="@android:color/white"
+        android:textSize="20sp"
+        android:text="@string/TAd_actionEditTask"
+        android:background="#707070"/>
+    <Button
+        android:id="@+id/reminder_snooze"
+        android:layout_width="fill_parent"
+        android:layout_height="35dip"
+        android:layout_marginLeft="5dip"
+        android:layout_marginRight="5dip"
+        android:layout_marginBottom="10dip"
+        android:textColor="@android:color/white"
+        android:textSize="20sp"
+        android:text="@string/rmd_NoA_snooze"
+        android:background="#707070"/>
+    <Button
+        android:id="@+id/reminder_complete"
+        android:layout_width="fill_parent"
+        android:layout_height="35dip"
+        android:layout_marginLeft="5dip"
+        android:layout_marginRight="5dip"
+        android:layout_marginBottom="10dip"
+        android:textColor="@android:color/white"
+        android:textSize="20sp"
+        android:text="@string/rmd_NoA_done"
+        android:background="?attr/asThemeTextColor"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/astrid_speech_bubble.xml b/astrid/res/layout/astrid_speech_bubble.xml
index dc2316725..c4881df4c 100644
--- a/astrid/res/layout/astrid_speech_bubble.xml
+++ b/astrid/res/layout/astrid_speech_bubble.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge>
 	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	    android:id="@+id/speech_bubble_container"
 	    android:layout_width="fill_parent"
 	    android:layout_height="wrap_content"
 	    android:orientation="horizontal"
diff --git a/astrid/res/values/strings-reminders.xml b/astrid/res/values/strings-reminders.xml
index 530a2e15a..4b928404b 100644
--- a/astrid/res/values/strings-reminders.xml
+++ b/astrid/res/values/strings-reminders.xml
@@ -57,6 +57,9 @@
   <!-- Reminder: Completed Toast -->
   <string name="rmd_NoA_completed_toast">Congratulations on finishing!</string>
   
+  <!-- Prefix for reminder dialog title -->
+  <string name="rmd_NoA_dlg_title">Reminder:</string>
+  
   <!-- ============================================= reminder preferences == -->
   
   <!-- Reminder Preference Screen Title -->