From 4f053d453844436395ef75b2b870df0392f7f413 Mon Sep 17 00:00:00 2001 From: spicysquid Date: Mon, 2 May 2011 22:17:23 -0700 Subject: [PATCH] renamed package added new icon --- .../andlib/service/ExceptionService.java | 2 +- .../andlib/utility/DialogUtilities.java | 2 +- api/src/com/todoroo/astrid/data/Task.java | 2 +- .../com/todoroo/astrid/sync/SyncProvider.java | 2 +- .../astrid/sync/SyncProviderPreferences.java | 2 +- astrid/AndroidManifest.xml | 4 +-- .../commonsware/cwac/tlv/TouchListView.java | 2 +- .../astrid/alarms/AlarmControlSet.java | 2 +- .../todoroo/astrid/backup/BackupActivity.java | 2 +- .../astrid/backup/BackupPreferences.java | 2 +- .../todoroo/astrid/backup/BackupService.java | 2 +- .../astrid/backup/FilePickerBuilder.java | 2 +- .../astrid/backup/TasksXmlExporter.java | 2 +- .../astrid/backup/TasksXmlImporter.java | 2 +- .../astrid/core/CoreFilterExposer.java | 2 +- .../astrid/core/CustomFilterActivity.java | 2 +- .../astrid/core/CustomFilterAdapter.java | 2 +- .../astrid/core/CustomFilterExposer.java | 2 +- .../astrid/core/DefaultsPreferences.java | 2 +- .../com/todoroo/astrid/gcal/Calendars.java | 2 +- .../todoroo/astrid/gcal/GCalControlSet.java | 2 +- .../astrid/gcal/GCalTaskCompleteListener.java | 2 +- .../GtasksCustomFilterCriteriaExposer.java | 2 +- .../astrid/gtasks/GtasksFilterExposer.java | 2 +- .../astrid/gtasks/GtasksListActivity.java | 2 +- .../gtasks/GtasksPreferenceService.java | 2 +- .../astrid/gtasks/GtasksPreferences.java | 2 +- .../gtasks/GtasksSyncActionExposer.java | 2 +- .../gtasks/auth/GtasksLoginActivity.java | 2 +- .../gtasks/sync/GtasksSyncProvider.java | 2 +- .../astrid/locale/LocaleEditAlerts.java | 2 +- .../todoroo/astrid/locale/LocaleReceiver.java | 2 +- .../astrid/notes/NoteViewingActivity.java | 2 +- .../astrid/notes/NotesActionExposer.java | 2 +- .../astrid/notes/NotesDecorationExposer.java | 2 +- .../astrid/notes/NotesDetailExposer.java | 2 +- .../producteev/ProducteevControlSet.java | 2 +- ...ProducteevCustomFilterCriteriaExposer.java | 2 +- .../producteev/ProducteevDetailExposer.java | 2 +- .../producteev/ProducteevFilterExposer.java | 2 +- .../producteev/ProducteevLoginActivity.java | 2 +- .../producteev/ProducteevPreferences.java | 2 +- .../ProducteevSyncActionExposer.java | 2 +- .../producteev/ProducteevUtilities.java | 2 +- .../sync/ProducteevSyncProvider.java | 2 +- .../reminders/NotificationActivity.java | 2 +- .../astrid/reminders/Notifications.java | 2 +- .../astrid/reminders/ReminderPreferences.java | 2 +- .../astrid/reminders/ReminderService.java | 2 +- .../astrid/repeats/RepeatControlSet.java | 2 +- .../astrid/repeats/RepeatDetailExposer.java | 2 +- .../todoroo/astrid/repeats/RepeatsPlugin.java | 2 +- .../astrid/sharing/SharingActionExposer.java | 2 +- .../astrid/sharing/SharingLoginActivity.java | 2 +- .../astrid/tags/FilterByTagExposer.java | 2 +- .../tags/TagCustomFilterCriteriaExposer.java | 2 +- .../todoroo/astrid/tags/TagFilterExposer.java | 2 +- .../todoroo/astrid/tags/TagsControlSet.java | 2 +- .../astrid/timers/TimerActionExposer.java | 2 +- .../astrid/timers/TimerControlSet.java | 2 +- .../astrid/timers/TimerDecorationExposer.java | 2 +- .../astrid/timers/TimerFilterExposer.java | 2 +- .../todoroo/astrid/timers/TimerPlugin.java | 2 +- astrid/res/drawable/icon.png | Bin 6888 -> 4447 bytes .../res/layout/task_list_body_draggable.xml | 2 +- astrid/res/values/strings-core.xml | 28 +++++++++--------- .../weloveastrid/rmilk/MilkDetailExposer.java | 2 +- .../weloveastrid/rmilk/MilkFilterExposer.java | 2 +- .../weloveastrid/rmilk/MilkLoginActivity.java | 2 +- .../weloveastrid/rmilk/MilkPreferences.java | 2 +- .../rmilk/MilkSyncActionExposer.java | 2 +- .../org/weloveastrid/rmilk/MilkUtilities.java | 2 +- .../rmilk/sync/MilkSyncProvider.java | 2 +- .../timsu/astrid/data/enums/Importance.java | 2 +- .../astrid/data/task/AbstractTaskModel.java | 2 +- .../utilities/LegacyTasksXmlExporter.java | 2 +- .../astrid/activity/AboutActivity.java | 2 +- .../astrid/activity/AddOnActivity.java | 2 +- .../activity/DraggableTaskListActivity.java | 2 +- .../astrid/activity/EditPreferences.java | 2 +- .../src/com/todoroo/astrid/activity/Eula.java | 2 +- .../astrid/activity/FilterListActivity.java | 2 +- .../astrid/activity/ShortcutActivity.java | 2 +- .../activity/SortSelectionActivity.java | 2 +- .../astrid/activity/TaskEditActivity.java | 2 +- .../astrid/activity/TaskListActivity.java | 13 ++++++-- .../todoroo/astrid/adapter/AddOnAdapter.java | 2 +- .../todoroo/astrid/adapter/FilterAdapter.java | 2 +- .../todoroo/astrid/adapter/TaskAdapter.java | 2 +- .../src/com/todoroo/astrid/dao/TaskDao.java | 2 +- .../todoroo/astrid/service/AddOnService.java | 2 +- .../service/Astrid2To3UpgradeHelper.java | 2 +- .../astrid/service/StartupService.java | 2 +- .../astrid/service/StatisticsService.java | 2 +- .../astrid/service/UpdateMessageService.java | 2 +- .../astrid/service/UpgradeService.java | 2 +- .../com/todoroo/astrid/ui/CalendarDialog.java | 2 +- .../com/todoroo/astrid/ui/CalendarView.java | 2 +- .../astrid/ui/DeadlineTimePickerDialog.java | 2 +- .../astrid/ui/NNumberPickerDialog.java | 2 +- .../com/todoroo/astrid/ui/NumberPicker.java | 2 +- .../todoroo/astrid/ui/NumberPickerButton.java | 2 +- .../todoroo/astrid/ui/NumberPickerDialog.java | 2 +- .../astrid/ui/TimeDurationControlSet.java | 2 +- .../astrid/utility/AstridPreferences.java | 2 +- .../astrid/voice/VoiceInputAssistant.java | 2 +- .../todoroo/astrid/widget/TasksWidget.java | 2 +- .../astrid/widget/WidgetConfigActivity.java | 2 +- .../src/greendroid/app/GDActivity.java | 2 +- .../src/greendroid/app/GDListActivity.java | 2 +- .../src/greendroid/app/GDTabActivity.java | 2 +- .../src/greendroid/widget/ActionBar.java | 2 +- .../src/greendroid/widget/ActionBarHost.java | 2 +- .../src/greendroid/widget/ActionBarItem.java | 2 +- .../widget/LoaderActionBarItem.java | 2 +- .../widget/NormalActionBarItem.java | 2 +- .../src/greendroid/widget/QuickActionBar.java | 2 +- .../greendroid/widget/QuickActionGrid.java | 2 +- .../greendroid/widget/QuickActionWidget.java | 2 +- .../src/greendroid/widget/SegmentedBar.java | 2 +- .../src/greendroid/widget/SegmentedHost.java | 2 +- .../widget/item/DescriptionItem.java | 2 +- .../greendroid/widget/item/DrawableItem.java | 2 +- .../src/greendroid/widget/item/Item.java | 2 +- .../greendroid/widget/item/LongTextItem.java | 2 +- .../greendroid/widget/item/ProgressItem.java | 2 +- .../greendroid/widget/item/SeparatorItem.java | 2 +- .../greendroid/widget/item/SubtextItem.java | 2 +- .../greendroid/widget/item/SubtitleItem.java | 2 +- .../src/greendroid/widget/item/TextItem.java | 2 +- .../greendroid/widget/item/ThumbnailItem.java | 2 +- .../widget/itemview/DrawableItemView.java | 2 +- .../widget/itemview/ProgressItemView.java | 2 +- .../widget/itemview/SubtextItemView.java | 2 +- .../widget/itemview/SubtitleItemView.java | 2 +- .../widget/itemview/ThumbnailItemView.java | 2 +- 136 files changed, 159 insertions(+), 150 deletions(-) diff --git a/api/src/com/todoroo/andlib/service/ExceptionService.java b/api/src/com/todoroo/andlib/service/ExceptionService.java index 1372288700..370a7c2633 100644 --- a/api/src/com/todoroo/andlib/service/ExceptionService.java +++ b/api/src/com/todoroo/andlib/service/ExceptionService.java @@ -9,7 +9,7 @@ import android.content.pm.PackageManager.NameNotFoundException; import android.util.Log; -import com.todoroo.astrid.api.R; +import com.timsu.astridsquid.R; /** * Exception handling utility class - reports and logs errors diff --git a/api/src/com/todoroo/andlib/utility/DialogUtilities.java b/api/src/com/todoroo/andlib/utility/DialogUtilities.java index 995296b789..684358363c 100644 --- a/api/src/com/todoroo/andlib/utility/DialogUtilities.java +++ b/api/src/com/todoroo/andlib/utility/DialogUtilities.java @@ -10,7 +10,7 @@ import android.view.View; import android.webkit.WebView; -import com.todoroo.astrid.api.R; +import com.timsu.astridsquid.R; public class DialogUtilities { diff --git a/api/src/com/todoroo/astrid/data/Task.java b/api/src/com/todoroo/astrid/data/Task.java index f0b31fda3c..cb9cb8e01a 100644 --- a/api/src/com/todoroo/astrid/data/Task.java +++ b/api/src/com/todoroo/astrid/data/Task.java @@ -21,7 +21,7 @@ import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.astrid.api.AstridApiConstants; -import com.todoroo.astrid.api.R; +import com.timsu.astridsquid.R; /** * Data Model which represents a task users need to accomplish. diff --git a/api/src/com/todoroo/astrid/sync/SyncProvider.java b/api/src/com/todoroo/astrid/sync/SyncProvider.java index 6e037d6f4a..d470968f28 100644 --- a/api/src/com/todoroo/astrid/sync/SyncProvider.java +++ b/api/src/com/todoroo/astrid/sync/SyncProvider.java @@ -18,7 +18,7 @@ import com.todoroo.andlib.data.Property.LongProperty; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.NotificationManager; -import com.todoroo.astrid.api.R; +import com.timsu.astridsquid.R; import com.todoroo.astrid.data.Task; /** diff --git a/api/src/com/todoroo/astrid/sync/SyncProviderPreferences.java b/api/src/com/todoroo/astrid/sync/SyncProviderPreferences.java index 8937292155..fcbaec8a75 100644 --- a/api/src/com/todoroo/astrid/sync/SyncProviderPreferences.java +++ b/api/src/com/todoroo/astrid/sync/SyncProviderPreferences.java @@ -16,7 +16,7 @@ import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DialogUtilities; import com.todoroo.andlib.utility.TodorooPreferenceActivity; -import com.todoroo.astrid.api.R; +import com.timsu.astridsquid.R; /** * Utility class for common synchronization action: displaying synchronization diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml index 4a1a6f967d..954b2f6e28 100644 --- a/astrid/AndroidManifest.xml +++ b/astrid/AndroidManifest.xml @@ -1,6 +1,6 @@ @@ -96,7 +96,7 @@ - + diff --git a/astrid/common-src/com/commonsware/cwac/tlv/TouchListView.java b/astrid/common-src/com/commonsware/cwac/tlv/TouchListView.java index 62ab25e94e..70c8ce28ee 100644 --- a/astrid/common-src/com/commonsware/cwac/tlv/TouchListView.java +++ b/astrid/common-src/com/commonsware/cwac/tlv/TouchListView.java @@ -34,7 +34,7 @@ import android.widget.ImageView; import android.widget.ListView; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; public class TouchListView extends ListView { private ImageView mDragView; diff --git a/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmControlSet.java b/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmControlSet.java index 7d9577d35c..7e0bb6f28e 100644 --- a/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmControlSet.java +++ b/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmControlSet.java @@ -11,7 +11,7 @@ import android.widget.ImageButton; import android.widget.LinearLayout; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.widget.DateControlSet; diff --git a/astrid/plugin-src/com/todoroo/astrid/backup/BackupActivity.java b/astrid/plugin-src/com/todoroo/astrid/backup/BackupActivity.java index 4f926a0abc..87366b1a75 100644 --- a/astrid/plugin-src/com/todoroo/astrid/backup/BackupActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/backup/BackupActivity.java @@ -6,7 +6,7 @@ import android.view.View.OnClickListener; import android.widget.Button; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.service.ContextManager; public class BackupActivity extends Activity { diff --git a/astrid/plugin-src/com/todoroo/astrid/backup/BackupPreferences.java b/astrid/plugin-src/com/todoroo/astrid/backup/BackupPreferences.java index ba73d70646..fa869f84fc 100644 --- a/astrid/plugin-src/com/todoroo/astrid/backup/BackupPreferences.java +++ b/astrid/plugin-src/com/todoroo/astrid/backup/BackupPreferences.java @@ -10,7 +10,7 @@ import android.view.View; import android.view.ViewGroup.OnHierarchyChangeListener; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DialogUtilities; import com.todoroo.andlib.utility.Preferences; diff --git a/astrid/plugin-src/com/todoroo/astrid/backup/BackupService.java b/astrid/plugin-src/com/todoroo/astrid/backup/BackupService.java index 4e4c2f2973..c04d397c75 100644 --- a/astrid/plugin-src/com/todoroo/astrid/backup/BackupService.java +++ b/astrid/plugin-src/com/todoroo/astrid/backup/BackupService.java @@ -13,7 +13,7 @@ import android.os.IBinder; import android.util.Log; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.Preferences; diff --git a/astrid/plugin-src/com/todoroo/astrid/backup/FilePickerBuilder.java b/astrid/plugin-src/com/todoroo/astrid/backup/FilePickerBuilder.java index 582e5b948e..dc24146b67 100644 --- a/astrid/plugin-src/com/todoroo/astrid/backup/FilePickerBuilder.java +++ b/astrid/plugin-src/com/todoroo/astrid/backup/FilePickerBuilder.java @@ -8,7 +8,7 @@ import android.content.DialogInterface; import android.util.Log; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.utility.AndroidUtilities; @SuppressWarnings("nls") diff --git a/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlExporter.java b/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlExporter.java index 857defcbdf..7703d7ad31 100644 --- a/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlExporter.java +++ b/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlExporter.java @@ -14,7 +14,7 @@ import android.util.Xml; import android.widget.Toast; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.data.AbstractModel; import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.Property.PropertyVisitor; diff --git a/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlImporter.java b/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlImporter.java index a216c1f044..2237385faa 100644 --- a/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlImporter.java +++ b/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlImporter.java @@ -21,7 +21,7 @@ import android.util.Log; import com.google.ical.values.RRule; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.data.AbstractModel; import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.Property.PropertyVisitor; diff --git a/astrid/plugin-src/com/todoroo/astrid/core/CoreFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/core/CoreFilterExposer.java index 302a26354b..8e0fd72f3c 100644 --- a/astrid/plugin-src/com/todoroo/astrid/core/CoreFilterExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/core/CoreFilterExposer.java @@ -9,7 +9,7 @@ import android.content.res.Resources; import android.graphics.drawable.BitmapDrawable; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.sql.Criterion; import com.todoroo.andlib.sql.Order; diff --git a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterActivity.java b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterActivity.java index 6b55260f17..8d48e36869 100644 --- a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterActivity.java @@ -22,7 +22,7 @@ import android.widget.Button; import android.widget.TextView; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.data.Property.CountProperty; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager; diff --git a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterAdapter.java b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterAdapter.java index 07676f8fcd..f37696e08e 100644 --- a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterAdapter.java +++ b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterAdapter.java @@ -20,7 +20,7 @@ import android.widget.ImageView; import android.widget.TextView; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.astrid.api.MultipleSelectCriterion; import com.todoroo.astrid.api.TextInputCriterion; import com.todoroo.astrid.core.CustomFilterActivity.CriterionInstance; diff --git a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterExposer.java index d00c4f4737..d3c22351a9 100644 --- a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterExposer.java @@ -13,7 +13,7 @@ import android.graphics.drawable.BitmapDrawable; import android.os.Bundle; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.sql.Order; diff --git a/astrid/plugin-src/com/todoroo/astrid/core/DefaultsPreferences.java b/astrid/plugin-src/com/todoroo/astrid/core/DefaultsPreferences.java index e2541f0043..afc35063be 100644 --- a/astrid/plugin-src/com/todoroo/astrid/core/DefaultsPreferences.java +++ b/astrid/plugin-src/com/todoroo/astrid/core/DefaultsPreferences.java @@ -7,7 +7,7 @@ import android.content.res.Resources; import android.preference.Preference; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.widget.TodorooPreferences; import com.todoroo.andlib.utility.Preferences; diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/Calendars.java b/astrid/plugin-src/com/todoroo/astrid/gcal/Calendars.java index c668d9b8a2..84d0180514 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gcal/Calendars.java +++ b/astrid/plugin-src/com/todoroo/astrid/gcal/Calendars.java @@ -6,7 +6,7 @@ import android.database.Cursor; import android.net.Uri; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.Preferences; diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java b/astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java index 3331aa29a9..6410556a0b 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java +++ b/astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java @@ -21,7 +21,7 @@ import android.widget.Toast; import com.todoroo.astrid.service.StatisticsService; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.ExceptionService; diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java b/astrid/plugin-src/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java index 1c4005e97c..9d0f0c9679 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java +++ b/astrid/plugin-src/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java @@ -9,7 +9,7 @@ import android.text.TextUtils; import android.util.Log; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.core.PluginServices; diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksCustomFilterCriteriaExposer.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksCustomFilterCriteriaExposer.java index 29bb639dfb..0028497e2e 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksCustomFilterCriteriaExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksCustomFilterCriteriaExposer.java @@ -7,7 +7,7 @@ import android.content.res.Resources; import android.graphics.drawable.BitmapDrawable; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.data.AbstractModel; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager; diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksFilterExposer.java index 01837098b7..3de270d92a 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksFilterExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksFilterExposer.java @@ -10,7 +10,7 @@ import android.content.Intent; import android.graphics.drawable.BitmapDrawable; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.data.AbstractModel; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager; diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListActivity.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListActivity.java index faa0abcc44..5915835640 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListActivity.java @@ -5,7 +5,7 @@ import com.commonsware.cwac.tlv.TouchListView; import com.commonsware.cwac.tlv.TouchListView.DropListener; import com.commonsware.cwac.tlv.TouchListView.SwipeListener; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.data.Property.IntegerProperty; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.utility.DialogUtilities; diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferenceService.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferenceService.java index 3cbb29a25a..89bfec890b 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferenceService.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferenceService.java @@ -1,6 +1,6 @@ package com.todoroo.astrid.gtasks; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.astrid.sync.SyncProviderUtilities; /** diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferences.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferences.java index 8d2c76fa04..46d0034f05 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferences.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferences.java @@ -2,7 +2,7 @@ import android.os.Bundle; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.astrid.gtasks.sync.GtasksSyncProvider; diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksSyncActionExposer.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksSyncActionExposer.java index d04078ba1c..00115f7701 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksSyncActionExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksSyncActionExposer.java @@ -8,7 +8,7 @@ import android.content.Context; import android.content.Intent; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.DependencyInjectionService; diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java index f1a37c344f..8e3deea3db 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java @@ -41,7 +41,7 @@ import com.google.android.googlelogin.GoogleLoginServiceConstants; import com.google.android.googlelogin.GoogleLoginServiceHelper; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.DependencyInjectionService; diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncProvider.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncProvider.java index acb6a45602..ac961c0a16 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncProvider.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncProvider.java @@ -20,7 +20,7 @@ import android.text.TextUtils; import android.util.Log; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.data.AbstractModel; import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.TodorooCursor; diff --git a/astrid/plugin-src/com/todoroo/astrid/locale/LocaleEditAlerts.java b/astrid/plugin-src/com/todoroo/astrid/locale/LocaleEditAlerts.java index 568f7cbc3f..a985b667d3 100644 --- a/astrid/plugin-src/com/todoroo/astrid/locale/LocaleEditAlerts.java +++ b/astrid/plugin-src/com/todoroo/astrid/locale/LocaleEditAlerts.java @@ -14,7 +14,7 @@ import android.widget.LinearLayout; import android.widget.Spinner; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.astrid.activity.AddOnActivity; diff --git a/astrid/plugin-src/com/todoroo/astrid/locale/LocaleReceiver.java b/astrid/plugin-src/com/todoroo/astrid/locale/LocaleReceiver.java index cd9d13e5de..1ef0b53942 100644 --- a/astrid/plugin-src/com/todoroo/astrid/locale/LocaleReceiver.java +++ b/astrid/plugin-src/com/todoroo/astrid/locale/LocaleReceiver.java @@ -7,7 +7,7 @@ import android.text.TextUtils; import android.util.Log; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.DependencyInjectionService; diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/NoteViewingActivity.java b/astrid/plugin-src/com/todoroo/astrid/notes/NoteViewingActivity.java index 0607b7880f..7dfcf39af9 100644 --- a/astrid/plugin-src/com/todoroo/astrid/notes/NoteViewingActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/notes/NoteViewingActivity.java @@ -13,7 +13,7 @@ import android.widget.ScrollView; import android.widget.TextView; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.sql.Query; import com.todoroo.astrid.core.PluginServices; diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/NotesActionExposer.java b/astrid/plugin-src/com/todoroo/astrid/notes/NotesActionExposer.java index eecbd5e51d..d658177dc3 100644 --- a/astrid/plugin-src/com/todoroo/astrid/notes/NotesActionExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/notes/NotesActionExposer.java @@ -12,7 +12,7 @@ import android.graphics.drawable.Drawable; import android.text.TextUtils; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.api.TaskAction; diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/NotesDecorationExposer.java b/astrid/plugin-src/com/todoroo/astrid/notes/NotesDecorationExposer.java index 17f9e576fa..c88f955da3 100644 --- a/astrid/plugin-src/com/todoroo/astrid/notes/NotesDecorationExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/notes/NotesDecorationExposer.java @@ -7,7 +7,7 @@ import android.content.Intent; import android.widget.RemoteViews; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.astrid.api.TaskDecoration; import com.todoroo.astrid.api.TaskDecorationExposer; diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/NotesDetailExposer.java b/astrid/plugin-src/com/todoroo/astrid/notes/NotesDetailExposer.java index a187899acc..bd307d0169 100644 --- a/astrid/plugin-src/com/todoroo/astrid/notes/NotesDetailExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/notes/NotesDetailExposer.java @@ -9,7 +9,7 @@ import android.content.Intent; import android.text.TextUtils; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.sql.Query; import com.todoroo.andlib.utility.Preferences; diff --git a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevControlSet.java b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevControlSet.java index 98f0cc9471..bba53507cd 100644 --- a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevControlSet.java +++ b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevControlSet.java @@ -19,7 +19,7 @@ import android.widget.Spinner; import android.widget.TextView; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.utility.DateUtilities; diff --git a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevCustomFilterCriteriaExposer.java b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevCustomFilterCriteriaExposer.java index cfc065fba4..19aa99398a 100644 --- a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevCustomFilterCriteriaExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevCustomFilterCriteriaExposer.java @@ -10,7 +10,7 @@ import android.content.res.Resources; import android.graphics.drawable.BitmapDrawable; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.sql.Criterion; import com.todoroo.andlib.sql.Join; import com.todoroo.andlib.sql.Query; diff --git a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevDetailExposer.java b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevDetailExposer.java index f43255e5bc..70d3fc03dc 100644 --- a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevDetailExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevDetailExposer.java @@ -10,7 +10,7 @@ import android.content.Context; import android.content.Intent; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.adapter.TaskAdapter; diff --git a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevFilterExposer.java index 004eb99ec8..55b671c38d 100644 --- a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevFilterExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevFilterExposer.java @@ -10,7 +10,7 @@ import android.content.Context; import android.content.Intent; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.sql.Criterion; import com.todoroo.andlib.sql.QueryTemplate; diff --git a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevLoginActivity.java b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevLoginActivity.java index 997b3ad13a..166f8aabc7 100644 --- a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevLoginActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevLoginActivity.java @@ -34,7 +34,7 @@ import android.widget.Spinner; import android.widget.TextView; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.utility.DialogUtilities; diff --git a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevPreferences.java b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevPreferences.java index a08a1cd25c..0b853d2f93 100644 --- a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevPreferences.java +++ b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevPreferences.java @@ -5,7 +5,7 @@ import android.preference.ListPreference; import android.preference.Preference; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.astrid.data.StoreObject; import com.todoroo.astrid.producteev.sync.ProducteevDashboard; diff --git a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevSyncActionExposer.java b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevSyncActionExposer.java index bc9bb35e5e..9f56dfe953 100644 --- a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevSyncActionExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevSyncActionExposer.java @@ -8,7 +8,7 @@ import android.content.Context; import android.content.Intent; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.api.SyncAction; diff --git a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevUtilities.java b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevUtilities.java index 4e83a77f77..26de43f08f 100644 --- a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevUtilities.java +++ b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevUtilities.java @@ -1,6 +1,6 @@ package com.todoroo.astrid.producteev; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.sync.SyncProviderUtilities; diff --git a/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevSyncProvider.java b/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevSyncProvider.java index eac03b9d0a..aa49b8f911 100644 --- a/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevSyncProvider.java +++ b/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevSyncProvider.java @@ -19,7 +19,7 @@ import android.content.Intent; import android.text.TextUtils; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.Autowired; diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/NotificationActivity.java b/astrid/plugin-src/com/todoroo/astrid/reminders/NotificationActivity.java index 650a0b6cac..5802621493 100644 --- a/astrid/plugin-src/com/todoroo/astrid/reminders/NotificationActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/reminders/NotificationActivity.java @@ -39,7 +39,7 @@ import android.widget.TextView; import android.widget.TimePicker; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.sql.QueryTemplate; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.Preferences; diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/Notifications.java b/astrid/plugin-src/com/todoroo/astrid/reminders/Notifications.java index bcc68bc7fa..a5d70ce434 100644 --- a/astrid/plugin-src/com/todoroo/astrid/reminders/Notifications.java +++ b/astrid/plugin-src/com/todoroo/astrid/reminders/Notifications.java @@ -14,7 +14,7 @@ import android.telephony.TelephonyManager; import android.util.Log; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.DependencyInjectionService; diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderPreferences.java b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderPreferences.java index dc528f3b9c..31a5d9bcc4 100644 --- a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderPreferences.java +++ b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderPreferences.java @@ -6,7 +6,7 @@ import android.content.res.Resources; import android.preference.Preference; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.widget.TodorooPreferences; import com.todoroo.andlib.utility.Preferences; diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderService.java b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderService.java index 040b24df03..0d25d9d598 100644 --- a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderService.java +++ b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderService.java @@ -12,7 +12,7 @@ import android.content.res.Resources; import android.util.Log; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.Autowired; diff --git a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java index a6672ac947..4e539fc641 100644 --- a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java +++ b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java @@ -24,7 +24,7 @@ import com.google.ical.values.RRule; import com.google.ical.values.Weekday; import com.google.ical.values.WeekdayNum; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.ExceptionService; diff --git a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatDetailExposer.java b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatDetailExposer.java index 9d8c87eb15..299272d942 100644 --- a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatDetailExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatDetailExposer.java @@ -15,7 +15,7 @@ import com.google.ical.values.Frequency; import com.google.ical.values.RRule; import com.google.ical.values.WeekdayNum; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.core.PluginServices; import com.todoroo.astrid.data.Task; diff --git a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatsPlugin.java b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatsPlugin.java index 33be78046f..2ca8729d73 100644 --- a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatsPlugin.java +++ b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatsPlugin.java @@ -4,7 +4,7 @@ import android.content.Context; import android.content.Intent; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.astrid.api.Addon; import com.todoroo.astrid.api.AstridApiConstants; diff --git a/astrid/plugin-src/com/todoroo/astrid/sharing/SharingActionExposer.java b/astrid/plugin-src/com/todoroo/astrid/sharing/SharingActionExposer.java index 126fd14d99..79d29c45c3 100644 --- a/astrid/plugin-src/com/todoroo/astrid/sharing/SharingActionExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/sharing/SharingActionExposer.java @@ -11,7 +11,7 @@ import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.api.TaskAction; diff --git a/astrid/plugin-src/com/todoroo/astrid/sharing/SharingLoginActivity.java b/astrid/plugin-src/com/todoroo/astrid/sharing/SharingLoginActivity.java index 4bd34d77e1..92442d856e 100644 --- a/astrid/plugin-src/com/todoroo/astrid/sharing/SharingLoginActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/sharing/SharingLoginActivity.java @@ -27,7 +27,7 @@ import com.facebook.android.AuthListener; import com.facebook.android.Facebook; import com.facebook.android.LoginButton; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.DependencyInjectionService; diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/FilterByTagExposer.java b/astrid/plugin-src/com/todoroo/astrid/tags/FilterByTagExposer.java index 4e84f4fffe..4d34566f10 100644 --- a/astrid/plugin-src/com/todoroo/astrid/tags/FilterByTagExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/tags/FilterByTagExposer.java @@ -17,7 +17,7 @@ import android.graphics.drawable.Drawable; import android.widget.ArrayAdapter; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.sql.Criterion; diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java index a6bff46543..d584850e83 100644 --- a/astrid/plugin-src/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java @@ -7,7 +7,7 @@ import android.content.res.Resources; import android.graphics.drawable.BitmapDrawable; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.sql.Criterion; import com.todoroo.andlib.sql.Join; import com.todoroo.andlib.sql.Query; diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java index eeb162a454..9b0be3f0d7 100644 --- a/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java @@ -20,7 +20,7 @@ import android.widget.EditText; import android.widget.Toast; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.sql.Criterion; diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java index bca8ec4a5e..afd218d553 100644 --- a/astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java +++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java @@ -21,7 +21,7 @@ import android.widget.TextView; import android.widget.TextView.OnEditorActionListener; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.data.AbstractModel; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.sql.Criterion; diff --git a/astrid/plugin-src/com/todoroo/astrid/timers/TimerActionExposer.java b/astrid/plugin-src/com/todoroo/astrid/timers/TimerActionExposer.java index 1381daee8a..3ffc671e07 100644 --- a/astrid/plugin-src/com/todoroo/astrid/timers/TimerActionExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/timers/TimerActionExposer.java @@ -11,7 +11,7 @@ import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.api.TaskAction; diff --git a/astrid/plugin-src/com/todoroo/astrid/timers/TimerControlSet.java b/astrid/plugin-src/com/todoroo/astrid/timers/TimerControlSet.java index d63ac66c38..31a6bf5346 100644 --- a/astrid/plugin-src/com/todoroo/astrid/timers/TimerControlSet.java +++ b/astrid/plugin-src/com/todoroo/astrid/timers/TimerControlSet.java @@ -4,7 +4,7 @@ import android.view.LayoutInflater; import android.view.ViewGroup; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.data.Property.IntegerProperty; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.astrid.activity.TaskEditActivity.TaskEditControlSet; diff --git a/astrid/plugin-src/com/todoroo/astrid/timers/TimerDecorationExposer.java b/astrid/plugin-src/com/todoroo/astrid/timers/TimerDecorationExposer.java index 21ab0b2640..fce9543449 100644 --- a/astrid/plugin-src/com/todoroo/astrid/timers/TimerDecorationExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/timers/TimerDecorationExposer.java @@ -11,7 +11,7 @@ import android.view.View; import android.widget.RemoteViews; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.astrid.api.AstridApiConstants; diff --git a/astrid/plugin-src/com/todoroo/astrid/timers/TimerFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/timers/TimerFilterExposer.java index 39a68661fa..3f94afec76 100644 --- a/astrid/plugin-src/com/todoroo/astrid/timers/TimerFilterExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/timers/TimerFilterExposer.java @@ -10,7 +10,7 @@ import android.content.res.Resources; import android.graphics.drawable.BitmapDrawable; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.sql.Query; import com.todoroo.andlib.sql.QueryTemplate; diff --git a/astrid/plugin-src/com/todoroo/astrid/timers/TimerPlugin.java b/astrid/plugin-src/com/todoroo/astrid/timers/TimerPlugin.java index 462d07b502..adc0c9cd6b 100644 --- a/astrid/plugin-src/com/todoroo/astrid/timers/TimerPlugin.java +++ b/astrid/plugin-src/com/todoroo/astrid/timers/TimerPlugin.java @@ -7,7 +7,7 @@ import android.content.Intent; import android.content.res.Resources; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.NotificationManager; import com.todoroo.andlib.service.NotificationManager.AndroidNotificationManager; diff --git a/astrid/res/drawable/icon.png b/astrid/res/drawable/icon.png index 25402e7f6cfe30f5793ff716be4cf4210a503d01..743ef89c3a48cb65d51f0efb7305be9f2beba401 100644 GIT binary patch literal 4447 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 literal 6888 zcmVP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igY# z6$}Sm(UqtG02*jXL_t(|+U=Wplw5V0_dmbiy|wqAbSIrXolXeZAcRfSh>S+XaT%O( z+(1P<>Uq`Iah(}nahn-mUmca>=;(1=02vh>g>gYa5J5nY5VjB!vXIW!-RbV?s_Lq` z+wb?hf81N$)geF!@H8`L?m5+cYrA#t_xCK{=leVt{%4z=O+Nh26aJ3*n|D0tu0#DP z4{kqniK~=44S1f2yi6%h5tLSl0`-W9{0?{s%R^SnF880mWg6cNK5#MVFMs>LA3*Zq zcWwqg0-OfSL#%_b2!MbnKW`{>pa6T`4`l53z6wi zH9wu)Z?dZR^QsZa9uuq9b$t7K)#scA`R{xCd5GL3AY^k&b#@|^GE%M})`HfP7p5K; zSJX5c5}ER+>Fy=R?5oKG$&?w^!JgdtogeIfP5?CVo{Mlrvf}6wguE!FR4#|DRlx`- zHO+md#}t_YuEYh@~WsR&})sI=(+lu*#l_eT^G{wjjNb=_eH-` zuz6~Y6-sMxU2q*#It`8+TaH%oPgsi$BZ#8-e;8nmjWbx2Ur8g%V2|T&$7Z?71rXq8 zJ>R?LHM4I)?|RE(Py<#(wBsn!X`DhH-PVdO6i~SwWHYE#8e9jo1CA44oE0RD5Z}X8 zs>pbWXnY(~sbV}2A`8mK@v6zv;^3^NTjVtGL(qFM?uAR3eigaL#hXcdFwrXZbxOd48RAd|*PrNIj6i3(cDG!h4O)s+0~;{&z= zZ2aVv!0Z4tM>~I}ZG@`&vDL((@oCy@!fC|BWya7TjE|#6M__p$sili(6~W$fAKu_7 z*mxnD!D*%fO_kg!&$f%{nSAKOvW-*}E}&k2X5bv_a*bnH3tk-#9fXG;LJc1!wO~Fi zC$GY7D`2f)jZOXw#t5eAHDfK-T8xoJvjWf;)J8B;ZUoL}49*k9r!a!iQP{l;ieqFJ zFC@Qo5h~@z;Mf=tX@Dbwv1anQSX-DCfZ|1#$XfZ+m(EcHBvMmr8-l5!=nA`!tRC5(-e=)|l6 z72gAhGx$aZ#Gd zK|T-JEEt1SYbd`4K^U{?8Kaa)J1QZNN;TD8Hs(x~5;|8P)lvX7)`rLEMN=h-z{sq* zm_SXG1DPyz&0(aqgU{Y|Kffu~P`$m7Z-tbbXhAbSD5_D4q#;*;mKLO?1+uw#F?=88 zdpOw?=p;}ZCR4vyi;?&>F>++qEGR-v2nup}wpMDKe(9yGI%ySus0Q3VJjy4|SO*8Z zIKVdOz)aGX){sgg`2wnE9%M2oD{+vnj3Z%)3Op1VD=H4uYD!%bX|f+UGHVuub^@yu zs-=~0-h3-cfr%o#T8-v&MP(9wx< zQ%DeE13%_LNqTP(L}Tp~M>6)ntO2B5RTmM6BIdQXBO)9+bcpTSxAWNU-Lz&>PxA~M zR5r)gZoZX&zvFH)*(~Wo3-A5;P1JG)a8rmCLNCOG5yserFxuFfnh2z|GJ60?WG8GG zB9#i4{`nS`^>h;k0V6|0eDU?KMtfeY1~jT zW8KF_Q9=x*sr0Z@;26P1_Ta3=Ai~fyfYfWGM~2z+*^g6?EU9doRJn|d9*rA=iLf=J za-<=VgaIG>^Oy6ZyY69VXo#_~F*;ic^rqanP_=@DW)hU?3S*-;r2KvRl{aeuiM779 z1_B?clu@2X!F4AukRX7lQOKT{OewW0n|kJR%Vi(sUw(ZvOXtqv6MykaRB;4?5J3|K zVFC~hKoWo&BER+CIP!b$+_ahJZM}6ih@wm=W0A<9eGdXZVZ9AYuu~Q>(_&VD$e?^5 zjt=vp&Q@OZt_x$*IWh$GDufZ@xY)=}Sx^i}tS}}3DPrq+Ho-X|fV5VgH8$3P#o~v8 z7(u&=w4+YUwI*XwLKLF_YBmOaY%~$pOhP(A(3l{^m^jun(6y5)qo7gsIIK-S0TB_c zb>fw6p_~IaZ00zO#7OM#AU~1 z@>9patgylauG6U?BVa|uYOSq^7^Rd+Kr%`xQA*h)kdaEItk(Lt;GAd-@{F<6J#f=0 z7QN#l@_kDH@D2|$_S-ucz4dPH7^^dHVGF&zIr6RUlUO$%@`PeT8E8*j zDgq)POn?X*;ApL*ruR()Fs-!_5tB}*B?tl8=i()?E7bLN-I&SsT%M zQw&~0?3&|;6+tx`gd*tnR`Ta;V$FHa$JFX@QO;y6y!NCq=6Ruy&ERcP1Y(8oT9aa{~T zXGaGU6S2}cfBt-m#Uk~39j!HkgM;kbw~v8=0T4;t1O^5MC>Dz-rIK!hL2J!{0|yu% zAE#I>qVqZC|MjbgChCkGtzjekq!r8lz^^LE3S>kirBfE#1iG~? zl?Bqt>uv(3w$`erp-J1wM3#9A^NjuOkKDicFB!b@Kk$p=^ekRXM^87AG0f}fVPs^4 zf&Kd_6bdX}yqM0;&KM+M|Ni}Sb#sHgTC-xfKIs#-E$uY-t%!#nmO|_lt;$!YW{Hm z64Gcc*n9uS$D(kk5s-mUM8Zb)N?s46(1t(w^^3k5;hZ7@`3wi%`TE<>9UlwITB~Xl zMZPgpoMOfR?R?q!DBYUITJoq&CY~X}PR=7Ltx+gUtxj#{ZjOBAN-Fo;V40fys(n(U6}N zXob#Y(CKtMl@>*qY7H@QJtsj#+s4(Hsz<6aic-=T;yk|lE1?vHHsd%M5z$Ji$zYsh zE64Z!%D4XG+|LE#tglQMS-*0=%4b~exPL&x$m#jVubsa2OOShp$8WPx1rKkNIxeD&(hpORGS)MDAN zu781A(%VXRSB|qcEK$XZrC7Ghue^TCwq|fn$by`dV{MQWk4e+6!E!-p?M%@zH%$}@ z)lx{g=u@pkL_xxm8v}c)sfKDCJDVoAY$2`d`*Awj8M*Nf=z+cTukXY}25Zby2n7PD zOhdV9PVv4U*1z=K7hdWXGV4Z5hV?6ZS-!BHx_=0Oo;mY4YyARlzyA=SkyD?3v8pgO zY0^!PTn%joY!vG=xmJgKTLJCFHCYr1^@))BM1)r}1fH3!%*BGO`_vxUi@)|O6cFr`61nFWPn<@9{pipv)CztoQceBU>p zy!_0!q}wvf$I6kMb85d@vwSW!Z%?u?Q{X72C{-c`M-S89>RtA#f`v=p&jL^`OVe~c*&-p zJTX8ir3jl&=;VA$=R10qym*z${Bsyu3H?ZAvZ*EjrbP595ae+QM~>NP$nDK;sVqG7 z!a5Ik))_fy@z>M{Lt)MhGYXO_FqYv<@_E~<@<)piXRTY#+U4^Yt8AY>^qKr#scK|w zJW@*W`PXj#)n|Tr=PRaxb1Xm#kek<^qyAxF*QOV?cfI?}md@99xv4q6SUhWSBcr@} zNH(8AYc9;OzKY5A{ zwiO<|FvEdvMX4C^{8LtO`sxJ?kKI4rev{uTO;{PP7zJ|qU!8ZuM}PXemvjE}u0L*X zbFvBinmO}d@%M}RuL-QpH=IQp_W;DYH2Ibcb9&lhjfZ1{^ps6B4_HpKt^~lwtu2kO z-@T>A&b-f9DdOBstJ%Ssv>VO4W#$ zp1GFweTz9fa@VoT2Lj_2LwUji@(*v?a>K`;l-@L3&)53a-(ZBff~ZD{QSnBi>BerD za!93{GLlU7xI`Mm1$OdAmT8a4j1_~ZEIho?XIrPoa4}@_#?`Fr>t&?4gEQBj%W&~1 zdk>fJ7DBEyLt#e%&J;*)UD$D9hCTCy;)LO4XPwH1{-q2I-jO5_!PvN;X)TPGtrW{f znb2N#;rTay@&`A*j2~aMXGQ?!7H4vHMXqpORy&SP$^zZ|NI z3#eBEP&yeQih+v>rkw_uvT$dAo&7<;=8daZyJ9{Ehqe-g9#!usXRkY#BO}A?Ib5c? zT#?VZv^}P<7*Y{ze@m8K^M$ce#EVZmg-xqhv-`kJm?U#HKoSwg%SOgZMtPq3+&ll` zrptgQ1?O0R+*`|I`@TDT;6H~#zg9MpUy8!N~pQLUhy7OXg~ z>%^cXEf}$a??qHfb?Q|gE8uFKXz>Y1(!3v|`o|uR^=GVL{fc=U7~F=n3Tq+o>rB*! zc)_W!V(+2-3>>LYS)plL+C%4Hnr*LxM>-;krHB`wzL6K6at7P?TszHT;(cMfVr8sk zRlOd4{k?zv+YcpoY|UuCq8Y3_(3Lz|5|PPC_>u!eC+Azv{>t)of169YnM^iCu8_uc z-B@yrEM7IhtH&uim3GPHGqkj26LKk&ZJjs#gKSzoZkj%qX=82w z8~EmRSF-oeQRa8Kv_&q5!hljW;x(IJz}agyu=U}qkK5fYO&BUwA&ShGKJdohek7s) zGn!&j$LuR0)lk_IP*Om+DqDEo<$Y_v*zTnIBI4E8TH(5JF&fupLKH<{&N0kfDCFDOwB|y-_4BKFaQ6U(oTgke zylKl8PVHaC-49-Y*y;DHDS=AOQ1Jx69)02?7ya(juB(#TaE3MLaWZD33*Z4hQ2uh? z+E2f~clqTSI!!{;8$sLHxFusEgRxd}%25XcfB5c+;@ywdtB?4`hVz_sH(H5ybgaEM zZmzR&Fb{k~;g%ZJK9|wFLKA~OIXEuh`5t4X-MsePw=yt1z@Eb+y#BmDTu5`g8COHcaHYvwO_b*hlYarLyL7%NoEb-a2=swQ&V+q805 zW$DOkNvE}%P7N$`I=eZ0{oA7BU4vaFj}1CkCNftF!mO)+tb$9_5;0!bjbG^T8Xh z{m#x$5#Rk&e!9~g&QlFH{IWQ__4#d`=Pb?S7ulp|o>rQS*6i}Cd%kdJ@BjVo@WCsR zRXPNe5>RY&OgkC|2R7u}*7i85m60(j3N2v}5k+xz5Adj0-S?~UqgMbsw%&T={^e^r z)~8!C9Ss+@2?sMGlVjO7Rz?tka^1>=FY2zF5B=g7SMB;Vusu1Sr@cLuXzyxhu~0a# zea0JLct2f;fSTjw^ZSbT= zz1p5jcHe(d0(1e`@V37@?H?ERwfD7UA)D4s>VQmd+WA(>by4^K{_yqJe{a_(ft}A3 zoS6Wml30{YI8wT)z>N}c>Pgl!Pr)r*pyhRQdf)n?g?(QRt(E3k9uZ;GgyR?NxaU=g zt5$$s;IxbW_O#E>U(&XuJ+CC4QfgXR2b19J_~YPBzr14S-vf_46Sq1M7n_^|OVWNV zv6RN6p1fygcpSB(KCx$Ap>5NWbZ)tQymXqqB6io21fVidz5n+|9$B`w>v<}hZc{2Q zd5j2F6y>^Q!WZ@MT|>XR{>q(~Cg4<_tqC*d1U{QEmw24yMA+yt0=E3Rc=Q*iw6v}6 z&lXmBaR5?{AGl)p;J+j;>m}es=la)|1kKIn}4wDQ^1~Q8=TqPbW-PaBr`qBfj(dk(E0=mmrg!&!K>eQ z%AR-pzZb}h-mvnQz^O^y_}_AC)OwBS3->7!M+#U5ylUf1mV7G#r|_pdLG@n{R5!6a iH%a4l{%4!L#r^+ - Astrid Tasks + To Do List - Astrid Permission + To Do List Permission read tasks, display task filters - Astrid Permission + To Do Lists Permission create new tasks, edit existing tasks @@ -34,7 +34,7 @@ Time (hours : minutes) - Astrid should to be updated to the latest + To Do Tasks should to be updated to the latest version in the Android market! Please do that before continuing, or wait a few seconds. @@ -48,7 +48,7 @@ I Decline - Astrid Terms Of Use + To Do Tasks Terms Of Use @@ -91,7 +91,7 @@ Add to this list... - Notifications are muted. You won\'t be able to hear Astrid! + Notifications are muted. You won\'t be able to hear To Do Tasks! @@ -143,7 +143,7 @@ Sort Options - Astrid Smart Sort + Smart Sort By Title @@ -169,7 +169,7 @@ - Astrid: Filters + Filters Loading Filters... @@ -201,10 +201,10 @@ - Astrid: Editing \'%s\' + Editing \'%s\' - Astrid: New Task + New Task Basic @@ -316,15 +316,15 @@ - What\'s New In Astrid? + What\'s New In To Do Tasks? - Latest Astrid News + Latest To Do Tasks News - Astrid: Settings + To Do Tasks: Settings Appearance @@ -438,7 +438,7 @@ Current version: %s\n\n - +This is branched off Astrid. Astrid is open-source and proudly maintained by Todoroo, Inc. diff --git a/astrid/rmilk-src/org/weloveastrid/rmilk/MilkDetailExposer.java b/astrid/rmilk-src/org/weloveastrid/rmilk/MilkDetailExposer.java index 4152155a54..1bbd501d2f 100644 --- a/astrid/rmilk-src/org/weloveastrid/rmilk/MilkDetailExposer.java +++ b/astrid/rmilk-src/org/weloveastrid/rmilk/MilkDetailExposer.java @@ -11,7 +11,7 @@ import android.content.Context; import android.content.Intent; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.DependencyInjectionService; diff --git a/astrid/rmilk-src/org/weloveastrid/rmilk/MilkFilterExposer.java b/astrid/rmilk-src/org/weloveastrid/rmilk/MilkFilterExposer.java index 598213e27a..821ff24e99 100644 --- a/astrid/rmilk-src/org/weloveastrid/rmilk/MilkFilterExposer.java +++ b/astrid/rmilk-src/org/weloveastrid/rmilk/MilkFilterExposer.java @@ -12,7 +12,7 @@ import android.content.Context; import android.content.Intent; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.DependencyInjectionService; diff --git a/astrid/rmilk-src/org/weloveastrid/rmilk/MilkLoginActivity.java b/astrid/rmilk-src/org/weloveastrid/rmilk/MilkLoginActivity.java index 11602eb1de..deffc8fabf 100644 --- a/astrid/rmilk-src/org/weloveastrid/rmilk/MilkLoginActivity.java +++ b/astrid/rmilk-src/org/weloveastrid/rmilk/MilkLoginActivity.java @@ -28,7 +28,7 @@ import android.webkit.WebViewClient; import android.widget.Button; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.utility.DialogUtilities; /** diff --git a/astrid/rmilk-src/org/weloveastrid/rmilk/MilkPreferences.java b/astrid/rmilk-src/org/weloveastrid/rmilk/MilkPreferences.java index 89b3ab7806..eb281c94e5 100644 --- a/astrid/rmilk-src/org/weloveastrid/rmilk/MilkPreferences.java +++ b/astrid/rmilk-src/org/weloveastrid/rmilk/MilkPreferences.java @@ -2,7 +2,7 @@ import org.weloveastrid.rmilk.sync.MilkSyncProvider; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.astrid.sync.SyncProviderPreferences; import com.todoroo.astrid.sync.SyncProviderUtilities; diff --git a/astrid/rmilk-src/org/weloveastrid/rmilk/MilkSyncActionExposer.java b/astrid/rmilk-src/org/weloveastrid/rmilk/MilkSyncActionExposer.java index 666e3bbe94..0f98704bfc 100644 --- a/astrid/rmilk-src/org/weloveastrid/rmilk/MilkSyncActionExposer.java +++ b/astrid/rmilk-src/org/weloveastrid/rmilk/MilkSyncActionExposer.java @@ -8,7 +8,7 @@ import android.content.Context; import android.content.Intent; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.api.SyncAction; diff --git a/astrid/rmilk-src/org/weloveastrid/rmilk/MilkUtilities.java b/astrid/rmilk-src/org/weloveastrid/rmilk/MilkUtilities.java index dbdbd6d960..09f94333b6 100644 --- a/astrid/rmilk-src/org/weloveastrid/rmilk/MilkUtilities.java +++ b/astrid/rmilk-src/org/weloveastrid/rmilk/MilkUtilities.java @@ -7,7 +7,7 @@ import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.sync.SyncProviderUtilities; diff --git a/astrid/rmilk-src/org/weloveastrid/rmilk/sync/MilkSyncProvider.java b/astrid/rmilk-src/org/weloveastrid/rmilk/sync/MilkSyncProvider.java index 2b9b9bf944..32aeee3821 100644 --- a/astrid/rmilk-src/org/weloveastrid/rmilk/sync/MilkSyncProvider.java +++ b/astrid/rmilk-src/org/weloveastrid/rmilk/sync/MilkSyncProvider.java @@ -42,7 +42,7 @@ import android.text.TextUtils; import android.util.Log; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.Autowired; diff --git a/astrid/src-legacy/com/timsu/astrid/data/enums/Importance.java b/astrid/src-legacy/com/timsu/astrid/data/enums/Importance.java index b13a37ec30..9c4f68fd48 100644 --- a/astrid/src-legacy/com/timsu/astrid/data/enums/Importance.java +++ b/astrid/src-legacy/com/timsu/astrid/data/enums/Importance.java @@ -19,7 +19,7 @@ */ package com.timsu.astrid.data.enums; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; public enum Importance { // MOST IMPORTANT diff --git a/astrid/src-legacy/com/timsu/astrid/data/task/AbstractTaskModel.java b/astrid/src-legacy/com/timsu/astrid/data/task/AbstractTaskModel.java index 4f194d4b24..33bc45eef5 100644 --- a/astrid/src-legacy/com/timsu/astrid/data/task/AbstractTaskModel.java +++ b/astrid/src-legacy/com/timsu/astrid/data/task/AbstractTaskModel.java @@ -28,7 +28,7 @@ import android.database.sqlite.SQLiteOpenHelper; import android.util.Log; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.timsu.astrid.data.AbstractController; import com.timsu.astrid.data.AbstractModel; import com.timsu.astrid.data.enums.Importance; diff --git a/astrid/src-legacy/com/timsu/astrid/utilities/LegacyTasksXmlExporter.java b/astrid/src-legacy/com/timsu/astrid/utilities/LegacyTasksXmlExporter.java index ef165f2e5a..f61342153d 100644 --- a/astrid/src-legacy/com/timsu/astrid/utilities/LegacyTasksXmlExporter.java +++ b/astrid/src-legacy/com/timsu/astrid/utilities/LegacyTasksXmlExporter.java @@ -18,7 +18,7 @@ import android.util.Xml; import android.widget.Toast; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.timsu.astrid.data.alerts.AlertController; import com.timsu.astrid.data.sync.SyncDataController; import com.timsu.astrid.data.sync.SyncMapping; diff --git a/astrid/src/com/todoroo/astrid/activity/AboutActivity.java b/astrid/src/com/todoroo/astrid/activity/AboutActivity.java index 269205e887..e2397e41ba 100644 --- a/astrid/src/com/todoroo/astrid/activity/AboutActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/AboutActivity.java @@ -21,7 +21,7 @@ import android.text.Html; import android.text.Spanned; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; /** * Displays an About dialog. diff --git a/astrid/src/com/todoroo/astrid/activity/AddOnActivity.java b/astrid/src/com/todoroo/astrid/activity/AddOnActivity.java index ee5f3207fc..730bdee8d9 100644 --- a/astrid/src/com/todoroo/astrid/activity/AddOnActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/AddOnActivity.java @@ -15,7 +15,7 @@ import android.widget.ListView; import android.widget.TabHost; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.astrid.adapter.AddOnAdapter; diff --git a/astrid/src/com/todoroo/astrid/activity/DraggableTaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/DraggableTaskListActivity.java index 49b6fddbb5..e430cd15be 100644 --- a/astrid/src/com/todoroo/astrid/activity/DraggableTaskListActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/DraggableTaskListActivity.java @@ -14,7 +14,7 @@ import android.widget.TextView; import com.commonsware.cwac.tlv.TouchListView; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.Property.IntegerProperty; import com.todoroo.andlib.data.TodorooCursor; diff --git a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java index 09ca18c638..1932c836b1 100644 --- a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java +++ b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java @@ -26,7 +26,7 @@ import android.preference.PreferenceScreen; import android.widget.Toast; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.DependencyInjectionService; diff --git a/astrid/src/com/todoroo/astrid/activity/Eula.java b/astrid/src/com/todoroo/astrid/activity/Eula.java index be9886b7ba..78631e905c 100644 --- a/astrid/src/com/todoroo/astrid/activity/Eula.java +++ b/astrid/src/com/todoroo/astrid/activity/Eula.java @@ -20,7 +20,7 @@ import android.content.DialogInterface; import android.content.SharedPreferences; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.utility.AndroidUtilities; /** diff --git a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java index ad3b766d21..13079aa14a 100644 --- a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java @@ -33,7 +33,7 @@ import android.widget.ExpandableListView.ExpandableListContextMenuInfo; import android.widget.TextView.OnEditorActionListener; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.ExceptionService; diff --git a/astrid/src/com/todoroo/astrid/activity/ShortcutActivity.java b/astrid/src/com/todoroo/astrid/activity/ShortcutActivity.java index c672ec94ad..4e9d41f5ec 100644 --- a/astrid/src/com/todoroo/astrid/activity/ShortcutActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/ShortcutActivity.java @@ -27,7 +27,7 @@ import android.content.Intent; import android.os.Bundle; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.sql.QueryTemplate; import com.todoroo.andlib.utility.AndroidUtilities; diff --git a/astrid/src/com/todoroo/astrid/activity/SortSelectionActivity.java b/astrid/src/com/todoroo/astrid/activity/SortSelectionActivity.java index 0fbab1639d..ca51cf9050 100644 --- a/astrid/src/com/todoroo/astrid/activity/SortSelectionActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/SortSelectionActivity.java @@ -8,7 +8,7 @@ import android.widget.CheckBox; import android.widget.RadioButton; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.astrid.core.SortHelper; /** diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java index 173cf97336..0fb067d939 100755 --- a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java @@ -64,7 +64,7 @@ import android.widget.Toast; import android.widget.ToggleButton; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.data.Property.StringProperty; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java index e9954cc6ea..de668f2309 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java @@ -1,9 +1,11 @@ package com.todoroo.astrid.activity; import java.util.ArrayList; +import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; import java.util.Map.Entry; +import java.util.Set; import java.util.Timer; import java.util.TimerTask; import java.util.concurrent.atomic.AtomicReference; @@ -57,7 +59,7 @@ import com.google.ads.AdRequest; import com.google.ads.AdView; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.Autowired; @@ -217,8 +219,15 @@ protected void onCreate(Bundle savedInstanceState) { setContentView(parent); + //AdManager AdView adView = (AdView)this.findViewById(R.id.adView); - adView.loadAd(new AdRequest()); + AdRequest ar = new AdRequest(); + Set keywords = new HashSet(); + //keywords.add("organizer"); + //keywords.add("to do list"); + //keywords.add("GTD"); + //keywords.add("calendar"); + adView.loadAd(ar); if(database == null) diff --git a/astrid/src/com/todoroo/astrid/adapter/AddOnAdapter.java b/astrid/src/com/todoroo/astrid/adapter/AddOnAdapter.java index 63bb7a335f..ecc5fc5043 100644 --- a/astrid/src/com/todoroo/astrid/adapter/AddOnAdapter.java +++ b/astrid/src/com/todoroo/astrid/adapter/AddOnAdapter.java @@ -20,7 +20,7 @@ import android.widget.ImageView; import android.widget.TextView; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.astrid.data.AddOn; /** diff --git a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java index cb17a09d03..e9b13e3df9 100644 --- a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java +++ b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java @@ -25,7 +25,7 @@ import android.widget.ImageView; import android.widget.TextView; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.utility.Preferences; diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java index 0671251c29..11d9740c39 100644 --- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java +++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java @@ -42,7 +42,7 @@ import android.widget.ListView; import android.widget.TextView; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.Autowired; diff --git a/astrid/src/com/todoroo/astrid/dao/TaskDao.java b/astrid/src/com/todoroo/astrid/dao/TaskDao.java index 07bc1b6d1b..4bc4e03372 100644 --- a/astrid/src/com/todoroo/astrid/dao/TaskDao.java +++ b/astrid/src/com/todoroo/astrid/dao/TaskDao.java @@ -7,7 +7,7 @@ import android.content.ContentValues; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.data.DatabaseDao; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager; diff --git a/astrid/src/com/todoroo/astrid/service/AddOnService.java b/astrid/src/com/todoroo/astrid/service/AddOnService.java index 23877b9eed..14cd78e710 100644 --- a/astrid/src/com/todoroo/astrid/service/AddOnService.java +++ b/astrid/src/com/todoroo/astrid/service/AddOnService.java @@ -8,7 +8,7 @@ import android.graphics.drawable.BitmapDrawable; import android.net.Uri; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.Preferences; diff --git a/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java b/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java index 766b7295ae..766fbd14f1 100644 --- a/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java +++ b/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java @@ -16,7 +16,7 @@ import android.util.Log; import com.google.ical.values.RRule; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.timsu.astrid.utilities.LegacyTasksXmlExporter; import com.todoroo.andlib.data.AbstractModel; import com.todoroo.andlib.data.DatabaseDao; diff --git a/astrid/src/com/todoroo/astrid/service/StartupService.java b/astrid/src/com/todoroo/astrid/service/StartupService.java index 493a08b40d..6a3cf04785 100644 --- a/astrid/src/com/todoroo/astrid/service/StartupService.java +++ b/astrid/src/com/todoroo/astrid/service/StartupService.java @@ -21,7 +21,7 @@ import android.util.Log; import android.widget.Toast; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.DependencyInjectionService; diff --git a/astrid/src/com/todoroo/astrid/service/StatisticsService.java b/astrid/src/com/todoroo/astrid/service/StatisticsService.java index 4dfe7e89d6..da5fc5acf0 100644 --- a/astrid/src/com/todoroo/astrid/service/StatisticsService.java +++ b/astrid/src/com/todoroo/astrid/service/StatisticsService.java @@ -7,7 +7,7 @@ import android.content.Context; import com.flurry.android.FlurryAgent; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.utility.Constants; diff --git a/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java b/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java index fe46aed0e1..80b966dc4e 100644 --- a/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java +++ b/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java @@ -15,7 +15,7 @@ import android.content.pm.PackageManager.NameNotFoundException; import android.text.TextUtils; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.Property.StringProperty; import com.todoroo.andlib.service.Autowired; diff --git a/astrid/src/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/com/todoroo/astrid/service/UpgradeService.java index 4c00111bd7..8b8d0a3b33 100644 --- a/astrid/src/com/todoroo/astrid/service/UpgradeService.java +++ b/astrid/src/com/todoroo/astrid/service/UpgradeService.java @@ -10,7 +10,7 @@ import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.data.Property.LongProperty; import com.todoroo.andlib.data.Property.StringProperty; import com.todoroo.andlib.data.TodorooCursor; diff --git a/astrid/src/com/todoroo/astrid/ui/CalendarDialog.java b/astrid/src/com/todoroo/astrid/ui/CalendarDialog.java index a5fb8da4a2..a83f51ad0c 100644 --- a/astrid/src/com/todoroo/astrid/ui/CalendarDialog.java +++ b/astrid/src/com/todoroo/astrid/ui/CalendarDialog.java @@ -10,7 +10,7 @@ import android.view.ViewGroup.LayoutParams; import android.widget.Button; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.astrid.ui.CalendarView.OnSelectedDateListener; public class CalendarDialog extends Dialog implements OnClickListener, OnSelectedDateListener { diff --git a/astrid/src/com/todoroo/astrid/ui/CalendarView.java b/astrid/src/com/todoroo/astrid/ui/CalendarView.java index 3f513b938f..b523ce517f 100644 --- a/astrid/src/com/todoroo/astrid/ui/CalendarView.java +++ b/astrid/src/com/todoroo/astrid/ui/CalendarView.java @@ -20,7 +20,7 @@ import android.view.View; import android.view.WindowManager; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; public class CalendarView extends View { diff --git a/astrid/src/com/todoroo/astrid/ui/DeadlineTimePickerDialog.java b/astrid/src/com/todoroo/astrid/ui/DeadlineTimePickerDialog.java index 2a3f355a98..698dc2038c 100644 --- a/astrid/src/com/todoroo/astrid/ui/DeadlineTimePickerDialog.java +++ b/astrid/src/com/todoroo/astrid/ui/DeadlineTimePickerDialog.java @@ -33,7 +33,7 @@ import android.widget.TimePicker; import android.widget.TimePicker.OnTimeChangedListener; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; /** * A dialog that prompts the user for the time of day using a {@link TimePicker}. diff --git a/astrid/src/com/todoroo/astrid/ui/NNumberPickerDialog.java b/astrid/src/com/todoroo/astrid/ui/NNumberPickerDialog.java index 3ac68cca85..0b5e2e8175 100644 --- a/astrid/src/com/todoroo/astrid/ui/NNumberPickerDialog.java +++ b/astrid/src/com/todoroo/astrid/ui/NNumberPickerDialog.java @@ -33,7 +33,7 @@ import android.widget.TextView; import android.widget.FrameLayout.LayoutParams; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; /** Dialog box with an arbitrary number of number pickers */ public class NNumberPickerDialog extends AlertDialog implements OnClickListener { diff --git a/astrid/src/com/todoroo/astrid/ui/NumberPicker.java b/astrid/src/com/todoroo/astrid/ui/NumberPicker.java index 413666804b..5180616e35 100644 --- a/astrid/src/com/todoroo/astrid/ui/NumberPicker.java +++ b/astrid/src/com/todoroo/astrid/ui/NumberPicker.java @@ -36,7 +36,7 @@ import android.widget.LinearLayout; import android.widget.TextView; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.utility.AndroidUtilities; @SuppressWarnings({"nls","unused"}) diff --git a/astrid/src/com/todoroo/astrid/ui/NumberPickerButton.java b/astrid/src/com/todoroo/astrid/ui/NumberPickerButton.java index 54c6cf9bd1..8392ce61a3 100644 --- a/astrid/src/com/todoroo/astrid/ui/NumberPickerButton.java +++ b/astrid/src/com/todoroo/astrid/ui/NumberPickerButton.java @@ -25,7 +25,7 @@ import android.view.MotionEvent; import android.widget.ImageButton; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; /** * This class exists purely to cancel long click events. diff --git a/astrid/src/com/todoroo/astrid/ui/NumberPickerDialog.java b/astrid/src/com/todoroo/astrid/ui/NumberPickerDialog.java index 0777935c91..3eec32e476 100644 --- a/astrid/src/com/todoroo/astrid/ui/NumberPickerDialog.java +++ b/astrid/src/com/todoroo/astrid/ui/NumberPickerDialog.java @@ -26,7 +26,7 @@ import android.view.LayoutInflater; import android.view.View; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; public class NumberPickerDialog extends AlertDialog implements OnClickListener { diff --git a/astrid/src/com/todoroo/astrid/ui/TimeDurationControlSet.java b/astrid/src/com/todoroo/astrid/ui/TimeDurationControlSet.java index 9ece5937b5..78ef155e9b 100644 --- a/astrid/src/com/todoroo/astrid/ui/TimeDurationControlSet.java +++ b/astrid/src/com/todoroo/astrid/ui/TimeDurationControlSet.java @@ -25,7 +25,7 @@ import android.view.View; import android.widget.Button; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.astrid.ui.NNumberPickerDialog.OnNNumberPickedListener; diff --git a/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java b/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java index bd5c42ce4a..1654605661 100644 --- a/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java +++ b/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java @@ -5,7 +5,7 @@ import android.content.SharedPreferences.Editor; import android.content.res.Resources; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.api.AstridApiConstants; diff --git a/astrid/src/com/todoroo/astrid/voice/VoiceInputAssistant.java b/astrid/src/com/todoroo/astrid/voice/VoiceInputAssistant.java index 37285d69d2..1a92eace9a 100644 --- a/astrid/src/com/todoroo/astrid/voice/VoiceInputAssistant.java +++ b/astrid/src/com/todoroo/astrid/voice/VoiceInputAssistant.java @@ -18,7 +18,7 @@ import android.widget.EditText; import android.widget.ImageButton; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.DialogUtilities; import com.todoroo.andlib.utility.Preferences; diff --git a/astrid/src/com/todoroo/astrid/widget/TasksWidget.java b/astrid/src/com/todoroo/astrid/widget/TasksWidget.java index d14187bab7..5ac4a4c5b5 100644 --- a/astrid/src/com/todoroo/astrid/widget/TasksWidget.java +++ b/astrid/src/com/todoroo/astrid/widget/TasksWidget.java @@ -14,7 +14,7 @@ import android.view.View; import android.widget.RemoteViews; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager; diff --git a/astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java b/astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java index 6eea9e95a2..58bbe445ce 100644 --- a/astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java +++ b/astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java @@ -10,7 +10,7 @@ import android.widget.Button; import android.widget.ExpandableListView; -import com.timsu.astrid.R; +import com.timsu.astridsquid.R; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.adapter.FilterAdapter; diff --git a/greendroid/GreenDroid/src/greendroid/app/GDActivity.java b/greendroid/GreenDroid/src/greendroid/app/GDActivity.java index fba8560c6f..802e8066a2 100644 --- a/greendroid/GreenDroid/src/greendroid/app/GDActivity.java +++ b/greendroid/GreenDroid/src/greendroid/app/GDActivity.java @@ -15,7 +15,7 @@ */ package greendroid.app; -import com.cyrilmottier.android.greendroid.R; +import com.timsu.astridsquid.R; import greendroid.util.Config; import greendroid.widget.ActionBar; diff --git a/greendroid/GreenDroid/src/greendroid/app/GDListActivity.java b/greendroid/GreenDroid/src/greendroid/app/GDListActivity.java index 59de729c1b..31c1563318 100644 --- a/greendroid/GreenDroid/src/greendroid/app/GDListActivity.java +++ b/greendroid/GreenDroid/src/greendroid/app/GDListActivity.java @@ -24,7 +24,7 @@ import android.widget.ListAdapter; import android.widget.ListView; -import com.cyrilmottier.android.greendroid.R; +import com.timsu.astridsquid.R; /** diff --git a/greendroid/GreenDroid/src/greendroid/app/GDTabActivity.java b/greendroid/GreenDroid/src/greendroid/app/GDTabActivity.java index 87723aaab2..45298a909c 100644 --- a/greendroid/GreenDroid/src/greendroid/app/GDTabActivity.java +++ b/greendroid/GreenDroid/src/greendroid/app/GDTabActivity.java @@ -31,7 +31,7 @@ import android.widget.TabHost; import android.widget.TextView; -import com.cyrilmottier.android.greendroid.R; +import com.timsu.astridsquid.R; /** * An equivalent to a TabActivity that manages fancy tabs and an ActionBar diff --git a/greendroid/GreenDroid/src/greendroid/widget/ActionBar.java b/greendroid/GreenDroid/src/greendroid/widget/ActionBar.java index ad643292f3..865ea10586 100644 --- a/greendroid/GreenDroid/src/greendroid/widget/ActionBar.java +++ b/greendroid/GreenDroid/src/greendroid/widget/ActionBar.java @@ -31,7 +31,7 @@ import android.widget.LinearLayout; import android.widget.TextView; -import com.cyrilmottier.android.greendroid.R; +import com.timsu.astridsquid.R; public class ActionBar extends LinearLayout { diff --git a/greendroid/GreenDroid/src/greendroid/widget/ActionBarHost.java b/greendroid/GreenDroid/src/greendroid/widget/ActionBarHost.java index 14b533fbb8..9caf3c98cd 100644 --- a/greendroid/GreenDroid/src/greendroid/widget/ActionBarHost.java +++ b/greendroid/GreenDroid/src/greendroid/widget/ActionBarHost.java @@ -20,7 +20,7 @@ import android.widget.FrameLayout; import android.widget.LinearLayout; -import com.cyrilmottier.android.greendroid.R; +import com.timsu.astridsquid.R; public class ActionBarHost extends LinearLayout { diff --git a/greendroid/GreenDroid/src/greendroid/widget/ActionBarItem.java b/greendroid/GreenDroid/src/greendroid/widget/ActionBarItem.java index 4d5e9ff1bd..6e704ea247 100644 --- a/greendroid/GreenDroid/src/greendroid/widget/ActionBarItem.java +++ b/greendroid/GreenDroid/src/greendroid/widget/ActionBarItem.java @@ -20,7 +20,7 @@ import android.graphics.drawable.StateListDrawable; import android.view.View; -import com.cyrilmottier.android.greendroid.R; +import com.timsu.astridsquid.R; /** * Base class representing an {@link ActionBarItem} used in {@link ActionBar}s. diff --git a/greendroid/GreenDroid/src/greendroid/widget/LoaderActionBarItem.java b/greendroid/GreenDroid/src/greendroid/widget/LoaderActionBarItem.java index 2f505d6650..42df85074d 100644 --- a/greendroid/GreenDroid/src/greendroid/widget/LoaderActionBarItem.java +++ b/greendroid/GreenDroid/src/greendroid/widget/LoaderActionBarItem.java @@ -18,7 +18,7 @@ import android.view.LayoutInflater; import android.view.View; -import com.cyrilmottier.android.greendroid.R; +import com.timsu.astridsquid.R; /** * An extension of a {@link NormalActionBarItem} that supports a loading states. diff --git a/greendroid/GreenDroid/src/greendroid/widget/NormalActionBarItem.java b/greendroid/GreenDroid/src/greendroid/widget/NormalActionBarItem.java index 03d43665e1..8aa913fa03 100644 --- a/greendroid/GreenDroid/src/greendroid/widget/NormalActionBarItem.java +++ b/greendroid/GreenDroid/src/greendroid/widget/NormalActionBarItem.java @@ -19,7 +19,7 @@ import android.view.View; import android.widget.ImageButton; -import com.cyrilmottier.android.greendroid.R; +import com.timsu.astridsquid.R; /** * Default implementation of an {@link ActionBarItem}. A diff --git a/greendroid/GreenDroid/src/greendroid/widget/QuickActionBar.java b/greendroid/GreenDroid/src/greendroid/widget/QuickActionBar.java index 0980e17376..a7553b066b 100644 --- a/greendroid/GreenDroid/src/greendroid/widget/QuickActionBar.java +++ b/greendroid/GreenDroid/src/greendroid/widget/QuickActionBar.java @@ -36,7 +36,7 @@ import android.widget.LinearLayout; -import com.cyrilmottier.android.greendroid.R; +import com.timsu.astridsquid.R; /** * A QuickActionBar displays a set of {@link QuickAction} on a single row. In diff --git a/greendroid/GreenDroid/src/greendroid/widget/QuickActionGrid.java b/greendroid/GreenDroid/src/greendroid/widget/QuickActionGrid.java index 9692f7b455..ebfcac9ebc 100644 --- a/greendroid/GreenDroid/src/greendroid/widget/QuickActionGrid.java +++ b/greendroid/GreenDroid/src/greendroid/widget/QuickActionGrid.java @@ -30,7 +30,7 @@ import android.widget.GridView; import android.widget.TextView; -import com.cyrilmottier.android.greendroid.R; +import com.timsu.astridsquid.R; /** * A {@link QuickActionGrid} is an implementation of a {@link QuickActionWidget} diff --git a/greendroid/GreenDroid/src/greendroid/widget/QuickActionWidget.java b/greendroid/GreenDroid/src/greendroid/widget/QuickActionWidget.java index febc4d91d8..a4e1197316 100644 --- a/greendroid/GreenDroid/src/greendroid/widget/QuickActionWidget.java +++ b/greendroid/GreenDroid/src/greendroid/widget/QuickActionWidget.java @@ -29,7 +29,7 @@ import android.view.WindowManager; import android.widget.PopupWindow; -import com.cyrilmottier.android.greendroid.R; +import com.timsu.astridsquid.R; /** * Abstraction of a {@link QuickAction} wrapper. A QuickActionWidget is diff --git a/greendroid/GreenDroid/src/greendroid/widget/SegmentedBar.java b/greendroid/GreenDroid/src/greendroid/widget/SegmentedBar.java index 1b8a349368..13bbe3ccf4 100644 --- a/greendroid/GreenDroid/src/greendroid/widget/SegmentedBar.java +++ b/greendroid/GreenDroid/src/greendroid/widget/SegmentedBar.java @@ -28,7 +28,7 @@ import android.widget.ImageView; import android.widget.LinearLayout; -import com.cyrilmottier.android.greendroid.R; +import com.timsu.astridsquid.R; /** * A SegmentedBar displays a set of Buttons. Only one segment in a SegmentedBar diff --git a/greendroid/GreenDroid/src/greendroid/widget/SegmentedHost.java b/greendroid/GreenDroid/src/greendroid/widget/SegmentedHost.java index e6c52aade3..c8485b97ec 100644 --- a/greendroid/GreenDroid/src/greendroid/widget/SegmentedHost.java +++ b/greendroid/GreenDroid/src/greendroid/widget/SegmentedHost.java @@ -26,7 +26,7 @@ import android.widget.FrameLayout; import android.widget.LinearLayout; -import com.cyrilmottier.android.greendroid.R; +import com.timsu.astridsquid.R; /** * A SegmentedHost is a wrapper view that handle a SegmentedBar and a diff --git a/greendroid/GreenDroid/src/greendroid/widget/item/DescriptionItem.java b/greendroid/GreenDroid/src/greendroid/widget/item/DescriptionItem.java index 0c3e504da8..e8fa5c3922 100644 --- a/greendroid/GreenDroid/src/greendroid/widget/item/DescriptionItem.java +++ b/greendroid/GreenDroid/src/greendroid/widget/item/DescriptionItem.java @@ -19,7 +19,7 @@ import android.content.Context; import android.view.ViewGroup; -import com.cyrilmottier.android.greendroid.R; +import com.timsu.astridsquid.R; /** * A description item displays a text on several lines. The default diff --git a/greendroid/GreenDroid/src/greendroid/widget/item/DrawableItem.java b/greendroid/GreenDroid/src/greendroid/widget/item/DrawableItem.java index 3635529ec5..17cd34120c 100644 --- a/greendroid/GreenDroid/src/greendroid/widget/item/DrawableItem.java +++ b/greendroid/GreenDroid/src/greendroid/widget/item/DrawableItem.java @@ -28,7 +28,7 @@ import android.util.AttributeSet; import android.view.ViewGroup; -import com.cyrilmottier.android.greendroid.R; +import com.timsu.astridsquid.R; /** * A DrawableItem displays a single Drawable on the left of the item cell and a diff --git a/greendroid/GreenDroid/src/greendroid/widget/item/Item.java b/greendroid/GreenDroid/src/greendroid/widget/item/Item.java index 3fc17b1795..ea23fdfa3f 100644 --- a/greendroid/GreenDroid/src/greendroid/widget/item/Item.java +++ b/greendroid/GreenDroid/src/greendroid/widget/item/Item.java @@ -31,7 +31,7 @@ import android.view.ViewGroup; import android.widget.ListView; -import com.cyrilmottier.android.greendroid.R; +import com.timsu.astridsquid.R; /** * Base class for all items used in GreenDroid. An item represents a wrapper of diff --git a/greendroid/GreenDroid/src/greendroid/widget/item/LongTextItem.java b/greendroid/GreenDroid/src/greendroid/widget/item/LongTextItem.java index 6232d26a3b..3f07ff4786 100644 --- a/greendroid/GreenDroid/src/greendroid/widget/item/LongTextItem.java +++ b/greendroid/GreenDroid/src/greendroid/widget/item/LongTextItem.java @@ -19,7 +19,7 @@ import android.content.Context; import android.view.ViewGroup; -import com.cyrilmottier.android.greendroid.R; +import com.timsu.astridsquid.R; /** * A LongTextItem is very similar to a regular {@link TextItem}. The only diff --git a/greendroid/GreenDroid/src/greendroid/widget/item/ProgressItem.java b/greendroid/GreenDroid/src/greendroid/widget/item/ProgressItem.java index 2806827823..198ad7582e 100644 --- a/greendroid/GreenDroid/src/greendroid/widget/item/ProgressItem.java +++ b/greendroid/GreenDroid/src/greendroid/widget/item/ProgressItem.java @@ -28,7 +28,7 @@ import android.util.AttributeSet; import android.view.ViewGroup; -import com.cyrilmottier.android.greendroid.R; +import com.timsu.astridsquid.R; /** * Progress indicator that displays a centered text with a circular progress bar diff --git a/greendroid/GreenDroid/src/greendroid/widget/item/SeparatorItem.java b/greendroid/GreenDroid/src/greendroid/widget/item/SeparatorItem.java index 1028e0975c..7f443f7025 100644 --- a/greendroid/GreenDroid/src/greendroid/widget/item/SeparatorItem.java +++ b/greendroid/GreenDroid/src/greendroid/widget/item/SeparatorItem.java @@ -20,7 +20,7 @@ import android.view.ViewGroup; import android.widget.ListView; -import com.cyrilmottier.android.greendroid.R; +import com.timsu.astridsquid.R; /** * Acts as a separator between important {@link ListView} sections. A separator diff --git a/greendroid/GreenDroid/src/greendroid/widget/item/SubtextItem.java b/greendroid/GreenDroid/src/greendroid/widget/item/SubtextItem.java index 20d81ad502..bb9c6856cf 100644 --- a/greendroid/GreenDroid/src/greendroid/widget/item/SubtextItem.java +++ b/greendroid/GreenDroid/src/greendroid/widget/item/SubtextItem.java @@ -28,7 +28,7 @@ import android.util.AttributeSet; import android.view.ViewGroup; -import com.cyrilmottier.android.greendroid.R; +import com.timsu.astridsquid.R; /** * A SubtextItem is really similar to a SubtitleItem as it displays a two lines diff --git a/greendroid/GreenDroid/src/greendroid/widget/item/SubtitleItem.java b/greendroid/GreenDroid/src/greendroid/widget/item/SubtitleItem.java index 8058ed1892..47067d170d 100644 --- a/greendroid/GreenDroid/src/greendroid/widget/item/SubtitleItem.java +++ b/greendroid/GreenDroid/src/greendroid/widget/item/SubtitleItem.java @@ -28,7 +28,7 @@ import android.util.AttributeSet; import android.view.ViewGroup; -import com.cyrilmottier.android.greendroid.R; +import com.timsu.astridsquid.R; /** * An Item that contains two Strings : a text and a subtitle. The representation diff --git a/greendroid/GreenDroid/src/greendroid/widget/item/TextItem.java b/greendroid/GreenDroid/src/greendroid/widget/item/TextItem.java index ca969f3089..0c2519f6d3 100644 --- a/greendroid/GreenDroid/src/greendroid/widget/item/TextItem.java +++ b/greendroid/GreenDroid/src/greendroid/widget/item/TextItem.java @@ -28,7 +28,7 @@ import android.util.AttributeSet; import android.view.ViewGroup; -import com.cyrilmottier.android.greendroid.R; +import com.timsu.astridsquid.R; /** * A TextItem is a very basic item that only contains a single text. This text diff --git a/greendroid/GreenDroid/src/greendroid/widget/item/ThumbnailItem.java b/greendroid/GreenDroid/src/greendroid/widget/item/ThumbnailItem.java index a371bcaf4f..76a3aa91b6 100644 --- a/greendroid/GreenDroid/src/greendroid/widget/item/ThumbnailItem.java +++ b/greendroid/GreenDroid/src/greendroid/widget/item/ThumbnailItem.java @@ -28,7 +28,7 @@ import android.util.AttributeSet; import android.view.ViewGroup; -import com.cyrilmottier.android.greendroid.R; +import com.timsu.astridsquid.R; /** * A ThumbnailItem item is an complex item that wrap a drawable and two strings diff --git a/greendroid/GreenDroid/src/greendroid/widget/itemview/DrawableItemView.java b/greendroid/GreenDroid/src/greendroid/widget/itemview/DrawableItemView.java index 834f2a4c01..a374b0415f 100644 --- a/greendroid/GreenDroid/src/greendroid/widget/itemview/DrawableItemView.java +++ b/greendroid/GreenDroid/src/greendroid/widget/itemview/DrawableItemView.java @@ -24,7 +24,7 @@ import android.widget.LinearLayout; import android.widget.TextView; -import com.cyrilmottier.android.greendroid.R; +import com.timsu.astridsquid.R; public class DrawableItemView extends LinearLayout implements ItemView { diff --git a/greendroid/GreenDroid/src/greendroid/widget/itemview/ProgressItemView.java b/greendroid/GreenDroid/src/greendroid/widget/itemview/ProgressItemView.java index 00fd4ffbac..f87c23a739 100644 --- a/greendroid/GreenDroid/src/greendroid/widget/itemview/ProgressItemView.java +++ b/greendroid/GreenDroid/src/greendroid/widget/itemview/ProgressItemView.java @@ -24,7 +24,7 @@ import android.widget.ProgressBar; import android.widget.TextView; -import com.cyrilmottier.android.greendroid.R; +import com.timsu.astridsquid.R; public class ProgressItemView extends FrameLayout implements ItemView { diff --git a/greendroid/GreenDroid/src/greendroid/widget/itemview/SubtextItemView.java b/greendroid/GreenDroid/src/greendroid/widget/itemview/SubtextItemView.java index 2fdcf396c9..71ec7488de 100644 --- a/greendroid/GreenDroid/src/greendroid/widget/itemview/SubtextItemView.java +++ b/greendroid/GreenDroid/src/greendroid/widget/itemview/SubtextItemView.java @@ -22,7 +22,7 @@ import android.widget.LinearLayout; import android.widget.TextView; -import com.cyrilmottier.android.greendroid.R; +import com.timsu.astridsquid.R; public class SubtextItemView extends LinearLayout implements ItemView { diff --git a/greendroid/GreenDroid/src/greendroid/widget/itemview/SubtitleItemView.java b/greendroid/GreenDroid/src/greendroid/widget/itemview/SubtitleItemView.java index 6dfcc562aa..071275ae88 100644 --- a/greendroid/GreenDroid/src/greendroid/widget/itemview/SubtitleItemView.java +++ b/greendroid/GreenDroid/src/greendroid/widget/itemview/SubtitleItemView.java @@ -22,7 +22,7 @@ import android.widget.LinearLayout; import android.widget.TextView; -import com.cyrilmottier.android.greendroid.R; +import com.timsu.astridsquid.R; public class SubtitleItemView extends LinearLayout implements ItemView { diff --git a/greendroid/GreenDroid/src/greendroid/widget/itemview/ThumbnailItemView.java b/greendroid/GreenDroid/src/greendroid/widget/itemview/ThumbnailItemView.java index 0d331d0b7f..5e76e52e15 100644 --- a/greendroid/GreenDroid/src/greendroid/widget/itemview/ThumbnailItemView.java +++ b/greendroid/GreenDroid/src/greendroid/widget/itemview/ThumbnailItemView.java @@ -23,7 +23,7 @@ import android.widget.RelativeLayout; import android.widget.TextView; -import com.cyrilmottier.android.greendroid.R; +import com.timsu.astridsquid.R; public class ThumbnailItemView extends RelativeLayout implements ItemView {