From 2a38a42f4492dd113cdbab0fde474d4c4e8438a4 Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 7 Sep 2019 18:07:58 +0200 Subject: [PATCH] Fixed text spacing --- app/src/main/java/eu/faircode/email/FragmentPro.java | 5 +++++ app/src/main/java/eu/faircode/email/FragmentSetup.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/app/src/main/java/eu/faircode/email/FragmentPro.java b/app/src/main/java/eu/faircode/email/FragmentPro.java index e7846ae96f..19aa1eaa10 100644 --- a/app/src/main/java/eu/faircode/email/FragmentPro.java +++ b/app/src/main/java/eu/faircode/email/FragmentPro.java @@ -41,6 +41,7 @@ import com.google.android.material.snackbar.Snackbar; public class FragmentPro extends FragmentBase implements SharedPreferences.OnSharedPreferenceChangeListener { private TextView tvPending; private TextView tvActivated; + private TextView tvInfo; private TextView tvList; private Button btnPurchase; private TextView tvPrice; @@ -59,12 +60,16 @@ public class FragmentPro extends FragmentBase implements SharedPreferences.OnSha tvPending = view.findViewById(R.id.tvPending); tvActivated = view.findViewById(R.id.tvActivated); + tvInfo = view.findViewById(R.id.tvInfo); tvList = view.findViewById(R.id.tvList); btnPurchase = view.findViewById(R.id.btnPurchase); tvPrice = view.findViewById(R.id.tvPrice); tvPriceHint = view.findViewById(R.id.tvPriceHint); btnCheck = view.findViewById(R.id.btnCheck); + tvInfo.setText(getString(R.string.title_pro_info) + .replaceAll("^\\s+", "").replaceAll("\\s+", " ")); + tvList.setPaintFlags(tvList.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG); tvList.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java index 6c478b5a3d..50f2150dc5 100644 --- a/app/src/main/java/eu/faircode/email/FragmentSetup.java +++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java @@ -55,6 +55,7 @@ import java.util.List; public class FragmentSetup extends FragmentBase { private ViewGroup view; + private TextView tvWelcome; private ImageButton ibWelcome; private Button btnHelp; @@ -102,6 +103,7 @@ public class FragmentSetup extends FragmentBase { view = (ViewGroup) inflater.inflate(R.layout.fragment_setup, container, false); // Get controls + tvWelcome = view.findViewById(R.id.tvWelcome); ibWelcome = view.findViewById(R.id.ibWelcome); btnHelp = view.findViewById(R.id.btnHelp); @@ -134,6 +136,9 @@ public class FragmentSetup extends FragmentBase { // Wire controls + tvWelcome.setText(getString(R.string.title_setup_welcome) + .replaceAll("^\\s+", "").replaceAll("\\s+", " ")); + ibWelcome.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) {