From 09dbde910b4c04db809d8409acf516c41e7342a6 Mon Sep 17 00:00:00 2001
From: Jonas Lochmann <git@inkompetenz.org>
Date: Mon, 26 Aug 2019 00:00:00 +0000
Subject: [PATCH] Show reason at AnnoyActivity

---
 .../android/ui/manipulation/AnnoyActivity.kt  | 25 +++++++++++++
 app/src/main/res/layout/annoy_activity.xml    | 36 +++++++++++++++----
 app/src/main/res/values-de/strings-annoy.xml  |  3 ++
 app/src/main/res/values/strings-annoy.xml     |  3 ++
 4 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/io/timelimit/android/ui/manipulation/AnnoyActivity.kt b/app/src/main/java/io/timelimit/android/ui/manipulation/AnnoyActivity.kt
index b590827..729d74a 100644
--- a/app/src/main/java/io/timelimit/android/ui/manipulation/AnnoyActivity.kt
+++ b/app/src/main/java/io/timelimit/android/ui/manipulation/AnnoyActivity.kt
@@ -20,10 +20,14 @@ import android.content.Intent
 import android.os.Build
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.view.View
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
 import io.timelimit.android.R
+import io.timelimit.android.livedata.map
 import io.timelimit.android.logic.DefaultAppLogic
+import io.timelimit.android.ui.manage.device.manage.ManipulationWarningTypeLabel
+import io.timelimit.android.ui.manage.device.manage.ManipulationWarnings
 import io.timelimit.android.util.TimeTextUtil
 import kotlinx.android.synthetic.main.annoy_activity.*
 
@@ -67,6 +71,27 @@ class AnnoyActivity : AppCompatActivity() {
                     getString(R.string.annoy_timer, TimeTextUtil.seconds(it.toInt(), this@AnnoyActivity))
             )
         })
+
+        logic.deviceEntry.map {
+            val reasonItems = (it?.let { ManipulationWarnings.getFromDevice(it) } ?: ManipulationWarnings.empty)
+                    .current
+                    .map {
+                        getString(ManipulationWarningTypeLabel.getLabel(it))
+                    }
+
+            if (reasonItems.isEmpty()) {
+                null
+            } else {
+                getString(R.string.annoy_reason, reasonItems.joinToString(separator = ", "))
+            }
+        }.observe(this, Observer {
+            if (it.isNullOrEmpty()) {
+                annoy_reason.visibility = View.GONE
+            } else {
+                annoy_reason.visibility = View.VISIBLE
+                annoy_reason.setText(it)
+            }
+        })
     }
 
     private fun shutdown() {
diff --git a/app/src/main/res/layout/annoy_activity.xml b/app/src/main/res/layout/annoy_activity.xml
index fa65b4b..a9d9806 100644
--- a/app/src/main/res/layout/annoy_activity.xml
+++ b/app/src/main/res/layout/annoy_activity.xml
@@ -14,13 +14,35 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
-    <TextView
-        android:textAppearance="?android:textAppearanceMedium"
-        android:layout_margin="16dp"
-        android:gravity="center"
-        android:id="@+id/annoy_timer"
-        android:text="@string/annoy_timer"
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent">
+        <LinearLayout
+            android:layout_margin="8dp"
+            android:orientation="vertical"
+            android:layout_centerVertical="true"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:layout_margin="4dp"
+                android:textAppearance="?android:textAppearanceMedium"
+                android:gravity="center"
+                android:id="@+id/annoy_reason"
+                android:text="@string/annoy_reason"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+            <TextView
+                android:layout_margin="4dp"
+                android:textAppearance="?android:textAppearanceMedium"
+                android:gravity="center"
+                android:id="@+id/annoy_timer"
+                android:text="@string/annoy_timer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+        </LinearLayout>
+    </RelativeLayout>
 
 </LinearLayout>
diff --git a/app/src/main/res/values-de/strings-annoy.xml b/app/src/main/res/values-de/strings-annoy.xml
index c158f85..94b4efb 100644
--- a/app/src/main/res/values-de/strings-annoy.xml
+++ b/app/src/main/res/values-de/strings-annoy.xml
@@ -20,4 +20,7 @@
     <string name="annoy_timer">
         Das Gerät wird in %s entsperrt.
     </string>
+    <string name="annoy_reason">
+        Folgendes wurde manipuliert: %s
+    </string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings-annoy.xml b/app/src/main/res/values/strings-annoy.xml
index c329c29..5a8d6b2 100644
--- a/app/src/main/res/values/strings-annoy.xml
+++ b/app/src/main/res/values/strings-annoy.xml
@@ -20,4 +20,7 @@
     <string name="annoy_timer">
         The device will be unlocked in %s.
     </string>
+    <string name="annoy_reason">
+        This was manipulated: %s
+    </string>
 </resources>
\ No newline at end of file