From 2ec4c69832e0b35d43b0c6a29bde8e6e932db165 Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Fri, 15 Sep 2023 18:40:38 +0300
Subject: [PATCH] added "Data and storage" item to settings

---
 .../vtosters/lite/ui/fragments/OtherFragment.java  |  5 -----
 .../ru/vtosters/lite/ui/fragments/VTSettings.java  | 14 +++++++++++++-
 smali/res/values-be/strings.xml                    |  2 +-
 smali/res/values-ru/strings.xml                    |  2 +-
 smali/res/values-uk/strings.xml                    |  2 +-
 smali/res/values/strings.xml                       |  2 +-
 smali/res/xml/preferences_other.xml                |  5 -----
 7 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java
index 200bc51a8..d36bf1255 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java
@@ -103,11 +103,6 @@ public class OtherFragment extends TrackedMaterialPreferenceToolbarFragment {
             return true;
         });
 
-        findPreference("datasettings").setOnPreferenceClickListener(preference -> {
-            NavigatorUtils.switchFragment(requireContext(), DataSettingsFragment.class);
-            return true;
-        });
-
         findPreference("dialogrecomm").setVisible(!Preferences.hasVerification());
 
         findPreference("updateverifdata").setOnPreferenceClickListener(preference -> {
diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java
index 6193ea113..fc0b49d78 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java
@@ -441,7 +441,7 @@ public class VTSettings extends TrackedMaterialPreferenceToolbarFragment {
                 getPreferenceScreen(),
                 "",
                 requireContext().getString(R.string.vtlinterface),
-                getValAsString(R.string.showstories, Preferences.stories()),
+                getValAsString(R.string.show_superapps_title, Preferences.superapp()),
                 R.drawable.ic_interface_outline_28,
                 preference -> {
                     NavigatorUtils.switchFragment(requireContext(), InterfaceFragment.class);
@@ -449,6 +449,18 @@ public class VTSettings extends TrackedMaterialPreferenceToolbarFragment {
                 }
         );
 
+        PreferenceFragmentUtils.addPreference(
+                getPreferenceScreen(),
+                "",
+                AndroidUtils.getString(R.string.datasettings_title),
+                getString(com.vtosters.lite.R.string.cache_size_summ) + ": " + CacheUtils.humanReadableByteCountBin(IOUtils.getDirSize(AndroidUtils.getGlobalContext().getCacheDir())),
+                R.drawable.ic_document_outline_28,
+                preference -> {
+                    NavigatorUtils.switchFragment(requireContext(), DataSettingsFragment.class);
+                    return false;
+                }
+        );
+
         PreferenceFragmentUtils.addPreference(
                 getPreferenceScreen(),
                 "",
diff --git a/smali/res/values-be/strings.xml b/smali/res/values-be/strings.xml
index 343f0557f..b9287ab54 100644
--- a/smali/res/values-be/strings.xml
+++ b/smali/res/values-be/strings.xml
@@ -7010,7 +7010,7 @@
     <string name="useGenius_summ">Атрымліваць тэксты з сэрвісу Genius</string>
     <string name="useGenius_title">Тэксты з Genius</string>
 
-    <string name="datasettings_title">Налады дадзеных прыкладання</string>
+    <string name="datasettings_title">Дадзеныя і памяць</string>
     <string name="invalidate_theme_cache_title">Інвалідацыя кэша тэмы</string>
     <string name="invalidate_theme_cache_each_update_title">Ачыстка кэша тэмы пасля абнаўлення для прадухілення праблем з акцэнтамі</string>
 
diff --git a/smali/res/values-ru/strings.xml b/smali/res/values-ru/strings.xml
index 1dca5924c..3935dbcf2 100644
--- a/smali/res/values-ru/strings.xml
+++ b/smali/res/values-ru/strings.xml
@@ -6392,7 +6392,7 @@
     <string name="useGenius_summ">Получать тексты с сервиса Genius</string>
     <string name="useGenius_title">Тексты с Genius</string>
 
-    <string name="datasettings_title">Настройки данных приложения</string>
+    <string name="datasettings_title">Данные и память</string>
     <string name="invalidate_theme_cache_title">Инвалидация кэша темы</string>
     <string name="invalidate_theme_cache_each_update_title">Очистка кэша темы после обновления для предотвращения проблем с акцентами</string>
 
diff --git a/smali/res/values-uk/strings.xml b/smali/res/values-uk/strings.xml
index 357029e46..3ea7b0491 100644
--- a/smali/res/values-uk/strings.xml
+++ b/smali/res/values-uk/strings.xml
@@ -6317,7 +6317,7 @@
     <string name="useGenius_summ">Отримувати тексти з сервісу Genius</string>
     <string name="useGenius_title">Тексти з Genius</string>
 
-    <string name="datasettings_title">Налаштування даних додатку</string>
+    <string name="datasettings_title">"Дані та пам'ять"</string>
     <string name="invalidate_theme_cache_title">Інвалідація кешу теми</string>
     <string name="invalidate_theme_cache_each_update_title">Очищення кешу теми після оновлення для запобігання проблем з акцентами</string>
 
diff --git a/smali/res/values/strings.xml b/smali/res/values/strings.xml
index 6ae494d26..a86ef4770 100644
--- a/smali/res/values/strings.xml
+++ b/smali/res/values/strings.xml
@@ -6530,7 +6530,7 @@ May look like a fake leaving the online"</string>
     <string name="useGenius_summ">Genius service</string>
     <string name="useGenius_title">Texts from Genius</string>
 
-    <string name="datasettings_title">Application data settings</string>
+    <string name="datasettings_title">Data and storage</string>
     <string name="invalidate_theme_cache_title">Invalidate theme cache</string>
     <string name="invalidate_theme_cache_each_update_title">Clear theme cache after update to prevent problems with accents</string>
 
diff --git a/smali/res/xml/preferences_other.xml b/smali/res/xml/preferences_other.xml
index e844dc223..618dbf492 100644
--- a/smali/res/xml/preferences_other.xml
+++ b/smali/res/xml/preferences_other.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory android:title="@string/data">
-        <Preference
-                android:key="datasettings"
-                android:title="@string/datasettings_title"/>
-    </PreferenceCategory>
     <PreferenceCategory android:title="@string/other_fix_app">
         <Preference
                 android:key="firebasefix"