From a421857a50fc9d55101480e522e0469e9dfb141a Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 6 Oct 2019 10:23:21 +0200
Subject: [PATCH] Updated layout about

---
 app/src/main/java/eu/faircode/email/FragmentAbout.java | 4 ----
 app/src/main/java/eu/faircode/email/FragmentEula.java  | 5 -----
 app/src/main/res/layout/include_eula.xml               | 4 +++-
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentAbout.java b/app/src/main/java/eu/faircode/email/FragmentAbout.java
index 2fb241a736..d56edc2302 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAbout.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAbout.java
@@ -19,8 +19,6 @@ package eu.faircode.email;
     Copyright 2018-2019 by Marcel Bokhorst (M66B)
 */
 
-import android.content.pm.PackageManager;
-import android.graphics.Paint;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -46,11 +44,9 @@ public class FragmentAbout extends FragmentBase {
 
         TextView tvVersion = view.findViewById(R.id.tvVersion);
         TextView tvRelease = view.findViewById(R.id.tvRelease);
-        TextView tvLimitations = view.findViewById(R.id.tvLimitations);
 
         tvVersion.setText(getString(R.string.title_version, BuildConfig.VERSION_NAME));
         tvRelease.setText(BuildConfig.RELEASE_NAME);
-        tvLimitations.setPaintFlags(tvLimitations.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
 
         return view;
     }
diff --git a/app/src/main/java/eu/faircode/email/FragmentEula.java b/app/src/main/java/eu/faircode/email/FragmentEula.java
index a7920fe2d1..2906379f97 100644
--- a/app/src/main/java/eu/faircode/email/FragmentEula.java
+++ b/app/src/main/java/eu/faircode/email/FragmentEula.java
@@ -20,13 +20,11 @@ package eu.faircode.email;
 */
 
 import android.content.SharedPreferences;
-import android.graphics.Paint;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -40,12 +38,9 @@ public class FragmentEula extends FragmentBase {
 
         View view = inflater.inflate(R.layout.fragment_eula, container, false);
 
-        TextView tvLimitations = view.findViewById(R.id.tvLimitations);
         Button btnAgree = view.findViewById(R.id.btnOk);
         Button btnDisagree = view.findViewById(R.id.btnCancel);
 
-        tvLimitations.setPaintFlags(tvLimitations.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
-
         btnAgree.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
diff --git a/app/src/main/res/layout/include_eula.xml b/app/src/main/res/layout/include_eula.xml
index a9ca544f9a..c1ec4743b9 100644
--- a/app/src/main/res/layout/include_eula.xml
+++ b/app/src/main/res/layout/include_eula.xml
@@ -10,6 +10,7 @@
         android:layout_height="wrap_content"
         android:text="@string/app_welcome"
         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+        android:textColor="?android:attr/textColorPrimary"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -17,9 +18,10 @@
         android:id="@+id/tvLimitations"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="6dp"
+        android:layout_marginTop="12dp"
         android:text="@string/app_limitations"
         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+        android:textStyle="italic"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvWelcome" />