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

Moved backup to settings menu to make room for lists

Browse Source
pull/14/head
Tim Su 15 years ago
parent d35824de76
commit a645946133
6 changed files with 54 additions and 38 deletions
Show Stats Download Patch File Download Diff File

10
astrid/AndroidManifest.xml
Unescape Escape View File

@ -357,15 +357,7 @@
<!-- backup -->
<service android:name="com.todoroo.astrid.backup.BackupService"/>
<activity android:name="com.todoroo.astrid.backup.BackupActivity"
android:theme="@android:style/Theme.Dialog"
android:icon="@drawable/ic_menu_archive"
android:configChanges="orientation|keyboardHidden"
android:label="@string/backup_BAc_label">
<intent-filter>
<action android:name="com.todoroo.astrid.TASK_LIST_MENU" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
android:theme="@android:style/Theme.Dialog" />
<activity android:name="com.todoroo.astrid.backup.BackupPreferences"
android:theme="@android:style/Theme"
android:label="@string/backup_BPr_header">

10
astrid/plugin-src/com/todoroo/astrid/backup/BackupPreferences.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.todoroo.astrid.backup;
import java.util.Date;
import android.content.Intent;
import android.content.res.Resources;
import android.graphics.Color;
import android.os.Bundle;
@ -53,6 +54,15 @@ public class BackupPreferences extends TodorooPreferenceActivity {
view.setBackgroundColor(statusColor);
}
});
findPreference(getString(R.string.backup_BAc_label)).setOnPreferenceClickListener(new OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
Intent intent = new Intent(BackupPreferences.this, BackupActivity.class);
startActivity(intent);
return false;
}
});
}
@Override

BIN
astrid/res/drawable/ic_menu_lists.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

2
astrid/res/values/strings-backup.xml
Unescape Escape View File

@ -39,7 +39,7 @@
<!-- ================================================= BackupActivity == -->
<!-- backup activity label -->
<string name="backup_BAc_label">Backups</string>
<string name="backup_BAc_label">Manage Backups</string>
<!-- backup activity title -->
<string name="backup_BAc_title">Manage Your Backups</string>

6
astrid/res/xml/preferences_backup.xml
Unescape Escape View File

@ -22,5 +22,11 @@
android:defaultValue="true" />
</PreferenceCategory>
<Preference
android:key="@string/backup_BAc_label"
android:title="@string/backup_BAc_label"
android:textSize="24sp"
android:gravity="center"/>
</PreferenceScreen>

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

@ -121,12 +121,13 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
// --- menu codes
protected static final int MENU_ADDONS_ID = Menu.FIRST + 1;
protected static final int MENU_SETTINGS_ID = Menu.FIRST + 2;
protected static final int MENU_SORT_ID = Menu.FIRST + 3;
protected static final int MENU_SYNC_ID = Menu.FIRST + 4;
protected static final int MENU_HELP_ID = Menu.FIRST + 5;
protected static final int MENU_ADDON_INTENT_ID = Menu.FIRST + 6;
protected static final int MENU_LISTS_ID = Menu.FIRST + 1;
protected static final int MENU_ADDONS_ID = Menu.FIRST + 2;
protected static final int MENU_SETTINGS_ID = Menu.FIRST + 3;
protected static final int MENU_SORT_ID = Menu.FIRST + 4;
protected static final int MENU_SYNC_ID = Menu.FIRST + 5;
protected static final int MENU_HELP_ID = Menu.FIRST + 6;
protected static final int MENU_ADDON_INTENT_ID = Menu.FIRST + 7;
protected static final int CONTEXT_MENU_EDIT_TASK_ID = Menu.FIRST + 20;
protected static final int CONTEXT_MENU_COPY_TASK_ID = Menu.FIRST + 21;
@ -277,16 +278,6 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
MenuItem item;
if(!Constants.MARKET_DISABLED) {
item = menu.add(Menu.NONE, MENU_ADDONS_ID, Menu.NONE,
R.string.TLA_menu_addons);
item.setIcon(android.R.drawable.ic_menu_set_as);
}
item = menu.add(Menu.NONE, MENU_SETTINGS_ID, Menu.NONE,
R.string.TLA_menu_settings);
item.setIcon(android.R.drawable.ic_menu_preferences);
if(!(this instanceof DraggableTaskListActivity)) {
item = menu.add(Menu.NONE, MENU_SORT_ID, Menu.NONE,
R.string.TLA_menu_sort);
@ -297,10 +288,24 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
R.string.TLA_menu_sync);
item.setIcon(R.drawable.ic_menu_refresh);
item = menu.add(Menu.NONE, MENU_LISTS_ID, Menu.NONE,
R.string.tag_TLA_menu);
item.setIcon(R.drawable.ic_menu_lists);
if(!Constants.MARKET_DISABLED) {
item = menu.add(Menu.NONE, MENU_ADDONS_ID, Menu.NONE,
R.string.TLA_menu_addons);
item.setIcon(android.R.drawable.ic_menu_set_as);
}
item = menu.add(Menu.NONE, MENU_HELP_ID, Menu.NONE,
R.string.TLA_menu_help);
item.setIcon(android.R.drawable.ic_menu_help);
item = menu.add(Menu.NONE, MENU_SETTINGS_ID, Menu.NONE,
R.string.TLA_menu_settings);
item.setIcon(android.R.drawable.ic_menu_preferences);
// ask about plug-ins
Intent queryIntent = new Intent(AstridApiConstants.ACTION_TASK_LIST_MENU);
PackageManager pm = getPackageManager();
@ -324,12 +329,7 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
private void setUpUiComponents() {
((ImageView)findViewById(R.id.back)).setOnClickListener(new OnClickListener() {
public void onClick(View v) {
Intent intent = new Intent(TaskListActivity.this,
FilterListActivity.class);
startActivity(intent);
AndroidUtilities.callApiMethod(5, TaskListActivity.this, "overridePendingTransition", //$NON-NLS-1$
new Class<?>[] { Integer.TYPE, Integer.TYPE },
R.anim.slide_right_in, R.anim.slide_right_out);
showFilterListActivity();
}
});
@ -1006,6 +1006,10 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
// handle my own menus
switch (item.getItemId()) {
case MENU_LISTS_ID:
StatisticsService.reportEvent("tla-menu-lists"); //$NON-NLS-1$
showFilterListActivity();
return true;
case MENU_ADDONS_ID:
StatisticsService.reportEvent("tla-menu-addons"); //$NON-NLS-1$
intent = new Intent(this, AddOnActivity.class);
@ -1116,15 +1120,19 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
@Override
public void gesturePerformed(String gesture) {
if("nav_right".equals(gesture)) {
Intent intent = new Intent(TaskListActivity.this,
FilterListActivity.class);
startActivity(intent);
AndroidUtilities.callApiMethod(5, this, "overridePendingTransition",
new Class<?>[] { Integer.TYPE, Integer.TYPE },
R.anim.slide_right_in, R.anim.slide_right_out);
showFilterListActivity();
}
}
private void showFilterListActivity() {
Intent intent = new Intent(TaskListActivity.this,
FilterListActivity.class);
startActivity(intent);
AndroidUtilities.callApiMethod(5, this, "overridePendingTransition",
new Class<?>[] { Integer.TYPE, Integer.TYPE },
R.anim.slide_right_in, R.anim.slide_right_out);
}
@Override
public void onSortSelected(boolean always, int flags, int sort) {
sortFlags = flags;

Write Preview
Loading…
Cancel
Save