notfire/moshidon
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Fixes

Browse source
This commit is contained in:
Grishka 2024-07-10 01:01:31 +03:00
parent 761cadbcc7
commit 0182763b58
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
fastlane/metadata/android/en-US/changelogs/109.txt → fastlane/metadata/android/en-US/changelogs/110.txt
View file

2
fastlane/metadata/android/en-US/changelogs/default.txt
View file

@ -1 +1 @@
109.txt 110.txt

2
mastodon/build.gradle
View file

@ -13,7 +13,7 @@ android {
applicationId "org.joinmastodon.android" applicationId "org.joinmastodon.android"
minSdk 23 minSdk 23
targetSdk 34 targetSdk 34
versionCode 109 versionCode 110
versionName "2.6.0" versionName "2.6.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }

2
mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java
View file

@ -199,7 +199,7 @@ public class SettingsMainFragment extends BaseSettingsFragment<Void>{
} }
private void onDonateClick(ListItem<?> item){ private void onDonateClick(ListItem<?> item){
GetDonationCampaigns req=new GetDonationCampaigns(Locale.getDefault().toLanguageTag().replace('-', '_'), String.valueOf(AccountSessionManager.get(accountID).getDonationSeed()), null); GetDonationCampaigns req=new GetDonationCampaigns(Locale.getDefault().toLanguageTag().replace('-', '_'), String.valueOf(AccountSessionManager.get(accountID).getDonationSeed()), "menu");
if(getActivity().getSharedPreferences("debug", Context.MODE_PRIVATE).getBoolean("donationsStaging", false)){ if(getActivity().getSharedPreferences("debug", Context.MODE_PRIVATE).getBoolean("donationsStaging", false)){
req.setStaging(true); req.setStaging(true);
} }

4
mastodon/src/main/java/org/joinmastodon/android/ui/sheets/DonationSheet.java
View file

@ -142,13 +142,13 @@ public class DonationSheet extends BottomSheet{
btn.setTextColor(context.getResources().getColorStateList(R.color.filter_chip_text, context.getTheme())); btn.setTextColor(context.getResources().getColorStateList(R.color.filter_chip_text, context.getTheme()));
btn.setMinWidth(V.dp(64)); btn.setMinWidth(V.dp(64));
btn.setMinimumWidth(0); btn.setMinimumWidth(0);
int pad=V.dp(16); btn.setPadding(0, 0, 0, 0);
btn.setPadding(pad, 0, pad, 0);
btn.setStateListAnimator(null); btn.setStateListAnimator(null);
btn.setTextOff(null); btn.setTextOff(null);
btn.setTextOn(null); btn.setTextOn(null);
btn.setOnClickListener(this::onSuggestedAmountClick); btn.setOnClickListener(this::onSuggestedAmountClick);
btn.setTag(i); btn.setTag(i);
btn.setSingleLine();
suggestedAmountButtons[i]=btn; suggestedAmountButtons[i]=btn;
suggestedAmounts.addView(btn); suggestedAmounts.addView(btn);
} }