diff --git a/app/src/main/java/com/vtosters/lite/ui/bottomnavigation/BottomNavigationItemView.java b/app/src/main/java/com/vtosters/lite/ui/bottomnavigation/BottomNavigationItemView.java index 6df6b0d8b..d661873f5 100644 --- a/app/src/main/java/com/vtosters/lite/ui/bottomnavigation/BottomNavigationItemView.java +++ b/app/src/main/java/com/vtosters/lite/ui/bottomnavigation/BottomNavigationItemView.java @@ -1,5 +1,6 @@ package com.vtosters.lite.ui.bottomnavigation; +import static ru.vtosters.lite.utils.Preferences.*; import static ru.vtosters.lite.utils.ThemesUtils.getCSTDock; import android.annotation.SuppressLint; @@ -30,6 +31,7 @@ import com.vk.core.ui.themes.VKThemeHelper; import com.vtosters.lite.R; import me.grishka.appkit.utils.V; +import ru.vtosters.lite.utils.Preferences; public class BottomNavigationItemView extends FrameLayout implements MenuView.ItemView { private final TextView mSmallLabel; @@ -219,13 +221,19 @@ public class BottomNavigationItemView extends FrameLayout implements MenuView.It // ViewCompat.setScaleY(mLargeLabel, !mStaticModeEnabled && !checked ? mLargeScale : 1.0f); ViewCompat.setScaleX(mSmallLabel, !mStaticModeEnabled && checked ? mSmallScale : 1.0f); ViewCompat.setScaleY(mSmallLabel, !mStaticModeEnabled && checked ? mSmallScale : 1.0f); - // make mLargeLabel and mSmallLabel are bold mLargeLabel.setTypeface(null, Typeface.BOLD); mSmallLabel.setTypeface(null, Typeface.BOLD); - // make mLargeLabel and mSmallLabel text size is 10sp - mLargeLabel.setTextSize(TypedValue.COMPLEX_UNIT_SP, 10); - mSmallLabel.setTextSize(TypedValue.COMPLEX_UNIT_SP, 10); + int textsize; + + if (vkme()){ + textsize = 11; + } else { + textsize = 10; + } + + mLargeLabel.setTextSize(TypedValue.COMPLEX_UNIT_SP, textsize); + mSmallLabel.setTextSize(TypedValue.COMPLEX_UNIT_SP, textsize); mLargeLabel.setVisibility(/*checked ? VISIBLE :*/ INVISIBLE); mSmallLabel.setVisibility(VISIBLE);//checked ? INVISIBLE : VISIBLE); diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java index 0026a0821..eb66769f5 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java @@ -1,11 +1,14 @@ package ru.vtosters.lite.ui.fragments; +import static ru.vtosters.lite.utils.AndroidUtils.*; import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier; import static ru.vtosters.lite.utils.AndroidUtils.getPreferences; import static ru.vtosters.lite.utils.LifecycleUtils.restartApplicationWithTimer; import static ru.vtosters.lite.utils.Preferences.autoalltranslate; -import static ru.vtosters.lite.utils.Preferences.offline; +import static ru.vtosters.lite.utils.Preferences.vkme; +import static ru.vtosters.lite.utils.ThemesUtils.*; +import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Bundle; @@ -19,9 +22,12 @@ import com.vk.navigation.Navigator; import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment; import java.util.Arrays; +import java.util.Objects; import ru.vtosters.lite.ui.adapters.ImagineArrayAdapter; import ru.vtosters.lite.ui.wallpapers.WallpaperMenuFragment; +import ru.vtosters.lite.utils.AndroidUtils; +import ru.vtosters.lite.utils.ThemesUtils; public class MessagesFragment extends MaterialPreferenceToolbarFragment { @Override @@ -31,6 +37,7 @@ public class MessagesFragment extends MaterialPreferenceToolbarFragment { prefs(); } + @SuppressLint("UseCompatLoadingForDrawables") private void prefs() { findPreference("vkme").setOnPreferenceClickListener(new MessagesFragment.restart()); findPreference("vkme_notifs").setOnPreferenceClickListener(new MessagesFragment.restart()); @@ -50,7 +57,7 @@ public class MessagesFragment extends MaterialPreferenceToolbarFragment { .create(); var listView = (ListView) LayoutInflater.from(getContext()).inflate(com.vtosters.lite.R.layout.abc_select_dialog_material, null, false); - var adapter = new ImagineArrayAdapter(getContext(), items, i -> { + var adapter = new ImagineArrayAdapter(requireContext(), items, i -> { getPreferences().edit().putInt("translator", i).apply(); alert.dismiss(); }); @@ -61,15 +68,20 @@ public class MessagesFragment extends MaterialPreferenceToolbarFragment { return true; }); + + findPreference("vkme_notifs").setEnabled(vkme()); + findPreference("wallpapers").setIcon(recolorDrawable(getGlobalContext().getDrawable(getIdentifier("ic_media_outline_28", "drawable")))); + findPreference("vkme").setIcon(getIdentifier("ic_vkme_28", "drawable")); } @Override public boolean onPreferenceTreeClick(Preference preference) { findPreference("autotranslate").setEnabled(!autoalltranslate()); + findPreference("vkme_notifs").setEnabled(vkme()); return super.onPreferenceTreeClick(preference); } - public boolean restart(Preference preference) { + public boolean restart() { restartApplicationWithTimer(); return true; } @@ -77,14 +89,14 @@ public class MessagesFragment extends MaterialPreferenceToolbarFragment { public class restart implements Preference.OnPreferenceClickListener { @Override public boolean onPreferenceClick(Preference preference) { - return MessagesFragment.this.restart(preference); + return MessagesFragment.this.restart(); } } public class clearCache implements Preference.OnPreferenceClickListener { @Override public boolean onPreferenceClick(Preference preference) { - return MessagesFragment.this.restart(preference); + return MessagesFragment.this.restart(); } } 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 7ff1be1f7..d7bbecc94 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 @@ -330,7 +330,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment { }); } } else { - addPreference(this, "", "Внимание!", "Некоторые пункты настроек были скрыты из-за режима VK Me \n\nДля отключения режима перейдите в настройки Сообщений", "ic_about_outline_28", preference -> false); + addPreference(this, "", "Внимание!", "Некоторые пункты настроек были скрыты из-за режима VK Мессенджер \n\nДля отключения режима перейдите в настройки Сообщений", "ic_about_outline_28", preference -> false); } addPreference(this, "", AndroidUtils.getString("vtlmedia"), mediasumm, "ic_media_outline_28", preference -> { diff --git a/smali/res/drawable-hdpi/ic_vkme_28.png b/smali/res/drawable-hdpi/ic_vkme_28.png index 4fae2af3d..14230a13c 100644 Binary files a/smali/res/drawable-hdpi/ic_vkme_28.png and b/smali/res/drawable-hdpi/ic_vkme_28.png differ diff --git a/smali/res/drawable-mdpi/ic_vkme_28.png b/smali/res/drawable-mdpi/ic_vkme_28.png index 0384cc87b..1864b4385 100644 Binary files a/smali/res/drawable-mdpi/ic_vkme_28.png and b/smali/res/drawable-mdpi/ic_vkme_28.png differ diff --git a/smali/res/drawable-xhdpi/ic_vkme_28.png b/smali/res/drawable-xhdpi/ic_vkme_28.png index e5f321a7a..30f6c2201 100644 Binary files a/smali/res/drawable-xhdpi/ic_vkme_28.png and b/smali/res/drawable-xhdpi/ic_vkme_28.png differ diff --git a/smali/res/drawable-xxhdpi/ic_vkme_28.png b/smali/res/drawable-xxhdpi/ic_vkme_28.png index 6de771331..e3b84bd76 100644 Binary files a/smali/res/drawable-xxhdpi/ic_vkme_28.png and b/smali/res/drawable-xxhdpi/ic_vkme_28.png differ diff --git a/smali/res/drawable-xxxhdpi/ic_vkme_28.png b/smali/res/drawable-xxxhdpi/ic_vkme_28.png index 20e85a061..201ad0aec 100644 Binary files a/smali/res/drawable-xxxhdpi/ic_vkme_28.png and b/smali/res/drawable-xxxhdpi/ic_vkme_28.png differ diff --git a/smali/res/values-ru/strings.xml b/smali/res/values-ru/strings.xml index acef9b9f5..ea8d7a566 100644 --- a/smali/res/values-ru/strings.xml +++ b/smali/res/values-ru/strings.xml @@ -5751,8 +5751,8 @@ Анимация фрагментов (бета) Выберите анимацию фрагментов - Режим VK Me - Замена докбара и некоторых элементов на что-то похожее как в VK Me + Режим VK Мессенджера + Замена докбара и некоторых элементов на что-то похожее как в VK Мессенджере Аккаунт Темная тема @@ -5768,7 +5768,7 @@ Блокировать рекламу Докбар элементов VKX интеграция - Режим VK Me + Режим VK Мессенджера Офлайн режим Покраска навбара Установлено паков diff --git a/smali/res/values/strings.xml b/smali/res/values/strings.xml index 19eaf5644..708e87c90 100644 --- a/smali/res/values/strings.xml +++ b/smali/res/values/strings.xml @@ -5909,8 +5909,8 @@ May look like a fake leaving the online" Fragment animation (beta) Select fragment animation - VK Me mode - Replacing the dock and some elements with something similar as in VK Me + VK Messenger mode + Replacing the dock and some elements with something similar as in VK Messenger Account Dark theme @@ -5926,7 +5926,7 @@ May look like a fake leaving the online" Block ads Dockbar elements VKX Integration - VK Me mode + VK Messenger mode Offline mode Navbar coloring Installed packs diff --git a/smali/res/xml/preferences_messages.xml b/smali/res/xml/preferences_messages.xml index 80e5b5109..d4486f11e 100644 --- a/smali/res/xml/preferences_messages.xml +++ b/smali/res/xml/preferences_messages.xml @@ -15,7 +15,7 @@ android:summary="Скрыть блок рекомендаций добавления в друзья в сообщениях и других советов" android:title="Скрыть рекомендации" /> - +