From 0182763b584c2e32ad1c769a757b94b32115a14a Mon Sep 17 00:00:00 2001 From: Grishka Date: Wed, 10 Jul 2024 01:01:31 +0300 Subject: [PATCH] Fixes --- .../metadata/android/en-US/changelogs/{109.txt => 110.txt} | 0 fastlane/metadata/android/en-US/changelogs/default.txt | 2 +- mastodon/build.gradle | 2 +- .../android/fragments/settings/SettingsMainFragment.java | 2 +- .../org/joinmastodon/android/ui/sheets/DonationSheet.java | 4 ++-- 5 files changed, 5 insertions(+), 5 deletions(-) rename fastlane/metadata/android/en-US/changelogs/{109.txt => 110.txt} (100%) diff --git a/fastlane/metadata/android/en-US/changelogs/109.txt b/fastlane/metadata/android/en-US/changelogs/110.txt similarity index 100% rename from fastlane/metadata/android/en-US/changelogs/109.txt rename to fastlane/metadata/android/en-US/changelogs/110.txt diff --git a/fastlane/metadata/android/en-US/changelogs/default.txt b/fastlane/metadata/android/en-US/changelogs/default.txt index 70d691d9..4fceb3df 120000 --- a/fastlane/metadata/android/en-US/changelogs/default.txt +++ b/fastlane/metadata/android/en-US/changelogs/default.txt @@ -1 +1 @@ -109.txt \ No newline at end of file +110.txt \ No newline at end of file diff --git a/mastodon/build.gradle b/mastodon/build.gradle index eeb56977..fa316ccc 100644 --- a/mastodon/build.gradle +++ b/mastodon/build.gradle @@ -13,7 +13,7 @@ android { applicationId "org.joinmastodon.android" minSdk 23 targetSdk 34 - versionCode 109 + versionCode 110 versionName "2.6.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java index 78f3fede..141826a5 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java @@ -199,7 +199,7 @@ public class SettingsMainFragment extends BaseSettingsFragment{ } 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)){ req.setStaging(true); } diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/sheets/DonationSheet.java b/mastodon/src/main/java/org/joinmastodon/android/ui/sheets/DonationSheet.java index a6e0ef89..f3624f8c 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/sheets/DonationSheet.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/sheets/DonationSheet.java @@ -142,13 +142,13 @@ public class DonationSheet extends BottomSheet{ btn.setTextColor(context.getResources().getColorStateList(R.color.filter_chip_text, context.getTheme())); btn.setMinWidth(V.dp(64)); btn.setMinimumWidth(0); - int pad=V.dp(16); - btn.setPadding(pad, 0, pad, 0); + btn.setPadding(0, 0, 0, 0); btn.setStateListAnimator(null); btn.setTextOff(null); btn.setTextOn(null); btn.setOnClickListener(this::onSuggestedAmountClick); btn.setTag(i); + btn.setSingleLine(); suggestedAmountButtons[i]=btn; suggestedAmounts.addView(btn); }