Merge pull request #1942 from moneymanagerex/clean_old_cat_subcat

Use always new nested category model

app/src/main/java/com/money/manager/ex/settings/BehaviourSettings.java

@@ -44,7 +44,9 @@ public boolean getProcessRecurringTransaction() {
     }
 
     public boolean getUseNestedCategory() {
-        return get(R.string.pref_use_nested_category, true);
+        // todo remove entire methods after cleaning old catsubcat
+        return true; // force true for cleaning old catsubcat
+        // return get(R.string.pref_use_nested_category, true);
     }
 
     public void setUseNestedCategory(boolean status) {

app/src/main/java/com/money/manager/ex/settings/BehaviourSettingsFragment.java

@@ -58,6 +58,15 @@ public void onCreatePreferences(Bundle bundle, String s) {
         initializeNotificationTime();
         initializeSmsAutomation();
 
+        // todo force true and disable. remove after cleaning old catsubcat
+        Preference nestedCat = findPreference(getString(R.string.pref_use_nested_category));
+        if (nestedCat != null) {
+            // TODO: until review of code for nestedcategory is not complited
+            (new AppSettings(getContext()).getBehaviourSettings()).setUseNestedCategory(true);
+            nestedCat.setEnabled(false);
+            nestedCat.setDefaultValue(true);
+        }
+
     }
 
     @Override

app/src/main/res/values-de/strings.xml

@@ -417,8 +417,8 @@
   <string name="donate_in_app_error">Der in-app Kauf kann nicht verwendet werden. Überprüfen Sie ob die neuste Version von Play Store installiert ist.</string>
   <string name="title_repeating_transaction_process">Geplante Buchung verarbeiten</string>
   <string name="summary_repeating_transaction_process">Geplante überfällige Buchung verarbeiten (nachträglich, Eingabe, manuell)</string>
-  <string name="title_use_nested_category">(BETA) Neues verschachteltes Kategorie-Modell verwenden</string>
-  <string name="summary_use_nested_category">Neues verschachteltes Kategorie-Modell anstelle von Kategorie:Unterkategorie-Modell verwenden (Beta, Verwendung auf eigene Gefahr)</string>
+  <string name="title_use_nested_category">Neues verschachteltes Kategorie-Modell verwenden</string>
+  <string name="summary_use_nested_category">Neues verschachteltes Kategorie-Modell anstelle von Kategorie:Unterkategorie-Modell verwenden</string>
   <string name="tools">Werkzeuge</string>
   <string name="entities">Extras</string>
   <string name="loading">Wird geladen&#8230;</string>

app/src/main/res/values-fr/strings.xml

@@ -394,7 +394,7 @@
   <string name="donate_in_app_already_donate">Vous avez déjà contribué au développement de MoneyManagerEx pour Android en envoyant votre don.\n\nUn grand merci de la part de l\'équipe de développement !</string>
   <string name="donate_in_app_retrieving_status">Confirmation de vos dons depuis Google Play. Veuillez patienter ...</string>
   <string name="donate_in_app_error">Impossible d\'effectuer des achats intégrés. Vérifiez si la dernière version de l\'application Play Store est installée.</string>
-  <string name="title_use_nested_category">(BETA) Utiliser les catégories imbriquées</string>
+  <string name="title_use_nested_category">Utiliser les catégories imbriquées</string>
   <string name="tools">Outils</string>
   <string name="entities">Données de référence</string>
   <string name="loading">Chargement &#8230;</string>

app/src/main/res/values-hu/strings.xml

@@ -417,8 +417,8 @@
   <string name="donate_in_app_error">Nem tudjuk használni az alkalmazáson belüli számlázást. Ellenőrizze, hogy a Play Áruház legfrissebb verziója van-e telepítve az eszközére.</string>
   <string name="title_repeating_transaction_process">Ütemezett ügyletének feldolgozása</string>
   <string name="summary_repeating_transaction_process">Ütemezett ügylet lejárt feldolgozása (bevitel, felszólítás, kézi)</string>
-  <string name="title_use_nested_category">(BÉTA) Új beágyazott kategóriamodell használata</string>
-  <string name="summary_use_nested_category">Új beágyazott kategóriamodell használata kategória:alkategória modell helyett (béta, használat saját felelősségre)</string>
+  <string name="title_use_nested_category">Új beágyazott kategóriamodell használata</string>
+  <string name="summary_use_nested_category">Új beágyazott kategóriamodell használata kategória:alkategória modell helyett</string>
   <string name="tools">Eszközök</string>
   <string name="entities">Listák</string>
   <string name="loading">Betöltés&#8230;</string>

app/src/main/res/values-it/strings.xml

@@ -417,8 +417,8 @@
   <string name="donate_in_app_error">Non è possibile utilizzare il pagamento in-app. Verifica se è installata l\'ultima versione dell\'applicazione Play Store.</string>
   <string name="title_repeating_transaction_process">Processa transazioni pianificate</string>
   <string name="summary_repeating_transaction_process">Processa transazioni pianificate scadute (Automatica, Chiedi, Manuale)</string>
-  <string name="title_use_nested_category">(BETA) Usa un nuovo modello di categoria annidato</string>
-  <string name="summary_use_nested_category">Usa il nuovo modello di categoria annidato invece di categoria:sottocategoria (Beta, usa a proprio rischio)</string>
+  <string name="title_use_nested_category">Usa un nuovo modello di categoria annidato</string>
+  <string name="summary_use_nested_category">Usa il nuovo modello di categoria annidato invece di categoria:sottocategoria</string>
   <string name="tools">Strumenti</string>
   <string name="entities">Entità</string>
   <string name="loading">Caricamento in corso&#8230;</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -412,8 +412,8 @@
   <string name="donate_in_app_already_donate">Você já apoiou o desenvolvimento do MoneyManagerEx para o Android com a sua doação! \n\nMuito obrigado da equipe de desenvolvimento!</string>
   <string name="donate_in_app_retrieving_status">Recuperando o status de suas doações do Google Play. Aguarde&#8230;</string>
   <string name="donate_in_app_error">Não é possível usar o faturamento no aplicativo. Verifique se a versão mais recente do aplicativo Play Store está instalada.</string>
-  <string name="title_use_nested_category">(BETA) Use novo modelo de categoria aninhada</string>
-  <string name="summary_use_nested_category">Use o novo modelo de categoria aninhada em vez do modelo categoria:subcategoria (Beta, use por sua própria conta e risco)</string>
+  <string name="title_use_nested_category">Use novo modelo de categoria aninhada</string>
+  <string name="summary_use_nested_category">Use o novo modelo de categoria aninhada em vez do modelo categoria:subcategoria</string>
   <string name="tools">Ferramentas</string>
   <string name="entities">Entidades</string>
   <string name="loading">Carregando...</string>

app/src/main/res/values-ru/strings.xml

@@ -412,8 +412,8 @@
   <string name="donate_in_app_already_donate">Вы уже поддержали разработчиков MoneyManagerEx для Android внеся пожертвование!\n\nБольшое спасибо от группы разработчиков!</string>
   <string name="donate_in_app_retrieving_status">Запрашиваем статус ваших пожертвований через Google Play. Пожалуйста подождите&#8230;</string>
   <string name="donate_in_app_error">Невозможно использовать функцию оплаты из программы. Проверьте, что у вас установлена последняя версия приложения Google Play Store.</string>
-  <string name="title_use_nested_category">(BETA) Использовать новую модель вложенных категорий</string>
-  <string name="summary_use_nested_category">Использовать новую вложенную модель категорий вместо схемы \"категория:подкатегория\" (бета, использовать на свой риск)</string>
+  <string name="title_use_nested_category">Использовать новую модель вложенных категорий</string>
+  <string name="summary_use_nested_category">Использовать новую вложенную модель категорий вместо схемы \"категория:подкатегория\"</string>
   <string name="tools">Инструменты</string>
   <string name="entities">Сущности</string>
   <string name="loading">Загрузка&#8230;</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -416,8 +416,8 @@
   <string name="donate_in_app_retrieving_status">正在从 Google Play 确认您的捐款状态 请稍候&#8230;</string>
   <string name="donate_in_app_error">无法使用内购功能。请确认您是否安装了最新的谷歌应用商店程序</string>
   <string name="title_repeating_transaction_process">处理周期性交易</string>
-  <string name="title_use_nested_category">(BETA) 使用新嵌套类别结构</string>
-  <string name="summary_use_nested_category">使用新嵌套类别结构而不是类别:子类别结构 （Beta功能，自担风险）</string>
+  <string name="title_use_nested_category">使用新嵌套类别结构</string>
+  <string name="summary_use_nested_category">使用新嵌套类别结构而不是类别:子类别结构</string>
   <string name="tools">工具</string>
   <string name="entities">主体</string>
   <string name="loading">正在加载...</string>

app/src/main/res/values/strings.xml

@@ -440,8 +440,8 @@
     <string name="title_repeating_transaction_process">Process Scheduled Transaction</string>
     <string name="summary_repeating_transaction_process">Process scheduled transaction overdue (Post, Prompt, Manual)</string>
 
-    <string name="title_use_nested_category">(BETA) Use new nested category model</string>
-    <string name="summary_use_nested_category">Use new nested category model instead of category:subcategory model (Beta, use at own risk)</string>
+    <string name="title_use_nested_category">Use new nested category model</string>
+    <string name="summary_use_nested_category">Use new nested category model instead of category:subcategory model</string>
 
     <string name="tools">Tools</string>
     <string name="entities">Entities</string>