From f78151e5c805d062f05391ab31d793e498aa18b0 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 19 Nov 2023 18:59:07 +0100
Subject: [PATCH] Small layout improvement

---
 app/src/main/java/eu/faircode/email/FragmentPro.java | 8 ++++++++
 app/src/main/res/layout/fragment_pro.xml             | 1 +
 2 files changed, 9 insertions(+)

diff --git a/app/src/main/java/eu/faircode/email/FragmentPro.java b/app/src/main/java/eu/faircode/email/FragmentPro.java
index fdec38d113..6d6cf64d21 100644
--- a/app/src/main/java/eu/faircode/email/FragmentPro.java
+++ b/app/src/main/java/eu/faircode/email/FragmentPro.java
@@ -23,6 +23,7 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.res.ColorStateList;
 import android.graphics.Paint;
 import android.net.Uri;
 import android.os.Bundle;
@@ -43,6 +44,8 @@ import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
+import androidx.core.graphics.ColorUtils;
+import androidx.core.widget.TextViewCompat;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import androidx.preference.PreferenceManager;
 
@@ -280,7 +283,12 @@ public class FragmentPro extends FragmentBase implements SharedPreferences.OnSha
                 post(new Runnable() {
                     @Override
                     public void run() {
+                        int color = Helper.resolveColor(btnPurchase.getContext(), R.attr.colorInfoForeground);
+                        if (purchased)
+                            color = ColorUtils.setAlphaComponent(color, (int) Math.round(0.6 * 255));
                         btnPurchase.setEnabled(!purchased);
+                        btnPurchase.setTextColor(color);
+                        TextViewCompat.setCompoundDrawableTintList(btnPurchase, ColorStateList.valueOf(color));
                         tvPending.setVisibility(View.GONE);
                         btnConsume.setEnabled(purchased);
                     }
diff --git a/app/src/main/res/layout/fragment_pro.xml b/app/src/main/res/layout/fragment_pro.xml
index 2eea96dd91..ae44a01552 100644
--- a/app/src/main/res/layout/fragment_pro.xml
+++ b/app/src/main/res/layout/fragment_pro.xml
@@ -31,6 +31,7 @@
             android:layout_height="wrap_content"
             android:text="@string/title_pro_activated"
             android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            android:textColor="?attr/colorWarning"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvPending" />