Fixed text spacing

pull/162/head
M66B 5 years ago
parent 2124bfd8ce
commit 2a38a42f44

@ -41,6 +41,7 @@ import com.google.android.material.snackbar.Snackbar;
public class FragmentPro extends FragmentBase implements SharedPreferences.OnSharedPreferenceChangeListener { public class FragmentPro extends FragmentBase implements SharedPreferences.OnSharedPreferenceChangeListener {
private TextView tvPending; private TextView tvPending;
private TextView tvActivated; private TextView tvActivated;
private TextView tvInfo;
private TextView tvList; private TextView tvList;
private Button btnPurchase; private Button btnPurchase;
private TextView tvPrice; private TextView tvPrice;
@ -59,12 +60,16 @@ public class FragmentPro extends FragmentBase implements SharedPreferences.OnSha
tvPending = view.findViewById(R.id.tvPending); tvPending = view.findViewById(R.id.tvPending);
tvActivated = view.findViewById(R.id.tvActivated); tvActivated = view.findViewById(R.id.tvActivated);
tvInfo = view.findViewById(R.id.tvInfo);
tvList = view.findViewById(R.id.tvList); tvList = view.findViewById(R.id.tvList);
btnPurchase = view.findViewById(R.id.btnPurchase); btnPurchase = view.findViewById(R.id.btnPurchase);
tvPrice = view.findViewById(R.id.tvPrice); tvPrice = view.findViewById(R.id.tvPrice);
tvPriceHint = view.findViewById(R.id.tvPriceHint); tvPriceHint = view.findViewById(R.id.tvPriceHint);
btnCheck = view.findViewById(R.id.btnCheck); 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.setPaintFlags(tvList.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
tvList.setOnClickListener(new View.OnClickListener() { tvList.setOnClickListener(new View.OnClickListener() {
@Override @Override

@ -55,6 +55,7 @@ import java.util.List;
public class FragmentSetup extends FragmentBase { public class FragmentSetup extends FragmentBase {
private ViewGroup view; private ViewGroup view;
private TextView tvWelcome;
private ImageButton ibWelcome; private ImageButton ibWelcome;
private Button btnHelp; private Button btnHelp;
@ -102,6 +103,7 @@ public class FragmentSetup extends FragmentBase {
view = (ViewGroup) inflater.inflate(R.layout.fragment_setup, container, false); view = (ViewGroup) inflater.inflate(R.layout.fragment_setup, container, false);
// Get controls // Get controls
tvWelcome = view.findViewById(R.id.tvWelcome);
ibWelcome = view.findViewById(R.id.ibWelcome); ibWelcome = view.findViewById(R.id.ibWelcome);
btnHelp = view.findViewById(R.id.btnHelp); btnHelp = view.findViewById(R.id.btnHelp);
@ -134,6 +136,9 @@ public class FragmentSetup extends FragmentBase {
// Wire controls // Wire controls
tvWelcome.setText(getString(R.string.title_setup_welcome)
.replaceAll("^\\s+", "").replaceAll("\\s+", " "));
ibWelcome.setOnClickListener(new View.OnClickListener() { ibWelcome.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {

Loading…
Cancel
Save