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 25402e7f6c..743ef89c3a 100644 Binary files a/astrid/res/drawable/icon.png and b/astrid/res/drawable/icon.png differ diff --git a/astrid/res/layout/task_list_body_draggable.xml b/astrid/res/layout/task_list_body_draggable.xml index 69d94b921c..e5ce811e7d 100644 --- a/astrid/res/layout/task_list_body_draggable.xml +++ b/astrid/res/layout/task_list_body_draggable.xml @@ -15,7 +15,7 @@ - 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 {