archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Hide sort options for google tasks, tweaked the strings

Browse Source
pull/14/head
Tim Su 14 years ago
parent 076459a80f
commit 289e1ac58d
4 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File

3
astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksFilterExposer.java
Unescape Escape View File

@ -50,7 +50,8 @@ public class GtasksFilterExposer extends BroadcastReceiver {
values.putAll(GtasksMetadata.createEmptyMetadata(AbstractModel.NO_ID).getMergedValues());
values.remove(Metadata.TASK.name);
values.put(GtasksMetadata.LIST_ID.name, list.getValue(GtasksList.REMOTE_ID));
FilterWithCustomIntent filter = new FilterWithCustomIntent(listName, listName, new QueryTemplate().join(
FilterWithCustomIntent filter = new FilterWithCustomIntent(listName,
ContextManager.getString(R.string.gtasks_FEx_title, listName), new QueryTemplate().join(
Join.left(Metadata.TABLE, Task.ID.eq(Metadata.TASK))).where(Criterion.and(
MetadataCriteria.withKey(GtasksMetadata.METADATA_KEY),
TaskCriteria.isVisible(),

5
astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncProvider.java
Unescape Escape View File

@ -23,6 +23,7 @@ import android.text.method.PasswordTransformationMethod;
import android.util.Log;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.ScrollView;
import android.widget.TextView;
import android.widget.Toast;
@ -191,7 +192,9 @@ public class GtasksSyncProvider extends SyncProvider<GtasksTaskContainer> {
preferenceActivity.getCredentials(new OnGetCredentials() {
@Override
public void getCredentials(String[] accounts) {
ScrollView layoutScroller = new ScrollView(activity);
LinearLayout layout = new LinearLayout(activity);
layoutScroller.addView(layout);
layout.setPadding(5, -5, 5, 0);
layout.setOrientation(LinearLayout.VERTICAL);
TextView textView = new TextView(activity);
@ -209,7 +212,7 @@ public class GtasksSyncProvider extends SyncProvider<GtasksTaskContainer> {
layout.addView(password);
DialogUtilities.viewDialog(activity,
activity.getString(R.string.gtasks_login), layout,
activity.getString(R.string.gtasks_login), layoutScroller,
new OnClickListener() {
@Override
public void onClick(DialogInterface arg0, int arg1) {

11
astrid/res/values/strings-gtasks.xml
Unescape Escape View File

@ -2,21 +2,21 @@
<!-- See the file "LICENSE" for the full license governing this code. -->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<!-- =========================================================== Misc == -->
<!-- =========================================================== UI == -->
<!-- filters header: GTasks -->
<string name="gtasks_FEx_header">Google Tasks</string>
<!-- filter category for GTasks lists -->
<string name="gtasks_FEx_list">By List</string>
<!-- GTasks Indent changed message (%d => new level) -->
<string name="gtasks_indent_toast">New Indentation: %d</string>
<!-- filter title for GTasks lists (%s => list name) -->
<string name="gtasks_FEx_title">Google Tasks: %s</string>
<!-- ============================================== GtasksPreferences == -->
<!-- GTasks Preferences Title -->
<string name="gtasks_GPr_header">Google Tasks</string>
<string name="gtasks_GPr_header">Google Tasks (Beta!)</string>
<!-- ================================================ Synchronization == -->
@ -44,6 +44,5 @@
<!-- Login Message when Error -->
<string name="gtasks_login_error">Please try your e-mail and password again.</string>
</resources>

24
astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
Unescape Escape View File

@ -3,9 +3,9 @@ package com.todoroo.astrid.activity;
import java.util.Date;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map.Entry;
import java.util.Timer;
import java.util.TimerTask;
import java.util.Map.Entry;
import java.util.concurrent.atomic.AtomicReference;
import android.app.AlertDialog;
@ -27,30 +27,29 @@ import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo;
import android.view.KeyEvent;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.View.OnKeyListener;
import android.view.ViewGroup;
import android.view.Window;
import android.view.WindowManager;
import android.view.ContextMenu.ContextMenuInfo;
import android.view.View.OnClickListener;
import android.view.View.OnKeyListener;
import android.view.inputmethod.EditorInfo;
import android.widget.AbsListView;
import android.widget.AbsListView.OnScrollListener;
import android.widget.AdapterView.AdapterContextMenuInfo;
import android.widget.ArrayAdapter;
import android.widget.EditText;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.TextView.OnEditorActionListener;
import android.widget.Toast;
import android.widget.AbsListView.OnScrollListener;
import android.widget.AdapterView.AdapterContextMenuInfo;
import android.widget.TextView.OnEditorActionListener;
import com.todoroo.astrid.service.StatisticsService;
import com.timsu.astrid.R;
import com.todoroo.andlib.data.Property;
import com.todoroo.andlib.data.TodorooCursor;
@ -86,6 +85,7 @@ import com.todoroo.astrid.service.AddOnService;
import com.todoroo.astrid.service.AstridDependencyInjector;
import com.todoroo.astrid.service.MetadataService;
import com.todoroo.astrid.service.StartupService;
import com.todoroo.astrid.service.StatisticsService;
import com.todoroo.astrid.service.TaskService;
import com.todoroo.astrid.utility.Constants;
import com.todoroo.astrid.utility.Flags;
@ -251,9 +251,11 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
R.string.TLA_menu_settings);
item.setIcon(android.R.drawable.ic_menu_preferences);
item = menu.add(Menu.NONE, MENU_SORT_ID, Menu.NONE,
R.string.TLA_menu_sort);
item.setIcon(android.R.drawable.ic_menu_sort_by_size);
if(!(this instanceof DraggableTaskListActivity)) {
item = menu.add(Menu.NONE, MENU_SORT_ID, Menu.NONE,
R.string.TLA_menu_sort);
item.setIcon(android.R.drawable.ic_menu_sort_by_size);
}
if(syncActions.size() > 0) {
item = menu.add(Menu.NONE, MENU_SYNC_ID, Menu.NONE,

Write Preview
Loading…
Cancel
Save