From f0b912f9294ae4fbddde55d53cd3bb9b900a0911 Mon Sep 17 00:00:00 2001
From: Jonas L <jonas@determapp.de>
Date: Wed, 30 Jan 2019 14:10:41 +0100
Subject: [PATCH] Improve lockscreen design

---
 .../timelimit/android/ui/lock/LockActivity.kt |  5 ++
 .../timelimit/android/ui/lock/LockFragment.kt |  2 +
 app/src/main/res/layout/lock_fragment.xml     | 53 ++++++++++++-------
 3 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/io/timelimit/android/ui/lock/LockActivity.kt b/app/src/main/java/io/timelimit/android/ui/lock/LockActivity.kt
index 82011fd..7a1ebab 100644
--- a/app/src/main/java/io/timelimit/android/ui/lock/LockActivity.kt
+++ b/app/src/main/java/io/timelimit/android/ui/lock/LockActivity.kt
@@ -104,4 +104,9 @@ class LockActivity : AppCompatActivity(), ActivityViewModelHolder {
             }
         }
     }
+
+    override fun onBackPressed() {
+        // do nothing because going back would open the blocked app again
+        // super.onBackPressed()
+    }
 }
diff --git a/app/src/main/java/io/timelimit/android/ui/lock/LockFragment.kt b/app/src/main/java/io/timelimit/android/ui/lock/LockFragment.kt
index 6cd69de..0019c48 100644
--- a/app/src/main/java/io/timelimit/android/ui/lock/LockFragment.kt
+++ b/app/src/main/java/io/timelimit/android/ui/lock/LockFragment.kt
@@ -91,6 +91,8 @@ class LockFragment : Fragment() {
             binding.appTitle = "???"
         }
 
+        binding.appIcon.setImageDrawable(logic.platformIntegration.getAppIcon(packageName))
+
         blockingReason.observe(this, Observer {
             if (it == BlockingReason.None) {
                 activity!!.finish()
diff --git a/app/src/main/res/layout/lock_fragment.xml b/app/src/main/res/layout/lock_fragment.xml
index 113a14e..37dfcf3 100644
--- a/app/src/main/res/layout/lock_fragment.xml
+++ b/app/src/main/res/layout/lock_fragment.xml
@@ -88,33 +88,46 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
                     <LinearLayout
-                        android:padding="8dp"
-                        android:orientation="vertical"
+                        android:orientation="horizontal"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
 
-                        <TextView
-                            android:textAppearance="?android:textAppearanceMedium"
-                            tools:text="Evil App"
-                            android:text="@{appTitle}"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content" />
+                        <ImageView
+                            android:id="@+id/app_icon"
+                            tools:src="@mipmap/ic_launcher"
+                            android:layout_margin="8dp"
+                            android:layout_gravity="center_vertical"
+                            android:layout_width="48dp"
+                            android:layout_height="48dp" />
 
-                        <TextView
-                            tools:text="verbotene Apps"
-                            android:visibility="@{TextUtils.isEmpty(appCategoryTitle) ? View.GONE : View.VISIBLE}"
-                            android:textAppearance="?android:textAppearanceMedium"
-                            android:text="@{appCategoryTitle}"
+                        <LinearLayout
+                            android:padding="8dp"
+                            android:orientation="vertical"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content" />
+                            android:layout_height="wrap_content">
+                            <TextView
+                                android:textAppearance="?android:textAppearanceMedium"
+                                tools:text="Evil App"
+                                android:text="@{appTitle}"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content" />
 
-                        <TextView
-                            tools:text="com.evil.app"
-                            android:textAppearance="?android:textAppearanceMedium"
-                            android:text="@{packageName}"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content" />
+                            <TextView
+                                tools:text="verbotene Apps"
+                                android:visibility="@{TextUtils.isEmpty(appCategoryTitle) ? View.GONE : View.VISIBLE}"
+                                android:textAppearance="?android:textAppearanceMedium"
+                                android:text="@{appCategoryTitle}"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content" />
 
+                            <TextView
+                                tools:text="com.evil.app"
+                                android:textAppearance="?android:textAppearanceSmall"
+                                android:text="@{packageName}"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content" />
+
+                        </LinearLayout>
                     </LinearLayout>
                 </androidx.cardview.widget.CardView>