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

Minor code reorg, prepare for release

Browse Source
pull/14/head 3.8.4.2
Tim Su 14 years ago
parent 63db137e24
commit 0ea06ee00c
26 changed files with 58 additions and 84 deletions
Show Stats Download Patch File Download Diff File

34
astrid/AndroidManifest.xml
Unescape Escape View File

@ -159,23 +159,23 @@
</intent-filter> </intent-filter>
</activity> </activity>
<!-- Start of Crittercism.com Code --> <!-- Start of Crittercism.com Code -->
<activity android:name="com.crittercism.FeedbackActivity" /> <activity android:name="com.crittercism.FeedbackActivity" />
<activity android:name="com.crittercism.FeedbackCreateActivity" /> <activity android:name="com.crittercism.FeedbackCreateActivity" />
<activity android:name="com.crittercism.FeedbackDetailsActivity" /> <activity android:name="com.crittercism.FeedbackDetailsActivity" />
<activity android:name="com.crittercism.NotificationActivity" /> <activity android:name="com.crittercism.NotificationActivity" />
<service android:name="com.crittercism.service.CrittercismService" <service android:name="com.crittercism.service.CrittercismService"
android:process="com.crittercism.service" android:exported="true"> android:process="com.crittercism.service" android:exported="true">
<intent-filter> <intent-filter>
<action android:name="com.crittercism.service.CrittercismService" /> <action android:name="com.crittercism.service.CrittercismService" />
</intent-filter> </intent-filter>
</service> </service>
<receiver android:name="com.crittercism.service.BReceiver"> <receiver android:name="com.crittercism.service.BReceiver">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED"></action> <action android:name="android.intent.action.BOOT_COMPLETED"></action>
</intent-filter> </intent-filter>
</receiver> </receiver>
<!-- End of Crittercism.com Code --> <!-- End of Crittercism.com Code -->
<!-- ======================================================= Receivers = --> <!-- ======================================================= Receivers = -->

34
astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java
Unescape Escape View File

@ -169,41 +169,15 @@ public class TagViewActivity extends TaskListActivity {
} }
} }
/**
* Create options menu (displayed when user presses menu key)
*
* @return true if menu should be displayed
*/
@Override @Override
public boolean onPrepareOptionsMenu(Menu menu) { protected void addSyncRefreshMenuItem(Menu menu) {
if(menu.size() > 0)
menu.clear();
MenuItem item;
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);
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(actFmPreferenceService.isLoggedIn()) { if(actFmPreferenceService.isLoggedIn()) {
item = menu.add(Menu.NONE, MENU_REFRESH_ID, Menu.NONE, MenuItem item = menu.add(Menu.NONE, MENU_REFRESH_ID, Menu.NONE,
R.string.actfm_TVA_menu_refresh); R.string.actfm_TVA_menu_refresh);
item.setIcon(R.drawable.ic_menu_refresh); item.setIcon(R.drawable.ic_menu_refresh);
} else {
super.addSyncRefreshMenuItem(menu);
} }
item = menu.add(Menu.NONE, MENU_HELP_ID, Menu.NONE,
R.string.TLA_menu_help);
item.setIcon(android.R.drawable.ic_menu_help);
return true;
} }
// --- data loading // --- data loading

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

@ -404,7 +404,7 @@ File %1$s contained %2$s.\n\n
<string name="TLA_menu_settings">Paràmetres</string> <string name="TLA_menu_settings">Paràmetres</string>
<!-- Menu: Help --> <!-- Menu: Help -->
<string name="TLA_menu_help">Ajuda</string> <string name="p_help">Ajuda</string>
<!-- Search Label--> <!-- Search Label-->
<string name="TLA_search_label">Busca en aquesta llista</string> <string name="TLA_search_label">Busca en aquesta llista</string>

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

@ -399,7 +399,7 @@
<string name="TLA_menu_settings">Nastavení</string> <string name="TLA_menu_settings">Nastavení</string>
<!-- Menu: Help --> <!-- Menu: Help -->
<string name="TLA_menu_help">Nápověda</string> <string name="p_help">Nápověda</string>
<!-- Search Label--> <!-- Search Label-->
<string name="TLA_search_label">Hledat v tomto seznamu</string> <string name="TLA_search_label">Hledat v tomto seznamu</string>

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

@ -399,7 +399,7 @@
<string name="TLA_menu_settings">Opsætning</string> <string name="TLA_menu_settings">Opsætning</string>
<!-- Menu: Help --> <!-- Menu: Help -->
<string name="TLA_menu_help">Hjælp</string> <string name="p_help">Hjælp</string>
<!-- Search Label--> <!-- Search Label-->
<string name="TLA_search_label">Søge i denne liste</string> <string name="TLA_search_label">Søge i denne liste</string>

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

@ -399,7 +399,7 @@
<string name="TLA_menu_settings">Einstellungen</string> <string name="TLA_menu_settings">Einstellungen</string>
<!-- Menu: Help --> <!-- Menu: Help -->
<string name="TLA_menu_help">Hilfe</string> <string name="p_help">Hilfe</string>
<!-- Search Label--> <!-- Search Label-->
<string name="TLA_search_label">Durchsuche diese Liste</string> <string name="TLA_search_label">Durchsuche diese Liste</string>

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

@ -404,7 +404,7 @@ File %1$s contained %2$s.\n\n
<string name="TLA_menu_settings">Preferencias</string> <string name="TLA_menu_settings">Preferencias</string>
<!-- Menu: Help --> <!-- Menu: Help -->
<string name="TLA_menu_help">Ayuda</string> <string name="p_help">Ayuda</string>
<!-- Search Label--> <!-- Search Label-->
<string name="TLA_search_label">Buscar en esta lista</string> <string name="TLA_search_label">Buscar en esta lista</string>

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

@ -398,7 +398,7 @@
<string name="TLA_menu_settings">Paramètres</string> <string name="TLA_menu_settings">Paramètres</string>
<!-- Menu: Help --> <!-- Menu: Help -->
<string name="TLA_menu_help">Aide</string> <string name="p_help">Aide</string>
<!-- Search Label--> <!-- Search Label-->
<string name="TLA_search_label">Rechercher dans cette liste</string> <string name="TLA_search_label">Rechercher dans cette liste</string>

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

@ -406,7 +406,7 @@ File %1$s contained %2$s.\n\n
<string name="TLA_menu_settings">הגדרות</string> <string name="TLA_menu_settings">הגדרות</string>
<!-- Menu: Help --> <!-- Menu: Help -->
<string name="TLA_menu_help">עזרה</string> <string name="p_help">עזרה</string>
<!-- Search Label--> <!-- Search Label-->
<string name="TLA_search_label">חיפוש ברשימה זו</string> <string name="TLA_search_label">חיפוש ברשימה זו</string>

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

@ -399,7 +399,7 @@
<string name="TLA_menu_settings">Impostazioni</string> <string name="TLA_menu_settings">Impostazioni</string>
<!-- Menu: Help --> <!-- Menu: Help -->
<string name="TLA_menu_help">Aiuto</string> <string name="p_help">Aiuto</string>
<!-- Search Label--> <!-- Search Label-->
<string name="TLA_search_label">Cerca questo elenco</string> <string name="TLA_search_label">Cerca questo elenco</string>

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

@ -401,7 +401,7 @@
<string name="TLA_menu_settings">設定</string> <string name="TLA_menu_settings">設定</string>
<!-- Menu: Help --> <!-- Menu: Help -->
<string name="TLA_menu_help">ヘルプ</string> <string name="p_help">ヘルプ</string>
<!-- Search Label--> <!-- Search Label-->
<string name="TLA_search_label">このリストの検索</string> <string name="TLA_search_label">このリストの検索</string>

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

@ -399,7 +399,7 @@
<string name="TLA_menu_settings">설정</string> <string name="TLA_menu_settings">설정</string>
<!-- Menu: Help --> <!-- Menu: Help -->
<string name="TLA_menu_help">도움말</string> <string name="p_help">도움말</string>
<!-- Search Label--> <!-- Search Label-->
<string name="TLA_search_label">이 목록 검색</string> <string name="TLA_search_label">이 목록 검색</string>

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

@ -399,7 +399,7 @@
<string name="TLA_menu_settings">Innstillinger</string> <string name="TLA_menu_settings">Innstillinger</string>
<!-- Menu: Help --> <!-- Menu: Help -->
<string name="TLA_menu_help">Hjelp</string> <string name="p_help">Hjelp</string>
<!-- Search Label--> <!-- Search Label-->
<string name="TLA_search_label">Søk i denne listen</string> <string name="TLA_search_label">Søk i denne listen</string>

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

@ -398,7 +398,7 @@
<string name="TLA_menu_settings">Instellingen</string> <string name="TLA_menu_settings">Instellingen</string>
<!-- Menu: Help --> <!-- Menu: Help -->
<string name="TLA_menu_help">Help</string> <string name="p_help">Help</string>
<!-- Search Label--> <!-- Search Label-->
<string name="TLA_search_label">In deze lijst zoeken</string> <string name="TLA_search_label">In deze lijst zoeken</string>

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

@ -399,7 +399,7 @@
<string name="TLA_menu_settings">Ustawienia</string> <string name="TLA_menu_settings">Ustawienia</string>
<!-- Menu: Help --> <!-- Menu: Help -->
<string name="TLA_menu_help">Pomoc</string> <string name="p_help">Pomoc</string>
<!-- Search Label--> <!-- Search Label-->
<string name="TLA_search_label">Przeszukaj tą listę</string> <string name="TLA_search_label">Przeszukaj tą listę</string>

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

@ -399,7 +399,7 @@
<string name="TLA_menu_settings">Definições</string> <string name="TLA_menu_settings">Definições</string>
<!-- Menu: Help --> <!-- Menu: Help -->
<string name="TLA_menu_help">Ajuda</string> <string name="p_help">Ajuda</string>
<!-- Search Label--> <!-- Search Label-->
<string name="TLA_search_label">Procurar Nesta Lista</string> <string name="TLA_search_label">Procurar Nesta Lista</string>

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

@ -399,7 +399,7 @@
<string name="TLA_menu_settings">Параметры</string> <string name="TLA_menu_settings">Параметры</string>
<!-- Menu: Help --> <!-- Menu: Help -->
<string name="TLA_menu_help">Справка</string> <string name="p_help">Справка</string>
<!-- Search Label--> <!-- Search Label-->
<string name="TLA_search_label">Поиск по списку</string> <string name="TLA_search_label">Поиск по списку</string>

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

@ -399,7 +399,7 @@
<string name="TLA_menu_settings">Inställningar</string> <string name="TLA_menu_settings">Inställningar</string>
<!-- Menu: Help --> <!-- Menu: Help -->
<string name="TLA_menu_help">Hjälp</string> <string name="p_help">Hjälp</string>
<!-- Search Label--> <!-- Search Label-->
<string name="TLA_search_label">Sök i denna lista</string> <string name="TLA_search_label">Sök i denna lista</string>

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

@ -406,7 +406,7 @@ File %1$s contained %2$s.\n\n
<string name="TLA_menu_settings">ตั้งค่า</string> <string name="TLA_menu_settings">ตั้งค่า</string>
<!-- Menu: Help --> <!-- Menu: Help -->
<string name="TLA_menu_help">ความช่วยเหลือ</string> <string name="p_help">ความช่วยเหลือ</string>
<!-- Search Label--> <!-- Search Label-->
<string name="TLA_search_label">ค้นหาในรายการนี้</string> <string name="TLA_search_label">ค้นหาในรายการนี้</string>

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

@ -398,7 +398,7 @@
<string name="TLA_menu_settings">设置</string> <string name="TLA_menu_settings">设置</string>
<!-- Menu: Help --> <!-- Menu: Help -->
<string name="TLA_menu_help">帮助</string> <string name="p_help">帮助</string>
<!-- Search Label--> <!-- Search Label-->
<string name="TLA_search_label">查找此列表</string> <string name="TLA_search_label">查找此列表</string>

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

@ -399,7 +399,7 @@
<string name="TLA_menu_settings">設定</string> <string name="TLA_menu_settings">設定</string>
<!-- Menu: Help --> <!-- Menu: Help -->
<string name="TLA_menu_help">幫助</string> <string name="p_help">幫助</string>
<!-- Search Label--> <!-- Search Label-->
<string name="TLA_search_label">尋找此列表</string> <string name="TLA_search_label">尋找此列表</string>

3
astrid/res/values/strings-core.xml
Unescape Escape View File

@ -110,9 +110,6 @@
<!-- Menu: Settings --> <!-- Menu: Settings -->
<string name="TLA_menu_settings">Settings</string> <string name="TLA_menu_settings">Settings</string>
<!-- Menu: Help -->
<string name="TLA_menu_help">Help</string>
<!-- Menu: Support --> <!-- Menu: Support -->
<string name="TLA_menu_support">Support</string> <string name="TLA_menu_support">Support</string>

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

@ -135,7 +135,7 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
protected static final int MENU_SETTINGS_ID = Menu.FIRST + 3; 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_SORT_ID = Menu.FIRST + 4;
protected static final int MENU_SYNC_ID = Menu.FIRST + 5; 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_SUPPORT_ID = Menu.FIRST + 6;
protected static final int MENU_ADDON_INTENT_ID = Menu.FIRST + 7; 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_EDIT_TASK_ID = Menu.FIRST + 20;
@ -296,6 +296,12 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
contextMenuExtensionLoader.loadInNewThread(this); contextMenuExtensionLoader.loadInNewThread(this);
} }
protected void addSyncRefreshMenuItem(Menu menu) {
MenuItem item = menu.add(Menu.NONE, MENU_SYNC_ID, Menu.NONE,
R.string.TLA_menu_sync);
item.setIcon(R.drawable.ic_menu_refresh);
}
/** /**
* Create options menu (displayed when user presses menu key) * Create options menu (displayed when user presses menu key)
* *
@ -314,10 +320,6 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
item.setIcon(android.R.drawable.ic_menu_sort_by_size); item.setIcon(android.R.drawable.ic_menu_sort_by_size);
} }
item = menu.add(Menu.NONE, MENU_SYNC_ID, Menu.NONE,
R.string.TLA_menu_sync);
item.setIcon(R.drawable.ic_menu_refresh);
item = menu.add(Menu.NONE, MENU_LISTS_ID, Menu.NONE, item = menu.add(Menu.NONE, MENU_LISTS_ID, Menu.NONE,
R.string.tag_TLA_menu); R.string.tag_TLA_menu);
item.setIcon(R.drawable.ic_menu_lists); item.setIcon(R.drawable.ic_menu_lists);
@ -328,7 +330,7 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
item.setIcon(android.R.drawable.ic_menu_set_as); item.setIcon(android.R.drawable.ic_menu_set_as);
} }
item = menu.add(Menu.NONE, MENU_HELP_ID, Menu.NONE, item = menu.add(Menu.NONE, MENU_SUPPORT_ID, Menu.NONE,
R.string.TLA_menu_support); R.string.TLA_menu_support);
item.setIcon(android.R.drawable.ic_menu_help); item.setIcon(android.R.drawable.ic_menu_help);
@ -1117,7 +1119,7 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
StatisticsService.reportEvent(StatisticsConstants.TLA_MENU_SYNC); StatisticsService.reportEvent(StatisticsConstants.TLA_MENU_SYNC);
performSyncAction(); performSyncAction();
return true; return true;
case MENU_HELP_ID: case MENU_SUPPORT_ID:
StatisticsService.reportEvent(StatisticsConstants.TLA_MENU_HELP); StatisticsService.reportEvent(StatisticsConstants.TLA_MENU_HELP);
intent = new Intent(this, FeedbackActivity.class); intent = new Intent(this, FeedbackActivity.class);
startActivity(intent); startActivity(intent);

9
astrid/src/com/todoroo/astrid/service/StartupService.java
Unescape Escape View File

@ -90,11 +90,6 @@ public class StartupService {
*/ */
private static boolean hasStartedUp = false; private static boolean hasStartedUp = false;
private static final String CRITTERCISM_APP_ID = "4e8a796fddf5203b6f0097c5"; //$NON-NLS-1$
private static final String CRITTERCISM_SECRET = "9mhdwlu85lc6sovpxkabq1cbzzmxe2oi"; //$NON-NLS-1$
private static final String CRITTERCISM_OATH_KEY = "4e8a796fddf5203b6f0097c5nn35ziwt"; //$NON-NLS-1$
/** /**
* Call to skip initialization steps (i.e. if only a notification screen is needed) * Call to skip initialization steps (i.e. if only a notification screen is needed)
*/ */
@ -110,8 +105,8 @@ public class StartupService {
// sets up context manager // sets up context manager
ContextManager.setContext(context); ContextManager.setContext(context);
Crittercism.init(context.getApplicationContext(), CRITTERCISM_APP_ID, CRITTERCISM_OATH_KEY, CRITTERCISM_SECRET); Crittercism.init(context.getApplicationContext(), Constants.CRITTERCISM_APP_ID,
Constants.CRITTERCISM_OATH_KEY, Constants.CRITTERCISM_SECRET);
// show notification if reminders are silenced // show notification if reminders are silenced
if(context instanceof Activity) { if(context instanceof Activity) {

3
astrid/src/com/todoroo/astrid/service/UpgradeService.java
Unescape Escape View File

@ -159,7 +159,8 @@ public final class UpgradeService {
// current message // current message
if (from >= V3_8_4 && from < V3_8_4_2) { if (from >= V3_8_4 && from < V3_8_4_2) {
newVersionString(changeLog, "3.8.4.2 (10/03/11)", new String[] { newVersionString(changeLog, "3.8.4.2 (10/03/11)", new String[] {
"Updated Google Tasks API libraries to 1.2.2" "Updated Google Tasks API libraries to 1.2.2. This may fix some of your Google Task sync issues",
"Added a new way for easy bug reporting. Just tap the Menu key, Support."
}); });
} }
if(from >= V3_8_4 && from < V3_8_4_1) { if(from >= V3_8_4 && from < V3_8_4_1) {

5
astrid/src/com/todoroo/astrid/utility/Constants.java
Unescape Escape View File

@ -67,6 +67,11 @@ public final class Constants {
/** Notification Manager id for astrid.com */ /** Notification Manager id for astrid.com */
public static final int NOTIFICATION_ACTFM = -5; public static final int NOTIFICATION_ACTFM = -5;
// --- crittercism
public static final String CRITTERCISM_APP_ID = "4e8a796fddf5203b6f0097c5"; //$NON-NLS-1$
public static final String CRITTERCISM_SECRET = "9mhdwlu85lc6sovpxkabq1cbzzmxe2oi"; //$NON-NLS-1$
public static final String CRITTERCISM_OATH_KEY = "4e8a796fddf5203b6f0097c5nn35ziwt"; //$NON-NLS-1$
} }

Write Preview
Loading…
Cancel
Save