From 82eeefb544cc27e75724827b81f942f1da878e23 Mon Sep 17 00:00:00 2001
From: Viktor De Pasquale <info@depasquale.wiki>
Date: Thu, 24 Oct 2019 18:40:15 +0200
Subject: [PATCH] Added system version to the details section for safetynet
 checks

---
 .../redesign/safetynet/SafetynetFragment.kt   | 40 +------------------
 .../res/layout/fragment_safetynet_md2.xml     | 32 ++++++++++++++-
 app/src/main/res/values/strings_md2.xml       |  1 +
 3 files changed, 32 insertions(+), 41 deletions(-)

diff --git a/app/src/main/java/com/topjohnwu/magisk/redesign/safetynet/SafetynetFragment.kt b/app/src/main/java/com/topjohnwu/magisk/redesign/safetynet/SafetynetFragment.kt
index bcd5d44ad..468df5b64 100644
--- a/app/src/main/java/com/topjohnwu/magisk/redesign/safetynet/SafetynetFragment.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/redesign/safetynet/SafetynetFragment.kt
@@ -1,19 +1,10 @@
 package com.topjohnwu.magisk.redesign.safetynet
 
 import android.os.Build
-import android.view.View
-import android.view.ViewAnimationUtils
-import androidx.core.animation.doOnEnd
-import androidx.core.view.isInvisible
-import androidx.core.view.isVisible
-import androidx.databinding.BindingAdapter
-import androidx.interpolator.view.animation.FastOutSlowInInterpolator
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.databinding.FragmentSafetynetMd2Binding
 import com.topjohnwu.magisk.redesign.compat.CompatFragment
 import org.koin.androidx.viewmodel.ext.android.viewModel
-import kotlin.math.hypot
-import kotlin.math.roundToInt
 
 class SafetynetFragment : CompatFragment<SafetynetViewModel, FragmentSafetynetMd2Binding>() {
 
@@ -22,37 +13,8 @@ class SafetynetFragment : CompatFragment<SafetynetViewModel, FragmentSafetynetMd
 
     override fun onStart() {
         super.onStart()
+        Build.VERSION.RELEASE
         activity.setTitle(R.string.safetyNet)
     }
 
-}
-
-@BindingAdapter("revealSafetyNet")
-fun View.revealOnCenter(expand: Boolean) {
-    val anim = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-        isInvisible = expand
-        return
-    } else {
-        val x = measuredWidth.toDouble()
-        val y = measuredHeight.toDouble()
-        val maxRadius = hypot(x, y).toFloat()
-        val start = if (expand) 0f else maxRadius
-        val end = if (expand) maxRadius else 0f
-
-        ViewAnimationUtils.createCircularReveal(
-            this,
-            (x / 2).roundToInt(),
-            (y / 2).roundToInt(),
-            start,
-            end
-        ).apply {
-            interpolator = FastOutSlowInInterpolator()
-            doOnEnd { if (!expand) isVisible = false }
-        }
-    }
-
-    post {
-        isVisible = true
-        anim.start()
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_safetynet_md2.xml b/app/src/main/res/layout/fragment_safetynet_md2.xml
index f262834d5..9b8ac1954 100644
--- a/app/src/main/res/layout/fragment_safetynet_md2.xml
+++ b/app/src/main/res/layout/fragment_safetynet_md2.xml
@@ -5,6 +5,7 @@
 
     <data>
 
+        <import type="android.os.Build" />
         <import type="com.topjohnwu.magisk.Info" />
 
         <import type="com.topjohnwu.magisk.BuildConfig" />
@@ -92,7 +93,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/manager"
                     android:textAppearance="?appearanceTextCaptionVariant"
-                    app:layout_constraintBottom_toTopOf="@+id/safetynet_attestation"
+                    app:layout_constraintBottom_toTopOf="@+id/safetynet_android_title"
                     app:layout_constraintEnd_toStartOf="@+id/safetynet_manager_version"
                     app:layout_constraintHorizontal_chainStyle="packed"
                     app:layout_constraintStart_toStartOf="parent"
@@ -113,6 +114,33 @@
                     app:layout_constraintTop_toTopOf="@+id/safetynet_manager_title"
                     tools:text="10.0.0" />
 
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/safetynet_android_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/system"
+                    android:textAppearance="?appearanceTextCaptionVariant"
+                    app:layout_constraintBottom_toTopOf="@+id/safetynet_attestation"
+                    app:layout_constraintEnd_toStartOf="@+id/safetynet_android_version"
+                    app:layout_constraintHorizontal_chainStyle="packed"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/safetynet_manager_title" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/safetynet_android_version"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/l_50"
+                    android:text="@{Build.VERSION.RELEASE}"
+                    android:textAppearance="?appearanceTextCaptionNormal"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toBottomOf="@+id/safetynet_android_title"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_chainStyle="packed"
+                    app:layout_constraintStart_toEndOf="@+id/safetynet_android_title"
+                    app:layout_constraintTop_toTopOf="@+id/safetynet_android_title"
+                    tools:text="10" />
+
                 <com.google.android.material.card.MaterialCardView
                     android:id="@+id/safetynet_attestation"
                     style="?styleCardElevated"
@@ -126,7 +154,7 @@
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/safetynet_manager_title"
+                    app:layout_constraintTop_toBottomOf="@+id/safetynet_android_title"
                     app:layout_constraintWidth_max="300dp">
 
                     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/values/strings_md2.xml b/app/src/main/res/values/strings_md2.xml
index 41d1cdf87..4c2a382c7 100644
--- a/app/src/main/res/values/strings_md2.xml
+++ b/app/src/main/res/values/strings_md2.xml
@@ -3,6 +3,7 @@
 
     <string name="manager">Manager</string>
     <string name="magisk">Magisk</string>
+    <string name="system">System</string>
 
     <string name="no_connection">No connection available</string>