diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 6291fbe65..fcef752e9 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -261,13 +261,7 @@ - - - - - + android:theme="@android:style/Theme"/> - - - - - - - - + android:screenOrientation="portrait"/> @@ -401,31 +382,13 @@ - - - - - - + android:theme="@android:style/Theme"/> - - - - - - + android:theme="@android:style/Theme"/> - - - - - + android:theme="@android:style/Theme"/> , Integer> PREFERENCE_REQUEST_CODES = new HashMap<>(); - static { - PREFERENCE_REQUEST_CODES.put(GtasksPreferences.class, REQUEST_CODE_SYNC); - } - - private void addPluginPreferences(PreferenceScreen screen) { - Intent queryIntent = new Intent(AstridApiConstants.ACTION_SETTINGS); - PackageManager pm = getPackageManager(); - List resolveInfoList = pm.queryIntentActivities(queryIntent, - PackageManager.GET_META_DATA); - LinkedHashMap> categoryPreferences = - new LinkedHashMap<>(); - - // Loop through a list of all packages (including plugins, addons) - // that have a settings action - for (ResolveInfo resolveInfo : resolveInfoList) { - final Intent intent = new Intent(AstridApiConstants.ACTION_SETTINGS); - intent.setClassName(resolveInfo.activityInfo.packageName, - resolveInfo.activityInfo.name); - - if (GtasksPreferences.class.getName().equals(resolveInfo.activityInfo.name) - && AmazonMarketStrategy.isKindleFire()) { - continue; - } - - Preference preference = new Preference(this); - preference.setTitle(resolveInfo.activityInfo.loadLabel(pm)); - try { - Class intentComponent = Class.forName(intent.getComponent().getClassName()); - if (intentComponent.getSuperclass().equals(GtasksPreferences.class)) { - intentComponent = GtasksPreferences.class; - } - if (PREFERENCE_REQUEST_CODES.containsKey(intentComponent)) { - final int code = PREFERENCE_REQUEST_CODES.get(intentComponent); - preference.setOnPreferenceClickListener(new OnPreferenceClickListener() { - @Override - public boolean onPreferenceClick(Preference pref) { - startActivityForResult(intent, code); - return true; - } - }); - } else { - preference.setIntent(intent); - } - } catch (ClassNotFoundException e) { - log.error(e.getMessage(), e); - preference.setIntent(intent); - } - - String category = MetadataHelper.resolveActivityCategoryName(resolveInfo, pm); - - if (!categoryPreferences.containsKey(category)) { - categoryPreferences.put(category, new ArrayList()); - } - ArrayList arrayList = categoryPreferences.get(category); - arrayList.add(preference); + private void addPreferences(PreferenceScreen screen) { + List preferences = new ArrayList() {{ + add(getPreference(ReminderPreferences.class, R.string.notifications)); + add(getPreference(DefaultsPreferences.class, R.string.task_defaults)); + add(getPreference(GtasksPreferences.class, R.string.gtasks_GPr_header)); + add(getPreference(BackupPreferences.class, R.string.backup_BPr_header)); + add(getPreference(OldTaskPreferences.class, R.string.EPr_manage_header)); + }}; + + for (Preference preference : preferences) { + screen.addPreference(preference); } + } - for(Entry> entry : categoryPreferences.entrySet()) { - if (entry.getKey().equals(getString(R.string.app_name))) { - for(Preference preference : entry.getValue()) { - screen.addPreference(preference); - } - } else { - PreferenceManager manager = getPreferenceManager(); - PreferenceScreen header = manager.createPreferenceScreen(this); - header.setTitle(entry.getKey()); - screen.addPreference(header); - - for(Preference preference : entry.getValue()) { - header.addPreference(preference); - } - } - - - } + private Preference getPreference(final Class klass, final int label) { + return new Preference(this) {{ + setTitle(getResources().getString(label)); + setIntent(new Intent(EditPreferences.this, klass) {{ + setAction(AstridApiConstants.ACTION_SETTINGS); + }}); + }}; } @SuppressWarnings("StatementWithEmptyBody") @@ -265,11 +205,7 @@ public class EditPreferences extends TodorooPreferenceActivity { @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { - if (requestCode == REQUEST_CODE_SYNC && resultCode == GtasksPreferences.RESULT_CODE_SYNCHRONIZE) { - setResult(GtasksPreferences.RESULT_CODE_SYNCHRONIZE); - finish(); - return; - } else if (requestCode == REQUEST_CODE_FILES_DIR && resultCode == RESULT_OK) { + if (requestCode == REQUEST_CODE_FILES_DIR && resultCode == RESULT_OK) { if (data != null) { String dir = data.getStringExtra(FileExplore.RESULT_DIR_SELECTED); preferences.setString(TaskAttachment.FILES_DIRECTORY_PREF, dir); diff --git a/src/main/java/com/todoroo/astrid/helper/MetadataHelper.java b/src/main/java/com/todoroo/astrid/helper/MetadataHelper.java deleted file mode 100644 index c918493ed..000000000 --- a/src/main/java/com/todoroo/astrid/helper/MetadataHelper.java +++ /dev/null @@ -1,50 +0,0 @@ -/** - * Copyright (c) 2012 Todoroo Inc - * - * See the file "LICENSE" for the full license governing this code. - */ -package com.todoroo.astrid.helper; - -import android.content.pm.PackageManager; -import android.content.pm.ResolveInfo; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * @author joshuagross - */ -public class MetadataHelper { - - private static final Logger log = LoggerFactory.getLogger(MetadataHelper.class); - - private static final String CATEGORY_KEY = "category"; //$NON-NLS-1$ - - public static String resolveActivityCategoryName (ResolveInfo resolveInfo, PackageManager pm) { - // category - either from metadata, or the application name - String category = null; - if (resolveInfo.activityInfo.metaData != null && resolveInfo.activityInfo.metaData.containsKey(CATEGORY_KEY)) { - int resource = resolveInfo.activityInfo.metaData.getInt( - CATEGORY_KEY, -1); - if (resource > -1) { - // category stored as integer in Manifest - try { - category = pm.getResourcesForApplication( - resolveInfo.activityInfo.applicationInfo).getString( - resource); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - } else { - // category stored as String in Manifest - category = resolveInfo.activityInfo.metaData.getString(CATEGORY_KEY); - } - } - // If category is null at this point, we use the name of the application this activity is found in - if (category == null) { - category = resolveInfo.activityInfo.applicationInfo.loadLabel(pm).toString(); - } - - return category; - } -} diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml index 6345850d7..1d7035319 100644 --- a/src/main/res/values-ar/strings.xml +++ b/src/main/res/values-ar/strings.xml @@ -85,7 +85,6 @@ معلومة إغلاق إنتظر من فضلك... - تحيين و نسخ احتياطي الحالة الحالة: %s لم يتم تسجيل الدخول diff --git a/src/main/res/values-bg-rBG/strings.xml b/src/main/res/values-bg-rBG/strings.xml index e195d9a23..538fc368a 100644 --- a/src/main/res/values-bg-rBG/strings.xml +++ b/src/main/res/values-bg-rBG/strings.xml @@ -492,7 +492,6 @@ Затвори Ами сега, изглежда е станала грешка! Ето какво се случи:\n\n%s Моля, изчакайте... - Синхронизиране и Резервни копия Състояние Състояние: %s Не сте влезнали diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index f027ffa9d..861ce1eef 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -472,7 +472,6 @@ Zavřít Jejda, vypadá to, že se vyskytla chyba! Tady je co se stalo:\n\n%s Čekejte prosím... - Synchronizace Stav Stav: %s Nepřihlášen diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml index 0b687b0da..80d970130 100644 --- a/src/main/res/values-da/strings.xml +++ b/src/main/res/values-da/strings.xml @@ -243,7 +243,6 @@ Spørsmål: Luk Vent venligst... - Synkronisering Indstillinger Baggrunds Synk Baggrunds synkronisering er slået fra diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 647836d64..2f9314f3e 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -481,7 +481,6 @@ Schließen Ups, sieht aus, als ob ein Fehler aufgetreten ist! Folgendes ist passiert:\n\n%s Bitte warten... - Synchronisation & Backup Nicht angemeldet Synchronisierung läuft... Letzte Synchronisierung:\n%s diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml index afe33662f..bd3de745c 100644 --- a/src/main/res/values-el/strings.xml +++ b/src/main/res/values-el/strings.xml @@ -480,7 +480,6 @@ Κλείσε Ωπ, προέκυψε σφάλμα!! Νά τι έγινε :\n\n%s Παρακαλώ περιμένετε... - Συγχρονισμός και αντίγ.ασφαλείας Κατάσταση Κατάσταση: %s Δεν συνδέθηκατε diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index 82a135b6e..27b167612 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -484,7 +484,6 @@ Cerrar ¡Uy, parece que ocurró un error! Esto es lo que pasó:\n\n%s Por favor, espere... - Sincronización y copia de seguridad Estado Estado: %s Sesión no iniciada diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index c0b89e638..3fb302f9c 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -484,7 +484,6 @@ Fermer Oups, une erreur est survenue ! Voici ce qu\'il s\'est passé :\n\n%s Veuillez patienter... - Synchronisation Statut État : %s Non connecté diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index b8ad76405..ab47fc984 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -428,7 +428,6 @@ Se visualizzi questo errore più volte, ti consigliamo di cancellare tutti i dat Chiudi Oops, sembra che ci sia stato un errore! E\' successo questo:\n\n%s Attendi... - Sincronizza & archivia Stato Stato: %s Non connesso diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml index 614cce8ab..8aa038a4a 100644 --- a/src/main/res/values-iw/strings.xml +++ b/src/main/res/values-iw/strings.xml @@ -478,7 +478,6 @@ סגור אוּפְּס, נראה שארעה שגיאה! הנה מה שקה:\n\n%s אנא המתן... - סינכרון וגיבוי מצב מצב: %s לא מחובר diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml index eb8808c2e..3939b765d 100644 --- a/src/main/res/values-ja/strings.xml +++ b/src/main/res/values-ja/strings.xml @@ -490,7 +490,6 @@ 閉じる エラーが発生しました! 発生した内容\n\n%s お待ちください - 同期 状況 状況: %s ログインしていません diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml index bb7c69fc8..0b1053ea2 100644 --- a/src/main/res/values-ko/strings.xml +++ b/src/main/res/values-ko/strings.xml @@ -485,7 +485,6 @@ 닫기 에러가 발생한 것 같습니다! 발생한 에러는 다음과 같습니다:\n\n%s 잠시 기다리세요... - 동기화 & 백업 상태 상태: %s 로그인 안 됨 diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index 090a24eb0..ec32a7a09 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -484,7 +484,6 @@ Sluit Er is een fout opgetreden:\n\n%s Even geduld a.u.b. - Synchronisatie Niet aangemeld Synchronisatie bezig... Vorige:\n%s diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index deefddfb5..1ce9f7735 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -488,7 +488,6 @@ i odzyskanie zadań z kopi zapasowej (Settings->Sync and backup->Backup-&g Zamknij Ups! Wygląda na to, że wystąpił jakiś błąd! Oto, co się stało:\n\n%s Proszę czekać... - Synchronizacja Stan Niezalogowany Synchronizacja trwa... diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml index 64115ad05..d1e6d6588 100644 --- a/src/main/res/values-pt-rBR/strings.xml +++ b/src/main/res/values-pt-rBR/strings.xml @@ -484,7 +484,6 @@ Fechar Opa, parece que ocorreu um erro! Aqui está o que aconteceu:\n\n%s Por favor, aguarde... - Sincronização Estado Estado: %s Não Registrado diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml index 44fb2192f..ada7e98a4 100644 --- a/src/main/res/values-pt/strings.xml +++ b/src/main/res/values-pt/strings.xml @@ -490,7 +490,6 @@ das tarefas através de um backup em Definições->Sincronização e backup-& Fechar Parece que ocorreu um erro! Isto foi o que aconteceu:\n\n%s Por favor aguarde... - Sincronização e backup Estado Estado: %s Sessão não iniciada diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index 7ff5d079f..4225cab13 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -491,7 +491,6 @@ Закрыть Ой, похоже произошла ошибка! Подробности ниже:\n\n%s Пожалуйста, подождите… - Синхронизация и резервное копирование Состояние Состояние: %s Вход не выполнен diff --git a/src/main/res/values-sl-rSI/strings.xml b/src/main/res/values-sl-rSI/strings.xml index a36010a84..0de575ce5 100644 --- a/src/main/res/values-sl-rSI/strings.xml +++ b/src/main/res/values-sl-rSI/strings.xml @@ -485,7 +485,6 @@ Zapri Ups, zdi se, da je prišlo do napake! Tole se je zgodilo:\n\n%s Prosimo, počakajte... - Uskladitev & varnostna kopija Niste prijavljeni Usklajevanje poteka... Najnovejše usklajevanje:\n%s diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index 053f311c1..6f783fdec 100644 --- a/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -473,7 +473,6 @@ och återställer dina aktuella uppgifter från en backup Stäng Oj, det uppstod ett fel! Detta hände:\n\n%s Var god vänta... - Synkronisering Ej inloggad Synkronisering pågår... Synkroniserades senast:\n%s diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml index cd918b7ae..efe00237b 100644 --- a/src/main/res/values-uk/strings.xml +++ b/src/main/res/values-uk/strings.xml @@ -469,7 +469,6 @@ Закрити На жаль, схоже, сталася помилка! Ось що вийшло:\n\n%s Будь ласка, зачекайте... - Синхронізація і резерв. копіювання Статус Статус: %s Не залогований diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index 5f66080e7..2a0b789e5 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -416,7 +416,6 @@ 关闭 糟糕,发生错误!状况是:\n\n%s 请稍候... - 同步和备份 状态 状态:%s 未登陆 diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml index ba1f4d2c0..9a95f2b87 100644 --- a/src/main/res/values-zh-rTW/strings.xml +++ b/src/main/res/values-zh-rTW/strings.xml @@ -460,7 +460,6 @@ 關閉 糟糕,發生錯誤!狀況是:\n\n%s 請稍候... - 同步和備份 狀態 狀態:%s 未登陸 diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index e991697fa..c16c64dc6 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -53,11 +53,6 @@ Please wait... - - - - Sync & backup -