Rename Turbo to Sakura; make Premium icon sponsor-only with donate redirect
This commit is contained in:
parent
48bf925df9
commit
7257b6b06c
5 changed files with 10 additions and 13 deletions
|
|
@ -44,6 +44,9 @@ import org.telegram.ui.Components.RecyclerListView;
|
||||||
import org.telegram.ui.LauncherIconController;
|
import org.telegram.ui.LauncherIconController;
|
||||||
import org.telegram.ui.PremiumPreviewFragment;
|
import org.telegram.ui.PremiumPreviewFragment;
|
||||||
|
|
||||||
|
import tw.nekomimi.nekogram.helpers.SponsorHelper;
|
||||||
|
import tw.nekomimi.nekogram.settings.NekoDonateActivity;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
@ -109,8 +112,8 @@ public class AppIconsSelectorCell extends RecyclerListView implements Notificati
|
||||||
setOnItemClickListener((view, position) -> {
|
setOnItemClickListener((view, position) -> {
|
||||||
IconHolderView holderView = (IconHolderView) view;
|
IconHolderView holderView = (IconHolderView) view;
|
||||||
LauncherIconController.LauncherIcon icon = availableIcons.get(position);
|
LauncherIconController.LauncherIcon icon = availableIcons.get(position);
|
||||||
if (icon.premium && !UserConfig.hasPremiumOnAccounts()) {
|
if (icon.premium && !SponsorHelper.isCurrentUserSponsor()) {
|
||||||
fragment.showDialog(new PremiumFeatureBottomSheet(fragment, PremiumPreviewFragment.PREMIUM_FEATURE_APPLICATION_ICONS, true));
|
fragment.presentFragment(new NekoDonateActivity());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -151,14 +154,6 @@ public class AppIconsSelectorCell extends RecyclerListView implements Notificati
|
||||||
private void updateIconsVisibility() {
|
private void updateIconsVisibility() {
|
||||||
availableIcons.clear();
|
availableIcons.clear();
|
||||||
availableIcons.addAll(Arrays.asList(LauncherIconController.LauncherIcon.values()));
|
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();
|
getAdapter().notifyDataSetChanged();
|
||||||
invalidateItemDecorations();
|
invalidateItemDecorations();
|
||||||
|
|
||||||
|
|
@ -275,7 +270,7 @@ public class AppIconsSelectorCell extends RecyclerListView implements Notificati
|
||||||
iconView.setImageResource(icon.background);
|
iconView.setImageResource(icon.background);
|
||||||
|
|
||||||
MarginLayoutParams params = (MarginLayoutParams) titleView.getLayoutParams();
|
MarginLayoutParams params = (MarginLayoutParams) titleView.getLayoutParams();
|
||||||
if (icon.premium && !UserConfig.hasPremiumOnAccounts()) {
|
if (icon.premium && !SponsorHelper.isCurrentUserSponsor()) {
|
||||||
SpannableString str = new SpannableString("d " + LocaleController.getString(icon.title));
|
SpannableString str = new SpannableString("d " + LocaleController.getString(icon.title));
|
||||||
ColoredImageSpan span = new ColoredImageSpan(R.drawable.msg_mini_premiumlock);
|
ColoredImageSpan span = new ColoredImageSpan(R.drawable.msg_mini_premiumlock);
|
||||||
span.setTopOffset(1);
|
span.setTopOffset(1);
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,7 @@ public class LauncherIconController {
|
||||||
DEFAULT("DefaultIcon", R.color.ic_launcher_background, R.drawable.ic_launcher_foreground, R.string.AppIconDefault),
|
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),
|
//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),
|
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),
|
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),
|
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),
|
SPACE("SpaceIcon", R.mipmap.icon_11_launcher_background, R.mipmap.icon_11_launcher_foreground, R.string.AppIconSpace),
|
||||||
|
|
|
||||||
|
|
@ -218,6 +218,7 @@
|
||||||
<string name="MarkdownAbout">Изменяйте текст сообщений, используя markdown: ^1**жирный**^1, ^2__курсив__^2, ^3~~зачёркнутый~~^3, ^4`моноширинный`^4, ^5||скрытый||^5, ^6текст^7url^8.</string>
|
<string name="MarkdownAbout">Изменяйте текст сообщений, используя markdown: ^1**жирный**^1, ^2__курсив__^2, ^3~~зачёркнутый~~^3, ^4`моноширинный`^4, ^5||скрытый||^5, ^6текст^7url^8.</string>
|
||||||
<string name="MarkdownAbout2">Изменяйте текст сообщений, используя markdown: ^1**жирный**^1, ^2__курсив__^2, ^3~~зачёркнутый~~^3, ^4`моноширинный`^4, ^5||скрытый||^5.</string>
|
<string name="MarkdownAbout2">Изменяйте текст сообщений, используя markdown: ^1**жирный**^1, ^2__курсив__^2, ^3~~зачёркнутый~~^3, ^4`моноширинный`^4, ^5||скрытый||^5.</string>
|
||||||
<string name="AppIconOldSchool">Old School</string>
|
<string name="AppIconOldSchool">Old School</string>
|
||||||
|
<string name="AppIconTurbo">Сакура</string>
|
||||||
<string name="AppIconMerio">Мерио</string>
|
<string name="AppIconMerio">Мерио</string>
|
||||||
<string name="AppIconRainbow">Ночь</string>
|
<string name="AppIconRainbow">Ночь</string>
|
||||||
<string name="AppIconMusheen">Мушин</string>
|
<string name="AppIconMusheen">Мушин</string>
|
||||||
|
|
|
||||||
|
|
@ -5702,7 +5702,7 @@
|
||||||
<string name="AppIconVintage">Vintage</string>
|
<string name="AppIconVintage">Vintage</string>
|
||||||
<string name="AppIconAqua">Aqua</string>
|
<string name="AppIconAqua">Aqua</string>
|
||||||
<string name="AppIconPremium">Premium</string>
|
<string name="AppIconPremium">Premium</string>
|
||||||
<string name="AppIconTurbo">Turbo</string>
|
<string name="AppIconTurbo">Sakura</string>
|
||||||
<string name="AppIconNox">Nox</string>
|
<string name="AppIconNox">Nox</string>
|
||||||
<string name="AppIconChangedTo">App icon has been changed to %1$s</string>
|
<string name="AppIconChangedTo">App icon has been changed to %1$s</string>
|
||||||
<string name="FileTooLarge">File Too Large</string>
|
<string name="FileTooLarge">File Too Large</string>
|
||||||
|
|
|
||||||
|
|
@ -241,6 +241,7 @@
|
||||||
<string name="MarkdownAbout">Edit text in messages using markdown: ^1**bold**^1, ^2__italic__^2, ^3~~strikethrough~~^3, ^4`monospace`^4, ^5||spoiler||^5, ^6text^7url^8.</string>
|
<string name="MarkdownAbout">Edit text in messages using markdown: ^1**bold**^1, ^2__italic__^2, ^3~~strikethrough~~^3, ^4`monospace`^4, ^5||spoiler||^5, ^6text^7url^8.</string>
|
||||||
<string name="MarkdownAbout2">Edit text in messages using markdown: ^1**bold**^1, ^2__italic__^2, ^3~~strikethrough~~^3, ^4`monospace`^4, ^5||spoiler||^5.</string>
|
<string name="MarkdownAbout2">Edit text in messages using markdown: ^1**bold**^1, ^2__italic__^2, ^3~~strikethrough~~^3, ^4`monospace`^4, ^5||spoiler||^5.</string>
|
||||||
<string name="AppIconOldSchool">Old School</string>
|
<string name="AppIconOldSchool">Old School</string>
|
||||||
|
<string name="AppIconTurbo">Sakura</string>
|
||||||
<string name="AppIconMerio">Merio</string>
|
<string name="AppIconMerio">Merio</string>
|
||||||
<string name="AppIconRainbow">Night</string>
|
<string name="AppIconRainbow">Night</string>
|
||||||
<string name="AppIconMusheen">Musheen</string>
|
<string name="AppIconMusheen">Musheen</string>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue