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"> - + - + android:layout_height="wrap_content"> + - + + + +