diff --git a/app/src/main/java/com/aefyr/tsg/g2/TelegramStickersService.java b/app/src/main/java/com/aefyr/tsg/g2/TelegramStickersService.java index f3f792542..ded64f57c 100755 --- a/app/src/main/java/com/aefyr/tsg/g2/TelegramStickersService.java +++ b/app/src/main/java/com/aefyr/tsg/g2/TelegramStickersService.java @@ -1,16 +1,14 @@ package com.aefyr.tsg.g2; -import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext; - import android.content.Context; import android.content.Intent; import android.os.Handler; import android.os.Looper; import android.util.Log; - import com.aefyr.tsg.g2.sql.TelegramStickersDbHelper; import com.aefyr.tsg.g2.stickersgrabber.TelegramStickersGrabber; import com.aefyr.tsg.g2.stickersgrabber.TelegramStickersPackInfo; +import ru.vtosters.lite.ui.fragments.tgstickers.StickersFragment; import java.io.File; import java.util.ArrayList; @@ -19,7 +17,7 @@ import java.util.List; import java.util.concurrent.Executors; import java.util.concurrent.ThreadPoolExecutor; -import ru.vtosters.lite.ui.fragments.tgstickers.StickersFragment; +import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext; /** * Created by Aefyr on 19.05.2018. @@ -227,6 +225,7 @@ public class TelegramStickersService { currentlyDownloading.add(id.toLowerCase()); notificationsHelper.packStartedDownloading(newPack); + grabber.enableProxy(); grabber.grabPack(id, packFolder, pack.version, new TelegramStickersGrabber.PackDownloadListener() { @Override @@ -383,7 +382,7 @@ public class TelegramStickersService { getPacksListReference().set(li1, p2); } - interface StickersEventsListener { + public interface StickersEventsListener { void onPackAdded(TelegramStickersPack pack, int atIndex); void onPackRemoved(TelegramStickersPack pack, int atIndex); diff --git a/app/src/main/java/ru/vtosters/lite/ui/adapters/StickerPackAdapter.java b/app/src/main/java/ru/vtosters/lite/ui/adapters/StickerPackAdapter.java index d8ec3c958..cd4f1e1ed 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/adapters/StickerPackAdapter.java +++ b/app/src/main/java/ru/vtosters/lite/ui/adapters/StickerPackAdapter.java @@ -1,11 +1,5 @@ package ru.vtosters.lite.ui.adapters; -import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext; -import static ru.vtosters.lite.utils.AndroidUtils.getResources; -import static ru.vtosters.lite.utils.ThemesUtils.getSTextAttr; -import static ru.vtosters.lite.utils.ThemesUtils.getTextAttr; -import static ru.vtosters.lite.utils.ThemesUtils.recolorDrawable; - import android.annotation.SuppressLint; import android.net.Uri; import android.view.LayoutInflater; @@ -14,19 +8,20 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; - import androidx.annotation.NonNull; import androidx.appcompat.widget.SwitchCompat; import androidx.recyclerview.widget.RecyclerView; - import com.aefyr.tsg.g2.TelegramStickersPack; import com.aefyr.tsg.g2.TelegramStickersService; import com.vtosters.lite.R; +import ru.vtosters.lite.tgs.TGPref; +import ru.vtosters.lite.ui.components.IItemMovingListener; import java.io.File; -import ru.vtosters.lite.tgs.TGPref; -import ru.vtosters.lite.ui.components.IItemMovingListener; +import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext; +import static ru.vtosters.lite.utils.AndroidUtils.getResources; +import static ru.vtosters.lite.utils.ThemesUtils.*; public class StickerPackAdapter extends RecyclerView.Adapter implements IItemMovingListener { private static final TelegramStickersService sService = TelegramStickersService.getInstance(getGlobalContext()); @@ -129,7 +124,7 @@ public class StickerPackAdapter extends RecyclerView.Adapter sService.setPackEnabled(pack, isChecked, false)); + mSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> sService.setPackEnabled(pack, isChecked, true)); mStickersCount.setText(pack.stickersCount + " " + mStickersCount.getContext().getString(R.string.stickerscount)); // Color костыль 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 5b1ebf2f6..9699c822a 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 @@ -5,6 +5,7 @@ import android.net.Uri; import android.os.Build; import android.os.Bundle; import androidx.annotation.StringRes; +import com.aefyr.tsg.g2.TelegramStickersPack; import com.aefyr.tsg.g2.TelegramStickersService; import com.vk.about.AboutAppFragment; import com.vk.balance.BalanceFragment; @@ -32,7 +33,7 @@ import ru.vtosters.lite.ui.dialogs.OTADialog; import ru.vtosters.lite.ui.fragments.tgstickers.StickersFragment; import ru.vtosters.lite.utils.*; -public class VTSettings extends MaterialPreferenceToolbarFragment { +public class VTSettings extends MaterialPreferenceToolbarFragment implements TelegramStickersService.StickersEventsListener { public static String getValAsString(@StringRes int strRes, Boolean value) { if(Preferences.disableSettingsSumms()) return null; @@ -108,10 +109,42 @@ public class VTSettings extends MaterialPreferenceToolbarFragment { ThemesUtils.setTheme(isDarkTheme ? ThemesUtils.getDarkTheme() : ThemesUtils.getLightTheme(), requireActivity()); } + @Override + public void onPackAdded(TelegramStickersPack pack, int atIndex) { + + } + + @Override + public void onPackRemoved(TelegramStickersPack pack, int atIndex) { + + } + + @Override + public void onPackChanged(TelegramStickersPack pack, int atIndex) { + + } + + @Override + public void onPackDownloadError(TelegramStickersPack pack, Exception error) { + + } + + @Override + public void onActivePacksListChanged() { + findPreference("tgs_stickers").setSummary(getTGSsumm()); + } + + @Override + public void onInactivePacksListChanged() { + + } + @Override public void onCreate(Bundle bundle) { super.onCreate(bundle); + TelegramStickersService.getInstance(requireContext()).addStickersEventsListener(this); + this.addPreferencesFromResource(R.xml.empty); var accountSwitcher = PreferenceFragmentUtils.addPreference( @@ -427,7 +460,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment { PreferenceFragmentUtils.addPreference( getPreferenceScreen(), - "", + "tgs_stickers", requireContext().getString(R.string.vtltgs), getTGSsumm(), R.drawable.ic_telegram_outline_28, @@ -611,4 +644,10 @@ public class VTSettings extends MaterialPreferenceToolbarFragment { public int T4() { return R.string.notification_settings; } + + @Override + public void onDestroyView() { + super.onDestroyView(); + TelegramStickersService.getInstance(requireContext()).removeStickersEventsListener(this); + } } diff --git a/smali/res/values-ru/strings.xml b/smali/res/values-ru/strings.xml index 7fb143b12..b47d63cee 100644 --- a/smali/res/values-ru/strings.xml +++ b/smali/res/values-ru/strings.xml @@ -5936,7 +5936,7 @@ Режим VK Мессенджера Офлайн режим Покраска навбара - Установлено паков + Используется паков Округление чисел Тип проксирования Отображение верификаций diff --git a/smali/res/values/strings.xml b/smali/res/values/strings.xml index 64952bece..2cde1214d 100644 --- a/smali/res/values/strings.xml +++ b/smali/res/values/strings.xml @@ -6071,7 +6071,7 @@ May look like a fake leaving the online" VK Messenger mode Offline mode Navbar coloring - Installed packs + Activated packs Round numbers Proxy type Show verifications