From 12357583c6f1dd0245829ead1a30d8f33fa30077 Mon Sep 17 00:00:00 2001
From: Finn M Glas <finnmglas@gmail.com>
Date: Tue, 19 May 2020 15:01:26 +0200
Subject: [PATCH] Clean up code in the Choose Activity

This branch now does way more than just fixing the back screen issue. It
became more of a cleanup branch to be merged into master ^^
---
 .../com/finnmglas/launcher/ChooseActivity.kt  | 37 +++++++------------
 .../com/finnmglas/launcher/MainActivity.kt    |  3 +-
 app/src/main/res/layout/activity_choose.xml   |  5 +--
 app/src/main/res/values/strings.xml           | 10 +++++
 4 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/com/finnmglas/launcher/ChooseActivity.kt b/app/src/main/java/com/finnmglas/launcher/ChooseActivity.kt
index 34ea301..d72568b 100644
--- a/app/src/main/java/com/finnmglas/launcher/ChooseActivity.kt
+++ b/app/src/main/java/com/finnmglas/launcher/ChooseActivity.kt
@@ -1,6 +1,5 @@
 package com.finnmglas.launcher
 
-import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
 import android.graphics.Color
@@ -18,11 +17,8 @@ class ChooseActivity : AppCompatActivity() {
 
     val UNINSTALL_REQUEST_CODE = 1
 
-    fun backHome(view: View) {
-        finish()
-    }
+    /** Activity Lifecycle functions */
 
-    @SuppressLint("SetTextI18n") // I do not care
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -36,13 +32,13 @@ class ChooseActivity : AppCompatActivity() {
         val forApp = bundle.getString("forApp") // which app we choose
 
         if (action == "launch")
-            heading.text = "Launch Apps"
+            heading.text = getString(R.string.choose_title_launch)
         else if (action == "pick") {
-            heading.text = "Choose App"
-            subheading.text = forApp
+            heading.text = getString(R.string.choose_title)
+            subheading.text = forApp // TODO: make translatable
         }
         else if (action == "uninstall")
-            heading.text = "Uninstall Apps"
+            heading.text = getString(R.string.choose_title_remove)
 
         /* Build Layout */
 
@@ -95,28 +91,21 @@ class ChooseActivity : AppCompatActivity() {
         }
     }
 
-    override fun onActivityResult(
-        requestCode: Int,
-        resultCode: Int,
-        data: Intent?
-    ) {
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         if (requestCode == UNINSTALL_REQUEST_CODE) {
             if (resultCode == Activity.RESULT_OK) {
-                Toast.makeText(
-                    this,
-                    "Removed the selected application",
-                    Toast.LENGTH_LONG
-                ).show()
+                Toast.makeText(this, getString(R.string.choose_removed_toast), Toast.LENGTH_LONG).show()
                 finish()
             } else if (resultCode == Activity.RESULT_FIRST_USER) {
-                Toast.makeText(
-                    this,
-                    "Can't remove this app",
-                    Toast.LENGTH_LONG
-                ).show()
+                Toast.makeText(this, getString(R.string.choose_not_removed_toast), Toast.LENGTH_LONG).show()
                 finish()
             }
         }
     }
+
+    /** onClick functions */
+
+    fun backHome(view: View) { finish() }
+
 }
diff --git a/app/src/main/java/com/finnmglas/launcher/MainActivity.kt b/app/src/main/java/com/finnmglas/launcher/MainActivity.kt
index 102ba39..676f196 100644
--- a/app/src/main/java/com/finnmglas/launcher/MainActivity.kt
+++ b/app/src/main/java/com/finnmglas/launcher/MainActivity.kt
@@ -5,7 +5,6 @@ import android.content.Intent
 import android.os.Bundle
 import android.util.DisplayMetrics
 import android.view.*
-import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.GestureDetectorCompat
 import kotlinx.android.synthetic.main.activity_main.*
@@ -33,7 +32,7 @@ class MainActivity : AppCompatActivity(),
 
     // get device dimensions
     private val displayMetrics = DisplayMetrics()
-    private var clockTimer = Timer();
+    private var clockTimer = Timer()
 
     /** Activity Lifecycle functions */
     override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/res/layout/activity_choose.xml b/app/src/main/res/layout/activity_choose.xml
index e0a755f..7c9b989 100644
--- a/app/src/main/res/layout/activity_choose.xml
+++ b/app/src/main/res/layout/activity_choose.xml
@@ -11,7 +11,7 @@
         android:id="@+id/heading"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Choose App"
+        android:text="@string/choose_title"
         android:textColor="#cccccc"
         android:textSize="36sp"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -55,11 +55,10 @@
     </ScrollView>
 
     <Button
-        android:id="@+id/button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:onClick="backHome"
-        android:text="Back to Settings"
+        android:text="@string/choose_back_settings"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6b05f26..e86d6e7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -24,6 +24,16 @@
 
     <string name="settings_footer_by">By</string>
 
+    <!-- Choose Activity -->
+    <string name="choose_title">Choose App</string>
+    <string name="choose_title_launch">Launch Apps</string>
+    <string name="choose_title_remove">Uninstall Apps</string>
+
+    <string name="choose_back_settings">Back to Settings</string>
+
+    <string name="choose_removed_toast">Removed the selected application</string>
+    <string name="choose_not_removed_toast">Unable to remove application</string>
+
     <!-- Errors, Exceptions (Alerts, Toasts ...) -->
     <string name="none_found">None found</string>