diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/AppIconsSelectorCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/AppIconsSelectorCell.java index 411ff659..489425c0 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/AppIconsSelectorCell.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/AppIconsSelectorCell.java @@ -44,6 +44,9 @@ import org.telegram.ui.Components.RecyclerListView; import org.telegram.ui.LauncherIconController; import org.telegram.ui.PremiumPreviewFragment; +import tw.nekomimi.nekogram.helpers.SponsorHelper; +import tw.nekomimi.nekogram.settings.NekoDonateActivity; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -109,8 +112,8 @@ public class AppIconsSelectorCell extends RecyclerListView implements Notificati setOnItemClickListener((view, position) -> { IconHolderView holderView = (IconHolderView) view; LauncherIconController.LauncherIcon icon = availableIcons.get(position); - if (icon.premium && !UserConfig.hasPremiumOnAccounts()) { - fragment.showDialog(new PremiumFeatureBottomSheet(fragment, PremiumPreviewFragment.PREMIUM_FEATURE_APPLICATION_ICONS, true)); + if (icon.premium && !SponsorHelper.isCurrentUserSponsor()) { + fragment.presentFragment(new NekoDonateActivity()); return; } @@ -151,14 +154,6 @@ public class AppIconsSelectorCell extends RecyclerListView implements Notificati private void updateIconsVisibility() { availableIcons.clear(); availableIcons.addAll(Arrays.asList(LauncherIconController.LauncherIcon.values())); - if (MessagesController.getInstance(currentAccount).premiumFeaturesBlocked()) { - for (int i = 0; i < availableIcons.size(); i++) { - if (availableIcons.get(i).premium) { - availableIcons.remove(i); - i--; - } - } - } getAdapter().notifyDataSetChanged(); invalidateItemDecorations(); @@ -275,7 +270,7 @@ public class AppIconsSelectorCell extends RecyclerListView implements Notificati iconView.setImageResource(icon.background); MarginLayoutParams params = (MarginLayoutParams) titleView.getLayoutParams(); - if (icon.premium && !UserConfig.hasPremiumOnAccounts()) { + if (icon.premium && !SponsorHelper.isCurrentUserSponsor()) { SpannableString str = new SpannableString("d " + LocaleController.getString(icon.title)); ColoredImageSpan span = new ColoredImageSpan(R.drawable.msg_mini_premiumlock); span.setTopOffset(1); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/LauncherIconController.java b/TMessagesProj/src/main/java/org/telegram/ui/LauncherIconController.java index 111cbfc2..4508aafa 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/LauncherIconController.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/LauncherIconController.java @@ -43,7 +43,7 @@ public class LauncherIconController { DEFAULT("DefaultIcon", R.color.ic_launcher_background, R.drawable.ic_launcher_foreground, R.string.AppIconDefault), //VINTAGE("VintageIcon", R.drawable.icon_6_background_sa, R.drawable.ic_launcher_foreground, R.string.AppIconVintage), AQUA("AquaIcon", R.drawable.icon_4_background_sa, R.mipmap.icon_4_launcher_foreground, R.string.AppIconAqua), - PREMIUM("PremiumIcon", R.drawable.icon_3_background_sa, R.mipmap.icon_3_launcher_foreground, R.string.AppIconPremium), + PREMIUM("PremiumIcon", R.drawable.icon_3_background_sa, R.mipmap.icon_3_launcher_foreground, R.string.AppIconPremium, true), TURBO("TurboIcon", R.drawable.icon_5_background_sa, R.mipmap.icon_5_launcher_foreground, R.string.AppIconTurbo), RAINBOW("RainbowIcon", R.drawable.icon_8_background_sa, R.mipmap.icon_8_launcher_foreground, R.string.AppIconRainbow), SPACE("SpaceIcon", R.mipmap.icon_11_launcher_background, R.mipmap.icon_11_launcher_foreground, R.string.AppIconSpace), diff --git a/TMessagesProj/src/main/res/values-ru/strings_neko.xml b/TMessagesProj/src/main/res/values-ru/strings_neko.xml index ee066e3c..b0072a35 100644 --- a/TMessagesProj/src/main/res/values-ru/strings_neko.xml +++ b/TMessagesProj/src/main/res/values-ru/strings_neko.xml @@ -218,6 +218,7 @@ Изменяйте текст сообщений, используя markdown: ^1**жирный**^1, ^2__курсив__^2, ^3~~зачёркнутый~~^3, ^4`моноширинный`^4, ^5||скрытый||^5, ^6текст^7url^8. Изменяйте текст сообщений, используя markdown: ^1**жирный**^1, ^2__курсив__^2, ^3~~зачёркнутый~~^3, ^4`моноширинный`^4, ^5||скрытый||^5. Old School + Сакура Мерио Ночь Мушин diff --git a/TMessagesProj/src/main/res/values/strings.xml b/TMessagesProj/src/main/res/values/strings.xml index 17df9efb..3a38ef37 100644 --- a/TMessagesProj/src/main/res/values/strings.xml +++ b/TMessagesProj/src/main/res/values/strings.xml @@ -5702,7 +5702,7 @@ Vintage Aqua Premium - Turbo + Sakura Nox App icon has been changed to %1$s File Too Large diff --git a/TMessagesProj/src/main/res/values/strings_neko.xml b/TMessagesProj/src/main/res/values/strings_neko.xml index f2e37924..8b5aa141 100644 --- a/TMessagesProj/src/main/res/values/strings_neko.xml +++ b/TMessagesProj/src/main/res/values/strings_neko.xml @@ -241,6 +241,7 @@ Edit text in messages using markdown: ^1**bold**^1, ^2__italic__^2, ^3~~strikethrough~~^3, ^4`monospace`^4, ^5||spoiler||^5, ^6text^7url^8. Edit text in messages using markdown: ^1**bold**^1, ^2__italic__^2, ^3~~strikethrough~~^3, ^4`monospace`^4, ^5||spoiler||^5. Old School + Sakura Merio Night Musheen