diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java index 1d60f042..2310721a 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java @@ -264,6 +264,8 @@ public class HomeTimelineFragment extends StatusListFragment implements ToolbarD E.register(this); updateUpdateState(GithubSelfUpdater.getInstance().getState()); } + if(currentDonationCampaign!=null) + showDonationBanner(currentDonationCampaign); } @Override @@ -618,6 +620,8 @@ public class HomeTimelineFragment extends StatusListFragment implements ToolbarD if(GithubSelfUpdater.needSelfUpdating()){ E.unregister(this); } + donationBanner=null; + donationBannerDismissing=false; } private void updateUpdateState(GithubSelfUpdater.UpdateState state){ diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/views/CurrencyAmountInput.java b/mastodon/src/main/java/org/joinmastodon/android/ui/views/CurrencyAmountInput.java index bbd98310..6537220d 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/views/CurrencyAmountInput.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/views/CurrencyAmountInput.java @@ -294,7 +294,6 @@ public class CurrencyAmountInput extends LinearLayout implements CustomViewHelpe public CurrencySymbolSpan(Paint paint){ this.paint=new Paint(paint); this.paint.setTextSize(paint.getTextSize()*0.66f); - this.paint.setAlpha(77); } @Override @@ -304,6 +303,8 @@ public class CurrencyAmountInput extends LinearLayout implements CustomViewHelpe @Override public void draw(@NonNull Canvas canvas, CharSequence text, int start, int end, float x, int top, int y, int bottom, @NonNull Paint paint){ + this.paint.setColor(paint.getColor()); + this.paint.setAlpha(77); if(!symbolBeforeAmount) x+=dp(2); canvas.drawText(currentCurrency.symbol, x, top+dp(1.5f)-this.paint.ascent(), this.paint);