diff --git a/api/src/main/java/com/todoroo/astrid/api/AstridApiConstants.java b/api/src/main/java/com/todoroo/astrid/api/AstridApiConstants.java index 2c617dd3a..e8cb7e0de 100644 --- a/api/src/main/java/com/todoroo/astrid/api/AstridApiConstants.java +++ b/api/src/main/java/com/todoroo/astrid/api/AstridApiConstants.java @@ -58,11 +58,6 @@ public class AstridApiConstants { */ public static final String EXTRAS_RESPONSE = "response"; - /** - * Extras name for plug-in identifier - */ - public static final String EXTRAS_ADDON = "addon"; - /** * Extras name for old task due date */ @@ -73,14 +68,6 @@ public class AstridApiConstants { */ public static final String EXTRAS_NEW_DUE_DATE = "newDueDate"; - // --- Add-ons API - - /** - * Action name for broadcast intent sending add-ons back to Astrid - *
  • EXTRAS_RESPONSE an {@link Addon} object - */ - public static final String BROADCAST_SEND_ADDONS = API_PACKAGE + ".SEND_ADDONS"; - // --- Filters API /** @@ -110,26 +97,6 @@ public class AstridApiConstants { */ public static final String BROADCAST_SEND_CUSTOM_FILTER_CRITERIA = API_PACKAGE + ".SEND_CUSTOM_FILTER_CRITERIA"; - // --- Task Details API - - /** - * Action name for broadcast intent requesting details for a task. - * Extended details are displayed when a user presses on a task. - * - *
  • EXTRAS_TASK_ID id of the task - *
  • EXTRAS_EXTENDED whether request is for standard or extended details - */ - public static final String BROADCAST_REQUEST_DETAILS = API_PACKAGE + ".REQUEST_DETAILS"; - - /** - * Action name for broadcast intent sending details back to Astrid - *
  • EXTRAS_ADDON your add-on identifier - *
  • EXTRAS_TASK_ID id of the task - *
  • EXTRAS_EXTENDED whether request is for standard or extended details - *
  • EXTRAS_RESPONSE a String - */ - public static final String BROADCAST_SEND_DETAILS = API_PACKAGE + ".SEND_DETAILS"; - // --- Sync Action API /** @@ -161,14 +128,6 @@ public class AstridApiConstants { */ public static final String BROADCAST_EVENT_REFRESH = API_PACKAGE + ".REFRESH"; - /** - * Action name for broadcast intent notifying Astrid to clear detail cache - * because an event occurred that potentially affects all tasks (e.g. - * logging out of a sync provider). Use this call carefully, as loading - * details can degrade the performance of Astrid. - */ - public static final String BROADCAST_EVENT_FLUSH_DETAILS = API_PACKAGE + ".FLUSH_DETAILS"; - /** * Action name for broadcast intent notifying that task was created or * title was changed diff --git a/api/src/main/java/com/todoroo/astrid/data/Task.java b/api/src/main/java/com/todoroo/astrid/data/Task.java index 844078a15..85498ccf0 100644 --- a/api/src/main/java/com/todoroo/astrid/data/Task.java +++ b/api/src/main/java/com/todoroo/astrid/data/Task.java @@ -79,16 +79,6 @@ public class Task extends RemoteModel { public static final LongProperty DELETION_DATE = new LongProperty( TABLE, "deleted", Property.PROP_FLAG_DATE); - /** Cached Details Column - built from add-on detail exposers. A null - * value means there is no value in the cache and it needs to be - * refreshed */ - public static final StringProperty DETAILS = new StringProperty( - TABLE, "details"); - - /** Date details were last updated */ - public static final LongProperty DETAILS_DATE = new LongProperty( - TABLE, "detailsDate", Property.PROP_FLAG_DATE); - // --- non-core task metadata public static final StringProperty NOTES = new StringProperty( @@ -198,8 +188,6 @@ public class Task extends RemoteModel { defaultValues.put(ELAPSED_SECONDS.name, 0); defaultValues.put(NOTES.name, ""); defaultValues.put(TIMER_START.name, 0); - defaultValues.put(DETAILS.name, (String)null); - defaultValues.put(DETAILS_DATE.name, 0); defaultValues.put(UUID.name, NO_UUID); } @@ -453,14 +441,6 @@ public class Task extends RemoteModel { setValue(TITLE, title); } - public String getDetails() { - return getValue(DETAILS); - } - - public void setDetails(String details) { - setValue(DETAILS, details); - } - public Long getDeletionDate() { return getValue(DELETION_DATE); } @@ -533,14 +513,6 @@ public class Task extends RemoteModel { setValue(COMPLETION_DATE, completionDate); } - public Long getDetailsDate() { - return getValue(DETAILS_DATE); - } - - public void setDetailsDate(Long detailsDate) { - setValue(DETAILS_DATE, detailsDate); - } - public String getNotes() { return getValue(NOTES); } @@ -549,10 +521,6 @@ public class Task extends RemoteModel { setValue(NOTES, notes); } - public Long getModificationDate() { - return getValue(MODIFICATION_DATE); - } - public void setModificationDate(Long modificationDate) { setValue(MODIFICATION_DATE, modificationDate); } diff --git a/api/src/main/java/com/todoroo/astrid/data/TaskApiDao.java b/api/src/main/java/com/todoroo/astrid/data/TaskApiDao.java index 13f48bc5a..df2940701 100644 --- a/api/src/main/java/com/todoroo/astrid/data/TaskApiDao.java +++ b/api/src/main/java/com/todoroo/astrid/data/TaskApiDao.java @@ -37,11 +37,6 @@ public class TaskApiDao { return true; } - if(values.containsKey(Task.DETAILS_DATE.name) && - values.size() <= 3) { - return true; - } - if(values.containsKey(Task.REMINDER_LAST.name) && values.size() <= 2) { return true; diff --git a/astrid/src/main/AndroidManifest.xml b/astrid/src/main/AndroidManifest.xml index ccbdb57d6..4ee9a2808 100644 --- a/astrid/src/main/AndroidManifest.xml +++ b/astrid/src/main/AndroidManifest.xml @@ -241,13 +241,6 @@ - - - - - - - @@ -277,13 +270,6 @@ android:theme="@android:style/Theme.Translucent.NoTitleBar"/> - - - - - - - @@ -298,13 +284,6 @@ - - - - - - - @@ -337,13 +316,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -433,13 +392,6 @@ - - - - - - - @@ -515,14 +467,6 @@ - - - - - - - - diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/EditPreferences.java b/astrid/src/main/java/com/todoroo/astrid/activity/EditPreferences.java index 19facdfd9..d573d0b30 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/EditPreferences.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/EditPreferences.java @@ -23,7 +23,6 @@ import android.speech.tts.TextToSpeech; import android.text.TextUtils; import com.todoroo.andlib.service.ContextManager; -import com.todoroo.andlib.sql.Criterion; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.DialogUtilities; import com.todoroo.astrid.api.AstridApiConstants; @@ -37,7 +36,6 @@ import com.todoroo.astrid.service.StartupService; import com.todoroo.astrid.service.TaskService; import com.todoroo.astrid.sync.SyncProviderPreferences; import com.todoroo.astrid.utility.Constants; -import com.todoroo.astrid.utility.Flags; import com.todoroo.astrid.utility.TodorooPreferenceActivity; import com.todoroo.astrid.voice.VoiceInputAssistant; import com.todoroo.astrid.voice.VoiceOutputAssistant; @@ -141,9 +139,6 @@ public class EditPreferences extends TodorooPreferenceActivity { addPreferenceListeners(); - preference = screen.findPreference(getString(R.string.p_showNotes)); - preference.setEnabled(preferences.getIntegerFromString(R.string.p_taskRowStyle_v2, 0) == 0); - removeForbiddenPreferences(screen, r); } @@ -276,46 +271,7 @@ public class EditPreferences extends TodorooPreferenceActivity { public void updatePreferences(final Preference preference, Object value) { final Resources r = getResources(); - if (r.getString(R.string.p_taskRowStyle_v2).equals(preference.getKey())) { - try { - Integer valueInt = Integer.parseInt((String) value); - String[] titles = getResources().getStringArray(R.array.EPr_task_row_styles); - String[] descriptions = getResources().getStringArray(R.array.EPr_task_row_style_descriptions); - - preference.setTitle(getString(R.string.EPr_task_row_style_title, titles[valueInt])); - preference.setSummary(descriptions[valueInt]); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - - preference.setOnPreferenceChangeListener(new SetResultOnPreferenceChangeListener(RESULT_CODE_PERFORMANCE_PREF_CHANGED) { - @Override - public boolean onPreferenceChange(Preference p, Object newValue) { - Preference notes = findPreference(getString(R.string.p_showNotes)); - Preference fullTitle = findPreference(getString(R.string.p_fullTaskTitle)); - try { - int newValueInt = Integer.parseInt((String) newValue); - fullTitle.setEnabled(newValueInt != 2); - notes.setEnabled(newValueInt == 0); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - return super.onPreferenceChange(p, newValue); - } - - }); - - } else if (r.getString(R.string.p_showNotes).equals(preference.getKey())) { - if (value != null && !(Boolean) value) { - preference.setSummary(R.string.EPr_showNotes_desc_disabled); - } else { - preference.setSummary(R.string.EPr_showNotes_desc_enabled); - } - if ((Boolean) value != preferences.getBoolean(preference.getKey(), false)) { - taskService.clearDetails(Criterion.all); - Flags.set(Flags.REFRESH); - } - } else if (r.getString(R.string.p_fullTaskTitle).equals(preference.getKey())) { + if (r.getString(R.string.p_fullTaskTitle).equals(preference.getKey())) { if (value != null && (Boolean) value) { preference.setSummary(R.string.EPr_fullTask_desc_enabled); } else { @@ -444,14 +400,6 @@ public class EditPreferences extends TodorooPreferenceActivity { }); } - findPreference(getString(R.string.p_showNotes)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() { - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - updatePreferences(preference, newValue); - return true; - } - }); - findPreference(getString(R.string.p_fullTaskTitle)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() { @Override public boolean onPreferenceChange(Preference preference, Object newValue) { 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 451b7b3be..def7a0f26 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java @@ -142,7 +142,6 @@ public class TaskListFragment extends InjectingListFragment implements OnSortSel protected Resources resources; protected TaskAdapter taskAdapter = null; - protected DetailReceiver detailReceiver = new DetailReceiver(); protected RefreshReceiver refreshReceiver = new RefreshReceiver(); protected final AtomicReference sqlQueryTemplate = new AtomicReference<>(); protected SyncActionHelper syncActionHelper; @@ -490,8 +489,6 @@ public class TaskListFragment extends InjectingListFragment implements OnSortSel public void onResume() { super.onResume(); - getActivity().registerReceiver(detailReceiver, - new IntentFilter(AstridApiConstants.BROADCAST_SEND_DETAILS)); getActivity().registerReceiver(refreshReceiver, new IntentFilter(AstridApiConstants.BROADCAST_EVENT_REFRESH)); syncActionHelper.register(); @@ -554,7 +551,6 @@ public class TaskListFragment extends InjectingListFragment implements OnSortSel public void onPause() { super.onPause(); - AndroidUtilities.tryUnregisterReceiver(getActivity(), detailReceiver); AndroidUtilities.tryUnregisterReceiver(getActivity(), refreshReceiver); syncActionHelper.unregister(); @@ -599,28 +595,6 @@ public class TaskListFragment extends InjectingListFragment implements OnSortSel loadTaskListContent(); } - /** - * Receiver which receives detail or decoration intents - * - * @author Tim Su - * - */ - protected class DetailReceiver extends BroadcastReceiver { - @Override - public void onReceive(Context context, Intent intent) { - try { - Bundle receivedExtras = intent.getExtras(); - long taskId = receivedExtras.getLong(AstridApiConstants.EXTRAS_TASK_ID); - if (AstridApiConstants.BROADCAST_SEND_DETAILS.equals(intent.getAction())) { - String detail = receivedExtras.getString(AstridApiConstants.EXTRAS_RESPONSE); - taskAdapter.addDetails(taskId, detail); - } - } catch (Exception e) { - log.error("receive-detail-{}", intent.getStringExtra(AstridApiConstants.EXTRAS_ADDON), e); - } - } - } - @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { if(quickAddBar.onActivityResult(requestCode, resultCode, data)) { @@ -674,21 +648,13 @@ public class TaskListFragment extends InjectingListFragment implements OnSortSel syncActionHelper.request(); } - public static int getTaskRowResource(int rowStyle) { - switch(rowStyle) { - case 1: - return R.layout.task_adapter_row_simple; - case 2: - return R.layout.task_adapter_row_title_only; - case 0: - default: - return R.layout.task_adapter_row; - } + public static int getTaskRowResource() { + return R.layout.task_adapter_row_simple; } protected TaskAdapter createTaskAdapter(TodorooCursor cursor) { - return new TaskAdapter(preferences, taskAttachmentDao, taskService, this, getTaskRowResource(preferences.getIntegerFromString(R.string.p_taskRowStyle_v2, 0)), + return new TaskAdapter(preferences, taskAttachmentDao, taskService, this, getTaskRowResource(), cursor, sqlQueryTemplate, new OnCompletedTaskListener() { @Override @@ -725,9 +691,6 @@ public class TaskListFragment extends InjectingListFragment implements OnSortSel } public Property[] taskProperties() { - if (preferences.getIntegerFromString(R.string.p_taskRowStyle_v2, 0) == 2) { - return TaskAdapter.BASIC_PROPERTIES; - } return TaskAdapter.PROPERTIES; } diff --git a/astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java index 6e6c042dc..3facb96c5 100644 --- a/astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java +++ b/astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java @@ -9,19 +9,12 @@ import android.app.Activity; import android.app.Dialog; import android.app.PendingIntent.CanceledException; import android.content.Context; -import android.content.Intent; import android.content.res.Configuration; import android.content.res.Resources; import android.database.Cursor; import android.graphics.Paint; import android.graphics.drawable.Drawable; -import android.text.Html; -import android.text.Html.ImageGetter; -import android.text.Spannable; -import android.text.SpannableStringBuilder; -import android.text.Spanned; import android.text.TextUtils; -import android.text.TextUtils.TruncateAt; import android.util.DisplayMetrics; import android.view.LayoutInflater; import android.view.MotionEvent; @@ -30,14 +23,12 @@ import android.view.View.OnClickListener; import android.view.View.OnTouchListener; import android.view.ViewGroup; import android.view.ViewGroup.LayoutParams; -import android.view.ViewGroup.MarginLayoutParams; import android.view.animation.Animation; import android.view.animation.ScaleAnimation; import android.widget.CursorAdapter; import android.widget.Filterable; import android.widget.ImageView; import android.widget.LinearLayout; -import android.widget.RelativeLayout; import android.widget.TextView; import com.todoroo.andlib.data.Property; @@ -50,7 +41,6 @@ import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.Pair; import com.todoroo.astrid.activity.TaskListFragment; -import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.api.TaskAction; import com.todoroo.astrid.core.LinkActionExposer; import com.todoroo.astrid.dao.TaskAttachmentDao; @@ -63,7 +53,6 @@ import com.todoroo.astrid.notes.NotesAction; import com.todoroo.astrid.service.TaskService; import com.todoroo.astrid.tags.TaskToTagMetadata; import com.todoroo.astrid.ui.CheckableImageView; -import com.todoroo.astrid.utility.Constants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -73,7 +62,6 @@ import org.tasks.preferences.ActivityPreferences; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import java.util.Random; import java.util.concurrent.atomic.AtomicReference; import static org.tasks.date.DateTimeUtils.newDate; @@ -92,8 +80,6 @@ public class TaskAdapter extends CursorAdapter implements Filterable { public void onCompletedTask(Task item, boolean newState); } - public static final String DETAIL_SEPARATOR = " | "; //$NON-NLS-1$ - private static final StringProperty TAGS = new StringProperty(null, "group_concat(nullif(" + TaskListFragment.TAGS_METADATA_JOIN + "." + TaskToTagMetadata.TAG_NAME.name + ", '')"+ ", ' | ')").as("tags"); private static final LongProperty FILE_ID_PROPERTY = TaskAttachment.ID.cloneAs(TaskListFragment.FILE_METADATA_JOIN, "fileId"); private static final IntegerProperty HAS_NOTES_PROPERTY = new IntegerProperty(null, "length(" + Task.NOTES + ") > 0").as("hasNotes"); @@ -111,7 +97,6 @@ public class TaskAdapter extends CursorAdapter implements Filterable { Task.MODIFICATION_DATE, Task.HIDE_UNTIL, Task.DELETION_DATE, - Task.DETAILS, Task.ELAPSED_SECONDS, Task.TIMER_START, Task.RECURRENCE, @@ -121,17 +106,6 @@ public class TaskAdapter extends CursorAdapter implements Filterable { FILE_ID_PROPERTY // File id }; - public static final Property[] BASIC_PROPERTIES = new Property[] { - Task.ID, - Task.UUID, - Task.TITLE, - Task.IMPORTANCE, - Task.RECURRENCE, - Task.COMPLETION_DATE, - Task.HIDE_UNTIL, - Task.DELETION_DATE - }; - public static final int[] IMPORTANCE_RESOURCES = new int[] { R.drawable.check_box_1, R.drawable.check_box_2, @@ -195,8 +169,6 @@ public class TaskAdapter extends CursorAdapter implements Filterable { protected final Paint paint; protected final DisplayMetrics displayMetrics; - private final boolean simpleLayout; - private final boolean titleOnlyLayout; protected final int minRowHeight; private final Map taskActionLoader = Collections.synchronizedMap(new HashMap()); @@ -220,7 +192,6 @@ public class TaskAdapter extends CursorAdapter implements Filterable { this.context = ContextManager.getContext(); this.query = query; this.resource = resource; - this.titleOnlyLayout = resource == R.layout.task_adapter_row_title_only; this.fragment = fragment; this.resources = fragment.getResources(); this.onCompletedTaskListener = onCompletedTaskListener; @@ -232,11 +203,8 @@ public class TaskAdapter extends CursorAdapter implements Filterable { displayMetrics = new DisplayMetrics(); fragment.getActivity().getWindowManager().getDefaultDisplay().getMetrics(displayMetrics); - this.simpleLayout = (resource == R.layout.task_adapter_row_simple); this.minRowHeight = computeMinRowHeight(); - startDetailThread(); - scaleAnimation = new ScaleAnimation(1.4f, 1.0f, 1.4f, 1.0f, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f); scaleAnimation.setDuration(100); @@ -256,11 +224,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable { protected int computeMinRowHeight() { DisplayMetrics metrics = resources.getDisplayMetrics(); - if (simpleLayout || titleOnlyLayout) { - return (int) (metrics.density * 40); - } else { - return (int) (metrics.density * 45); - } + return (int) (metrics.density * 40); } public int computeFullRowHeight() { @@ -272,13 +236,6 @@ public class TaskAdapter extends CursorAdapter implements Filterable { } } - private void startDetailThread() { - if (preferences.getBoolean(R.string.p_showNotes, false) && !simpleLayout && !titleOnlyLayout) { - DetailLoaderThread detailLoader = new DetailLoaderThread(); - detailLoader.start(); - } - } - /* ====================================================================== * =========================================================== filterable * ====================================================================== */ @@ -312,25 +269,14 @@ public class TaskAdapter extends CursorAdapter implements Filterable { viewHolder.tagsView = (TextView)view.findViewById(R.id.tagsDisplay); viewHolder.details1 = (TextView)view.findViewById(R.id.details1); viewHolder.details2 = (TextView)view.findViewById(R.id.details2); - viewHolder.taskRow = (LinearLayout)view.findViewById(R.id.task_row); viewHolder.taskActionContainer = view.findViewById(R.id.taskActionContainer); viewHolder.taskActionIcon = (ImageView)view.findViewById(R.id.taskActionIcon); boolean showFullTaskTitle = preferences.getBoolean(R.string.p_fullTaskTitle, false); - boolean showNotes = preferences.getBoolean(R.string.p_showNotes, false); - if (showFullTaskTitle && !titleOnlyLayout) { + if (showFullTaskTitle) { viewHolder.nameView.setMaxLines(Integer.MAX_VALUE); viewHolder.nameView.setSingleLine(false); viewHolder.nameView.setEllipsize(null); - } else if (titleOnlyLayout) { - viewHolder.nameView.setMaxLines(1); - viewHolder.nameView.setSingleLine(true); - viewHolder.nameView.setEllipsize(TruncateAt.END); - } - - if (showNotes && !simpleLayout && !titleOnlyLayout) { - RelativeLayout.LayoutParams taskRowParams = (RelativeLayout.LayoutParams)viewHolder.taskRow.getLayoutParams(); - taskRowParams.addRule(RelativeLayout.CENTER_VERTICAL, 0); } @@ -354,11 +300,9 @@ public class TaskAdapter extends CursorAdapter implements Filterable { TodorooCursor cursor = (TodorooCursor)c; ViewHolder viewHolder = ((ViewHolder)view.getTag()); - if (!titleOnlyLayout) { - viewHolder.tagsString = cursor.get(TAGS); - viewHolder.hasFiles = cursor.get(FILE_ID_PROPERTY) > 0; - viewHolder.hasNotes = cursor.get(HAS_NOTES_PROPERTY) > 0; - } + viewHolder.tagsString = cursor.get(TAGS); + viewHolder.hasFiles = cursor.get(FILE_ID_PROPERTY) > 0; + viewHolder.hasNotes = cursor.get(HAS_NOTES_PROPERTY) > 0; // TODO: see if this is a performance issue viewHolder.task = new Task(cursor); @@ -395,7 +339,6 @@ public class TaskAdapter extends CursorAdapter implements Filterable { public TextView dueDate; public TextView tagsView; public TextView details1, details2; - public LinearLayout taskRow; public View taskActionContainer; public ImageView taskActionIcon; public String tagsString; // From join query, not part of the task model @@ -407,7 +350,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable { public synchronized void setFieldContentsAndVisibility(View view) { ViewHolder viewHolder = (ViewHolder)view.getTag(); Task task = viewHolder.task; - if (fontSize < 16 || titleOnlyLayout) { + if (fontSize < 16) { viewHolder.rowBody.setMinimumHeight(0); viewHolder.completeBox.setMinimumHeight(0); } else { @@ -431,34 +374,9 @@ public class TaskAdapter extends CursorAdapter implements Filterable { nameView.setText(nameValue); } - if (titleOnlyLayout) { - return; - } - - float dueDateTextWidth = setupDueDateAndTags(viewHolder, task); - - String details; if(viewHolder.details1 != null) { - if(taskDetailLoader.containsKey(task.getId())) { - details = taskDetailLoader.get(task.getId()).toString(); - } else { - details = task.getDetails(); - } - if(TextUtils.isEmpty(details) || DETAIL_SEPARATOR.equals(details) || task.isCompleted()) { - viewHolder.details1.setVisibility(View.GONE); - viewHolder.details2.setVisibility(View.GONE); - } else if (preferences.getBoolean(R.string.p_showNotes, false)) { - viewHolder.details1.setVisibility(View.VISIBLE); - if (details.startsWith(DETAIL_SEPARATOR)) { - StringBuilder buffer = new StringBuilder(details); - int length = DETAIL_SEPARATOR.length(); - while(buffer.lastIndexOf(DETAIL_SEPARATOR, length) == 0) { - buffer.delete(0, length); - } - details = buffer.toString(); //details.substring(DETAIL_SEPARATOR.length()); - } - drawDetails(viewHolder, details, dueDateTextWidth); - } + viewHolder.details1.setVisibility(View.GONE); + viewHolder.details2.setVisibility(View.GONE); } // Task action @@ -477,59 +395,18 @@ public class TaskAdapter extends CursorAdapter implements Filterable { } private TaskAction getTaskAction(Task task, boolean hasFiles, boolean hasNotes) { - if (titleOnlyLayout || task.isCompleted()) { + if (task.isCompleted()) { return null; } if (taskActionLoader.containsKey(task.getId())) { return taskActionLoader.get(task.getId()); } else { - TaskAction action = LinkActionExposer.getActionsForTask(preferences, context, task, hasFiles, hasNotes); + TaskAction action = LinkActionExposer.getActionsForTask(context, task, hasFiles, hasNotes); taskActionLoader.put(task.getId(), action); return action; } } - private void drawDetails(ViewHolder viewHolder, String details, float rightWidth) { - SpannableStringBuilder prospective = new SpannableStringBuilder(); - SpannableStringBuilder actual = new SpannableStringBuilder(); - - details = details.trim().replace("\n", "
    "); - String[] splitDetails = details.split("\\|"); - viewHolder.completeBox.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED); - rightWidth = rightWidth + viewHolder.dueDate.getPaddingRight(); - float left = viewHolder.completeBox.getMeasuredWidth() + - ((MarginLayoutParams)viewHolder.completeBox.getLayoutParams()).leftMargin; - int availableWidth = (int) (displayMetrics.widthPixels - left - (rightWidth + 16) * displayMetrics.density); - - int i = 0; - for(; i < splitDetails.length; i++) { - Spanned spanned = convertToHtml(splitDetails[i] + " ", detailImageGetter); - prospective.insert(prospective.length(), spanned); - viewHolder.details1.setText(prospective); - viewHolder.details1.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED); - - if(rightWidth > 0 && viewHolder.details1.getMeasuredWidth() > availableWidth) { - break; - } - - actual.insert(actual.length(), spanned); - } - viewHolder.details1.setText(actual); - actual.clear(); - - if(i >= splitDetails.length) { - viewHolder.details2.setVisibility(View.GONE); - return; - } else { - viewHolder.details2.setVisibility(View.VISIBLE); - } - - for(; i < splitDetails.length; i++) { - actual.insert(actual.length(), convertToHtml(splitDetails[i] + " ", detailImageGetter)); - } - viewHolder.details2.setText(actual); - } - public void onClick(View v) { // expand view (unless deleted) final ViewHolder viewHolder = (ViewHolder)v.getTag(); @@ -634,23 +511,6 @@ public class TaskAdapter extends CursorAdapter implements Filterable { * ============================================================== details * ====================================================================== */ - private final HashMap htmlCache = new HashMap<>(8); - - private Spanned convertToHtml(String string, ImageGetter imageGetter) { - if(!htmlCache.containsKey(string)) { - Spanned html; - try { - html = Html.fromHtml(string, imageGetter, null); - } catch (RuntimeException e) { - log.error(e.getMessage(), e); - html = Spannable.Factory.getInstance().newSpannable(string); - } - htmlCache.put(string, html); - return html; - } - return htmlCache.get(string); - } - private final HashMap dateCache = new HashMap<>(8); private String formatDate(long date) { @@ -658,7 +518,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable { return dateCache.get(date); } - String formatString = "%s" + (simpleLayout ? " " : "\n") + "%s"; + String formatString = "%s %s"; String string = DateUtilities.getRelativeDay(fragment.getActivity(), date); if(Task.hasDueTime(date)) { string = String.format(formatString, string, //$NON-NLS-1$ @@ -669,157 +529,6 @@ public class TaskAdapter extends CursorAdapter implements Filterable { return string; } - // implementation note: this map is really costly if users have - // a large number of tasks to load, since it all goes into memory. - // it's best to do this, though, in order to append details to each other - private final Map taskDetailLoader = Collections.synchronizedMap(new HashMap(0)); - - public class DetailLoaderThread extends Thread { - @Override - public void run() { - // for all of the tasks returned by our cursor, verify details - AndroidUtilities.sleepDeep(500L); - TodorooCursor fetchCursor = taskService.fetchFiltered( - query.get(), null, Task.ID, Task.TITLE, Task.DETAILS, Task.DETAILS_DATE, - Task.MODIFICATION_DATE, Task.COMPLETION_DATE); - try { - Random random = new Random(); - - for(fetchCursor.moveToFirst(); !fetchCursor.isAfterLast(); fetchCursor.moveToNext()) { - Task task = new Task(fetchCursor); - if(task.isCompleted()) { - continue; - } - - if(detailsAreRecentAndUpToDate(task)) { - // even if we are up to date, randomly load a fraction - if(random.nextFloat() < 0.1) { - taskDetailLoader.put(task.getId(), - new StringBuilder(task.getDetails())); - requestNewDetails(task); - } - continue; - } - addTaskToLoadingArray(task); - - task.setDetails(DETAIL_SEPARATOR); - task.setDetailsDate(DateUtilities.now()); - taskService.save(task); - - requestNewDetails(task); - } - if(taskDetailLoader.size() > 0) { - Activity activity = fragment.getActivity(); - if (activity != null) { - activity.runOnUiThread(new Runnable() { - @Override - public void run() { - notifyDataSetChanged(); - } - }); - } - } - } catch (Exception e) { - // suppress silently - log.error(e.getMessage(), e); - } finally { - fetchCursor.close(); - } - } - - private boolean detailsAreRecentAndUpToDate(Task task) { - return task.getDetailsDate() >= task.getModificationDate() && - !TextUtils.isEmpty(task.getDetails()); - } - - private void addTaskToLoadingArray(Task task) { - StringBuilder detailStringBuilder = new StringBuilder(); - taskDetailLoader.put(task.getId(), detailStringBuilder); - } - - private void requestNewDetails(Task task) { - Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_REQUEST_DETAILS); - broadcastIntent.putExtra(AstridApiConstants.EXTRAS_TASK_ID, task.getId()); - Activity activity = fragment.getActivity(); - if (activity != null) { - activity.sendOrderedBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ); - } - } - } - - /** - * Add detail to a task - */ - public void addDetails(long id, String detail) { - final StringBuilder details = taskDetailLoader.get(id); - if(details == null) { - return; - } - synchronized(details) { - if(details.toString().contains(detail)) { - return; - } - if(details.length() > 0) { - details.append(DETAIL_SEPARATOR); - } - details.append(detail); - Task task = new Task(); - task.setId(id); - task.setDetails(details.toString()); - task.setDetailsDate(DateUtilities.now()); - taskService.save(task); - } - - Activity activity = fragment.getActivity(); - if (activity != null) { - activity.runOnUiThread(new Runnable() { - @Override - public void run() { - notifyDataSetChanged(); - } - }); - } - } - - private final ImageGetter detailImageGetter = new ImageGetter() { - private final HashMap cache = - new HashMap<>(3); - @Override - public Drawable getDrawable(String source) { - int drawable = 0; - switch (source) { - case "silk_clock": - drawable = R.drawable.details_alarm; - break; - case "silk_tag_pink": - drawable = R.drawable.details_tag; - break; - case "silk_date": - drawable = R.drawable.details_repeat; - break; - case "silk_note": - drawable = R.drawable.details_note; - break; - } - - if (drawable == 0) { - drawable = resources.getIdentifier("drawable/" + source, null, Constants.PACKAGE); - } - if(drawable == 0) { - return null; - } - Drawable d; - if(!cache.containsKey(drawable)) { - d = resources.getDrawable(drawable); - d.setBounds(0,0,d.getIntrinsicWidth(),d.getIntrinsicHeight()); - cache.put(drawable, d); - } else { - d = cache.get(drawable); - } - return d; - } - }; - /* ====================================================================== * ============================================================== add-ons * ====================================================================== */ @@ -829,8 +538,6 @@ public class TaskAdapter extends CursorAdapter implements Filterable { */ public void flushCaches() { completedItems.clear(); - taskDetailLoader.clear(); - startDetailThread(); } public HashMap getCompletedItems() { @@ -905,30 +612,24 @@ public class TaskAdapter extends CursorAdapter implements Filterable { } name.setTextSize(fontSize); - if (!titleOnlyLayout) { - setupDueDateAndTags(viewHolder, task); + setupDueDateAndTags(viewHolder, task); - float detailTextSize = Math.max(10, fontSize * 14 / 20); - if(viewHolder.details1 != null) { - viewHolder.details1.setTextSize(detailTextSize); - } - if(viewHolder.details2 != null) { - viewHolder.details2.setTextSize(detailTextSize); - } - if(viewHolder.dueDate != null) { - viewHolder.dueDate.setTextSize(detailTextSize); - if (simpleLayout) { - viewHolder.dueDate.setTypeface(null, 0); - } - } - if (viewHolder.tagsView != null) { - viewHolder.tagsView.setTextSize(detailTextSize); - if (simpleLayout) { - viewHolder.tagsView.setTypeface(null, 0); - } - } - paint.setTextSize(detailTextSize); + float detailTextSize = Math.max(10, fontSize * 14 / 20); + if(viewHolder.details1 != null) { + viewHolder.details1.setTextSize(detailTextSize); + } + if(viewHolder.details2 != null) { + viewHolder.details2.setTextSize(detailTextSize); + } + if(viewHolder.dueDate != null) { + viewHolder.dueDate.setTextSize(detailTextSize); + viewHolder.dueDate.setTypeface(null, 0); } + if (viewHolder.tagsView != null) { + viewHolder.tagsView.setTextSize(detailTextSize); + viewHolder.tagsView.setTypeface(null, 0); + } + paint.setTextSize(detailTextSize); setupCompleteBox(viewHolder); @@ -953,18 +654,14 @@ public class TaskAdapter extends CursorAdapter implements Filterable { boxes = completed ? IMPORTANCE_DRAWABLES_CHECKED : IMPORTANCE_DRAWABLES; } checkBoxView.setImageDrawable(boxes[value]); - if (titleOnlyLayout) { - return; - } checkBoxView.setVisibility(View.VISIBLE); } } // Returns due date text width - private float setupDueDateAndTags(ViewHolder viewHolder, Task task) { + private void setupDueDateAndTags(ViewHolder viewHolder, Task task) { // due date / completion date - float dueDateTextWidth = 0; final TextView dueDateView = viewHolder.dueDate; { Activity activity = fragment.getActivity(); if (activity != null) { @@ -977,13 +674,11 @@ public class TaskAdapter extends CursorAdapter implements Filterable { } String dateValue = formatDate(dueDate); dueDateView.setText(dateValue); - dueDateTextWidth = paint.measureText(dateValue); dueDateView.setVisibility(View.VISIBLE); } else if(task.isCompleted()) { String dateValue = formatDate(task.getCompletionDate()); dueDateView.setText(resources.getString(R.string.TAd_completed, dateValue)); dueDateView.setTextAppearance(activity, R.style.TextAppearance_TAd_ItemDueDate_Completed); - dueDateTextWidth = paint.measureText(dateValue); dueDateView.setVisibility(View.VISIBLE); } else { dueDateView.setVisibility(View.GONE); @@ -1004,7 +699,6 @@ public class TaskAdapter extends CursorAdapter implements Filterable { } } } - return dueDateTextWidth; } /** diff --git a/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmDetailExposer.java b/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmDetailExposer.java deleted file mode 100644 index 77bf5b26b..000000000 --- a/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmDetailExposer.java +++ /dev/null @@ -1,92 +0,0 @@ -/** - * Copyright (c) 2012 Todoroo Inc - * - * See the file "LICENSE" for the full license governing this code. - */ -package com.todoroo.astrid.alarms; - -import android.content.Context; -import android.content.Intent; -import android.text.format.DateUtils; - -import com.todoroo.andlib.data.TodorooCursor; -import com.todoroo.andlib.service.ContextManager; -import com.todoroo.andlib.utility.DateUtilities; -import com.todoroo.astrid.api.AstridApiConstants; -import com.todoroo.astrid.data.Metadata; - -import org.tasks.injection.InjectingBroadcastReceiver; - -import java.util.Date; - -import javax.inject.Inject; - -import static org.tasks.date.DateTimeUtils.newDate; - -/** - * Exposes Task Detail for tags, i.e. "Tags: frogs, animals" - * - * @author Tim Su - * - */ -public class AlarmDetailExposer extends InjectingBroadcastReceiver { - - @Inject AlarmService alarmService; - - @Override - public void onReceive(Context context, Intent intent) { - super.onReceive(context, intent); - - ContextManager.setContext(context); - // get tags associated with this task - long taskId = intent.getLongExtra(AstridApiConstants.EXTRAS_TASK_ID, -1); - if(taskId == -1) { - return; - } - - String taskDetail = getTaskDetails(context, taskId); - if(taskDetail == null) { - return; - } - - // transmit - Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_SEND_DETAILS); - broadcastIntent.putExtra(AstridApiConstants.EXTRAS_ADDON, AlarmService.IDENTIFIER); - broadcastIntent.putExtra(AstridApiConstants.EXTRAS_RESPONSE, taskDetail); - broadcastIntent.putExtra(AstridApiConstants.EXTRAS_TASK_ID, taskId); - context.sendBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ); - } - - public String getTaskDetails(Context context, long id) { - TodorooCursor cursor = alarmService.getAlarms(id); - long nextTime = -1; - try { - for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) { - long time = cursor.get(AlarmFields.TIME); - if(time > DateUtilities.now()) { - nextTime = time; - break; - } - } - - if(nextTime == -1) { - return null; - } - int flags = DateUtils.FORMAT_NUMERIC_DATE | DateUtils.FORMAT_SHOW_TIME; - Date today = newDate(); - Date alarm = newDate(nextTime); - if(today.getYear() == alarm.getYear()) { - flags |= DateUtils.FORMAT_NO_YEAR; - } - if(alarm.getTime() - today.getTime() > DateUtilities.ONE_DAY) { - flags |= DateUtils.FORMAT_SHOW_DATE; - } - CharSequence durationString = DateUtils.formatDateTime(context, nextTime, - flags); - return " " + durationString; //$NON-NLS-1$ - } finally { - cursor.close(); - } - } - -} diff --git a/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmService.java b/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmService.java index 708e2cf68..f4fae71c0 100644 --- a/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmService.java +++ b/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmService.java @@ -48,8 +48,6 @@ public class AlarmService { // --- data retrieval - public static final String IDENTIFIER = "alarms"; //$NON-NLS-1$ - private final MetadataService metadataService; private final Context context; diff --git a/astrid/src/main/java/com/todoroo/astrid/core/CorePlugin.java b/astrid/src/main/java/com/todoroo/astrid/core/CorePlugin.java deleted file mode 100644 index f6bd4fd80..000000000 --- a/astrid/src/main/java/com/todoroo/astrid/core/CorePlugin.java +++ /dev/null @@ -1,29 +0,0 @@ -/** - * Copyright (c) 2012 Todoroo Inc - * - * See the file "LICENSE" for the full license governing this code. - */ -package com.todoroo.astrid.core; - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; - -import com.todoroo.astrid.api.Addon; -import com.todoroo.astrid.api.AstridApiConstants; - -public class CorePlugin extends BroadcastReceiver { - - static final String IDENTIFIER = "core"; //$NON-NLS-1$ - - @Override - public void onReceive(Context context, Intent intent) { - Addon plugin = new Addon(IDENTIFIER, "Core Filters", "Todoroo", - "Provides 'Inbox', 'Search', and 'More...' Filters"); - - Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_SEND_ADDONS); - broadcastIntent.putExtra(AstridApiConstants.EXTRAS_ADDON, plugin); - context.sendBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ); - } - -} diff --git a/astrid/src/main/java/com/todoroo/astrid/core/LinkActionExposer.java b/astrid/src/main/java/com/todoroo/astrid/core/LinkActionExposer.java index 0aa2080fa..bf7220510 100644 --- a/astrid/src/main/java/com/todoroo/astrid/core/LinkActionExposer.java +++ b/astrid/src/main/java/com/todoroo/astrid/core/LinkActionExposer.java @@ -24,7 +24,6 @@ import com.todoroo.astrid.files.FilesAction; import com.todoroo.astrid.notes.NotesAction; import org.tasks.R; -import org.tasks.preferences.Preferences; import java.util.HashMap; import java.util.List; @@ -37,7 +36,7 @@ import java.util.List; */ public class LinkActionExposer { - public static TaskAction getActionsForTask(Preferences preferences, Context context, Task task, boolean hasAttachments, boolean hasNotes) { + public static TaskAction getActionsForTask(Context context, Task task, boolean hasAttachments, boolean hasNotes) { if (task == null) { return null; } @@ -70,7 +69,7 @@ public class LinkActionExposer { return new FilesAction(icon); } - if (hasNotes && !preferences.getBoolean(R.string.p_showNotes, false)) { + if (hasNotes) { BitmapDrawable icon = getBitmapDrawable(R.drawable.action_notes, r); return new NotesAction(icon); } diff --git a/astrid/src/main/java/com/todoroo/astrid/dao/TaskDao.java b/astrid/src/main/java/com/todoroo/astrid/dao/TaskDao.java index 000aff821..f3a950b06 100644 --- a/astrid/src/main/java/com/todoroo/astrid/dao/TaskDao.java +++ b/astrid/src/main/java/com/todoroo/astrid/dao/TaskDao.java @@ -221,7 +221,6 @@ public class TaskDao extends RemoteModelDao { return false; } if(!TaskApiDao.insignificantChange(values)) { - item.setDetails(null); if(!values.containsKey(Task.MODIFICATION_DATE.name)) { item.setModificationDate(DateUtilities.now()); } diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksCustomFilterCriteriaExposer.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksCustomFilterCriteriaExposer.java index b089ac4b0..fb1d0ec70 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksCustomFilterCriteriaExposer.java +++ b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksCustomFilterCriteriaExposer.java @@ -85,7 +85,6 @@ public class GtasksCustomFilterCriteriaExposer extends InjectingBroadcastReceive // transmit filter list Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_SEND_CUSTOM_FILTER_CRITERIA); - broadcastIntent.putExtra(AstridApiConstants.EXTRAS_ADDON, GtasksPreferenceService.IDENTIFIER); broadcastIntent.putExtra(AstridApiConstants.EXTRAS_RESPONSE, result); context.sendBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ); } diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksDetailExposer.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksDetailExposer.java deleted file mode 100644 index c2d6c810c..000000000 --- a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksDetailExposer.java +++ /dev/null @@ -1,82 +0,0 @@ -/** - * Copyright (c) 2012 Todoroo Inc - * - * See the file "LICENSE" for the full license governing this code. - */ -package com.todoroo.astrid.gtasks; - -import android.content.Context; -import android.content.Intent; - -import com.todoroo.andlib.service.ContextManager; -import com.todoroo.astrid.api.AstridApiConstants; -import com.todoroo.astrid.data.Metadata; - -import org.tasks.injection.InjectingBroadcastReceiver; - -import javax.inject.Inject; - -/** - * Exposes Task Details for Google TAsks: - * - list - * - * @author Tim Su - * - */ -public class GtasksDetailExposer extends InjectingBroadcastReceiver { - - @Inject GtasksMetadataService gtasksMetadataService; - @Inject GtasksListService gtasksListService; - @Inject GtasksPreferenceService gtasksPreferenceService; - - @Override - public void onReceive(Context context, Intent intent) { - super.onReceive(context, intent); - - ContextManager.setContext(context); - - // if we aren't logged in, don't expose features - if(!gtasksPreferenceService.isLoggedIn()) { - return; - } - - long taskId = intent.getLongExtra(AstridApiConstants.EXTRAS_TASK_ID, -1); - if(taskId == -1) { - return; - } - - String taskDetail = getTaskDetails(taskId); - if(taskDetail == null) { - return; - } - - Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_SEND_DETAILS); - broadcastIntent.putExtra(AstridApiConstants.EXTRAS_ADDON, GtasksPreferenceService.IDENTIFIER); - broadcastIntent.putExtra(AstridApiConstants.EXTRAS_TASK_ID, taskId); - broadcastIntent.putExtra(AstridApiConstants.EXTRAS_RESPONSE, taskDetail); - context.sendBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ); - } - - private String getTaskDetails(long id) { - Metadata metadata = gtasksMetadataService.getTaskMetadata(id); - if(metadata == null) { - return null; - } - - StringBuilder builder = new StringBuilder(); - - String listId = metadata.getValue(GtasksMetadata.LIST_ID); - if(listId == null || listId.equals(gtasksPreferenceService.getDefaultList())) { - return null; - } - String listName = gtasksListService.getListName(listId); - if(listName == null) { - return null; - } - - builder.append(" ").append(listName); //$NON-NLS-1$ - - return builder.toString(); - } - -} diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java index 8a34cb0a0..38aa6f502 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java +++ b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java @@ -82,7 +82,6 @@ public class GtasksFilterExposer extends InjectingBroadcastReceiver implements A ContextManager.setContext(context); FilterListItem[] list = prepareFilters(); Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_SEND_FILTERS); - broadcastIntent.putExtra(AstridApiConstants.EXTRAS_ADDON, GtasksPreferenceService.IDENTIFIER); broadcastIntent.putExtra(AstridApiConstants.EXTRAS_RESPONSE, list); context.sendBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ); } diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListService.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListService.java index b26d9f8f3..9724cc6eb 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListService.java +++ b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListService.java @@ -22,7 +22,6 @@ import javax.inject.Singleton; @Singleton public class GtasksListService { - public static final String LIST_NOT_FOUND = null; public static final StoreObject LIST_NOT_FOUND_OBJECT = null; private final StoreObjectDao storeObjectDao; @@ -58,18 +57,6 @@ public class GtasksListService { return lists; } - /** - * Get list name - * @return NOT_FOUND if no list by this id exists, otherwise list name - */ - public String getListName(String listId) { - StoreObject list = getList(listId); - if(list != LIST_NOT_FOUND_OBJECT) { - return list.getValue(GtasksList.NAME); - } - return LIST_NOT_FOUND; - } - /** * Reads in remote list information and updates local list objects. * diff --git a/astrid/src/main/java/com/todoroo/astrid/helper/SyncActionHelper.java b/astrid/src/main/java/com/todoroo/astrid/helper/SyncActionHelper.java index 7f94d0534..466af40d5 100644 --- a/astrid/src/main/java/com/todoroo/astrid/helper/SyncActionHelper.java +++ b/astrid/src/main/java/com/todoroo/astrid/helper/SyncActionHelper.java @@ -112,7 +112,7 @@ public class SyncActionHelper { SyncAction syncAction = extras.getParcelable(AstridApiConstants.EXTRAS_RESPONSE); syncActions.add(syncAction); } catch (Exception e) { - log.error("receive-sync-action-" + intent.getStringExtra(AstridApiConstants.EXTRAS_ADDON), e); + log.error(e.getMessage(), e); } } } diff --git a/astrid/src/main/java/com/todoroo/astrid/notes/NotesDetailExposer.java b/astrid/src/main/java/com/todoroo/astrid/notes/NotesDetailExposer.java deleted file mode 100644 index 5f2e521a0..000000000 --- a/astrid/src/main/java/com/todoroo/astrid/notes/NotesDetailExposer.java +++ /dev/null @@ -1,112 +0,0 @@ -/** - * Copyright (c) 2012 Todoroo Inc - * - * See the file "LICENSE" for the full license governing this code. - */ -package com.todoroo.astrid.notes; - - -import android.content.Context; -import android.content.Intent; -import android.text.TextUtils; - -import com.todoroo.andlib.data.TodorooCursor; -import com.todoroo.andlib.sql.Order; -import com.todoroo.andlib.sql.Query; -import com.todoroo.astrid.api.AstridApiConstants; -import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria; -import com.todoroo.astrid.data.Metadata; -import com.todoroo.astrid.data.Task; -import com.todoroo.astrid.service.MetadataService; -import com.todoroo.astrid.service.TaskService; - -import org.tasks.R; -import org.tasks.injection.InjectingBroadcastReceiver; -import org.tasks.preferences.Preferences; - -import javax.inject.Inject; - -/** - * Exposes Task Detail for notes - * - * @author Tim Su - * - */ -public class NotesDetailExposer extends InjectingBroadcastReceiver { - - private static final int NOTE_MAX = 200; - - @Inject MetadataService metadataService; - @Inject TaskService taskService; - @Inject Preferences preferences; - - @Override - public void onReceive(Context context, Intent intent) { - super.onReceive(context, intent); - - // get tags associated with this task - long taskId = intent.getLongExtra(AstridApiConstants.EXTRAS_TASK_ID, -1); - if(taskId == -1) { - return; - } - - String taskDetail = getTaskDetails(taskId); - if(taskDetail == null) { - return; - } - - // transmit - Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_SEND_DETAILS); - broadcastIntent.putExtra(AstridApiConstants.EXTRAS_ADDON, NotesPlugin.IDENTIFIER); - broadcastIntent.putExtra(AstridApiConstants.EXTRAS_RESPONSE, taskDetail); - broadcastIntent.putExtra(AstridApiConstants.EXTRAS_TASK_ID, taskId); - context.sendBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ); - } - - private String getTaskDetails(long id) { - if(!preferences.getBoolean(R.string.p_showNotes, false)) { - return null; - } - - Task task = taskService.fetchById(id, Task.ID, Task.NOTES); - if(task == null) { - return null; - } - - StringBuilder notesBuilder = new StringBuilder(); - - String notes = task.getNotes(); - if(!TextUtils.isEmpty(notes)) { - if(notes.length() > NOTE_MAX) { - int lastSpace = notes.lastIndexOf(' ', NOTE_MAX); - notes = notes.substring(0, Math.max(lastSpace, NOTE_MAX - 20)) + "..."; - } - notesBuilder.append(notes); - } - - TodorooCursor cursor = metadataService.query( - Query.select(Metadata.PROPERTIES).where( - MetadataCriteria.byTaskAndwithKey(task.getId(), - NoteMetadata.METADATA_KEY)).orderBy(Order.asc(Metadata.CREATION_DATE))); - try { - for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) { - Metadata metadata = new Metadata(cursor); - - if(notesBuilder.length() > 0) { - notesBuilder.append("\n"); - } - notesBuilder.append("").append(metadata.getValue(NoteMetadata.TITLE)).append("\n"); - notesBuilder.append(metadata.getValue(NoteMetadata.BODY)); - } - } finally { - cursor.close(); - } - - if(notesBuilder.length() == 0) { - return null; - } - - return " " + notesBuilder; //$NON-NLS-1$ - } - -} diff --git a/astrid/src/main/java/com/todoroo/astrid/notes/NotesPlugin.java b/astrid/src/main/java/com/todoroo/astrid/notes/NotesPlugin.java deleted file mode 100644 index cba535ed7..000000000 --- a/astrid/src/main/java/com/todoroo/astrid/notes/NotesPlugin.java +++ /dev/null @@ -1,28 +0,0 @@ -/** - * Copyright (c) 2012 Todoroo Inc - * - * See the file "LICENSE" for the full license governing this code. - */ -package com.todoroo.astrid.notes; - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; - -import com.todoroo.astrid.api.Addon; -import com.todoroo.astrid.api.AstridApiConstants; - -public class NotesPlugin extends BroadcastReceiver { - - public static final String IDENTIFIER = "notes"; //$NON-NLS-1$ - - @Override - public void onReceive(Context context, Intent intent) { - Addon plugin = new Addon(IDENTIFIER, "Notes", "Todoroo", - "Lets you add and view notes for a task."); - - Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_SEND_ADDONS); - broadcastIntent.putExtra(AstridApiConstants.EXTRAS_ADDON, plugin); - context.sendBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ); - } -} diff --git a/astrid/src/main/java/com/todoroo/astrid/repeats/RepeatDetailExposer.java b/astrid/src/main/java/com/todoroo/astrid/repeats/RepeatDetailExposer.java deleted file mode 100644 index 23a59286d..000000000 --- a/astrid/src/main/java/com/todoroo/astrid/repeats/RepeatDetailExposer.java +++ /dev/null @@ -1,137 +0,0 @@ -/** - * Copyright (c) 2012 Todoroo Inc - * - * See the file "LICENSE" for the full license governing this code. - */ -package com.todoroo.astrid.repeats; - -import android.content.Context; -import android.content.Intent; -import android.content.res.Resources; - -import com.google.ical.values.Frequency; -import com.google.ical.values.RRule; -import com.google.ical.values.WeekdayNum; -import com.todoroo.astrid.api.AstridApiConstants; -import com.todoroo.astrid.data.Task; -import com.todoroo.astrid.service.TaskService; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.tasks.R; -import org.tasks.injection.InjectingBroadcastReceiver; - -import java.text.DateFormatSymbols; -import java.text.ParseException; -import java.util.List; - -import javax.inject.Inject; - -/** - * Exposes Task Detail for repeats, i.e. "Repeats every 2 days" - * - * @author Tim Su - * - */ -public class RepeatDetailExposer extends InjectingBroadcastReceiver { - - private static final Logger log = LoggerFactory.getLogger(RepeatDetailExposer.class); - - @Inject TaskService taskService; - - @Override - public void onReceive(Context context, Intent intent) { - super.onReceive(context, intent); - - // get tags associated with this task - long taskId = intent.getLongExtra(AstridApiConstants.EXTRAS_TASK_ID, -1); - if(taskId == -1) { - return; - } - - String taskDetail = getTaskDetails(context, taskId); - if(taskDetail == null) { - return; - } - - // transmit - Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_SEND_DETAILS); - broadcastIntent.putExtra(AstridApiConstants.EXTRAS_ADDON, RepeatsPlugin.IDENTIFIER); - broadcastIntent.putExtra(AstridApiConstants.EXTRAS_RESPONSE, taskDetail); - broadcastIntent.putExtra(AstridApiConstants.EXTRAS_TASK_ID, taskId); - context.sendBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ); - } - - public String getTaskDetails(Context context, long id) { - Task task = taskService.fetchById(id, Task.RECURRENCE); - if(task == null) { - return null; - } - - Resources r = context.getResources(); - - String recurrence = task.sanitizedRecurrence(); - if(recurrence != null && recurrence.length() > 0) { - RRule rrule; - try { - rrule = new RRule(recurrence); - } catch (ParseException e) { - log.error(e.getMessage(), e); - return null; - } - - String interval = getIntervalFor(r, rrule); - - interval = "" + interval + ""; //$NON-NLS-1$//$NON-NLS-2$ - List byDay = rrule.getByDay(); - if(rrule.getFreq() == Frequency.WEEKLY || byDay.size() != 7) { - if(byDay.size() > 0) { - StringBuilder byDayString = new StringBuilder(); - DateFormatSymbols dfs = new DateFormatSymbols(); - String[] weekdays = dfs.getShortWeekdays(); - for(int i = 0; i < byDay.size(); i++) { - byDayString.append(weekdays[byDay.get(i).wday.javaDayNum]); - if(i < byDay.size() - 1) { - byDayString.append(", "); //$NON-NLS-1$ - } - } - interval = r.getString(R.string.repeat_detail_byday).replace("$I", //$NON-NLS-1$ - interval).replace("$D", byDayString); //$NON-NLS-1$ - } - } - - String detail; - if(task.repeatAfterCompletion()) { - detail = context.getString(R.string.repeat_detail_completion, interval); - } else { - detail = context.getString(R.string.repeat_detail_duedate, interval); - } - - return " " + detail; //$NON-NLS-1$ - } - return null; - } - - private String getIntervalFor(Resources r, RRule rrule) { - int plural; - switch(rrule.getFreq()) { - case MINUTELY: - plural = R.plurals.DUt_minutes; break; - case HOURLY: - plural = R.plurals.DUt_hours; break; - case DAILY: - plural = R.plurals.DUt_days; break; - case WEEKLY: - plural = R.plurals.DUt_weeks; break; - case MONTHLY: - plural = R.plurals.DUt_months; break; - case YEARLY: - plural = R.plurals.DUt_years; break; - default: - // not designed to be used, only a fail-safe - return rrule.getInterval() + "-" + rrule.getFreq().name(); //$NON-NLS-1$ - } - - return r.getQuantityString(plural, rrule.getInterval(), rrule.getInterval()); - } -} diff --git a/astrid/src/main/java/com/todoroo/astrid/repeats/RepeatsPlugin.java b/astrid/src/main/java/com/todoroo/astrid/repeats/RepeatsPlugin.java deleted file mode 100644 index b3edc53f4..000000000 --- a/astrid/src/main/java/com/todoroo/astrid/repeats/RepeatsPlugin.java +++ /dev/null @@ -1,32 +0,0 @@ -/** - * Copyright (c) 2012 Todoroo Inc - * - * See the file "LICENSE" for the full license governing this code. - */ -package com.todoroo.astrid.repeats; - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; - -import com.todoroo.astrid.api.Addon; -import com.todoroo.astrid.api.AstridApiConstants; - -import org.tasks.R; - -public class RepeatsPlugin extends BroadcastReceiver { - - static final String IDENTIFIER = "repeats"; //$NON-NLS-1$ - - @Override - public void onReceive(Context context, Intent intent) { - Addon plugin = new Addon(IDENTIFIER, context.getString(R.string.repeat_plugin), - context.getString(R.string.AOA_internal_author), - context.getString(R.string.repeat_plugin_desc)); - - Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_SEND_ADDONS); - broadcastIntent.putExtra(AstridApiConstants.EXTRAS_ADDON, plugin); - context.sendBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ); - } - -} diff --git a/astrid/src/main/java/com/todoroo/astrid/service/GlobalEventReceiver.java b/astrid/src/main/java/com/todoroo/astrid/service/GlobalEventReceiver.java deleted file mode 100644 index 391d61d83..000000000 --- a/astrid/src/main/java/com/todoroo/astrid/service/GlobalEventReceiver.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * Copyright (c) 2012 Todoroo Inc - * - * See the file "LICENSE" for the full license governing this code. - */ -package com.todoroo.astrid.service; - -import android.content.Context; -import android.content.Intent; - -import com.todoroo.andlib.sql.Criterion; -import com.todoroo.astrid.api.AstridApiConstants; -import com.todoroo.astrid.utility.Flags; - -import org.tasks.injection.InjectingBroadcastReceiver; - -import javax.inject.Inject; - -/** - * BroadcastReceiver for receiving Astrid events not associated with a - * specific activity - * - * @author Tim Su - * - */ -public final class GlobalEventReceiver extends InjectingBroadcastReceiver { - - @Inject TaskService taskService; - - @Override - public void onReceive(Context context, Intent intent) { - super.onReceive(context, intent); - - if(intent == null) { - return; - } - - if(AstridApiConstants.BROADCAST_EVENT_FLUSH_DETAILS.equals(intent.getAction())) { - taskService.clearDetails(Criterion.all); - Flags.set(Flags.REFRESH); - } - } -} diff --git a/astrid/src/main/java/com/todoroo/astrid/service/TaskService.java b/astrid/src/main/java/com/todoroo/astrid/service/TaskService.java index 9dd85fa77..e5e5aba9b 100644 --- a/astrid/src/main/java/com/todoroo/astrid/service/TaskService.java +++ b/astrid/src/main/java/com/todoroo/astrid/service/TaskService.java @@ -161,16 +161,6 @@ public class TaskService { return taskDao.count(query); } - /** - * Clear details cache. Useful if user performs some operation that - * affects details - */ - public void clearDetails(Criterion criterion) { - Task template = new Task(); - template.setDetailsDate(0L); - taskDao.update(criterion, template); - } - /** * Update all matching a clause to have the values set on template object. *

    diff --git a/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java index 0da3462c1..14c1fcd32 100644 --- a/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java +++ b/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java @@ -171,7 +171,7 @@ public class AstridOrderedListFragmentHelper implements OrderedListFragmen public TaskAdapter createTaskAdapter(TodorooCursor cursor, AtomicReference sqlQueryTemplate) { - taskAdapter = new DraggableTaskAdapter(preferences, fragment, TaskListFragment.getTaskRowResource(preferences.getIntegerFromString(R.string.p_taskRowStyle_v2, 0)), + taskAdapter = new DraggableTaskAdapter(preferences, fragment, TaskListFragment.getTaskRowResource(), cursor, sqlQueryTemplate); getTouchListView().setItemHightNormal(taskAdapter.computeFullRowHeight()); diff --git a/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java index c37e9ad07..004c59264 100644 --- a/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java +++ b/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java @@ -102,10 +102,6 @@ public class OrderedMetadataListFragmentHelper implements OrderedListFragm @Override public Property[] taskProperties() { Property[] baseProperties = TaskAdapter.PROPERTIES; - if (preferences.getIntegerFromString(R.string.p_taskRowStyle_v2, 0) == 2) { - baseProperties = TaskAdapter.BASIC_PROPERTIES; - } - ArrayList> properties = new ArrayList<>(Arrays.asList(baseProperties)); properties.add(updater.indentProperty()); properties.add(updater.orderProperty()); @@ -186,7 +182,7 @@ public class OrderedMetadataListFragmentHelper implements OrderedListFragm public TaskAdapter createTaskAdapter(TodorooCursor cursor, AtomicReference sqlQueryTemplate) { - taskAdapter = new DraggableTaskAdapter(preferences, fragment, TaskListFragment.getTaskRowResource(preferences.getIntegerFromString(R.string.p_taskRowStyle_v2, 0)), + taskAdapter = new DraggableTaskAdapter(preferences, fragment, TaskListFragment.getTaskRowResource(), cursor, sqlQueryTemplate); taskAdapter.addOnCompletedTaskListener(new OnCompletedTaskListener() { diff --git a/astrid/src/main/java/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java b/astrid/src/main/java/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java index 4cc2c03c4..313f73084 100644 --- a/astrid/src/main/java/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java +++ b/astrid/src/main/java/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java @@ -89,7 +89,6 @@ public class TagCustomFilterCriteriaExposer extends InjectingBroadcastReceiver { // transmit filter list Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_SEND_CUSTOM_FILTER_CRITERIA); broadcastIntent.putExtra(AstridApiConstants.EXTRAS_RESPONSE, ret); - broadcastIntent.putExtra(AstridApiConstants.EXTRAS_ADDON, TagsPlugin.IDENTIFIER); context.sendBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ); } diff --git a/astrid/src/main/java/com/todoroo/astrid/tags/TagDetailExposer.java b/astrid/src/main/java/com/todoroo/astrid/tags/TagDetailExposer.java deleted file mode 100644 index 39792ff82..000000000 --- a/astrid/src/main/java/com/todoroo/astrid/tags/TagDetailExposer.java +++ /dev/null @@ -1,57 +0,0 @@ -/** - * Copyright (c) 2012 Todoroo Inc - * - * See the file "LICENSE" for the full license governing this code. - */ -package com.todoroo.astrid.tags; - -import android.content.Context; -import android.content.Intent; - -import com.todoroo.astrid.api.AstridApiConstants; - -import org.tasks.injection.InjectingBroadcastReceiver; - -import javax.inject.Inject; - -/** - * Exposes Task Detail for tags, i.e. "Tags: frogs, animals" - * - * @author Tim Su - * - */ -public class TagDetailExposer extends InjectingBroadcastReceiver { - - @Inject TagService tagService; - - @Override - public void onReceive(Context context, Intent intent) { - super.onReceive(context, intent); - // get tags associated with this task - long taskId = intent.getLongExtra(AstridApiConstants.EXTRAS_TASK_ID, -1); - if(taskId == -1) { - return; - } - - String taskDetail = getTaskDetails(taskId); - if(taskDetail == null) { - return; - } - - // transmit - Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_SEND_DETAILS); - broadcastIntent.putExtra(AstridApiConstants.EXTRAS_ADDON, TagsPlugin.IDENTIFIER); - broadcastIntent.putExtra(AstridApiConstants.EXTRAS_RESPONSE, taskDetail); - broadcastIntent.putExtra(AstridApiConstants.EXTRAS_TASK_ID, taskId); - context.sendBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ); - } - - private String getTaskDetails(long id) { - String tagList = tagService.getTagsAsString(id); - if(tagList.length() == 0) { - return null; - } - - return /*" " +*/ tagList; - } -} diff --git a/astrid/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java b/astrid/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java index 5bf16c9e7..c65dd7665 100644 --- a/astrid/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java +++ b/astrid/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java @@ -109,7 +109,6 @@ public class TagFilterExposer extends InjectingBroadcastReceiver implements Astr Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_SEND_FILTERS); broadcastIntent.putExtra(AstridApiConstants.EXTRAS_RESPONSE, listAsArray); - broadcastIntent.putExtra(AstridApiConstants.EXTRAS_ADDON, TagsPlugin.IDENTIFIER); context.sendBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ); } diff --git a/astrid/src/main/java/com/todoroo/astrid/tags/TagService.java b/astrid/src/main/java/com/todoroo/astrid/tags/TagService.java index 172d11f21..5c6ec282d 100644 --- a/astrid/src/main/java/com/todoroo/astrid/tags/TagService.java +++ b/astrid/src/main/java/com/todoroo/astrid/tags/TagService.java @@ -223,37 +223,6 @@ public final class TagService { return metadataDao.query(query); } - /** - * Return tags as a comma-separated list of strings - * @return empty string if no tags, otherwise string - */ - public String getTagsAsString(long taskId) { - return getTagsAsString(taskId, ", "); - } - - /** - * Return tags as a list of strings separated by given separator - * @return empty string if no tags, otherwise string - */ - public String getTagsAsString(long taskId, String separator) { - StringBuilder tagBuilder = new StringBuilder(); - TodorooCursor tags = getTags(taskId); - try { - int length = tags.getCount(); - for (int i = 0; i < length; i++) { - tags.moveToNext(); - Metadata metadata = new Metadata(tags); - tagBuilder.append(metadata.getValue(TaskToTagMetadata.TAG_NAME)); - if (i < length - 1) { - tagBuilder.append(separator); - } - } - } finally { - tags.close(); - } - return tagBuilder.toString(); - } - /** * Return all tags (including metadata tags and TagData tags) in an array list */ diff --git a/astrid/src/main/java/com/todoroo/astrid/tags/TagsPlugin.java b/astrid/src/main/java/com/todoroo/astrid/tags/TagsPlugin.java deleted file mode 100644 index 105ad4203..000000000 --- a/astrid/src/main/java/com/todoroo/astrid/tags/TagsPlugin.java +++ /dev/null @@ -1,28 +0,0 @@ -/** - * Copyright (c) 2012 Todoroo Inc - * - * See the file "LICENSE" for the full license governing this code. - */ -package com.todoroo.astrid.tags; - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; - -import com.todoroo.astrid.api.Addon; -import com.todoroo.astrid.api.AstridApiConstants; - -public class TagsPlugin extends BroadcastReceiver { - - static final String IDENTIFIER = "tags"; //$NON-NLS-1$ - - @Override - public void onReceive(Context context, Intent intent) { - Addon plugin = new Addon(IDENTIFIER, "Tags", "Todoroo", - "Provides tagging support for tasks."); - - Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_SEND_ADDONS); - broadcastIntent.putExtra(AstridApiConstants.EXTRAS_ADDON, plugin); - context.sendBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ); - } -} diff --git a/astrid/src/main/java/com/todoroo/astrid/timers/TimerPlugin.java b/astrid/src/main/java/com/todoroo/astrid/timers/TimerPlugin.java index 20ad8477f..c2e277633 100644 --- a/astrid/src/main/java/com/todoroo/astrid/timers/TimerPlugin.java +++ b/astrid/src/main/java/com/todoroo/astrid/timers/TimerPlugin.java @@ -7,39 +7,22 @@ package com.todoroo.astrid.timers; import android.app.Notification; import android.app.PendingIntent; -import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.res.Resources; -import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.sql.Query; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.astrid.activity.ShortcutActivity; -import com.todoroo.astrid.api.Addon; -import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.data.Task; -import org.tasks.notifications.NotificationManager; import com.todoroo.astrid.service.TaskService; import com.todoroo.astrid.utility.Constants; import org.tasks.R; +import org.tasks.notifications.NotificationManager; -public class TimerPlugin extends BroadcastReceiver { - - static final String IDENTIFIER = "timer"; //$NON-NLS-1$ - - @Override - public void onReceive(Context context, Intent intent) { - ContextManager.setContext(context); - Addon plugin = new Addon(IDENTIFIER, "Timer", "Todoroo", - "Lets you time how long it takes to complete tasks."); - - Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_SEND_ADDONS); - broadcastIntent.putExtra(AstridApiConstants.EXTRAS_ADDON, plugin); - context.sendBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ); - } +public class TimerPlugin { /** * toggles timer and updates elapsed time. diff --git a/astrid/src/main/java/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java b/astrid/src/main/java/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java index 0bbbe438d..925b07f33 100644 --- a/astrid/src/main/java/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java +++ b/astrid/src/main/java/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java @@ -33,7 +33,6 @@ public class AstridDefaultPreferenceSpec { setPreference(prefs, editor, r, R.string.p_default_reminders_key, Task.NOTIFY_AT_DEADLINE | Task.NOTIFY_AFTER_DEADLINE); setPreference(prefs, editor, r, R.string.p_rmd_default_random_hours, 0); setPreference(prefs, editor, r, R.string.p_fontSize, 16); - setPreference(prefs, editor, r, R.string.p_showNotes, false); setPreference(prefs, editor, r, R.string.p_field_missed_calls, true); @@ -53,8 +52,6 @@ public class AstridDefaultPreferenceSpec { setPreference(prefs, editor, r, R.string.p_show_task_edit_comments, true); - setPreference(prefs, editor, r, R.string.p_taskRowStyle_v2, "1"); //$NON-NLS-1$ - setPreference(prefs, editor, r, R.string.p_use_date_shortcuts, false); setPreference(prefs, editor, r, R.string.p_hide_plus_button, true); @@ -96,17 +93,6 @@ public class AstridDefaultPreferenceSpec { setIfUnset(prefs, editor, r, key, value); } - private static void setPreference(SharedPreferences prefs, Editor editor, Resources r, int key, String value) { - setIfUnset(prefs, editor, r, key, value); - } - - private static void setIfUnset(SharedPreferences prefs, Editor editor, Resources r, int keyResource, String value) { - String key = r.getString(keyResource); - if(!prefs.contains(key) || !(prefs.getAll().get(key) instanceof String)) { - editor.putString(key, value); - } - } - private static void setIntIfUnset(SharedPreferences prefs, Editor editor, Resources r, int keyResource, int value) { String key = r.getString(keyResource); if(!prefs.contains(key)) { diff --git a/astrid/src/main/java/org/tasks/injection/BroadcastModule.java b/astrid/src/main/java/org/tasks/injection/BroadcastModule.java index 9a8d0d7f1..a5ee239d8 100644 --- a/astrid/src/main/java/org/tasks/injection/BroadcastModule.java +++ b/astrid/src/main/java/org/tasks/injection/BroadcastModule.java @@ -1,6 +1,5 @@ package org.tasks.injection; -import com.todoroo.astrid.alarms.AlarmDetailExposer; import com.todoroo.astrid.alarms.AlarmTaskRepeatListener; import com.todoroo.astrid.backup.BackupStartupReceiver; import com.todoroo.astrid.calls.PhoneStateChangedReceiver; @@ -10,17 +9,12 @@ import com.todoroo.astrid.gcal.CalendarAlarmReceiver; import com.todoroo.astrid.gcal.CalendarStartupReceiver; import com.todoroo.astrid.gcal.GCalTaskCompleteListener; import com.todoroo.astrid.gtasks.GtasksCustomFilterCriteriaExposer; -import com.todoroo.astrid.gtasks.GtasksDetailExposer; import com.todoroo.astrid.gtasks.GtasksFilterExposer; import com.todoroo.astrid.gtasks.GtasksStartupReceiver; -import com.todoroo.astrid.notes.NotesDetailExposer; import com.todoroo.astrid.reminders.Notifications; import com.todoroo.astrid.reminders.ShowNotificationReceiver; -import com.todoroo.astrid.repeats.RepeatDetailExposer; import com.todoroo.astrid.repeats.RepeatTaskCompleteListener; -import com.todoroo.astrid.service.GlobalEventReceiver; import com.todoroo.astrid.tags.TagCustomFilterCriteriaExposer; -import com.todoroo.astrid.tags.TagDetailExposer; import com.todoroo.astrid.tags.TagFilterExposer; import com.todoroo.astrid.timers.TimerFilterExposer; import com.todoroo.astrid.timers.TimerTaskCompleteListener; @@ -36,17 +30,11 @@ import dagger.Module; TasksWidget.class, Notifications.class, GtasksCustomFilterCriteriaExposer.class, - GtasksDetailExposer.class, - GlobalEventReceiver.class, - TagDetailExposer.class, TagCustomFilterCriteriaExposer.class, - NotesDetailExposer.class, GCalTaskCompleteListener.class, - RepeatDetailExposer.class, TimerTaskCompleteListener.class, RepeatTaskCompleteListener.class, AlarmTaskRepeatListener.class, - AlarmDetailExposer.class, GtasksStartupReceiver.class, PhoneStateChangedReceiver.class, ShowNotificationReceiver.class, diff --git a/astrid/src/main/res/drawable-hdpi/details_alarm.png b/astrid/src/main/res/drawable-hdpi/details_alarm.png deleted file mode 100644 index adec4c78c..000000000 Binary files a/astrid/src/main/res/drawable-hdpi/details_alarm.png and /dev/null differ diff --git a/astrid/src/main/res/drawable-hdpi/details_note.png b/astrid/src/main/res/drawable-hdpi/details_note.png deleted file mode 100644 index 9f02891e3..000000000 Binary files a/astrid/src/main/res/drawable-hdpi/details_note.png and /dev/null differ diff --git a/astrid/src/main/res/drawable-hdpi/details_repeat.png b/astrid/src/main/res/drawable-hdpi/details_repeat.png deleted file mode 100644 index 893d11926..000000000 Binary files a/astrid/src/main/res/drawable-hdpi/details_repeat.png and /dev/null differ diff --git a/astrid/src/main/res/drawable-hdpi/details_tag.png b/astrid/src/main/res/drawable-hdpi/details_tag.png deleted file mode 100644 index 7805ad3e2..000000000 Binary files a/astrid/src/main/res/drawable-hdpi/details_tag.png and /dev/null differ diff --git a/astrid/src/main/res/drawable/details_alarm.png b/astrid/src/main/res/drawable/details_alarm.png deleted file mode 100644 index a0b85b60b..000000000 Binary files a/astrid/src/main/res/drawable/details_alarm.png and /dev/null differ diff --git a/astrid/src/main/res/drawable/details_note.png b/astrid/src/main/res/drawable/details_note.png deleted file mode 100644 index 68e4f74fc..000000000 Binary files a/astrid/src/main/res/drawable/details_note.png and /dev/null differ diff --git a/astrid/src/main/res/drawable/details_repeat.png b/astrid/src/main/res/drawable/details_repeat.png deleted file mode 100644 index efe6e69d8..000000000 Binary files a/astrid/src/main/res/drawable/details_repeat.png and /dev/null differ diff --git a/astrid/src/main/res/drawable/details_tag.png b/astrid/src/main/res/drawable/details_tag.png deleted file mode 100644 index 91d6730bc..000000000 Binary files a/astrid/src/main/res/drawable/details_tag.png and /dev/null differ diff --git a/astrid/src/main/res/drawable/gtasks_detail.png b/astrid/src/main/res/drawable/gtasks_detail.png deleted file mode 100644 index 724570e6c..000000000 Binary files a/astrid/src/main/res/drawable/gtasks_detail.png and /dev/null differ diff --git a/astrid/src/main/res/layout/task_adapter_row.xml b/astrid/src/main/res/layout/task_adapter_row.xml deleted file mode 100644 index c21468987..000000000 --- a/astrid/src/main/res/layout/task_adapter_row.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/astrid/src/main/res/layout/task_adapter_row_title_only.xml b/astrid/src/main/res/layout/task_adapter_row_title_only.xml deleted file mode 100644 index 2043daadc..000000000 --- a/astrid/src/main/res/layout/task_adapter_row_title_only.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/astrid/src/main/res/values-ca/strings.xml b/astrid/src/main/res/values-ca/strings.xml index c7762f27c..9bbf3d451 100644 --- a/astrid/src/main/res/values-ca/strings.xml +++ b/astrid/src/main/res/values-ca/strings.xml @@ -160,15 +160,12 @@ Mida de la llista de tasques Mostra la confirmació per als recordatoris intel·ligents Mida de lletra en la pàgina de llista principal - Mostra notes a tasques Restableix els valors predeterminats - Es mostraran sempre les anotacions Mostra el títol sencer de la tasca Es mostrarà el títol sencer de la tasca Segur que voleu suprimir totes les tasques completades? S\'han suprimit %d tasques Segur que voleu suprimir els esdeveniments de calendari de les tasques completades? - Equip d\'Tasks S\'està carregant… Seleccionar les tasques a veure ... Sembla que utilitzes una aplicació que pot matar pocessos (%s)! Si pots, afegeix l\'Tasks a la llista d\'exclusió per tal de no ser morta. En cas contrari podria ser que l\'Tasks no t\'informés de les tasques quan vencin.\n @@ -257,8 +254,6 @@ Notificacions al Atzar Les tasques noves no mostraran notificacions a l\'atzar Les tasques noves notificaràn al atzar: %s - Repetició de Tasques - Permetre tasques repetides Repeticions Cada %d Interval de Repecitiò @@ -274,7 +269,6 @@ $I en $D Cada %s - %s després de finalització S\'ha completat la tasca recurrent «%s» Llista nova Llista nova diff --git a/astrid/src/main/res/values-cs/strings.xml b/astrid/src/main/res/values-cs/strings.xml index 012f794ed..948ad2415 100644 --- a/astrid/src/main/res/values-cs/strings.xml +++ b/astrid/src/main/res/values-cs/strings.xml @@ -158,10 +158,7 @@ Velikost seznamu úkolů Zobrazovat potvrzení chytrých upomínek Velikost písma na hlavní straně seznamu - Zobrazit poznámky v úkolu Obnovit výchozí hodnoty - Poznámky budou zobrazeny v liště rychlého přístupu - Poznámky budou vždy zobrazeny Zobrazit úplný název úkolu Zobrazí se úplný název úkolu Zobrazí se první dva řádky názvu úkolu @@ -183,7 +180,6 @@ Smazat události v kalendáři pro hotové úkoly Opravdu chcete smazat všechny události pro dokončené úkoly? Smazáno %d událostí z kalendáře! - Tasks tým Nahrávám... Označte úkol pro zobrazení... Vypadá to, že používate aplikaci, která ukončuje programy(%s)! Pokud můžete, přidejte Tasks do vyjímek, aby nebyla ukončována. Jinak se může stát, že vás nebude upozorňovat na úkoly.\n @@ -342,8 +338,6 @@ měsíčně každý druhý měsíc - Opakování úkolů - Povolit opakování úkolů Opakování Každý %d Opakovací interval @@ -371,7 +365,6 @@ $I na $D Každý %s - %s po dokončení Nebyly provedeny žádné změny. Settings: Aktivní časovače pro %s! diff --git a/astrid/src/main/res/values-da/strings.xml b/astrid/src/main/res/values-da/strings.xml index 40c161d58..a399ab4de 100644 --- a/astrid/src/main/res/values-da/strings.xml +++ b/astrid/src/main/res/values-da/strings.xml @@ -118,9 +118,6 @@ Udseende Opgavelistestørrelse Skriftstørrelse på den centrale liste - Vis noter i opgave - Noter vises altid - Tasks team Indlæser... Vælg opgaver der skal vises... Det ser ud som om du bruger en app der kan dræbe processer (%s)! Hvis du kan, så tilføj Tasks til udelukkelseslisten så den ikke bliver dræbt. Ellers kan Tasks muligvis ikke fortælle dig hvornår dine opgaver tidsfrist er.\n @@ -222,8 +219,6 @@ Tilfældige påmindelser Nye opgaver vil ikke have tilfældige påmindelser Nye opgaver vil blive påmindet tilfældigt: %s - Gentagne opgaver - Tillad at opgaver gentages Gentagelser Hver %d Interval for gentagelse @@ -244,7 +239,6 @@ $I på $D Hver %s Hver %1$s\nindtil %2$s - %s efter fuldførelse Gentag uendeligt Gentag indtil %s Skemalægger opgaven \"%s\" påny diff --git a/astrid/src/main/res/values-de/strings.xml b/astrid/src/main/res/values-de/strings.xml index 8a9e735fa..3821406f9 100644 --- a/astrid/src/main/res/values-de/strings.xml +++ b/astrid/src/main/res/values-de/strings.xml @@ -198,7 +198,6 @@ Angezeigte Filter Bestätigung für Smart-Erinnerungen anzeigen Schriftgröße auf der Hauptseite - Zeige Beschreibung in der Aufgabe Bildschirmeinstellungen bearbeiten Bearbeite Anordnung 5 Minuten Steigerung @@ -207,22 +206,9 @@ Erscheinungsbild Aufgabenseite anpassen Auf Standardeinstellungen zurücksetzen Du kannst die Eingabeseite für Aufgaben mit den Schiebereglern links anpassen - Beschreibung vom Eingabeschirm für Aufgaben aus erreichbar - Beschreibung wird immer angezeigt Gesamten Aufgabentitel anzeigen Aufgabentitel wird vollständig angezeigt Die ersten beiden Zeilen des Aufgabentitels werden angezeigt - - Original - Einfach - Nur Titel - - - Titel auf zwei Zeilen begrenzen mit Datum rechts - Titel auf eine Zeile begrenzen, Datum und Listen darunter - Einzeilig, nur Titel - - Zeilenart: %s Erweiterte Einstellungen für Schnelleingabe Verstecke den +-Knopf Listenansicht @@ -452,8 +438,6 @@ monatlich alle zwei Monate - Wiederkehrende Aufgaben - Aufgaben erlauben sich zu wiederholen Wiederholungen Jeden %d Wiederholungsintervall @@ -462,7 +446,7 @@ t w - Mo + M Std Min Jahr @@ -494,7 +478,6 @@ $D jede $I Jede(n) %s Jede(n) %1$s\nbis %2$s - %s nach Abschluss Endlos wiederholen Wiederhole bis %s Aufgabe \"%s\" erneut planen diff --git a/astrid/src/main/res/values-el/strings.xml b/astrid/src/main/res/values-el/strings.xml index 248708a14..b0c5068f6 100644 --- a/astrid/src/main/res/values-el/strings.xml +++ b/astrid/src/main/res/values-el/strings.xml @@ -155,23 +155,11 @@ Μέγεθος λίστας καθηκόντων Φίλτρα που θα εμφανιστούν Εμφάνιση επιβεβαίωσης για έξυπνες ειδοποιήσεις - Εμφάνιση περιγραφής στο καθήκον Ρύθμιση επιλογών εμφάνισης Αλλαγή σειράς επιλογών 5λεπτες αυξήσεις Επαναφορά προεπιλογών Εμφάνισε πλήρη τίτλο καθήκοντος - - Πρωτότυπο - Απλό - Τίτλος μόνο - - - Επέκταση τίτλου σε δύο σειρές με την ημερομηνία στα δεξια - Επέκταση τίτλου σε μια γραμμή με ημερομηνία και λίστες απο κάτω - Τίτλος μονής γραμμής μόνο - - Στύλ γραμμής: %s Προηγμένα χειριστήρια γρήγορης πρόσθεσης Απόκρυψη κουμπιού πρόσθεσης Εμφάνιση λίστας @@ -323,8 +311,6 @@ μηνιαία διμηνιαία - Επαναλαμβανόμενα καθήκοντα - Επιτρέπει στα καθήκοντα να επαναλαμβάνονται Επαναλήψεις Κάθε %d Διάστημα επανάληψης @@ -357,7 +343,6 @@ $I στο $D Κάθε %s Κάθε %1$s\nμέχρι %2$s - %s μετά την ολοκλήρωση Επανάληψη επ\'αορίστου Επανάληψη μέχρι %s Επανακαθορισμός καθήκοντος \"%s\" diff --git a/astrid/src/main/res/values-es/strings.xml b/astrid/src/main/res/values-es/strings.xml index 9326de4d7..465ad2020 100644 --- a/astrid/src/main/res/values-es/strings.xml +++ b/astrid/src/main/res/values-es/strings.xml @@ -203,7 +203,6 @@ Filtros a mostrar Mostrar confirmación para recordatorios inteligentes Tamaño de letra en el listado de la página principal - Mostrar descripción en tarea Editar opciones de pantalla Editar el orden de pantalla Incrementos de 5 minutos @@ -212,22 +211,9 @@ Personalizar la disposición de la pantalla de edición de tareas Restablecer valores predeterminados Personalice su pantalla de edición de tareas arrastrando el asa izquierda en cada fila - La descripción será accesible desde la pantalla de edición de la tarea - La descripción se mostrará siempre Mostrar completo el título de la tarea Se mostrará completo el título de la tarea Las primeras dos lineas de las tareas serán mostradas - - Original - Simple - Solo título - - - Truncar el título a dos líneas con la fecha a la derecha - Truncar el título a una línea con la fecha y listas debajo - Solo título a una línea - - Estilo de fila: %s Controles avanzados de agregado rápido Ocultar botón de agregado Vista de listas @@ -253,7 +239,6 @@ Borrar todos los eventos del calendario de las tareas ¿Seguro que quieres borrar todos tus eventos para las tareas? ¡Borrados %d eventos del calendario! - Equipo de Tasks Cargando… Seleccione las tareas que ver... ¡Parece que está usando una app que puede matar procesos (%s)! Si puede, @@ -279,7 +264,7 @@ Tasks podría no avisarle cuanto venza una tarea.\n Tipo predeterminado de timbre/vibración Actualmente: %s - !!! (Máximo) + !!! (máximo) !! ! o (Mínimo) @@ -300,7 +285,7 @@ Tasks podría no avisarle cuanto venza una tarea.\n Sin recordatorios del vencimiento En la fecha de vencimiento - Cuando esté atrasada + Cuando esté vencida En la fecha de vencimiento o ya vencida Mis Tareas @@ -458,10 +443,8 @@ Tasks podría no avisarle cuanto venza una tarea.\n semanalmente quincenalmente mensualmente - bimestralmente + bimensualmente - Tareas recurrentes - Permite que las tareas se repitan Repeticiones Cada %d Intervalo de repetición @@ -502,7 +485,6 @@ Tasks podría no avisarle cuanto venza una tarea.\n $I en $D Cada %s Cada %1$s\nhasta %2$s - %s una vez completada Repetir por siempre Repetir hasta %s Reprogramar tarea \"%s\" diff --git a/astrid/src/main/res/values-fr/strings.xml b/astrid/src/main/res/values-fr/strings.xml index df051700b..6e2698cb5 100644 --- a/astrid/src/main/res/values-fr/strings.xml +++ b/astrid/src/main/res/values-fr/strings.xml @@ -199,7 +199,6 @@ Filtres à afficher Montrer une confirmation pour les rappels intelligents Taille de la police pour la page principale des listes - Afficher la description dans la tâche Edition des options d\'affichage Edition de l\'ordre d\'affichage Incrément de 5 minutes @@ -208,22 +207,9 @@ Personnaliser la disposition de l\'écran d\'édition de tâche Rétablir les valeurs par défaut Personnalisez votre écran d\'ajout de tâche en faisant glisser chaque ligne vers la gauche - La description sera accessible depuis l\'écran d\'édition de tâche - La description sera toujours affichée Voir le titre complet de la tâche Le titre entier de la tâche sera montré Les deux premières lignes du titre de la tâche seront montrées - - Original - Simple - Titre seulement - - - Tronquer le titre en deux lignes avec la date sur la droite - Tronquer le titre en une ligne avec la date et les listes en dessous - Titre sur une seule ligne - - Style de ligne : %s Contrôles d\'ajouts rapides avancés Masquer le bouton \"+\" Vue sous forme de liste @@ -249,7 +235,6 @@ Supprimer toutes les entrées de calendrier des tâches Voulez-vous vraiment supprimer tous les événement du calendrier pour Tasks? %d événements du calendrier ont été supprimés! - L\'équipe d\'Tasks Chargement… Sélectionnez les tâches à afficher… Il semble que vous utilisiez un logiciel capable de fermer les processus (%s) ! Si vous pouvez, ajoutez Tasks à la liste d\'exception afin qu\'il ne soit pas fermé. Sinon, Tasks ne pourra probablement pas vous avertir lorsque vos tâches seront dues.\n @@ -455,8 +440,6 @@ mensuel bi-mensuel - Répétition de tâches - Permet aux tâches d\'être répétées Répétitions Tous les %d Interval de répétition @@ -497,7 +480,6 @@ $I sur $D Tous les %s Tous les %1$s jusqu\'à %2$s - %s après achèvement Répéter indéfiniment Répéter jusqu\'à %s Reprogrammer la tâche \"%s\" diff --git a/astrid/src/main/res/values-it/strings.xml b/astrid/src/main/res/values-it/strings.xml index 4d48254d6..22948e193 100644 --- a/astrid/src/main/res/values-it/strings.xml +++ b/astrid/src/main/res/values-it/strings.xml @@ -192,11 +192,6 @@ Visualizza titolo completo dell\'attività Sarà mostrato il titolo completo Saranno mostrate le prime due righe del titolo dell\'attività - - Riduci il titolo a due righe con la data a destra - Riduci il titolo a una riga con la data e gli elenchi sotto - Single line title only - Aspetto della riga dei task Gestisci compiti vecchi Elimina i compiti completati @@ -215,7 +210,6 @@ Elimina tutti gli eventi del calendario in programmi Vuoi davvero eliminare tutti i tuoi eventi in programmi? Eliminato il %d degli eventi del calendario! - Team Tasks Caricamento... Seleziona le attività da visualizzare... Sembra che si stia utilizzando un\'applicazione che può terminare i processi (%s)! Se è possibile, aggiungere Tasks all\'elenco di esclusione in modo che non venga terminato. Contrariamente, Tasks potrebbe non avvisarti quando le tue attività saranno compiute.\n @@ -404,8 +398,6 @@ Se visualizzi questo errore più volte, ti consigliamo di cancellare tutti i dat mensilmente bi-mensilmente - Attività ricorrente - Permette di ripetere le attività Ripeti Ogni %d Intervallo di ripetizione @@ -437,7 +429,6 @@ Se visualizzi questo errore più volte, ti consigliamo di cancellare tutti i dat $I su $D Ogni %s Ogni %1$s\nfino %2$s - %s dopo il completamento Ripeti all\'infinito Ripeti fino %s Ripianifica attività \"%s\" diff --git a/astrid/src/main/res/values-iw/strings.xml b/astrid/src/main/res/values-iw/strings.xml index f6f2a289b..afdb407f2 100644 --- a/astrid/src/main/res/values-iw/strings.xml +++ b/astrid/src/main/res/values-iw/strings.xml @@ -201,29 +201,15 @@ אילו מַסְנְנִים להציג הצג אישור על תזכורות חכמות גודל הגופן בדף הרישום הראשי - הצג תיאור עם המשימה עריכת אפשרויות מסך עריכת סדר מסך צעדים של 5 דקות הצג קיצורי תאריך התאם אישית את מסך עריכת משימה אפס להגדרות ברירת מחדל - התיאור יהיה נגיש ממסך עריכת המשימה - התיאור יוצג תמיד הצג כותרת מלאה כותרות משימה מלאות תוצגנה שתי השורות הראשונות של שם המשימה תוצגנה - - מקורי - פשוט - כותרת בלבד - - - צמצם את הכותרת לשתי שורות עם תאריך מצד ימין - צמצם את הכותרת לשורה אחת כולל תאריך ורשימות מתחת - שורת כותרת פשוטה בלבד - - סגנון שורה: %s בקרת הוספה מהירה מתקדם הסתר את כפתור ה-פלוס תצוגת רשימה @@ -249,7 +235,6 @@ מַחֲקִי את כל אירועי היומן הקשורים למשימות האם אתה בטוח שברצונך למחוק את כל אירועי היומן בעבור המשימות? %d אירועי יומן נמחקו - הצוות של אסטריד טוענת... בחר משימות להצגה... ככל הנראה הנך משתמש ביישום אשר יכול להרוג תהליכים (%s)! @@ -458,8 +443,6 @@ חודשי דו חודשי - משימות חוזרות - אפשר למשימות לחזור חזרה כל %d אינטרוול חזרות @@ -499,7 +482,6 @@ $I על $D כל %s כל %1$s\nעד %2$s - %s אחרי שהמשימה הושלמה חזור לנצח חזרה עד %s תזמון מחדש של משימה «%s\» diff --git a/astrid/src/main/res/values-ja/strings.xml b/astrid/src/main/res/values-ja/strings.xml index 13af41db7..af55b86b2 100644 --- a/astrid/src/main/res/values-ja/strings.xml +++ b/astrid/src/main/res/values-ja/strings.xml @@ -259,7 +259,6 @@ $I ($D 曜日) %s - 完了日から %s 新しいリスト 変更されませんでした Settings: diff --git a/astrid/src/main/res/values-ko/strings.xml b/astrid/src/main/res/values-ko/strings.xml index 1849072bf..1dbf15977 100644 --- a/astrid/src/main/res/values-ko/strings.xml +++ b/astrid/src/main/res/values-ko/strings.xml @@ -205,7 +205,6 @@ 표시할 필터 스마트 알림시 확인하기 주 목록 페이지 폰트 크기 - 일정에 설명 보기 화면 설정 편집하기 화면 정렬 순서 편집하기 5분 증가 @@ -214,22 +213,9 @@ 일정 편집화면 레이아웃 설정하기 기본값으로 초기화하기 각 줄의 왼쪽 손잡이를 끌어서 일정 편집 화면을 사용자 정의하기 - 설명은 일정 편집 화면에서 수정할 수 있습니다. - 설명을 항상 표시합니다 전체 일정 제목 보기 전체 일정 제목을 표시합니다 일정 제목의 첫 두 줄을 표시합니다 - - 원래대로 - 간단히 - 제목만 - - - 제목을 두 줄로 줄이고 날짜를 오른쪽에 출력 - 제목을 한 줄로 줄이고 날짜와 목록을 그 아래에 출력 - 제목을 한줄에만 - - 가로줄 스타일: %s 고급 빠른추가 조정 플러스 버튼 감추기 목록 보기 @@ -255,7 +241,6 @@ 일정의 모든 달력 이벤트 삭제하기 일정의 모든 이벤트를 정말 삭제할까요? %d 달력 이벤트를 삭제했습니다! - 아스트리드 팀 로드 중… 열람할 일정 선택... 프로세스(%s)를 강제종료할 수 있는 앱을 사용하고 있는 것 같습니다! @@ -466,8 +451,6 @@ 매달 격월로 - 일정 반복하기 - 일정 반복 허락 반복 설정 매 %d 반복 주기 @@ -507,7 +490,6 @@ 매 %s 매 %1$s 마다\n%2$s 까지 - 완료 후 %s 영원히 반복하기 %s 까지 반복 \"%s\" 일정 변경하기 diff --git a/astrid/src/main/res/values-nb/strings.xml b/astrid/src/main/res/values-nb/strings.xml index b4bc7f96c..e68295cd9 100644 --- a/astrid/src/main/res/values-nb/strings.xml +++ b/astrid/src/main/res/values-nb/strings.xml @@ -108,9 +108,6 @@ Utseende Tekststørrelse for oppgavelista Tekststørrelse for hovedlista - Vis notater i oppgaven - Notater vil alltid vises - Tasks-teamet Laster ... Velg oppgaver å se på Det ser ut til at du bruker en app som kan avslutte prosesser (%s)! Hvis du kan, legg Tasks til eksklusjonslista så den ikke blir avsluttet. Ellers vil Tasks kanskje ikke si fra når oppgavene dine forfaller.\n @@ -209,8 +206,6 @@ Tilfeldige påminnelser Nye oppgaver skal ikke påminnes tifeldig Nye oppgaver påminnes tilfeldig: %s - Gjentagende oppgaver - Tillat gjentagende oppgaver Gjentakelser Hver %d Gjentakelsesintervall @@ -227,7 +222,6 @@ $I på $D Hver %s - %s etter avslutning Ny liste Ny liste Slett liste diff --git a/astrid/src/main/res/values-nl/strings.xml b/astrid/src/main/res/values-nl/strings.xml index 34ab3ff7f..34ff2032c 100644 --- a/astrid/src/main/res/values-nl/strings.xml +++ b/astrid/src/main/res/values-nl/strings.xml @@ -202,7 +202,6 @@ Te tonen filters Laat bevestiging zien voor slimme herinneringen Grootte van Lettertype op hoofd takenlijst - Toon omschrijving in taak Scherm opties bewerken Scherm volgorde bewerken stappen van 5 minuten @@ -211,22 +210,9 @@ Pas de layout van het Taak Wijzigingsscherm aan Standaardinstellingen herstellen Pas uw taak bewerken scherm aan door de linker handle van elke rij te verslepen - Omschrijving zal toegankelijk zijn vanaf het bewerk taak scherm - Omschrijving zal altijd worden getoond Laat volledige taak titel zien Volledige taak titel zal worden weergegeven Eerste twee lijnen van taak titel zullen worden weergegeven - - Origineel - Simpel - Enkel titel - - - Titel afkappen naar twee regels met datum aan rechterkant - Titel afkappen tot één regel met datum en onderstaande lijsten - Enkele regel enkel titel - - Regel stijl %s Geavanceerde snel toevoegen controls Verberg plus knop Lijst weergave @@ -459,8 +445,6 @@ maandelijks tweemaandelijks - Herhalende taken - Herhalende taken toestaan Herhalingen Elke %d Herhaal interval @@ -501,7 +485,6 @@ $I op $D Elke %s Elke %1$s\ntot %2$s - %s na voltooing Altijd herhalen Herhalen tot %s Verplaatsen taak \"%s\" diff --git a/astrid/src/main/res/values-pl/strings.xml b/astrid/src/main/res/values-pl/strings.xml index 8ddfd9d00..84ddae36d 100644 --- a/astrid/src/main/res/values-pl/strings.xml +++ b/astrid/src/main/res/values-pl/strings.xml @@ -194,29 +194,15 @@ Pokazywane filtry Pokaż potwierdzenie dla inteligentnych powiadomień Rozmiar czcionki głównej listy zadań - Pokazuj opis w zadaniu Edytuj ustawienia ekranu Edytuj kolejność Krok co 5-minut Użyj skrótów dat Dostosuj układ strony edycji zadania Przywróć domyślne - Opis będzie dostępny na ekranie edycji zadania - Opis będzie zawsze wyświetlany Pokaż pełną nazwę zadania Pełna nazwa zadania będzie wyświetlana Pierwsze dwie linie nazwy zadania będą wyświetlane - - Oryginalny - Prosty - Tylko tytuł - - - Skróć tytuł do dwóch linii z datą na prawo - Skróć tytuł do jednej lini z datą i listami poniżej - Tytuł tylko w jednej linii - - Styl wiersza: %s Zaawansowane kontrolki szybkiego dodawania Widok listy Pokaż komentarze w edycji zadania @@ -241,7 +227,6 @@ Usuń wszystkie zdarzenia kalendarza dla zadań Na pewno chcesz usunąć wszystkie wydarzenia dla zadań? Usunięto %d wydarzeń kalendarza! - Zespół Tasks Ładowanie... Wybierz zadania do wyświetlenia Wygląda na to, że używasz aplikacji, która zabija procesy (%s)! Jeśli możesz, dodaj Tasks do listy wyjątków. Nieaktywny program Tasks nie będzie Ci przypominać o zadaniach do wykonania.\n @@ -446,8 +431,6 @@ i odzyskanie zadań z kopi zapasowej (Settings->Sync and backup->Backup-&g raz w miesiącu raz na dwa miesiące - Powtarzanie zadań - Zewzwól zadaniom na powtarzanie Powtarza się Co %d Odstęp powtarzania @@ -487,7 +470,6 @@ i odzyskanie zadań z kopi zapasowej (Settings->Sync and backup->Backup-&g $I w $D Każdy %s Co %1$s\ndo %2$s - %s po ukończeniu Powtarzaj bez końca Powtarzaj do %s Przekładanie zadania \"%s\" diff --git a/astrid/src/main/res/values-pt-rBR/strings.xml b/astrid/src/main/res/values-pt-rBR/strings.xml index 12f3f0c68..34ed198a7 100644 --- a/astrid/src/main/res/values-pt-rBR/strings.xml +++ b/astrid/src/main/res/values-pt-rBR/strings.xml @@ -197,7 +197,6 @@ Tamanho do texto Mostrar confirmação para lembretes espertos Tamanho do texto nas listagens - Mostrar descrição na tarefa Editar opções da tela Incrementos de 5 minutos Usar atalhos de data @@ -206,11 +205,6 @@ Exibir título completo O título completo será exibido Somente as primeiras duas linhas serão exibidas - - Truncar título para duas linhas com data à direita - Truncar título para uma única linha com data e lista abaixo - Single line title only - Aparência da Tarefa Gerenciar tarefas antigas Exclui as tarefas concluídas @@ -229,7 +223,6 @@ Apaga todos os eventos de calendário das tarefas Você quer mesmo apagar todos os eventos de calendário das tarefas? %d eventos de agenda apagados! - Equipe do Tasks Carregando... Selecionar tarefas para visualização... Parece que você está usando um aplicativo que pode eliminar processos (%s)! Se você puder, adicione o Tasks à lista de exclusão para que ele não seja eliminado. Caso contrário, o Tasks pode não avisar para você quando suas tarefas estiverem vencidas.\n @@ -419,8 +412,6 @@ mensalmente a cada dois meses - Tarefas recorrentes - Permitir tarefas recorrentes Repetir A cada %d Intervalo de repetição @@ -460,7 +451,6 @@ $I na $D a cada %s Todo %1$s\naté %2$s - %s após a conclusão Repetir para sempre Repetir até %s Reagendando tarefa \"%s\" diff --git a/astrid/src/main/res/values-pt/strings.xml b/astrid/src/main/res/values-pt/strings.xml index 60efb1bba..b815c08d1 100644 --- a/astrid/src/main/res/values-pt/strings.xml +++ b/astrid/src/main/res/values-pt/strings.xml @@ -203,7 +203,6 @@ Filtros a mostrar Mostrar confirmação para lembretes inteligentes Tamanho da letra na página principal da lista - Mostrar descrição na tarefa Opções do ecrã de edição Ordem do ecrã de edição Incrementos de 5 minutos @@ -212,22 +211,9 @@ Personalizar o esquema do ecrã de edição de tarefas Restaurar definições originas Personalize o ecrã de edição de tarefas arrastando a guia em cada linha - A descrição estará acessível no ecrã de edição de tarefas - A descrição será mostrada sempre Mostrar título completo das tarefas O título completo das tarefas será mostrado Primeiras duas linhas do título serão mostradas - - Original - Simples - Apenas título - - - Restringir título a duas linhas com data à direita - Restringir título a uma linha e com data e lista abaixo - Título com uma linha - - Estilo de linha: %s Controlos avançados de adição rápida Ocultar botão Mais Vista em lista @@ -254,7 +240,6 @@ Eliminar todos os eventos de calendário das tarefas Quer mesmo eliminar todos os eventos das tarefas? Eliminados %d eventos de calendário! - Equipa do Tasks Carregando... Escolha as tarefas a ver... Parece que está a utilizar uma aplicação que pode terminar processos (%s). @@ -465,8 +450,6 @@ das tarefas através de um backup em Definições->Sincronização e backup-& mensal bimensal - Tarefas recorrentes - Permitir repetição de tarefas Repete Cada %d Intervalo de repetição @@ -507,7 +490,6 @@ das tarefas através de um backup em Definições->Sincronização e backup-& $I em $D Cada %s Cada %1$s\naté %2$s - %s depois da conclusão Repetir eternamente Repetir até %s Reagendamento da tarefa %s diff --git a/astrid/src/main/res/values-ru/strings.xml b/astrid/src/main/res/values-ru/strings.xml index 76e27a865..2a9c18c0e 100644 --- a/astrid/src/main/res/values-ru/strings.xml +++ b/astrid/src/main/res/values-ru/strings.xml @@ -204,7 +204,6 @@ Показать фильтры Показывать подтверждения для умных напоминаний Размер шрифта основного экрана - Показать описание в задаче Редактировать настройки экрана Редактировать порядок экранов Шаг 5 минут @@ -213,22 +212,9 @@ Настроить внешний вид экрана правки задачи Настройки по умолчанию Настройте экран редактирования задачи, перетаскивая элементы ниже - Описание будет доступно на экране редактирования задачи - Всегда показывать описание Показывать полное название задачи Будет показано полное название задачи Будут показаны первые две строки названия - - Оригинальный - Простой - Только заголовки - - - Сократить заголовок до двух строк с указанием даты справа - Сократить заголовок до одной строки с указанием даты и списков ниже - В одну линию с заголовками - - Стиль строки: %s Расширенные возможности быстрого добавления Убрать кнопку плюс Списком @@ -255,7 +241,6 @@ Удалить все календарные события для задач Вы уверены, что хотите удалить все ваши события для задач? Удалено %d календарных событий! - Команда Tasks Загрузка... Выберите задачи для просмотра… Возможно вы используете менеджер задач (%s). По возможности добавьте Tasks в список исключений иначе возможны сложности с напоминаниями.\n @@ -464,8 +449,6 @@ ежемесячно каждые два месяца - Повторяющиеся задачи - Позволяет задачам повторяться Повторения С интервалом в %d Интервал повтора @@ -506,7 +489,6 @@ $I каждый $D С интервалом %s \"Каждые %1$s пока %2$s\" - %s после завершения Повторять всегда Повторять пока %s Перепланирование задачи \"%s\" diff --git a/astrid/src/main/res/values-sl-rSI/strings.xml b/astrid/src/main/res/values-sl-rSI/strings.xml index ed5a59668..2cf861859 100644 --- a/astrid/src/main/res/values-sl-rSI/strings.xml +++ b/astrid/src/main/res/values-sl-rSI/strings.xml @@ -205,7 +205,6 @@ Filtri za prikaz Pokaži potrditev za pametne opomnike Velikost črk na strani z glavnim seznamom - Prikaži opis pri opravku Uredi možnosti zaslona Uredi vrstni red zaslonov 5-minutni podaljški @@ -214,22 +213,9 @@ Po meri postavi stran za urejevanje opravkov Povrni privzeto nastavitev Stran za urejanje opravkov se postavi po meri s potegom leve ročke posamezne vrstice - Opis bo dosegljiv na zaslonu za urejanje opravkov - Opis bo vedno prikazan Prikaži celoten naziv opravka Celoten naziv opravka bo prikazan Prikazani bosta prvi dve vrstici naziva opravka - - Originalni - Enostavni - Samo naziv - - - Skajšaj naziv v dve vrstici z datumom na desni strani - Skrajšaj naziv na eno vrstico z datumom in seznami pod njo. - Enovrstični naziv - - Slog vrstice:%s Napredni kontrolniki za hitro dodajanje Skrij gumb s plusom Seznamski prikaz @@ -255,7 +241,6 @@ Zbriši vse dogodke na koledarju z opravki Ste prepričani, da želite zbrisati vse opravke iz vaših dogodkov? Število zbrisanih dogodkov na koledarju: %d - Sodelujoči pri izdelavi aplikacije Opravki Nalagam... Izberi in prikaži opravke... Zdi se, da uporabljate neko aplikacijo, ki ima pravico prekinjati procese(%s)! Prosimo, dodajte aplikacijo Opravki na seznam izjem, kajti sicer vas Opravki morda ne bodo mogli pravočano obvestiti o dospelosti opravkov.\n @@ -461,8 +446,6 @@ mesečno vsake dva meseca - Ponavljajoča se opravila - Omogoči ponavljanje opravil Ponovitve Vsakih %d Pogostost ponovitev @@ -503,7 +486,6 @@ $I dne $D Vsak %s Vsak %1$s\n do %2$s - %s po dokončanju Ponavljaj do preklica Ponavljaj do %s Spremenjen čas opravka \"%s\" diff --git a/astrid/src/main/res/values-sv/strings.xml b/astrid/src/main/res/values-sv/strings.xml index ad85634c0..f071be1c2 100644 --- a/astrid/src/main/res/values-sv/strings.xml +++ b/astrid/src/main/res/values-sv/strings.xml @@ -198,28 +198,14 @@ Filter att visa Visa bekräftelse vid smarta påminnelser Textstorlek för huvudlistan - Visa beskrivning i uppgiften Ändra skärminställningar Redigera skärmordning 5 minuters steg Ställ in layouten för uppgiftsredigeringsrutan Återställ till standardvärden - Beskrivning är tillgänglig från uppgiftsredigeringsskärmen - Beskrivning visas alltid Visa hela namnet på uppgiften Uppgiftens namn kommer att visas i sin helhet De första två raderna i uppgiftens namn kommer att visas - - Original - Enkel - Endast titel - - - Förkorta titel till två rader med datum till höger - Förkorta titel till en rad, med datum och listor nedanför - Single line title only - - Rad stil: %s Avancerade quickadd kontroller. Dölj plusknappen Listvy @@ -242,7 +228,6 @@ Radera alla kalenderhändelser för uppgifter Vill du verkligen radera alla dina händelser i kalendern för uppgifter? %d kalenderhändelser raderade! - Tasks-teamet Laddar... Välj uppgifter att se på... Det ser ut att du använder en app som kan avsluta processer (%s)! Om du kan, lägg till Tasks i exklusionslistan så att den inte avslutas. Annars kan det hända att Tasks inte meddelar när dina uppgifter förfaller.\n @@ -447,8 +432,6 @@ och återställer dina aktuella uppgifter från en backup varje månad varannan månad - Upprepande uppgifter - Tillåt upprepande uppgifter Upprepningar Varje %d Upprepningsintervall @@ -489,7 +472,6 @@ och återställer dina aktuella uppgifter från en backup $I på $D Varje %s Varje %1$s\ntill %2$s - %s efter avslutning Repetera oändligt Repetera till %s Ändrar tid för uppgiften \"%s\" diff --git a/astrid/src/main/res/values-th/strings.xml b/astrid/src/main/res/values-th/strings.xml index 58592b6c6..1bcfa1b6d 100644 --- a/astrid/src/main/res/values-th/strings.xml +++ b/astrid/src/main/res/values-th/strings.xml @@ -66,8 +66,6 @@ บันทึกย่อ รูปโฉม ขนาดฟอนต์บนหน้ารายการหลัก - บันทึกจะแสดงให้เห็นตลอดเวลา - ทีมงาน Tasks กำลังโหลด... เลือกแผนงานเพื่อดู... Uh oh! It looks like you may have a corrupted database. diff --git a/astrid/src/main/res/values-tr/strings.xml b/astrid/src/main/res/values-tr/strings.xml index 77a3426da..ea8b7098a 100644 --- a/astrid/src/main/res/values-tr/strings.xml +++ b/astrid/src/main/res/values-tr/strings.xml @@ -206,7 +206,6 @@ Görevlerdeki Bütün Takvim Olaylarını Sil Görevlerdeki bütün olayları silmek istediğinize emin misiniz? %d takvim olayı silindi! - Tasks Takımı Yükleniyor... Görüntülenecek görevi seç... Gönürüyor ki, işlemleri kapatabilen bir uygulama kullanıyorsunuz (%s)! Mümkünse, Tasks\'i programın muafiyet listesine ekleyin ki kapatılamasın. Aksi takdirde, Tasks görevlerin tarihi geldiğinde size bildiremeyebilir.\n @@ -396,8 +395,6 @@ ayda bir ayda 2 kez - Tekrarlanan Görevler - Görevlerin tekrarlanmasına izin ver Tekrarlar Her %d Yineleme Aralığı @@ -437,7 +434,6 @@ $I gün: $D Her %s Her %1$s\n%2$s \'e kadar - Tamamlandıktan sonra %s Sürekli yinele %s\'e kadar yinele Görev zamanı güncelleniyor: \"%s\" diff --git a/astrid/src/main/res/values-uk/strings.xml b/astrid/src/main/res/values-uk/strings.xml index 068cfcc99..9d2616363 100644 --- a/astrid/src/main/res/values-uk/strings.xml +++ b/astrid/src/main/res/values-uk/strings.xml @@ -205,7 +205,6 @@ Показати фільтри Показати підтвердження для розумного нагадування Розмір шрифта на головній сторінці оголошень - Показувати опис в завданні Редагувати налаштування екрану Редагувати порядок екранів Крок 5 хвилин @@ -214,17 +213,9 @@ Налаштувати зовнішній вигляд екрану редагування завдань Налаштування за замовчуванням Налаштуйте Ваш екран редагування нотатки перетягуванням лівої частини рядків - Опис буде доступно на екрані редагування завдання - Завжди показувати опис Показувати повну назву завдання Повна назва завдання буде показана Перші дві стрічки назви завдання будуть показані - - Оригінальний - Простий - Title only - - Стиль стрічки: %s Розширені можливості швидкого додавання Прибрати кнопку плюс Вигляд списку @@ -250,7 +241,6 @@ Видалити всі календарні події для завдань Ви дійсно хочете видалити всі події для завдань? Видалено %d календарних подій! - Команда Tasks Завантаження... Виберіть завдання для перегляду... Можливо ви використовуєте менеджер завдань (%s)! @@ -461,8 +451,6 @@ щомісяця два рази на місяць - Повторювані завдання - Дозволяє завданням повторюватися Повторення З інтервалом в %d Інтервал повторення @@ -491,7 +479,6 @@ $I кожен $D З інтервалом в %s Кожні %1$s\nпоки %2$s - %s після завершення Повторювати завжди Повторювати до %s Перепланування завдання \"%s\" diff --git a/astrid/src/main/res/values-zh-rCN/strings.xml b/astrid/src/main/res/values-zh-rCN/strings.xml index 4e009f5ab..91866c17d 100644 --- a/astrid/src/main/res/values-zh-rCN/strings.xml +++ b/astrid/src/main/res/values-zh-rCN/strings.xml @@ -174,11 +174,6 @@ 显示完整的任务标题 将显示完整的任务标题 将显示任务标题的头两行 - - 截取标题至两行，并在右边显示日期 - 截取标题为一行，并在下方显示日期和列表 - Single line title only - 任务栏 管理旧任务 删除已完成任务 @@ -197,7 +192,6 @@ 删除所有日程表 您真的想删除您所有事件中的各项任务吗？ 已经删除了 %d 个日历事件了！ - 清单小助理团队 载入中... 选择任务以显示... 似乎您正在使用会删除进程的应用程序(%s)！可以的话，请将 清单小助理加入到例外列表避免被杀死。否则 清单小助理可能无法通知您任务已到期。\n @@ -384,8 +378,6 @@ 每月 每两个月 - 重复任务 - 允许任务重复 重复 每 %d 重复间隔 @@ -425,7 +417,6 @@ $I 的 $D 每隔 %s 每隔 %1$s\n直到 %2$s - 完成后 %s 永远重复 重复到 %s 重新安排“%s”这项任务 diff --git a/astrid/src/main/res/values-zh-rTW/strings.xml b/astrid/src/main/res/values-zh-rTW/strings.xml index 89d55eb3c..793ac1c36 100644 --- a/astrid/src/main/res/values-zh-rTW/strings.xml +++ b/astrid/src/main/res/values-zh-rTW/strings.xml @@ -199,22 +199,14 @@ 工作清單大小 在智能提示上顯示確認消息 清單主頁面字型大小 - 顯示工作描述 編輯畫面選項 編輯畫面順序 使用日期捷徑 自定義設定菜單屏幕 恢復默認值 - 描述可在工作編輯畫面下存取 - 描述永遠顯示 顯示完整的任務工作標題 將顯示完整的任務工作標題 將顯示任務工作標題的頭兩行 - - 截取標題至兩行，並在右邊顯示日期 - 截取標題為一行，並在下方顯示日期和列表 - Single line title only - 任務工作欄 管理舊任務工作 刪除已完成任務工作 @@ -233,7 +225,6 @@ 刪除所有日程表 您真的想刪除您所有事件中的各項任務工作嗎？ 已經刪除了 %d 個日曆事件了！ - Tasks 團隊 載入中... 選擇工作顯示... 似乎您正在使用會刪除進程的應用程序(%s)！可以的話，請將Tasks 加入到例外列表避免被殺死。否則Tasks可能無法通知您任​​務已到期。\n @@ -428,8 +419,6 @@ 每月 每2個月 - 重複工作 - 允許工作重複 重複 每 %d 重複間隔 @@ -469,7 +458,6 @@ $I 的 $D 每隔 %s 每隔 %1$s\n直到 %2$s - 完成後 %s 永遠重複 重複到 %s 重新安排“%s”這項任務工作 diff --git a/astrid/src/main/res/values/keys.xml b/astrid/src/main/res/values/keys.xml index d0fb39795..5f7e9a0f5 100644 --- a/astrid/src/main/res/values/keys.xml +++ b/astrid/src/main/res/values/keys.xml @@ -100,13 +100,6 @@ font_size - p_taskRowStyle_v2 - - 0 - 1 - 2 - - notesVisible beastMode voicePrefSection diff --git a/astrid/src/main/res/values/strings-core.xml b/astrid/src/main/res/values/strings-core.xml index 2aaea422c..5339d6d1d 100644 --- a/astrid/src/main/res/values/strings-core.xml +++ b/astrid/src/main/res/values/strings-core.xml @@ -455,9 +455,6 @@ Font size on the main listing page - - Show description in task - Edit screen options @@ -477,33 +474,12 @@ Customize your task edit screen by dragging the left handle on each row - - Description will be accessible from the task edit screen - - Description will always be displayed - Show full task title Full task title will be shown First two lines of task title will be shown - - - - Original - Simple - Title only - - - - Truncate title to two lines with date on right - Truncate title to one line with date and lists below - Single line title only - - - - Row style: %s - + Advanced quickadd controls @@ -562,11 +538,6 @@ Do you really want to delete all your events for tasks? Deleted %d calendar events! - - - - Tasks Team - diff --git a/astrid/src/main/res/values/strings-repeat.xml b/astrid/src/main/res/values/strings-repeat.xml index cc1dccc7d..94b4c8542 100644 --- a/astrid/src/main/res/values/strings-repeat.xml +++ b/astrid/src/main/res/values/strings-repeat.xml @@ -3,12 +3,6 @@ - - Repeating Tasks - - - Allows tasks to repeat - Repeats @@ -74,9 +68,6 @@ Every %1$s\nuntil %2$s - - %s after completion - Repeat forever diff --git a/astrid/src/main/res/xml/preferences.xml b/astrid/src/main/res/xml/preferences.xml index 80304dc7a..7b5146201 100644 --- a/astrid/src/main/res/xml/preferences.xml +++ b/astrid/src/main/res/xml/preferences.xml @@ -31,21 +31,11 @@ android:title="@string/EPr_fontSize_title" android:summary="@string/EPr_fontSize_desc" /> - - - - - +