From 3f59c82788defc9298f4feb64bf4a9c41f9e4c2e Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 14 Jul 2018 15:37:33 +0000 Subject: [PATCH] Revert "Removed EULA" This reverts commit cee28cd274dc94f3c2de366fcdfc5c95b2481327. --- app/src/main/java/eu/faircode/netguard/ActivityMain.java | 8 ++++---- app/src/main/res/layout/about.xml | 4 ++-- app/src/main/res/layout/first.xml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/eu/faircode/netguard/ActivityMain.java b/app/src/main/java/eu/faircode/netguard/ActivityMain.java index 625df1e0..e8539ecb 100644 --- a/app/src/main/java/eu/faircode/netguard/ActivityMain.java +++ b/app/src/main/java/eu/faircode/netguard/ActivityMain.java @@ -337,10 +337,10 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences View view = inflater.inflate(R.layout.first, null, false); TextView tvFirst = view.findViewById(R.id.tvFirst); - //TextView tvEula = view.findViewById(R.id.tvEula); + TextView tvEula = view.findViewById(R.id.tvEula); TextView tvPrivacy = view.findViewById(R.id.tvPrivacy); tvFirst.setMovementMethod(LinkMovementMethod.getInstance()); - //tvEula.setMovementMethod(LinkMovementMethod.getInstance()); + tvEula.setMovementMethod(LinkMovementMethod.getInstance()); tvPrivacy.setMovementMethod(LinkMovementMethod.getInstance()); // Show dialog @@ -1147,7 +1147,7 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences TextView tvVersionName = view.findViewById(R.id.tvVersionName); TextView tvVersionCode = view.findViewById(R.id.tvVersionCode); Button btnRate = view.findViewById(R.id.btnRate); - //TextView tvEula = view.findViewById(R.id.tvEula); + TextView tvEula = view.findViewById(R.id.tvEula); TextView tvPrivacy = view.findViewById(R.id.tvPrivacy); // Show version @@ -1157,7 +1157,7 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences tvVersionCode.setText(Integer.toString(Util.getSelfVersionCode(this))); // Handle license - //tvEula.setMovementMethod(LinkMovementMethod.getInstance()); + tvEula.setMovementMethod(LinkMovementMethod.getInstance()); tvPrivacy.setMovementMethod(LinkMovementMethod.getInstance()); // Handle logcat diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml index 9516cb51..34ca7464 100644 --- a/app/src/main/res/layout/about.xml +++ b/app/src/main/res/layout/about.xml @@ -86,14 +86,14 @@ android:text="@string/title_rate" android:visibility="gone" /> - + android:textSize="12sp" /> - + android:textAppearance="@style/TextSmall" />