diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/ReengagementActivity.java b/astrid/plugin-src/com/todoroo/astrid/reminders/ReengagementActivity.java new file mode 100644 index 000000000..f967bf09d --- /dev/null +++ b/astrid/plugin-src/com/todoroo/astrid/reminders/ReengagementActivity.java @@ -0,0 +1,63 @@ +package com.todoroo.astrid.reminders; + +import android.app.Activity; +import android.os.Bundle; +import android.view.View; +import android.view.View.OnClickListener; +import android.widget.TextView; + +import com.timsu.astrid.R; +import com.todoroo.andlib.service.DependencyInjectionService; +import com.todoroo.andlib.utility.AndroidUtilities; +import com.todoroo.andlib.utility.Preferences; +import com.todoroo.astrid.service.StartupService; +import com.todoroo.astrid.service.ThemeService; + +public class ReengagementActivity extends Activity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + new StartupService().onStartupApplication(this); + super.onCreate(savedInstanceState); + DependencyInjectionService.getInstance().inject(this); + + setContentView(R.layout.reengagement_activity); + + setUpUi(); + } + + private void setUpUi() { + View dismiss1 = findViewById(R.id.dismiss); + View dismiss2 = findViewById(R.id.dismiss_button); + OnClickListener dismissListener = new OnClickListener() { + @Override + public void onClick(View v) { + finish(); + AndroidUtilities.callOverridePendingTransition(ReengagementActivity.this, 0, android.R.anim.fade_out); + } + }; + + dismiss1.setOnClickListener(dismissListener); + dismiss2.setOnClickListener(dismissListener); + + TextView seeTasksButton = (TextView) findViewById(R.id.see_tasks_button); + seeTasksButton.setBackgroundColor(getResources().getColor(ThemeService.getThemeColor())); + seeTasksButton.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + // + } + }); + + + ((TextView) findViewById(R.id.reminder_title)).setText("TITLE"); + + if (!Preferences.getBoolean(R.string.p_rmd_nagging, true)) { + findViewById(R.id.missed_calls_speech_bubble).setVisibility(View.GONE); + } else { + TextView dialogView = (TextView) findViewById(R.id.reminder_message); + dialogView.setText(Notifications.getRandomReminder(getResources().getStringArray(R.array.rmd_reengage_dialog_options))); + } + } + +} diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/ReengagementReceiver.java b/astrid/plugin-src/com/todoroo/astrid/reminders/ReengagementReceiver.java index f6019b8e8..3a75ffb68 100644 --- a/astrid/plugin-src/com/todoroo/astrid/reminders/ReengagementReceiver.java +++ b/astrid/plugin-src/com/todoroo/astrid/reminders/ReengagementReceiver.java @@ -16,7 +16,9 @@ public class ReengagementReceiver extends BroadcastReceiver { int reengagementReminders = Preferences.getInt(ReengagementService.PREF_REENGAGEMENT_COUNT, 1); Preferences.setInt(ReengagementService.PREF_REENGAGEMENT_COUNT, reengagementReminders + 1); - // TODO: show dialog + Intent reengagement = new Intent(context, ReengagementActivity.class); + reengagement.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK); + context.startActivity(reengagement); ReengagementService.scheduleReengagementAlarm(context); } diff --git a/astrid/res/layout/astrid_reengagement_view.xml b/astrid/res/layout/astrid_reengagement_view.xml new file mode 100644 index 000000000..c88db9640 --- /dev/null +++ b/astrid/res/layout/astrid_reengagement_view.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/astrid/res/layout/reengagement_activity.xml b/astrid/res/layout/reengagement_activity.xml new file mode 100644 index 000000000..ebe33d588 --- /dev/null +++ b/astrid/res/layout/reengagement_activity.xml @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/astrid/res/values/strings-reminders.xml b/astrid/res/values/strings-reminders.xml index 4b928404b..f0af2220b 100644 --- a/astrid/res/values/strings-reminders.xml +++ b/astrid/res/values/strings-reminders.xml @@ -60,6 +60,14 @@ Reminder: + + + See my tasks + + + Some stuff! + +