Mastodon
/
mastodon-app-ufficiale-android
mirror of https://github.com/mastodon/mastodon-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Trim strings in donation campaigns

This commit is contained in:
Grishka 2024-09-10 13:43:48 +03:00
parent e915aab2fb
commit 81ac72e4eb
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
View File

@ -744,9 +744,10 @@ public class HomeTimelineFragment extends StatusListFragment implements ToolbarD
} }
TextView text=donationBanner.findViewById(R.id.banner_text); TextView text=donationBanner.findViewById(R.id.banner_text);
SpannableStringBuilder ssb=new SpannableStringBuilder(campaign.bannerMessage); SpannableStringBuilder ssb=new SpannableStringBuilder(campaign.bannerMessage);
if(!campaign.bannerMessage.endsWith("\n"))
ssb.append(' '); ssb.append(' ');
int start=ssb.length(); int start=ssb.length();
ssb.append(campaign.bannerButtonText); ssb.append(campaign.bannerButtonText.trim());
ssb.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.masterialDark_colorGoldenrodContainer, getActivity().getTheme())), start, ssb.length(), 0); ssb.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.masterialDark_colorGoldenrodContainer, getActivity().getTheme())), start, ssb.length(), 0);
ssb.setSpan(new UnderlineSpan(), start, ssb.length(), 0); ssb.setSpan(new UnderlineSpan(), start, ssb.length(), 0);
ssb.setSpan(new TypefaceSpan("sans-serif-medium"), start, ssb.length(), 0); ssb.setSpan(new TypefaceSpan("sans-serif-medium"), start, ssb.length(), 0);

2
mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsDebugFragment.java
View File

@ -35,7 +35,7 @@ public class SettingsDebugFragment extends BaseSettingsFragment<Void>{
new ListItem<>("Reset search info banners", null, this::onResetDiscoverBannersClick), new ListItem<>("Reset search info banners", null, this::onResetDiscoverBannersClick),
new ListItem<>("Reset pre-reply sheets", null, this::onResetPreReplySheetsClick), new ListItem<>("Reset pre-reply sheets", null, this::onResetPreReplySheetsClick),
new ListItem<>("Clear dismissed donation campaigns", null, this::onClearDismissedCampaignsClick), new ListItem<>("Clear dismissed donation campaigns", null, this::onClearDismissedCampaignsClick),
donationsStagingItem=new CheckableListItem<>("Use staging environment for donations", null, CheckableListItem.Style.SWITCH, getPrefs().getBoolean("donationsStaging", false), this::toggleCheckableItem) donationsStagingItem=new CheckableListItem<>("Use staging environment for donations", "Restart app to apply", CheckableListItem.Style.SWITCH, getPrefs().getBoolean("donationsStaging", false), this::toggleCheckableItem)
)); ));
if(!GithubSelfUpdater.needSelfUpdating()){ if(!GithubSelfUpdater.needSelfUpdating()){
resetUpdateItem.isEnabled=selfUpdateItem.isEnabled=false; resetUpdateItem.isEnabled=selfUpdateItem.isEnabled=false;

2
mastodon/src/main/java/org/joinmastodon/android/ui/sheets/DonationSheet.java
View File

@ -66,7 +66,7 @@ public class DonationSheet extends BottomSheet{
UiUtils.getThemeColor(context, R.attr.colorM3Primary), 0.05f)), !UiUtils.isDarkTheme()); UiUtils.getThemeColor(context, R.attr.colorM3Primary), 0.05f)), !UiUtils.isDarkTheme());
TextView text=findViewById(R.id.text); TextView text=findViewById(R.id.text);
text.setText(campaign.donationMessage); text.setText(campaign.donationMessage.trim());
onceTab=findViewById(R.id.once); onceTab=findViewById(R.id.once);
monthlyTab=findViewById(R.id.monthly); monthlyTab=findViewById(R.id.monthly);