diff --git a/astrid/src/instrumentTest/java/com/todoroo/astrid/dao/DatabaseDaoTests.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/dao/DatabaseDaoTests.java deleted file mode 100644 index 344050c0d..000000000 --- a/astrid/src/instrumentTest/java/com/todoroo/astrid/dao/DatabaseDaoTests.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.todoroo.astrid.dao; - -import com.todoroo.andlib.data.TodorooCursor; -import com.todoroo.andlib.sql.Query; -import com.todoroo.astrid.data.Task; -import com.todoroo.astrid.test.DatabaseTestCase; - -public class DatabaseDaoTests extends DatabaseTestCase { - - private TaskDao dao; - - @Override - protected void setUp() throws Exception { - super.setUp(); - RemoteModelDao.setOutstandingEntryFlags(RemoteModelDao.OUTSTANDING_ENTRY_FLAG_RECORD_OUTSTANDING); - } - - public void testFailedTransactionCreatesNoRows() { - dao = new TaskDao(); - dao.setDatabase(database); - - Task t = new Task(); - t.setValue(Task.TITLE, "Should not appear"); - dao.createNew(t); - - TodorooCursor tasks = dao.query(Query.select(Task.ID)); - try { - assertEquals(0, tasks.getCount()); - } finally { - tasks.close(); - } - } - -} diff --git a/astrid/src/instrumentTest/java/com/todoroo/astrid/test/DatabaseTestCase.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/test/DatabaseTestCase.java index 13daf415e..5e67560e0 100644 --- a/astrid/src/instrumentTest/java/com/todoroo/astrid/test/DatabaseTestCase.java +++ b/astrid/src/instrumentTest/java/com/todoroo/astrid/test/DatabaseTestCase.java @@ -8,7 +8,6 @@ package com.todoroo.astrid.test; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.test.TodorooTestCaseWithInjector; import com.todoroo.astrid.dao.Database; -import com.todoroo.astrid.legacy.AlarmDatabase; import com.todoroo.astrid.provider.ProviderTestUtilities; import com.todoroo.astrid.service.AstridDependencyInjector; @@ -67,11 +66,4 @@ public class DatabaseTestCase extends TodorooTestCaseWithInjector { return "databasetest"; } } - - public static class TestAlarmsDatabase extends AlarmDatabase { - @Override - public String getName() { - return "alarmstest"; - } - } } diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java index 5e5e4007b..5f1b19e2b 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java @@ -37,7 +37,6 @@ import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.AdapterView.AdapterContextMenuInfo; import android.widget.AdapterView.OnItemClickListener; -import android.widget.LinearLayout; import android.widget.ListView; import android.widget.TextView; @@ -89,7 +88,6 @@ import com.todoroo.astrid.subtasks.SubtasksUpdater; import com.todoroo.astrid.sync.SyncProviderPreferences; import com.todoroo.astrid.tags.TaskToTagMetadata; import com.todoroo.astrid.timers.TimerPlugin; -import com.todoroo.astrid.ui.FeedbackPromptDialogs; import com.todoroo.astrid.ui.QuickAddBar; import com.todoroo.astrid.utility.AstridPreferences; import com.todoroo.astrid.utility.Flags; @@ -610,47 +608,6 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele refreshFilterCount(); initiateAutomaticSync(); - -// showFeedbackPrompt(); - } - - private void showFeedbackPrompt() { - if (!(this instanceof TagViewFragment) && - (DateUtilities.now() - Preferences.getLong(PREF_LAST_FEEDBACK_TIME, 0)) > FEEDBACK_TIME_INTERVAL && - taskService.getUserActivationStatus()) { - final LinearLayout root = (LinearLayout) getView().findViewById(R.id.taskListParent); - if (root.findViewById(R.id.feedback_banner) == null) { - final View feedbackPrompt = getActivity().getLayoutInflater().inflate(R.layout.feedback_prompt, root, false); - - feedbackPrompt.findViewById(R.id.positiveFeedback).setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - try { - root.removeView(feedbackPrompt); - FeedbackPromptDialogs.showFeedbackDialog((AstridActivity) getActivity(), true); - Preferences.setLong(PREF_LAST_FEEDBACK_TIME, DateUtilities.now()); - } catch (Exception e) { - e.printStackTrace(); - } - } - }); - - feedbackPrompt.findViewById(R.id.negativeFeedback).setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - try { - root.removeView(feedbackPrompt); - FeedbackPromptDialogs.showFeedbackDialog((AstridActivity) getActivity(), false); - Preferences.setLong(PREF_LAST_FEEDBACK_TIME, DateUtilities.now()); - } catch (Exception e) { - e.printStackTrace(); - } - } - }); - - root.addView(feedbackPrompt, 0); - } - } } protected boolean isCurrentTaskListFragment() { diff --git a/astrid/src/main/java/com/todoroo/astrid/legacy/AlarmDatabase.java b/astrid/src/main/java/com/todoroo/astrid/legacy/AlarmDatabase.java deleted file mode 100644 index 554489545..000000000 --- a/astrid/src/main/java/com/todoroo/astrid/legacy/AlarmDatabase.java +++ /dev/null @@ -1,80 +0,0 @@ -/** - * Copyright (c) 2012 Todoroo Inc - * - * See the file "LICENSE" for the full license governing this code. - */ -package com.todoroo.astrid.legacy; - -import com.todoroo.andlib.data.AbstractDatabase; -import com.todoroo.andlib.data.DatabaseDao; -import com.todoroo.andlib.data.Table; - -/** - * Database wrapper - * - * @author Tim Su - * - */ -public class AlarmDatabase extends AbstractDatabase { - - // --- constants - - /** - * Database version number. This variable must be updated when database - * tables are updated, as it determines whether a database needs updating. - */ - public static final int VERSION = 1; - - /** - * Database name (must be unique) - */ - public static final String NAME = "alarms"; - - /** - * List of table/ If you're adding a new table, add it to this list and - * also make sure that our SQLite helper does the right thing. - */ - public static final Table[] TABLES = new Table[] { - TransitionalAlarm.TABLE - }; - - // --- implementation - - private final DatabaseDao dao = new DatabaseDao(TransitionalAlarm.class, this); - - @Override - protected String getName() { - return NAME; - } - - @Override - protected int getVersion() { - return VERSION; - } - - @Override - public Table[] getTables() { - return TABLES; - } - - public DatabaseDao getDao() { - return dao; - } - - @Override - protected synchronized void onCreateTables() { - StringBuilder sql = new StringBuilder(); - sql.append("CREATE INDEX IF NOT EXISTS a_task ON "). - append(TransitionalAlarm.TABLE).append('('). - append(TransitionalAlarm.TASK.name). - append(')'); - database.execSQL(sql.toString()); - } - - @Override - protected boolean onUpgrade(int oldVersion, int newVersion) { - return false; - } - -} - diff --git a/astrid/src/main/java/com/todoroo/astrid/legacy/TransitionalAlarm.java b/astrid/src/main/java/com/todoroo/astrid/legacy/TransitionalAlarm.java deleted file mode 100644 index 17897d462..000000000 --- a/astrid/src/main/java/com/todoroo/astrid/legacy/TransitionalAlarm.java +++ /dev/null @@ -1,103 +0,0 @@ -/** - * Copyright (c) 2012 Todoroo Inc - * - * See the file "LICENSE" for the full license governing this code. - */ -package com.todoroo.astrid.legacy; - - -import android.content.ContentValues; - -import com.todoroo.andlib.data.AbstractModel; -import com.todoroo.andlib.data.Property; -import com.todoroo.andlib.data.Property.LongProperty; -import com.todoroo.andlib.data.Table; -import com.todoroo.andlib.data.TodorooCursor; -import com.todoroo.astrid.data.Task; - -/** - * Data Model which represents an alarm. This is a transitional class - - * Alarms are moved over to metadata - * - * @author Tim Su - * - */ -public class TransitionalAlarm extends AbstractModel { - - // --- table - - public static final Table TABLE = new Table("alarm", TransitionalAlarm.class); - - // --- properties - - /** ID */ - public static final LongProperty ID = new LongProperty( - TABLE, ID_PROPERTY_NAME); - - /** Associated Task */ - public static final LongProperty TASK = new LongProperty( - TABLE, "task"); - - /** Alarm Time */ - public static final LongProperty TIME = new LongProperty( - TABLE, "time"); - - /** List of all properties for this model */ - public static final Property[] PROPERTIES = generateProperties(TransitionalAlarm.class); - - // --- constants - - /** this alarm was already triggered */ - public static final int TYPE_TRIGGERED = 0; - - /** this alarm is single-shot */ - public static final int TYPE_SINGLE = 1; - - /** this alarm repeats itself until turned off */ - public static final int TYPE_REPEATING = 2; - - // --- defaults - - /** Default values container */ - private static final ContentValues defaultValues = new ContentValues(); - - static { - // - } - - @Override - public ContentValues getDefaultValues() { - return defaultValues; - } - - // --- data access boilerplate - - @Deprecated - public TransitionalAlarm() { - super(); - } - - public TransitionalAlarm(TodorooCursor cursor) { - this(); - readPropertiesFromCursor(cursor); - } - - public void readFromCursor(TodorooCursor cursor) { - super.readPropertiesFromCursor(cursor); - } - - @Override - public long getId() { - return getIdHelper(ID); - }; - - // --- parcelable helpers - - private static final Creator CREATOR = new ModelCreator(Task.class); - - @Override - protected Creator getCreator() { - return CREATOR; - } - -} diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/AstridDialog.java b/astrid/src/main/java/com/todoroo/astrid/ui/AstridDialog.java deleted file mode 100644 index c446df5d6..000000000 --- a/astrid/src/main/java/com/todoroo/astrid/ui/AstridDialog.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.todoroo.astrid.ui; - -import android.app.Dialog; -import android.view.View; -import android.widget.Button; -import android.widget.LinearLayout; -import android.widget.TextView; - -import com.todoroo.astrid.activity.AstridActivity; - -import org.tasks.R; - -public class AstridDialog extends Dialog { - - private final Button[] buttons; - private final TextView title; - private final TextView message; - private final LinearLayout root; - - public AstridDialog(AstridActivity activity, boolean forcePortrait) { - super(activity, R.style.ReminderDialog); - setContentView(forcePortrait ? R.layout.astrid_dialog_view_portrait : R.layout.astrid_dialog_view); - - buttons = new Button[3]; - buttons[0] = (Button) findViewById(R.id.button0); - buttons[1] = (Button) findViewById(R.id.button1); - buttons[2] = (Button) findViewById(R.id.button2); - - title = (TextView) findViewById(R.id.dialog_title); - message = (TextView) findViewById(R.id.reminder_message); - root = (LinearLayout) findViewById(R.id.dialog_root); - - findViewById(R.id.dismiss).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - dismiss(); - } - }); - setOwnerActivity(activity); - } - - public AstridDialog setButtonText(int resId, int buttonIndex) { - buttons[buttonIndex].setText(resId); - buttons[buttonIndex].setVisibility(View.VISIBLE); - return this; - } - - public AstridDialog setButtonColor(int color, int buttonIndex) { - buttons[buttonIndex].setBackgroundColor(color); - return this; - } - - public AstridDialog setButtonListener(View.OnClickListener listener, int buttonIndex) { - buttons[buttonIndex].setOnClickListener(listener); - return this; - } - - public void setButtonListeners(View.OnClickListener... listeners) { - int index = 0; - for (View.OnClickListener l : listeners) { - buttons[index].setOnClickListener(l); - index++; - if (index >= buttons.length) { - break; - } - } - } - - public AstridDialog setAstridText(int resId) { - message.setText(resId); - return this; - } - - public AstridDialog setAstridTitle(int resId) { - title.setText(resId); - return this; - } - - public AstridDialog addView(View v, int index) { - root.addView(v, index); - return this; - } - -} diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/FeedbackPromptDialogs.java b/astrid/src/main/java/com/todoroo/astrid/ui/FeedbackPromptDialogs.java deleted file mode 100644 index 18f44ce72..000000000 --- a/astrid/src/main/java/com/todoroo/astrid/ui/FeedbackPromptDialogs.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.todoroo.astrid.ui; - -import android.content.Intent; -import android.net.Uri; -import android.view.View; -import android.widget.Toast; - -import com.todoroo.astrid.activity.AstridActivity; - -import org.tasks.R; - -public class FeedbackPromptDialogs { - - public static void showFeedbackDialog(final AstridActivity activity, boolean positive) { - final AstridDialog d = new AstridDialog(activity, false); - - int titleRes = positive ? R.string.feedback_positive_title : R.string.feedback_negative_title; - int bodyRes = positive ? R.string.feedback_positive_body : R.string.feedback_negative_body; - int buttonRes = positive ? R.string.feedback_positive_button : R.string.feedback_negative_button; - - final String url = positive ? "https://play.google.com/store/apps/details?id=org.tasks&write_review=true" : "http://weloveastrid.com/problem_astrid_android.html"; - - d.setAstridTitle(titleRes) - .setAstridText(bodyRes) - .setButtonText(buttonRes, 0) - .setButtonText(R.string.feedback_not_now, 1) - .setButtonListeners(new View.OnClickListener() { - @Override - public void onClick(View v) { - Intent intent = new Intent(Intent.ACTION_VIEW, - Uri.parse(url)); - try { - activity.startActivity(intent); - } catch (Exception e) { - Toast.makeText(activity, R.string.feedback_activity_error, Toast.LENGTH_LONG).show(); - } - d.dismiss(); - } - }, new View.OnClickListener() { - @Override - public void onClick(View v) { - d.dismiss(); - } - }); - - d.show(); - } - -} diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/TouchInterceptingFrameLayout.java b/astrid/src/main/java/com/todoroo/astrid/ui/TouchInterceptingFrameLayout.java deleted file mode 100644 index 1ca669722..000000000 --- a/astrid/src/main/java/com/todoroo/astrid/ui/TouchInterceptingFrameLayout.java +++ /dev/null @@ -1,42 +0,0 @@ -/** - * Copyright (c) 2012 Todoroo Inc - * - * See the file "LICENSE" for the full license governing this code. - */ -package com.todoroo.astrid.ui; - -import android.content.Context; -import android.graphics.Color; -import android.util.AttributeSet; -import android.view.KeyEvent; -import android.widget.FrameLayout; - -public class TouchInterceptingFrameLayout extends FrameLayout { - - public interface InterceptTouchListener { - public boolean didInterceptTouch(KeyEvent event); - } - - private InterceptTouchListener mListener; - - public TouchInterceptingFrameLayout(Context context, AttributeSet attrs) { - super(context, attrs); - setBackgroundColor(Color.TRANSPARENT); - } - - @Override - public boolean dispatchKeyEvent(KeyEvent event) { - if (mListener != null && mListener.didInterceptTouch(event)) { - return true; - } - return super.dispatchKeyEvent(event); - } - - public InterceptTouchListener getInterceptTouchListener() { - return mListener; - } - - public void setInterceptTouchListener(InterceptTouchListener mListener) { - this.mListener = mListener; - } -} diff --git a/astrid/src/main/res/drawable-hdpi/icn_thumbsdown.png b/astrid/src/main/res/drawable-hdpi/icn_thumbsdown.png deleted file mode 100644 index a95a68989..000000000 Binary files a/astrid/src/main/res/drawable-hdpi/icn_thumbsdown.png and /dev/null differ diff --git a/astrid/src/main/res/drawable-hdpi/icn_thumbsup.png b/astrid/src/main/res/drawable-hdpi/icn_thumbsup.png deleted file mode 100644 index 9c0fda6cf..000000000 Binary files a/astrid/src/main/res/drawable-hdpi/icn_thumbsup.png and /dev/null differ diff --git a/astrid/src/main/res/drawable-xhdpi/icn_thumbsdown.png b/astrid/src/main/res/drawable-xhdpi/icn_thumbsdown.png deleted file mode 100644 index c4b0e0be8..000000000 Binary files a/astrid/src/main/res/drawable-xhdpi/icn_thumbsdown.png and /dev/null differ diff --git a/astrid/src/main/res/drawable-xhdpi/icn_thumbsup.png b/astrid/src/main/res/drawable-xhdpi/icn_thumbsup.png deleted file mode 100644 index 18f9a88c0..000000000 Binary files a/astrid/src/main/res/drawable-xhdpi/icn_thumbsup.png and /dev/null differ diff --git a/astrid/src/main/res/drawable/icn_thumbsdown.png b/astrid/src/main/res/drawable/icn_thumbsdown.png deleted file mode 100644 index 1ff4902e1..000000000 Binary files a/astrid/src/main/res/drawable/icn_thumbsdown.png and /dev/null differ diff --git a/astrid/src/main/res/drawable/icn_thumbsup.png b/astrid/src/main/res/drawable/icn_thumbsup.png deleted file mode 100644 index 5fadec4bb..000000000 Binary files a/astrid/src/main/res/drawable/icn_thumbsup.png and /dev/null differ diff --git a/astrid/src/main/res/layout-land/astrid_dialog_view.xml b/astrid/src/main/res/layout-land/astrid_dialog_view.xml deleted file mode 100644 index 0154539b7..000000000 --- a/astrid/src/main/res/layout-land/astrid_dialog_view.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - -