From 29145c7b32ab6f3f4f0cfee9eb30b97a71d8f4e9 Mon Sep 17 00:00:00 2001 From: Tim Su Date: Mon, 2 Aug 2010 20:32:33 -0700 Subject: [PATCH] Cleaned up add on adapter and made it work. Next step is locale plugin. Also added some help to backup preferences --- astrid/AndroidManifest.xml | 4 +-- astrid/default.properties | 2 +- .../astrid/backup/BackupPreferences.java | 28 ++++++++++++++++++ .../astrid/timers/TimerControlSet.java | 2 +- astrid/res/drawable/icon_locale.png | Bin 0 -> 3306 bytes astrid/res/layout/addon_adapter_row.xml | 3 +- astrid/res/layout/task_adapter_row.xml | 3 +- astrid/res/layout/task_edit_activity.xml | 2 +- astrid/res/layout/task_list_activity.xml | 3 +- astrid/res/values/strings-backup.xml | 5 ++++ astrid/res/values/styles.xml | 1 + .../astrid/activity/TaskEditActivity.java | 13 ++++++++ .../todoroo/astrid/adapter/AddOnAdapter.java | 8 ++--- .../todoroo/astrid/service/AddOnService.java | 15 +++++----- 14 files changed, 69 insertions(+), 20 deletions(-) create mode 100644 astrid/res/drawable/icon_locale.png diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml index ca7cb8e7d..8a94d522f 100644 --- a/astrid/AndroidManifest.xml +++ b/astrid/AndroidManifest.xml @@ -1,7 +1,8 @@ + android:versionName="3.0.0-beta2" android:versionCode="137" + android:installLocation="auto"> @@ -51,7 +52,6 @@ - diff --git a/astrid/default.properties b/astrid/default.properties index 08ad68f11..c5d5335ee 100644 --- a/astrid/default.properties +++ b/astrid/default.properties @@ -10,5 +10,5 @@ # Indicates whether an apk should be generated for each density. split.density=false # Project target. -target=android-4 +target=android-8 apk-configurations= diff --git a/astrid/plugin-src/com/todoroo/astrid/backup/BackupPreferences.java b/astrid/plugin-src/com/todoroo/astrid/backup/BackupPreferences.java index 1ca13d244..9aea2e7ca 100644 --- a/astrid/plugin-src/com/todoroo/astrid/backup/BackupPreferences.java +++ b/astrid/plugin-src/com/todoroo/astrid/backup/BackupPreferences.java @@ -2,6 +2,8 @@ package com.todoroo.astrid.backup; import java.util.Date; +import android.content.DialogInterface; +import android.content.Intent; import android.content.res.Resources; import android.graphics.Color; import android.os.Bundle; @@ -15,6 +17,8 @@ import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DialogUtilities; import com.todoroo.andlib.widget.TodorooPreferences; +import com.todoroo.astrid.activity.AddOnActivity; +import com.todoroo.astrid.core.PluginServices; import com.todoroo.astrid.utility.Preferences; /** @@ -57,6 +61,30 @@ public class BackupPreferences extends TodorooPreferences { view.setBackgroundColor(statusColor); } }); + + if(!PluginServices.getAddOnService().isPowerPack()) { + Preference restorePreference = new Preference(this); + restorePreference.setTitle(R.string.backup_BPr_how_to_restore); + restorePreference.setOnPreferenceClickListener(new OnPreferenceClickListener() { + @Override + public boolean onPreferenceClick(Preference preference) { + dialogUtilities.okCancelDialog(BackupPreferences.this, + getString(R.string.DLG_information_title), + getString(R.string.backup_BPr_how_to_restore_dialog), + new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + Intent intent = new Intent(BackupPreferences.this, + AddOnActivity.class); + intent.putExtra(AddOnActivity.TOKEN_START_WITH_AVAILABLE, true); + startActivity(intent); + } + }, null); + return false; + } + }); + getPreferenceScreen().addPreference(restorePreference); + } } @Override diff --git a/astrid/plugin-src/com/todoroo/astrid/timers/TimerControlSet.java b/astrid/plugin-src/com/todoroo/astrid/timers/TimerControlSet.java index 361f45dac..d87b3b3e1 100644 --- a/astrid/plugin-src/com/todoroo/astrid/timers/TimerControlSet.java +++ b/astrid/plugin-src/com/todoroo/astrid/timers/TimerControlSet.java @@ -28,7 +28,7 @@ public class TimerControlSet implements TaskEditControlSet { DependencyInjectionService.getInstance().inject(this); this.activity = activity; - LayoutInflater.from(activity).inflate(R.layout.gcal_control, parent, true); + LayoutInflater.from(activity).inflate(R.layout.timer_control, parent, true); estimated = new TimeDurationTaskEditControlSet(Task.ESTIMATED_SECONDS, R.id.estimatedDuration, 0, R.string.DLG_hour_minutes, diff --git a/astrid/res/drawable/icon_locale.png b/astrid/res/drawable/icon_locale.png new file mode 100644 index 0000000000000000000000000000000000000000..1d120188e212b75e1ad9f687c11752a507e54895 GIT binary patch literal 3306 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 o7z} @@ -63,7 +64,7 @@ diff --git a/astrid/res/layout/task_adapter_row.xml b/astrid/res/layout/task_adapter_row.xml index 46c8322bb..7d22cdf53 100644 --- a/astrid/res/layout/task_adapter_row.xml +++ b/astrid/res/layout/task_adapter_row.xml @@ -7,7 +7,8 @@ android:paddingTop="4dip" android:paddingBottom="4dip" android:paddingLeft="4dip" - android:paddingRight="10dip" + android:paddingRight="4dip" + android:minHeight="40dip" android:orientation="vertical">