diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java index 1afa73691..87748a749 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java @@ -5,10 +5,6 @@ */ package com.todoroo.astrid.activity; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - import android.animation.LayoutTransition; import android.app.Activity; import android.app.SearchManager; @@ -26,14 +22,12 @@ import android.view.View.OnClickListener; import android.view.ViewGroup; import android.view.ViewGroup.LayoutParams; import android.view.inputmethod.InputMethodManager; -import android.widget.Button; import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.PopupWindow.OnDismissListener; import android.widget.TextView; import com.actionbarsherlock.app.ActionBar; -import org.tasks.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.sql.QueryTemplate; @@ -55,8 +49,6 @@ import com.todoroo.astrid.dao.TagMetadataDao; import com.todoroo.astrid.data.RemoteModel; import com.todoroo.astrid.data.TagData; import com.todoroo.astrid.data.Task; -import com.todoroo.astrid.people.PeopleFilterMode; -import com.todoroo.astrid.people.PersonViewFragment; import com.todoroo.astrid.service.ThemeService; import com.todoroo.astrid.tags.TagFilterExposer; import com.todoroo.astrid.tags.TagsPlugin; @@ -71,6 +63,11 @@ import com.todoroo.astrid.utility.AstridPreferences; import com.todoroo.astrid.utility.Constants; import com.todoroo.astrid.utility.Flags; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; +import org.tasks.R; + public class TaskListActivity extends AstridActivity implements MainMenuListener, OnPageChangeListener { public static final String TOKEN_SELECTED_FILTER = "selectedFilter"; //$NON-NLS-1$ @@ -90,7 +87,6 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener private static final String FILTER_MODE = "filterMode"; //$NON-NLS-1$ public static final int FILTER_MODE_NORMAL = 0; - public static final int FILTER_MODE_PEOPLE = 1; public static final int FILTER_MODE_FEATURED = 2; public static final int REQUEST_CODE_RESTART = 10; @@ -135,10 +131,6 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener @Override public void onClick(View v) { TaskListFragment tlf = getTaskListFragment(); - if (tlf == null || !(tlf instanceof PersonViewFragment)) { - return; - } - ((PersonViewFragment) tlf).handleStatusButtonClicked(); } }; @@ -831,9 +823,6 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener case MainMenuPopover.MAIN_MENU_ITEM_FEATURED_LISTS: setFilterMode(FILTER_MODE_FEATURED); return; - case MainMenuPopover.MAIN_MENU_ITEM_FRIENDS: - setFilterMode(FILTER_MODE_PEOPLE); - return; case MainMenuPopover.MAIN_MENU_ITEM_SETTINGS: if (tlf != null) { tlf.showSettings(); @@ -853,11 +842,7 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener createListsPopover(); setupPopoverWithFilterList((FilterListFragment) setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT, 0, filterModeSpec.getFilterListClass(), true, true)); - if (mode == FILTER_MODE_PEOPLE) { - personStatus.setVisibility(View.VISIBLE); - } else { - personStatus.setVisibility(View.GONE); - } + personStatus.setVisibility(View.GONE); if (swipeIsEnabled()) { setupPagerAdapter(); @@ -886,9 +871,6 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener private void updateFilterModeSpec(int mode) { switch(mode) { - case FILTER_MODE_PEOPLE: - filterModeSpec = new PeopleFilterMode(); - break; case FILTER_MODE_FEATURED: filterModeSpec = new FeaturedListFilterMode(); break; diff --git a/astrid/src/main/java/com/todoroo/astrid/people/PeopleFilterAdapter.java b/astrid/src/main/java/com/todoroo/astrid/people/PeopleFilterAdapter.java deleted file mode 100644 index 46bacbd19..000000000 --- a/astrid/src/main/java/com/todoroo/astrid/people/PeopleFilterAdapter.java +++ /dev/null @@ -1,48 +0,0 @@ -/** - * Copyright (c) 2012 Todoroo Inc - * - * See the file "LICENSE" for the full license governing this code. - */ -package com.todoroo.astrid.people; - -import android.app.Activity; -import android.content.Intent; -import android.content.IntentFilter; -import android.widget.ListView; - -import com.todoroo.astrid.adapter.FilterAdapter; -import com.todoroo.astrid.utility.Constants; - -public class PeopleFilterAdapter extends FilterAdapter { - - public static final String BROADCAST_REQUEST_PEOPLE_FILTERS = Constants.PACKAGE + ".REQUEST_PEOPLE_FILTERS"; //$NON-NLS-1$ - public static final String BROADCAST_SEND_PEOPLE_FILTERS = Constants.PACKAGE + ".SEND_PEOPLE_FILTERS"; //$NON-NLS-1$ - - public PeopleFilterAdapter(Activity activity, ListView listView, - int rowLayout, boolean skipIntentFilters) { - super(activity, listView, rowLayout, skipIntentFilters); - } - - @Override - public void getLists() { - Intent broadcastIntent = new Intent(BROADCAST_REQUEST_PEOPLE_FILTERS); - activity.sendBroadcast(broadcastIntent); - } - - @Override - public void registerRecevier() { - IntentFilter peopleFilter = new IntentFilter(BROADCAST_SEND_PEOPLE_FILTERS); - activity.registerReceiver(filterReceiver, peopleFilter); - getLists(); - } - - @Override - public void unregisterRecevier() { - activity.unregisterReceiver(filterReceiver); - } - - @Override - protected boolean shouldDirectlyPopulateFilters() { - return false; - } -} diff --git a/astrid/src/main/java/com/todoroo/astrid/people/PeopleFilterExposer.java b/astrid/src/main/java/com/todoroo/astrid/people/PeopleFilterExposer.java deleted file mode 100644 index 90ad79eeb..000000000 --- a/astrid/src/main/java/com/todoroo/astrid/people/PeopleFilterExposer.java +++ /dev/null @@ -1,164 +0,0 @@ -/** - * Copyright (c) 2012 Todoroo Inc - * - * See the file "LICENSE" for the full license governing this code. - */ -package com.todoroo.astrid.people; - -import java.util.ArrayList; -import java.util.List; - -import android.content.BroadcastReceiver; -import android.content.ComponentName; -import android.content.ContentValues; -import android.content.Context; -import android.content.Intent; -import android.graphics.drawable.BitmapDrawable; -import android.os.Bundle; -import android.text.TextUtils; - -import org.tasks.R; -import com.todoroo.andlib.data.TodorooCursor; -import com.todoroo.andlib.service.ContextManager; -import com.todoroo.andlib.sql.Criterion; -import com.todoroo.andlib.sql.Field; -import com.todoroo.andlib.sql.Join; -import com.todoroo.andlib.sql.Order; -import com.todoroo.andlib.sql.Query; -import com.todoroo.andlib.sql.QueryTemplate; -import com.todoroo.astrid.actfm.sync.ActFmPreferenceService; -import com.todoroo.astrid.api.AstridApiConstants; -import com.todoroo.astrid.api.Filter; -import com.todoroo.astrid.api.FilterListItem; -import com.todoroo.astrid.api.FilterWithCustomIntent; -import com.todoroo.astrid.api.FilterWithUpdate; -import com.todoroo.astrid.core.PluginServices; -import com.todoroo.astrid.dao.TaskDao.TaskCriteria; -import com.todoroo.astrid.data.Metadata; -import com.todoroo.astrid.data.RemoteModel; -import com.todoroo.astrid.data.TagData; -import com.todoroo.astrid.data.Task; -import com.todoroo.astrid.data.User; -import com.todoroo.astrid.service.ThemeService; -import com.todoroo.astrid.tags.TaskToTagMetadata; -import com.todoroo.astrid.utility.AstridPreferences; - -public class PeopleFilterExposer extends BroadcastReceiver { - @Override - public void onReceive(Context context, Intent intent) { - FilterListItem[] listAsArray = prepareFilters(context); - - Intent broadcastIntent = new Intent(PeopleFilterAdapter.BROADCAST_SEND_PEOPLE_FILTERS); - broadcastIntent.putExtra(AstridApiConstants.EXTRAS_RESPONSE, listAsArray); - broadcastIntent.putExtra(AstridApiConstants.EXTRAS_ADDON, "people"); //$NON-NLS-1$ - context.sendBroadcast(broadcastIntent); - } - - private FilterListItem[] prepareFilters(Context context) { - TodorooCursor users = PluginServices.getUserDao().query(Query.select(User.PROPERTIES) - .where(Criterion.not(Criterion.or(User.STATUS.eq(User.STATUS_BLOCKED), - User.STATUS.eq(User.STATUS_IGNORED), User.STATUS.eq(User.STATUS_RENOUNCE), User.STATUS.eq(User.STATUS_IGNORE)))) - .orderBy(Order.asc(User.FIRST_NAME), Order.asc(User.LAST_NAME), Order.asc(User.NAME))); - try { - List items = new ArrayList(); - items.add(mySharedTasks(context)); - User user = new User(); - for (users.moveToFirst(); !users.isAfterLast(); users.moveToNext()) { - user.readFromCursor(users); - if (ActFmPreferenceService.userId().equals(user.getValue(User.UUID))) { - continue; - } - Filter currFilter = filterFromUserData(user); - if (currFilter != null) { - items.add(currFilter); - } - } - return items.toArray(new FilterListItem[items.size()]); - } finally { - users.close(); - } - } - - private static FilterWithCustomIntent filterFromUserData(User user) { - String title = user.getDisplayName(); - if (TextUtils.isEmpty(title) || "null".equals(title)) { - return null; - } - - String email = user.getValue(User.EMAIL); - Criterion criterion; - if (TextUtils.isEmpty(email) || "null".equals(email)) { - criterion = Task.USER_ID.eq(user.getValue(User.UUID)); - } else { - criterion = Criterion.or(Task.USER_ID.eq(user.getValue(User.UUID)), - Task.USER.like("%" + email + "%")); // Deprecated field OK for backwards compatibility - } - - criterion = Criterion.and(TaskCriteria.activeAndVisible(), criterion); - - QueryTemplate userTemplate = new QueryTemplate().where(criterion); - - FilterWithUpdate filter = new FilterWithUpdate(title, title, userTemplate, null); - - filter.customTaskList = new ComponentName(ContextManager.getContext(), PersonViewFragment.class); - - ContentValues values = new ContentValues(); - values.put(Task.USER_ID.name, user.getValue(User.UUID)); - filter.valuesForNewTasks = values; - - String imageUrl = user.getPictureUrl(User.PICTURE, RemoteModel.PICTURE_THUMB); //user.getValue(User.PICTURE); - filter.imageUrl = imageUrl; - - Bundle extras = new Bundle(); - extras.putLong(PersonViewFragment.EXTRA_USER_ID_LOCAL, user.getId()); - filter.customExtras = extras; - - return filter; - } - - public static FilterWithCustomIntent mySharedTasks(Context context) { - TodorooCursor tagsWithMembers = PluginServices.getTagDataService() - .query(Query.select(TagData.NAME).where(TagData.MEMBER_COUNT.gt(0))); - String[] names; - try { - if (tagsWithMembers.getCount() == 0) { - names = new String[1]; - names[0] = "\"\""; - } else { - names = new String[tagsWithMembers.getCount()]; - TagData curr = new TagData(); - int i = 0; - for (tagsWithMembers.moveToFirst(); !tagsWithMembers.isAfterLast(); tagsWithMembers.moveToNext()) { - curr.readFromCursor(tagsWithMembers); - names[i] = "\"" + curr.getValue(TagData.NAME) + "\""; - i++; - } - } - } finally { - tagsWithMembers.close(); - } - - boolean isTablet = AstridPreferences.useTabletLayout(context); - int themeFlags = isTablet ? ThemeService.FLAG_FORCE_LIGHT : 0; - - String title = context.getString(R.string.actfm_my_shared_tasks_title); - QueryTemplate template = new QueryTemplate().join(Join.inner(Metadata.TABLE.as("mtags"), - Criterion.and(Task.ID.eq(Field.field("mtags." + Metadata.TASK.name)), - Field.field("mtags." + Metadata.KEY.name).eq(TaskToTagMetadata.KEY), - Field.field("mtags." + TaskToTagMetadata.TAG_NAME.name).in(names), - TaskCriteria.activeVisibleMine()))); - - FilterWithCustomIntent filter = new FilterWithCustomIntent(title, title, template, null); - - filter.customTaskList = new ComponentName(ContextManager.getContext(), PersonViewFragment.class); - - Bundle extras = new Bundle(); - extras.putBoolean(PersonViewFragment.EXTRA_HIDE_QUICK_ADD, true); - filter.customExtras = extras; - - filter.listingIcon = ((BitmapDrawable)context.getResources().getDrawable( - ThemeService.getDrawable(R.drawable.icn_menu_friends, themeFlags))).getBitmap(); - - return filter; - } -} diff --git a/astrid/src/main/java/com/todoroo/astrid/people/PeopleFilterMode.java b/astrid/src/main/java/com/todoroo/astrid/people/PeopleFilterMode.java deleted file mode 100644 index a5a9274d7..000000000 --- a/astrid/src/main/java/com/todoroo/astrid/people/PeopleFilterMode.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.todoroo.astrid.people; - -import android.content.Context; - -import org.tasks.R; -import com.todoroo.astrid.activity.FilterListFragment; -import com.todoroo.astrid.activity.FilterModeSpec; -import com.todoroo.astrid.activity.TaskListFragment; -import com.todoroo.astrid.api.Filter; -import com.todoroo.astrid.api.FilterListItem; -import com.todoroo.astrid.ui.MainMenuPopover; - -public class PeopleFilterMode implements FilterModeSpec { - - @Override - public Filter getDefaultFilter(Context context) { - Filter defaultFilter = PeopleFilterExposer.mySharedTasks(context); - return defaultFilter; - } - - @Override - public Class getFilterListClass() { - return PeopleListFragment.class; - } - - @Override - public void onFilterItemClickedCallback(FilterListItem item) {/**/} - - @Override - public int[] getForbiddenMenuItems() { - return FORBIDDEN_MENU_ITEMS; - } - - @Override - public int getMainMenuIconAttr() { - return R.attr.asPeopleMenu; - } - - private static final int[] FORBIDDEN_MENU_ITEMS = { - TaskListFragment.MENU_NEW_FILTER_ID, - MainMenuPopover.MAIN_MENU_ITEM_FRIENDS - }; - - @Override - public boolean showComments() { - return false; - } -} diff --git a/astrid/src/main/java/com/todoroo/astrid/people/PeopleListFragment.java b/astrid/src/main/java/com/todoroo/astrid/people/PeopleListFragment.java deleted file mode 100644 index bd654b933..000000000 --- a/astrid/src/main/java/com/todoroo/astrid/people/PeopleListFragment.java +++ /dev/null @@ -1,30 +0,0 @@ -/** - * Copyright (c) 2012 Todoroo Inc - * - * See the file "LICENSE" for the full license governing this code. - */ -package com.todoroo.astrid.people; - -import android.app.Activity; - -import org.tasks.R; -import com.todoroo.astrid.activity.FilterListFragment; -import com.todoroo.astrid.adapter.FilterAdapter; -import com.todoroo.astrid.utility.AstridPreferences; - -public class PeopleListFragment extends FilterListFragment { - - @Override - protected FilterAdapter instantiateAdapter() { - return new PeopleFilterAdapter(getActivity(), null, R.layout.filter_adapter_row, false); - } - - @Override - protected int getLayout(Activity activity) { - if (AstridPreferences.useTabletLayout(activity)) { - return R.layout.filter_list_fragment_alternative_3pane; - } else { - return R.layout.filter_list_fragment_alternative; - } - } -} diff --git a/astrid/src/main/java/com/todoroo/astrid/people/PersonViewFragment.java b/astrid/src/main/java/com/todoroo/astrid/people/PersonViewFragment.java deleted file mode 100644 index 6df0add77..000000000 --- a/astrid/src/main/java/com/todoroo/astrid/people/PersonViewFragment.java +++ /dev/null @@ -1,258 +0,0 @@ -/** - * Copyright (c) 2012 Todoroo Inc - * - * See the file "LICENSE" for the full license governing this code. - */ -package com.todoroo.astrid.people; - -import java.util.List; - -import org.json.JSONArray; - -import android.app.Activity; -import android.content.ContentValues; -import android.content.Intent; -import android.text.TextUtils; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import com.actionbarsherlock.view.Menu; -import org.tasks.R; -import com.todoroo.andlib.data.TodorooCursor; -import com.todoroo.andlib.service.Autowired; -import com.todoroo.andlib.utility.DateUtilities; -import com.todoroo.astrid.actfm.sync.ActFmPreferenceService; -import com.todoroo.astrid.actfm.sync.ActFmSyncService; -import com.todoroo.astrid.actfm.sync.ActFmSyncThread; -import com.todoroo.astrid.actfm.sync.ActFmSyncThread.SyncMessageCallback; -import com.todoroo.astrid.actfm.sync.messages.BriefMe; -import com.todoroo.astrid.activity.TaskListFragment; -import com.todoroo.astrid.dao.UserDao; -import com.todoroo.astrid.data.RemoteModel; -import com.todoroo.astrid.data.Task; -import com.todoroo.astrid.data.User; -import com.todoroo.astrid.helper.AsyncImageView; -import com.todoroo.astrid.service.SyncV2Service; -import com.todoroo.astrid.service.ThemeService; -import com.todoroo.astrid.utility.ResourceDrawableCache; - -public class PersonViewFragment extends TaskListFragment { - - public static final String EXTRA_USER_ID_LOCAL = "user_local_id"; //$NON-NLS-1$ - - public static final String EXTRA_HIDE_QUICK_ADD = "hide_quickAdd"; //$NON-NLS-1$ - - protected static final int MENU_REFRESH_ID = MENU_SUPPORT_ID + 1; - - @Autowired UserDao userDao; - - @Autowired SyncV2Service syncService; - - @Autowired ActFmPreferenceService actFmPreferenceService; - - @Autowired ActFmSyncService actFmSyncService; - - private AsyncImageView userImage; - private TextView userSubtitle; - private TextView userStatusButton; - private TextView emptyView; - - private User user; - - @Override - protected void initializeData() { - super.initializeData(); - if (extras.containsKey(EXTRA_USER_ID_LOCAL)) { - user = userDao.fetch(extras.getLong(EXTRA_USER_ID_LOCAL), User.PROPERTIES); - } - emptyView = ((TextView) getView().findViewById(android.R.id.empty)); - emptyView.setText(getEmptyDisplayString()); - - setupUserHeader(); - } - - private void setupUserHeader() { - if (user != null) { - userImage.setDefaultImageDrawable(ResourceDrawableCache.getImageDrawableFromId(resources, R.drawable.icn_default_person_image)); - userImage.setUrl(user.getPictureUrl(User.PICTURE, RemoteModel.PICTURE_MEDIUM)); - - userSubtitle.setText(getUserSubtitleText()); - setupUserStatusButton(); - } else { - getView().findViewById(R.id.user_header).setVisibility(View.GONE); - userStatusButton.setVisibility(View.GONE); - } - } - - @Override - protected void setupQuickAddBar() { - super.setupQuickAddBar(); - if (user != null) { - quickAddBar.getQuickAddBox().setHint(getString(R.string.TLA_quick_add_hint_assign, user.getDisplayName())); - } - - if (extras.containsKey(EXTRA_HIDE_QUICK_ADD)) { - quickAddBar.setVisibility(View.GONE); - } - - // set listener for astrid icon - emptyView.setOnClickListener(null); - - } - - private String getUserSubtitleText() { - String status = user.getValue(User.STATUS); - String userName = user.getDisplayName(); - if (User.STATUS_PENDING.equals(status) || User.STATUS_REQUEST.equals(status)) { - return getString(R.string.actfm_friendship_pending, userName); - } else if (User.STATUS_BLOCKED.equals(status) || User.STATUS_RENOUNCE.equals(status)) { - return getString(R.string.actfm_friendship_blocked, userName); - } else if (User.STATUS_FRIENDS.equals(status) || User.STATUS_CONFIRM.equals(status)) { - return getString(R.string.actfm_friendship_friends, userName); - } else if (User.STATUS_OTHER_PENDING.equals(status)) { - return getString(R.string.actfm_friendship_other_pending, userName); - } else if (User.STATUS_IGNORED.equals(status) || User.STATUS_IGNORE.equals(status)) { - return getString(R.string.actfm_friendship_ignored, userName); - } else { - return getString(R.string.actfm_friendship_no_status, userName); - } - - } - - private void setupUserStatusButton() { - String status = user.getValue(User.STATUS); - userStatusButton.setVisibility(View.VISIBLE); - if (User.STATUS_CONFIRM.equals(status) || User.STATUS_IGNORE.equals(status) || User.STATUS_RENOUNCE.equals(status) || User.STATUS_REQUEST.equals(user)) // All the pending status options - { - userStatusButton.setVisibility(View.GONE); - } else if (TextUtils.isEmpty(status) || "null".equals(status)) //$NON-NLS-1$ - { - userStatusButton.setText(getString(R.string.actfm_friendship_connect)); - } else if (User.STATUS_OTHER_PENDING.equals(status)) { - userStatusButton.setText(getString(R.string.actfm_friendship_accept)); - } else { - userStatusButton.setVisibility(View.GONE); - } - } - - @Override - protected void setUpUiComponents() { - super.setUpUiComponents(); - userImage = (AsyncImageView) getView().findViewById(R.id.user_image); - userSubtitle = (TextView) getView().findViewById(R.id.user_subtitle); - userStatusButton = (TextView) getActivity().findViewById(R.id.person_image); - } - - @Override - protected View getListBody(ViewGroup root) { - ViewGroup parent = (ViewGroup) getActivity().getLayoutInflater().inflate(R.layout.task_list_body_user, root, false); - - View taskListView = super.getListBody(parent); - parent.addView(taskListView); - - return parent; - } - - public void handleStatusButtonClicked() { - if (user != null) { // Just in case - String status = user.getValue(User.STATUS); - if (TextUtils.isEmpty(status) || "null".equals(status)) { // Add friend case //$NON-NLS-1$ - user.setValue(User.STATUS, User.STATUS_REQUEST); - } else if (User.STATUS_OTHER_PENDING.equals(status)) { // Accept friend case - user.setValue(User.STATUS, User.STATUS_CONFIRM); - } - - ContentValues setValues = user.getSetValues(); - if (setValues != null && setValues.containsKey(User.STATUS.name)) { - userDao.saveExisting(user); - userStatusButton.setVisibility(View.GONE); - } - } - } - - @Override - protected void addSyncRefreshMenuItem(Menu menu, int themeFlags) { - if(actFmPreferenceService.isLoggedIn()) { - addMenuItem(menu, R.string.actfm_TVA_menu_refresh, - ThemeService.getDrawable(R.drawable.icn_menu_refresh, themeFlags), MENU_REFRESH_ID, true); - } else { - super.addSyncRefreshMenuItem(menu, themeFlags); - } - } - - @Override - public boolean handleOptionsMenuItemSelected(int id, Intent intent) { - switch (id) { - case MENU_REFRESH_ID: - refreshData(); - return true; - } - return super.handleOptionsMenuItemSelected(id, intent); - } - - @Override - protected void initiateAutomaticSyncImpl() { - if (!isCurrentTaskListFragment()) { - return; - } - if (user != null) { - long lastAutosync = user.getValue(User.LAST_AUTOSYNC); - - if(DateUtilities.now() - lastAutosync > AUTOSYNC_INTERVAL) { - refreshData(); - user.setValue(User.LAST_AUTOSYNC, DateUtilities.now()); - userDao.saveExisting(user); - } - } - } - - private void reloadUserData() { - user = userDao.fetch(extras.getLong(EXTRA_USER_ID_LOCAL), User.PROPERTIES); - } - - @Override - protected void refresh() { - super.refresh(); - setupUserHeader(); - } - - private void refreshData() { - if (user != null) { - emptyView.setText(R.string.DLG_loading); - SyncMessageCallback callback = new SyncMessageCallback() { - @Override - public void runOnSuccess() { - Activity activity = getActivity(); - if (activity != null) { - activity.runOnUiThread(new Runnable() { - @Override - public void run() { - reloadUserData(); - refresh(); - emptyView.setText(getEmptyDisplayString()); - } - }); - } - } - @Override - public void runOnErrors(List errors) {/**/} - }; - long pushedAt = user.getValue(User.TASKS_PUSHED_AT); - JSONArray existingTasks = new JSONArray(); - TodorooCursor tasksCursor = (TodorooCursor) taskAdapter.getCursor(); - for (tasksCursor.moveToFirst(); !tasksCursor.isAfterLast(); tasksCursor.moveToNext()) { - existingTasks.put(tasksCursor.get(Task.UUID)); - } - - BriefMe briefMe = new BriefMe(Task.class, null, pushedAt, BriefMe.USER_ID_KEY, user.getValue(User.UUID), "existing_task_ids", existingTasks); //$NON-NLS-1$ - ActFmSyncThread.getInstance().enqueueMessage(briefMe, callback); - } - } - - private String getEmptyDisplayString() { - String userName = user != null ? user.getDisplayName() : null; - return TextUtils.isEmpty(userName) ? getString(R.string.actfm_my_shared_tasks_empty) : getString(R.string.TLA_no_items_person, userName); - } - -} diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/MainMenuPopover.java b/astrid/src/main/java/com/todoroo/astrid/ui/MainMenuPopover.java index 03daebe5d..a0f6a7374 100644 --- a/astrid/src/main/java/com/todoroo/astrid/ui/MainMenuPopover.java +++ b/astrid/src/main/java/com/todoroo/astrid/ui/MainMenuPopover.java @@ -28,7 +28,6 @@ import com.todoroo.astrid.utility.AstridPreferences; public class MainMenuPopover extends FragmentPopover implements InterceptTouchListener { public static final int MAIN_MENU_ITEM_LISTS = R.string.TLA_menu_lists; - public static final int MAIN_MENU_ITEM_FRIENDS = R.string.TLA_menu_friends; public static final int MAIN_MENU_ITEM_FEATURED_LISTS = R.string.TLA_menu_featured_lists; public static final int MAIN_MENU_ITEM_SEARCH = R.string.TLA_menu_search; public static final int MAIN_MENU_ITEM_SETTINGS = R.string.TLA_menu_settings; diff --git a/astrid/src/main/res/drawable-hdpi/people_menu_button_blue_off.png b/astrid/src/main/res/drawable-hdpi/people_menu_button_blue_off.png deleted file mode 100644 index 919a1e72e..000000000 Binary files a/astrid/src/main/res/drawable-hdpi/people_menu_button_blue_off.png and /dev/null differ diff --git a/astrid/src/main/res/drawable-hdpi/people_menu_button_blue_on.png b/astrid/src/main/res/drawable-hdpi/people_menu_button_blue_on.png deleted file mode 100644 index 95be72f90..000000000 Binary files a/astrid/src/main/res/drawable-hdpi/people_menu_button_blue_on.png and /dev/null differ diff --git a/astrid/src/main/res/drawable-hdpi/people_menu_button_dark_blue_off.png b/astrid/src/main/res/drawable-hdpi/people_menu_button_dark_blue_off.png deleted file mode 100644 index a82daf39b..000000000 Binary files a/astrid/src/main/res/drawable-hdpi/people_menu_button_dark_blue_off.png and /dev/null differ diff --git a/astrid/src/main/res/drawable-hdpi/people_menu_button_dark_blue_on.png b/astrid/src/main/res/drawable-hdpi/people_menu_button_dark_blue_on.png deleted file mode 100644 index 9b7cda0c9..000000000 Binary files a/astrid/src/main/res/drawable-hdpi/people_menu_button_dark_blue_on.png and /dev/null differ diff --git a/astrid/src/main/res/drawable/people_menu_button_blue.xml b/astrid/src/main/res/drawable/people_menu_button_blue.xml deleted file mode 100644 index 4dd311572..000000000 --- a/astrid/src/main/res/drawable/people_menu_button_blue.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - diff --git a/astrid/src/main/res/drawable/people_menu_button_blue_off.png b/astrid/src/main/res/drawable/people_menu_button_blue_off.png deleted file mode 100644 index 3461c9060..000000000 Binary files a/astrid/src/main/res/drawable/people_menu_button_blue_off.png and /dev/null differ diff --git a/astrid/src/main/res/drawable/people_menu_button_blue_on.png b/astrid/src/main/res/drawable/people_menu_button_blue_on.png deleted file mode 100644 index 48521e6c3..000000000 Binary files a/astrid/src/main/res/drawable/people_menu_button_blue_on.png and /dev/null differ diff --git a/astrid/src/main/res/drawable/people_menu_button_dark_blue.xml b/astrid/src/main/res/drawable/people_menu_button_dark_blue.xml deleted file mode 100644 index 48112def1..000000000 --- a/astrid/src/main/res/drawable/people_menu_button_dark_blue.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - diff --git a/astrid/src/main/res/drawable/people_menu_button_dark_blue_off.png b/astrid/src/main/res/drawable/people_menu_button_dark_blue_off.png deleted file mode 100644 index e78e8af09..000000000 Binary files a/astrid/src/main/res/drawable/people_menu_button_dark_blue_off.png and /dev/null differ diff --git a/astrid/src/main/res/drawable/people_menu_button_dark_blue_on.png b/astrid/src/main/res/drawable/people_menu_button_dark_blue_on.png deleted file mode 100644 index d1a6afc28..000000000 Binary files a/astrid/src/main/res/drawable/people_menu_button_dark_blue_on.png and /dev/null differ diff --git a/astrid/src/main/res/layout/task_list_body_user.xml b/astrid/src/main/res/layout/task_list_body_user.xml deleted file mode 100644 index 2c4a375e2..000000000 --- a/astrid/src/main/res/layout/task_list_body_user.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/astrid/src/main/res/values-ca/strings.xml b/astrid/src/main/res/values-ca/strings.xml index 52be3b983..72d0f8920 100644 --- a/astrid/src/main/res/values-ca/strings.xml +++ b/astrid/src/main/res/values-ca/strings.xml @@ -13,16 +13,6 @@ La tasca s\'ha enviat a %s! Tu segueixes veient les teves pròpies tasques. Vols veure aquesta tasca i les altres que has assignat? Mostra les tasques assignades Queda\'t aquí - Les meves tasques compartides - No hi ha cap tasca compartida - Ha enviado una solicitud de amistad a %s ! - Ha bloqueado %s . - Ha ignorado %s . - Está amigo con %s ! Añada tarea para ello abajo. - %s quiere estar amigo contigo ! - Te conectate con %s para compartir y ver su actividad en tareas públicas ! - Afegeix com a amic - Accepta Afegiu un comentari... Actualitza Llista @@ -93,17 +83,14 @@ Algú Actualitza els comentaris No teniu tasques! \n Voleu afegir alguna cosa? - En/na %s no ha\ncompartit cap tasca amb vós Ordenació i subtasques Sincronitza ara Cerca Llistes - Gent Paràmetres Assistència Personalitzat Afegeix una tasca - Afegiu quelcom per a en/na %s S\'han silenciat les notificacions. No sentireu res més d\'Tasks! Els recordatoris de l\'Tasks estan inhabilitats. No rebreu cap recordatori Heu dit «%s» diff --git a/astrid/src/main/res/values-cs/strings.xml b/astrid/src/main/res/values-cs/strings.xml index daa5d5129..46327a635 100644 --- a/astrid/src/main/res/values-cs/strings.xml +++ b/astrid/src/main/res/values-cs/strings.xml @@ -13,9 +13,6 @@ %s se stal novým vlastníkem úkolu! Teď si prohlížíte vlastní úkoly. Chcete vidět úkoly, které jste delegoval(a)? Delegované Vlastní - Moje sdílené úkoly - Žádné sdílené úkoly - Potvrdit Přidej comment... Obnovit Název listu: @@ -74,12 +71,10 @@ Kdosi Obnovit komentáře Žádné úkoly! - %s s vámi\nnesdílí žádné úkoly Třídit & skryté Sychronizovat Hledat Seznamy - Lidé Podpora Vlastní Přidat úkol diff --git a/astrid/src/main/res/values-da/strings.xml b/astrid/src/main/res/values-da/strings.xml index 2e224723e..f9251a480 100644 --- a/astrid/src/main/res/values-da/strings.xml +++ b/astrid/src/main/res/values-da/strings.xml @@ -13,8 +13,6 @@ Opgaven blev sendt til %s! Du ser lige nu dine egne opgaver. Vil du se disse og andre opgaver, du har tildelt? Vis tildelte Bliv her - Mine delte opgaver - Ingen delte opgaver Tilføj en kommentar Opdater Listenavn diff --git a/astrid/src/main/res/values-de/strings.xml b/astrid/src/main/res/values-de/strings.xml index 5c85a05cd..767e59ca7 100644 --- a/astrid/src/main/res/values-de/strings.xml +++ b/astrid/src/main/res/values-de/strings.xml @@ -13,16 +13,6 @@ Diese Aufgabe wurde an %s gesandt! Sie sehen momentan Ihre eigenen Aufgaben an. Möchten Sie diese und weitere Aufgaben, die Sie Anderen zugewiesen haben, ansehen? Zugewiesene ansehen Hier bleiben - Meine freigegebenen Aufgaben - Keine freigegeben Aufgaben - Du hast %s eine Freundschaftsanfrage geschickt. - Du hast %s geblockt. - Du hast %s ignoriert. - Du bist jetzt mit %s befreundet! Füge jetzt Aufgaben für ihn hinzu. - %s möchte mit dir befreundet sein! - Verbinde Dich mit %s um Deine Aktivitäten zu freizugeben und seine/ihre zu sehen. - Freund hinzufügen - Zustimmen Kommentar hinzufügen … Aktualisieren Liste @@ -91,18 +81,15 @@ Irgendjemand Kommentare aktualisieren Sie haben keine Aufgaben! \n Möchten Sie welche hinzufügen? - %s hat noch\nkeine Aufgaben geteilt Sortieren Jetzt synchronisieren Suchen Listen - Personen Vorgeschlagene Listen Einstellungen Unterstützung Benutzerdefiniert Aufgabe hinzufügen - Etwas hinzufügen für %s Erinnerungen sind stummgeschaltet. Du wirst Tasks nicht hören! Taskss Erinnerungen sind ausgeschaltet! Du wirst keine Erinnerungen mehr erhalten! Sie sagten: \"%s\" diff --git a/astrid/src/main/res/values-es/strings.xml b/astrid/src/main/res/values-es/strings.xml index fa4cd9f44..1ef4b1b52 100644 --- a/astrid/src/main/res/values-es/strings.xml +++ b/astrid/src/main/res/values-es/strings.xml @@ -13,16 +13,6 @@ La tarea se envió a %s. Está viendo sus propias tareas. ¿Quiere ver además otras tareas que ha asignado? Ver asignadas Quedarse aquí - Mis tareas compartidas - No hay tareas compartidas - ¡Ha enviado una solicitud de amistad a %s! - Ha bloqueado a %s. - Ha ignorado %s. - Es amigo/a de %s. Añada tareas para ellos abajo. - %s quiere ser su amigo/a. - Conectar con %s para compartir y ver la actividad de las tareas públicas. - Añadir amigo - Aceptar Agregue un comentario... Actualizar Lista @@ -97,18 +87,15 @@ Alguien Actualizar Comentarios No tienes tareas! \n Quieres agregar alguna? - %s no tiene\ntareas compartidas contigo Ordenar Sincronizar ahora Buscar Listas - Gente Listas destacadas Configuración Soporte Personalizar Añadir una tarea - Agregar algo para %s Las notificaciones están silenciadas. ¡No podrá oír Tasks! ¡Los recordatorios de Tasks están deshabilitados! No recibirás ningún recordatorio Dijiste, \"%s\" diff --git a/astrid/src/main/res/values-fr/strings.xml b/astrid/src/main/res/values-fr/strings.xml index e951ed734..f03f6a5c1 100644 --- a/astrid/src/main/res/values-fr/strings.xml +++ b/astrid/src/main/res/values-fr/strings.xml @@ -13,16 +13,6 @@ La tâche a été envoyée à %s ! Vous voyez actuellement vos propres tâches. Voulez-vous également voir celle-ci et les autres tâches que vous avez envoyées ? Voir les tâches attribués Rester ici - Mes tâches partagées - Aucune tâche partagée - Vous avez envoyé une demande d\'amitié à %s! - Vous avez bloqué %s. - Vous avez ignoré %s. - Vous êtes ami avec %s! Assignez-lui une tâche. - %s désire être votre ami ! - Connectez-vous, comme %s, pour partager et faire le suivi des tâches publiques ! - Ajoutez un ami - Accepter Ajouter un commentaire Mettre à jour Nom de la liste : @@ -94,18 +84,15 @@ Quelqu\'un Mettre à jour les commentaires Aucune tâche ! n Voulez vous en créer une ? - %s n\'a aucune tâche partagée avec vous Trier Synchroniser maintenant Rechercher Listes - Contacts Listes favorites Paramètres Assistance Personnalisé Ajouter une tâche - Ajouter quelque chose pour %s Les notifications sont désactivées. Vous ne pourrez plus entendre Tasks ! Les rappels d\'Tasks sont désactivés ! Vous ne recevrez plus de rappels Vous avez dit \"%s\" diff --git a/astrid/src/main/res/values-it/strings.xml b/astrid/src/main/res/values-it/strings.xml index cf8b67228..6bd91d0f8 100644 --- a/astrid/src/main/res/values-it/strings.xml +++ b/astrid/src/main/res/values-it/strings.xml @@ -13,15 +13,6 @@ Attività inviata a %s! Adesso stai vedendo le tue attività . Vuoi vedere anche quelle che hai assegnato? Vedi Assegnate Resta quì - Le mie attività condivise - Nessuna attività condivisa - Hai inviato una richiesta di amicizia a %s! - Hai bloccato %s. - Hai stretto amicizia con %s! Aggiungi attività per loro qui sotto. - %s vorrebbe diventare tuo amico! - Collegati a %s per condividere le attività e vedere quelle pubbliche! - Aggiungi amico - Accetta Aggiungi un commento... Aggiorna Lista @@ -88,17 +79,14 @@ Qualcuno Aggiorna i commenti Nessuna Attività! - %s non ha attività\ncondivise con te. Sincronizza Ora Cerca Liste - Persone Liste in primo piano Impostazioni Supporto Personalizzato Aggiungi un\'attività - Aggiungi qualcosa per %s Le notifiche sono mutate. Non dovresti essere più in grado di sentire Tasks! I promemoria di Tasks sono disabilitati! Non riceverai nessun promemoria Hai detto, \"%s\" diff --git a/astrid/src/main/res/values-iw/strings.xml b/astrid/src/main/res/values-iw/strings.xml index 34204d546..b697ec78d 100644 --- a/astrid/src/main/res/values-iw/strings.xml +++ b/astrid/src/main/res/values-iw/strings.xml @@ -13,16 +13,6 @@ משימה נשלחה אל %s! הנך מביט במשימות שלך. הֲתִּרְצֶה לעיין במשימה זו ובמשימות אשר הטלת על אחרים? הצג משימות שהטלת הִשָּׁאֵר כאן - המשימות ששיתפתי - אין מטלות משותפות - שלחת בקשת חברות ל-%s! - חסמת את %s. - התעלמת מ-%s - אתה חבר של %s! הוסף משימות עבורם למטה. - %s רוצה להיות חבר שלך - התחבר ל-%s כדי לשתף ולראות פעילות במשימות ציבוריות! - הוסף חבר - אני מאשר הוסף הערה רַעְנֵן רשימה @@ -91,18 +81,15 @@ מישהו רַעְנֵן הערות אין לך משימות!\n הֲתִּרְצֶה להוסיף משימה? - %s אינו משתף עמך אף משימה מיון סנכרני כעת חיפוש רשימות - אנשים רשימות נבחרות הגדרות תמיכה מותאם אישית הוסף משימה - משהו לעשות %s תן ל ההתראות מוחרשות. לא תשמע את אסטריד יותר! התזכורות של אסטריד מושתקות! לא תקבל תזכורות נוספות אמרת ״%s״ diff --git a/astrid/src/main/res/values-ja/strings.xml b/astrid/src/main/res/values-ja/strings.xml index cb81331c7..11d0cc5ef 100644 --- a/astrid/src/main/res/values-ja/strings.xml +++ b/astrid/src/main/res/values-ja/strings.xml @@ -13,9 +13,6 @@ タスクは%sに送信されました！只今あなたのタスクが表示されています。あなたが割り当ていた他のタスクもここで表示しますか？ 表示する 表示しない - 自分の共有タスク - 共有タスクがありません - 受け入れる コメントする 更新 リスト @@ -73,7 +70,6 @@ コメントを更新 タスクなし リスト - 人々 設定 サポート カスタムフィルタ diff --git a/astrid/src/main/res/values-ko/strings.xml b/astrid/src/main/res/values-ko/strings.xml index 3c7078278..bb87c7ce8 100644 --- a/astrid/src/main/res/values-ko/strings.xml +++ b/astrid/src/main/res/values-ko/strings.xml @@ -13,16 +13,6 @@ %s 님에게 일정을 보냈습니다! 현재 자신의 일정을 보고 있습니다. 당신이 할당한 이 일정과 다른 일정을 보시겠습니까? 할당 일정 보기 머무르기 - 나의 공유 일정 - 미공유 일정 - %s 님에게 친구 요청을 보냈습니다! - %s 님을 차단했습니다. - %s 를 무시했습니다. - %s 님과 친구입니다! 관련 일정을 아래에 추가하세요. - %s 님이 친구가 되고 싶어합니다! - 공개일정을 공유하고 활동내역을 보려면 %s 에 연결하세요! - 친구 추가하기 - 승인 댓글 쓰기... 새로고침 목록 @@ -100,18 +90,15 @@ 누군가 댓글 새로고침 일정이 없네요!\n추가할까요? - %s 님은 당신과 공유한 일정이 없습니다 정렬 지금 동기화 검색 목록 - 사람들 기능 목록 설정 지원 사용자 설정 일정 추가하기 - %s 님의 일정 추가하기 알림를 껐습니다. 아스트리드 알림 소리를 들을 수 없습니다! Tasks 알림을 사용하지 않습니다! 어떤 알림도 받을 수 없을 것입니다. \"%s\" 라고 말했습니다 diff --git a/astrid/src/main/res/values-nl/strings.xml b/astrid/src/main/res/values-nl/strings.xml index 270169ade..31b491339 100644 --- a/astrid/src/main/res/values-nl/strings.xml +++ b/astrid/src/main/res/values-nl/strings.xml @@ -13,16 +13,6 @@ Taak is naar %s gestuurd! Je bekijkt op dit moment je eigen taken. Wil je deze en andere taken die je hebt toegewezen bekijken? Bekijk toegewezen taken Blijf Hier - Mijn Gedeelde Taken - Geen gedeelde taken - Je hebt %s een uitnodiging gestuurd! - Je hebt %s geblokkeerd. - Je hebt %s genegeerd - Je bent bevriend met %s! Voeg hieronder voor hem/haar een taak toe. - %s wil vrienden met je worden! - Verbind met %s om openbare taken te delen en daar de voortgang van te bekijken! - Vriend toevoegen - Accepteer Voeg een opmerking toe Vernieuwen Lijst @@ -95,18 +85,15 @@ Iemand Opmerkingen vernieuwen U heeft geen taken! \n Taak toevoegen? - %s heeft geen\ntaken met je gedeeld Sorteren Nu Synchroniseren Zoek Lijsten - Personen Aanbevolen Lijsten Instellingen Ondersteuning Aangepast Taak toevoegen - Voeg iets toe voor %s Meldingsgeluid uitgeschakeld. U kunt Tasks niet horen! Tasks herinneringen zijn uitgeschakeld! Je ontvangt geen herinneringen. Jij zei, \"%s\" diff --git a/astrid/src/main/res/values-pl/strings.xml b/astrid/src/main/res/values-pl/strings.xml index 74c7570e1..a80ce4df0 100644 --- a/astrid/src/main/res/values-pl/strings.xml +++ b/astrid/src/main/res/values-pl/strings.xml @@ -13,16 +13,6 @@ Zadanie zostało wysłane do %s! Aktualnie oglądasz własne zadania. Czy chcesz zobaczyć to i inne zadania które przypisałeś? Pokaż przypisane Zostań tutaj - Moje współdzielone zadania - Brak zadań współdzielonych - Wysłałeś zaproszenie do znajomego: %s! - Zablokowałeś %s. - Zignorowałeś %s. - Ty i %s zostaliście przyjaciółmi! Dodaj poniżej zadania dla niego. - %s chce zostać twoim znajomym! - Połącz się z %s aby dzielić się i zobaczyć aktywność publicznych zadań! - Dodaj znajomego - Akceptuj Dodaj komentarz... Odśwież Lista @@ -93,18 +83,15 @@ Ktoś Odśwież komentarze Brak zadań! - %s nie posiada \nzadań współdzielonych z Tobą Sortowanie Zsynchronizuj Szukaj Listy - Ludzie Wyróżnione listy Ustawienia Wsparcie Własny filtr Dodaj zadanie - Dodaj coś do %s Powiadomienia są wyciszone. Nie będziesz w stanie usłyszeć Tasks! Powiadomienia są wyłączone! Nie otrzymasz żadnych powiadomień Powiedziałeś, \"%s\" diff --git a/astrid/src/main/res/values-pt-rBR/strings.xml b/astrid/src/main/res/values-pt-rBR/strings.xml index de8936772..6fcf09551 100644 --- a/astrid/src/main/res/values-pt-rBR/strings.xml +++ b/astrid/src/main/res/values-pt-rBR/strings.xml @@ -13,16 +13,6 @@ A tarefa foi enviada para %s! Atualmente está vendo suas próprias tarefas. Quer ver esta e as outras tarefas que você atribuiu? Ver atribuídas Ficar aqui - Minhas tarefas compartilhadas - Sem tarefas compartilhadas - Você enviou um pedido de amizade para %s! - Você bloqueou %s. - Você ignorou %s. - Agora você é amigo de %s pessoas! Adicione tarefas para eles abaixo. - %s deseja ser seu amigo! - Conecte-se com %s para partilhar e ver a actividade em tarefas públicas! - Adicionar amigo - Aceitar Comentar... Atualizar Lista @@ -89,17 +79,14 @@ Alguém Atualizar comentários Você não tem tarefas! \n Deseja inserir alguma? - %s não tem Sincronizar Agora Buscar Listas - Pessoas Listas em Destaque Configurações Suporte Personalizar Inserir tarefa - Adicione alguma coisa para %s As notificações estão silenciadas. Você não ouvirá o Tasks! Os lembretes estão desligados! Você não receberá nenhum lembrete Você disse, \"%s\" diff --git a/astrid/src/main/res/values-pt/strings.xml b/astrid/src/main/res/values-pt/strings.xml index cb86bbbbd..f7abb4b39 100644 --- a/astrid/src/main/res/values-pt/strings.xml +++ b/astrid/src/main/res/values-pt/strings.xml @@ -13,8 +13,6 @@ A tarefa foi enviada para %s! Está a visualizar as suas próprias tarefas. Deseja ver esta e também outras tarefas já atribuídas? Ver atribuídas Ficar Aqui - Minhas Tarefas Partilhadas - Sem tarefas partilhadas Adicionar um comentário... Actualizar Lista diff --git a/astrid/src/main/res/values-ru/strings.xml b/astrid/src/main/res/values-ru/strings.xml index 4671815db..5c97477e8 100644 --- a/astrid/src/main/res/values-ru/strings.xml +++ b/astrid/src/main/res/values-ru/strings.xml @@ -13,16 +13,6 @@ Задача была отправлена %s! Сейчас вы просматриваете ваши собственные задачи. Хотите просмотреть эту и другие задачи назначенные вам? Просмотреть назначенные Остаться здесь - Мои общие задачи - Нет общих задач - Вы направили запрос дружбы %s! - Пользователь %s заблокирован. - Вы проигнорировали %s. - Вы и %s теперь друзья! Добавить задания для друга можно ниже. - %s хочет добавить вас в друзья. - Соединиться с %s чтобы делиться и следить за активностью публичных задач! - Добавить друга - Принять Добавить комментарий... Обновить Список @@ -94,18 +84,15 @@ Кто-нибудь Обновить комментарии Нет задач! \n Добавить? - %s пока не открыл вам\nсвоих задач Сортировка Синхронизация Поиск Списки - Люди Рекомендуемые списки Настройки Поддержка Другой Добавить задание - Добавить что-нибудь для %s Звуковые извещения заглушены. Вы не услышите Tasks! Напоминания Tasks отключены! Вы не будете получать никаких напоминаний Вы сказали, \"%s\" diff --git a/astrid/src/main/res/values-sv/strings.xml b/astrid/src/main/res/values-sv/strings.xml index 740245c1d..80320afbd 100644 --- a/astrid/src/main/res/values-sv/strings.xml +++ b/astrid/src/main/res/values-sv/strings.xml @@ -13,16 +13,6 @@ Uppgiften skickad till %s! Dina egna uppgifter visas. Vill du visa denna och andra uppgifter du har tilldelat? Visa tilldelade Stanna här - Mina delade uppgifter - Inga delade uppgifter - Du har skickat en vänförfrågan till %s! - Du har blockerat %s. - Du ingorerar %s. - Du är vän med %s! Lägg till uppgifter för dem nedan. - %s vill bli vän med dig! - Ta kontakt med %s för att dela och se aktivitet på offentliga uppgifter! - Lägg till vän - Godkänn Lägg till en kommentar... Uppdatera Lista @@ -85,17 +75,14 @@ Någon Uppdatera kommentarer Du har inga uppgifter!\n Vill du lägga till någonting? - %s delar\ninga uppgifter med dig Sortera Synkronisera nu Sök Listor - Personer Visa färdiga listor Inställningar Egendefinierad Lägg till uppgift - Lägg till något för %s Påminnelseljudet är avstängt! Du kommer inte att höra Tasks! Påminnelserna från Tasks är avstängda! Du kommer inte att få några påminnelser Du sa: \"%s\" diff --git a/astrid/src/main/res/values-tr/strings.xml b/astrid/src/main/res/values-tr/strings.xml index 21746dfe3..be4cc9adf 100644 --- a/astrid/src/main/res/values-tr/strings.xml +++ b/astrid/src/main/res/values-tr/strings.xml @@ -13,15 +13,6 @@ Görev gönderildi: %s! Şu anda kendi görevlerinizi görüntülüyorsunuz. Bunu ve diğer atanmış olduğunuz görevleri görmek istiyor musunuz? Atananları Göster Burada Kal - Paylaşılan Görevlerim - Paylaşılmış görev yok - %s kişisine arkadaşlık isteği gönderdiniz! - %s engellendi. - %s ile arkadaşsınız! Aşağıya onlar için görev ekleyin. - %s sizinle arkadaş olmak istiyor! - %s ile bağlanarak genel listenizdekileri paylaşabilirsiniz. - Arkadaş ekle - Kabul Et Yorum Gir Yenile Liste İsmi: @@ -86,17 +77,14 @@ Herhangi biri Yorumları Yenile Hiç göreviniz yok! \n Bir şeyler eklemek nasıl olur? - %s kişisi sizinle\ngörev paylaşmıyor Şimdi Eşle Ara Listeler - Kişiler Öne Çıkan Listeler Ayarlar Destek Özel Görev ekle - %s için bir şey ekle Uyarılar susturuldu. Tasks \'i duyamayacaksın! Tasks hatırlatıcıları devre dışı. Hatırlatma almayacaksınız. Dediniz ki, \"%s\" diff --git a/astrid/src/main/res/values-uk/strings.xml b/astrid/src/main/res/values-uk/strings.xml index 5bee1b912..7bcdcec35 100644 --- a/astrid/src/main/res/values-uk/strings.xml +++ b/astrid/src/main/res/values-uk/strings.xml @@ -13,16 +13,6 @@ Завдання було відправлена​о %s! Зараз ви переглядаєте ваші власні завдання. Хочете переглянути це та інші завдання призначені вам? Подивитись призначені Залишитись тут - Мої Спільні Завдання - Немає спільних завдань - Ви відправили запит на дружбу %s! - Користувач %s заблокований - Ви проігнорували %s. - Ви і %s тепер друзі! Додати завдання для нього можна нижче. - %s хоче добавити вас у друзі! - Зв’яжіться з %s для спільного користування та перегляду публічних завдань! - Додати друга - Прийняти Додати коментар Оновити Список @@ -100,18 +90,15 @@ Хтось Оновити коментарі У Вас немає завдань! \n Бажаєте щось додати? - У %s немає \nспільних з Вами завдань Сортувати Синхронізувати Пошук Списки - Люди Особливі списки Налаштування Підтримка Користувальницький Додати завдання - Додати щось для %s Сповіщення приглушені. Ви не зможете почути Tasks! Нагадування відключені! Ви не будете отримувати нагадування Ти сказав, \\"%s\\" diff --git a/astrid/src/main/res/values-zh-rCN/strings.xml b/astrid/src/main/res/values-zh-rCN/strings.xml index 6c3582302..26c707a3b 100644 --- a/astrid/src/main/res/values-zh-rCN/strings.xml +++ b/astrid/src/main/res/values-zh-rCN/strings.xml @@ -13,15 +13,6 @@ 任务已发送给%s！正在查看你所拥有的任务，是否查看其它被指定的任务？ 查看被指派的任务 保留在此处 - 已分享任务 - 没有已分享任务 - 你已经给%s发送了朋友请求！ - 你已经屏蔽了%s - 你和%s已经是朋友了！可以为他们添加任务了 - %s想与你成为朋友！ - 与%s连线以分享和查看公开任务的活动 - 添加好友 - 接受 添加注释... 刷新 列表名称： @@ -88,17 +79,14 @@ 某人 刷新留言 你没有任务 - %s 没有 \n与您分享的任务 立即同步 搜索 列表 - 人物 特定列表 设置 支持 自定义 添加任务 - 为 %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 ab7778713..b5d307272 100644 --- a/astrid/src/main/res/values-zh-rTW/strings.xml +++ b/astrid/src/main/res/values-zh-rTW/strings.xml @@ -13,15 +13,6 @@ 工作已被送到 %s！您目前正在查看自己的任務工作，你要查看你其餘被指派的工作嗎？ 查看被指派的工作 留下來吧 - 已分享任務工作 - 未有共享工作 - 你已經寄了一個好友邀請給%s! - 你已經封鎖了%s! - 你和%s!成為好友了！快給他們安排些工作吧！ - %s!想和你成為好友！ - 和%s!聯繫一下，分享並查看公開任務的活動！ - 新增好友 - 接受 添加評論 重新整理 列表名稱： @@ -88,17 +79,14 @@ 某人 刷新留言 無工作! - %s 沒有 \n與您分享的任務工作 立即同步 搜索 列表 - 朋友 特定列表 設定 支持 自訂 添加任務工作 - 為 %s 增加任務工作 已靜音。你不會再聽到了！ Tasks提醒功能被關閉，你不會收到任何提醒。 你說: \"%s\" diff --git a/astrid/src/main/res/values/attrs.xml b/astrid/src/main/res/values/attrs.xml index e48f17429..27c92b0e1 100644 --- a/astrid/src/main/res/values/attrs.xml +++ b/astrid/src/main/res/values/attrs.xml @@ -32,7 +32,6 @@ - diff --git a/astrid/src/main/res/values/strings-actfm.xml b/astrid/src/main/res/values/strings-actfm.xml index 87aff45de..3482f1bb4 100644 --- a/astrid/src/main/res/values/strings-actfm.xml +++ b/astrid/src/main/res/values/strings-actfm.xml @@ -29,31 +29,7 @@ Stay Here - - My Shared Tasks - - - No shared tasks - - - - You\'ve sent a friend request to %s! - - You\'ve blocked %s. - - You\'ve ignored %s. - - You\'re friends with %s! Add tasks for them below. - - %s wants to be friends with you! - - Connect with %s to share and see activity on public tasks! - - Add friend - - Accept - - + Add a comment... diff --git a/astrid/src/main/res/values/strings-core.xml b/astrid/src/main/res/values/strings-core.xml index 367285e6e..f657feadf 100644 --- a/astrid/src/main/res/values/strings-core.xml +++ b/astrid/src/main/res/values/strings-core.xml @@ -65,10 +65,7 @@ You have no tasks! \n Want to add something? - - %s has no\ntasks shared with you - - + Sort @@ -80,9 +77,6 @@ Lists - - People - Featured Lists @@ -98,9 +92,6 @@ Add a task - - Add something for %s - Notifications are muted. You won\'t be able to hear Tasks! diff --git a/astrid/src/main/res/values/styles.xml b/astrid/src/main/res/values/styles.xml index 9e6470fd0..ff9f0d835 100644 --- a/astrid/src/main/res/values/styles.xml +++ b/astrid/src/main/res/values/styles.xml @@ -27,7 +27,6 @@ #101010 @drawable/task_edit_background @drawable/menu_button_blue - @drawable/people_menu_button_blue @color/blue_theme_color @drawable/lists_disclosure_blue #000000 @@ -79,7 +78,6 @@ @drawable/task_row_bg_white #fff6d7 @drawable/menu_button_dark_blue - @drawable/people_menu_button_dark_blue @color/dark_blue_theme_color @drawable/lists_disclosure_dark_blue #e9e9e9