some fixes

This commit is contained in:
gdlbo
2023-03-07 12:49:33 +03:00
parent 07156f1c6a
commit 51c94d7334
8 changed files with 19 additions and 23 deletions
@@ -4,6 +4,7 @@ import android.os.Build;
import android.os.Bundle;
import com.vtosters.lite.R;
import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
import ru.vtosters.lite.ui.components.DockBarEditorManager;
import ru.vtosters.lite.ui.components.SuperAppEditorManager;
import ru.vtosters.lite.ui.dialogs.RoundingSeekbarDialog;
import ru.vtosters.lite.utils.AndroidUtils;
@@ -63,6 +64,17 @@ public class InterfaceFragment extends MaterialPreferenceToolbarFragment {
findPreference("swipe").setVisible(false);
}
if (Preferences.vkme() || isTablet()) {
findPreference("dockbareditor").setVisible(false);
}
var dockbarEditor = findPreference("dockbareditor");
dockbarEditor.setSummary(AndroidUtils.getString(R.string.vtldocksumm) + ": " + DockBarEditorManager.getInstance().getSelectedTabs().size());
dockbarEditor.setOnPreferenceClickListener(preference -> {
NavigatorUtils.switchFragment(requireContext(), DockBarEditorFragment.class);
return true;
});
if (ThemesUtils.isMilkshake() && Preferences.superapp()) {
findPreference("miniapps").setVisible(false);
@@ -74,10 +86,6 @@ public class InterfaceFragment extends MaterialPreferenceToolbarFragment {
return true;
});
if (Build.VERSION.SDK_INT >= 33) {
findPreference("anim_rtrn_type").setVisible(false);
}
if (Preferences.getPreferences().getInt("pic_rounding", 0) == 0) {
findPreference("customrounding").setSummary(requireContext().getString(R.string.disabled));
} else {
@@ -43,13 +43,6 @@ public class ThemesFragment extends MaterialPreferenceToolbarFragment {
findPreference("systememoji").setSummary(getGlobalContext().getString(R.string.systememojisum) + " \uD83D\uDE00\uD83D\uDE01\uD83E\uDD11\uD83E\uDD75\uD83D\uDC4D");
var dockbarEditor = findPreference("dockbareditor");
dockbarEditor.setSummary(AndroidUtils.getString(R.string.vtldocksumm) + ": " + DockBarEditorManager.getInstance().getSelectedTabs().size());
dockbarEditor.setOnPreferenceClickListener(preference -> {
NavigatorUtils.switchFragment(requireContext(), DockBarEditorFragment.class);
return true;
});
var invalidateThemeCache = findPreference("invalidate_theme_cache");
if(ThemesUtils.getReservedAccent() != Color.TRANSPARENT)
invalidateThemeCache.setOnPreferenceClickListener(preference -> {
@@ -130,15 +123,10 @@ public class ThemesFragment extends MaterialPreferenceToolbarFragment {
return true;
});
if (Preferences.vkme()) {
findPreference("dockbareditor").setVisible(false);
}
if(AndroidUtils.isTablet()) {
PreferenceCategory dockbarSettingsPreferenceCategory = (PreferenceCategory) findPreference("dockbarsett");
dockbarSettingsPreferenceCategory.setVisible(false);
findPreference("alteremoji").setVisible(false);
findPreference("dockbareditor").setVisible(false);
}
}
+1 -1
View File
@@ -5881,7 +5881,7 @@ QR-код"</string>
<string name="videodownloaderr">Дадзенае відэа немагчыма спампаваць</string>
<string name="roundedmsgs">Круглыя ​​паведамленні</string>
<string name="dateformat">Абярыце тып паказу дат</string>
<string name="franimation">Анімацыя фрагментаў (бэта)</string>
<string name="franimation">Анімацыя фрагментаў</string>
<string name="selectfranimation">Абярыце анімацыю фрагментаў</string>
<string name="vkme">Рэжым VK Месенджара</string>
<string name="vkmesumm">Замена докбара і некаторых элементаў на нешта падобнае як у VK Месенджэры</string>
+1 -1
View File
@@ -5917,7 +5917,7 @@
<string name="dateformat">Выберите тип показа дат</string>
<string name="franimation">Анимация фрагментов (бета)</string>
<string name="franimation">Анимация фрагментов</string>
<string name="selectfranimation">Выберите анимацию фрагментов</string>
<string name="vkme">Режим VK Мессенджера</string>
+1 -1
View File
@@ -5843,7 +5843,7 @@
<string name="dateformat">Виберіть тип показу дат</string>
<string name="franimation">Анімація фрагментів (бета)</string>
<string name="franimation">Анімація фрагментів</string>
<string name="selectfranimation">Виберіть анімацію фрагментів</string>
<string name="vkme">Режим VK Месенджера</string>
+1 -1
View File
@@ -6052,7 +6052,7 @@ May look like a fake leaving the online"</string>
<string name="dateformat">Select the date display type</string>
<string name="franimation">Fragment animation (beta)</string>
<string name="franimation">Fragment animation</string>
<string name="selectfranimation">Select fragment animation</string>
<string name="vkme">VK Messenger mode</string>
+3
View File
@@ -35,6 +35,9 @@
<Preference
android:key="customrounding"
android:title="@string/customrounding_title"/>
<Preference
android:key="dockbareditor"
android:title="@string/dockbar_editor"/>
</PreferenceCategory>
<PreferenceCategory android:title="@string/interfacenewsfeed">
<com.vtosters.lite.ui.MaterialSwitchPreference
-3
View File
@@ -48,9 +48,6 @@
<PreferenceCategory
android:key="dockbarsett"
android:title="@string/vtl_settings_dockbar_title">
<Preference
android:key="dockbareditor"
android:title="@string/dockbar_editor"/>
<com.vtosters.lite.ui.MaterialSwitchPreference
android:defaultValue="true"
android:key="dockbar_tab_titles"