Merge app menus into one View all apps menu

+ Apps can be launched
+ Apps can be removed
+ In the `Choose App` for action menu, the delete option is hidden
+ The recycler is a little faster as I asynchronously cache it in 
`onCreate`

app/src/main/java/com/finnmglas/launcher/ChooseActivity.kt

@@ -16,9 +16,6 @@ import kotlinx.android.synthetic.main.activity_choose.*
 
 class ChooseActivity : AppCompatActivity() {
 
-    private lateinit var viewAdapter: RecyclerView.Adapter<*>
-    private lateinit var viewManager: RecyclerView.LayoutManager
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -49,9 +46,8 @@ class ChooseActivity : AppCompatActivity() {
         val forApp = bundle.getString("forApp") // which app we choose
 
         when (action) {
-            "launch" -> activity_choose_heading.text = getString(R.string.choose_title_launch)
+            "view" -> activity_choose_heading.text = getString(R.string.choose_title_view)
             "pick" -> activity_choose_heading.text = getString(R.string.choose_title)
-            "uninstall" -> activity_choose_heading.text = getString(R.string.choose_title_remove)
         }
 
         // set up the list / recycler

app/src/main/java/com/finnmglas/launcher/MainActivity.kt

@@ -10,6 +10,8 @@ import android.util.DisplayMetrics
 import android.view.*
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.GestureDetectorCompat
+import androidx.recyclerview.widget.RecyclerView
+import com.finnmglas.launcher.choose.AppsRecyclerAdapter
 import com.finnmglas.launcher.extern.*
 import kotlinx.android.synthetic.main.activity_main.*
 import java.text.SimpleDateFormat
@@ -17,6 +19,9 @@ import java.util.*
 import kotlin.concurrent.fixedRateTimer
 import kotlin.math.abs
 
+// used for the apps drawer / menu (ChooseActivity)
+lateinit var viewAdapter: RecyclerView.Adapter<*>
+lateinit var viewManager: RecyclerView.LayoutManager
 
 class MainActivity : AppCompatActivity(),
     GestureDetector.OnGestureListener, GestureDetector.OnDoubleTapListener {
@@ -76,6 +81,9 @@ class MainActivity : AppCompatActivity(),
         // As older APIs somehow do not recognize the xml defined onClick
         activity_main_settings_icon.setOnClickListener() { openSettings() }
 
+        // Load apps list first - speed up settings that way
+        AsyncTask.execute { viewAdapter = AppsRecyclerAdapter( this, "", "") }
+
         // First Startup
         if (!sharedPref.getBoolean("startedBefore", false)){
             startActivity(Intent(this, FirstStartupActivity::class.java))

app/src/main/java/com/finnmglas/launcher/choose/AppInfo.kt

@@ -6,4 +6,5 @@ class AppInfo {
     var label: CharSequence? = null
     var packageName: CharSequence? = null
     var icon: Drawable? = null
+    var isSystemApp: Boolean = false
 }

app/src/main/java/com/finnmglas/launcher/choose/AppsRecyclerAdapter.kt

@@ -3,6 +3,7 @@ package com.finnmglas.launcher.choose
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
+import android.content.pm.ApplicationInfo
 import android.content.pm.PackageManager
 import android.net.Uri
 import android.view.LayoutInflater
@@ -12,7 +13,9 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.finnmglas.launcher.R
-import com.finnmglas.launcher.extern.*
+import com.finnmglas.launcher.extern.FontAwesome
+import com.finnmglas.launcher.extern.REQUEST_CHOOSE_APP
+import com.finnmglas.launcher.extern.REQUEST_UNINSTALL
 
 
 class AppsRecyclerAdapter(val activity: Activity, val action: String?, val forApp: String?):
@@ -24,6 +27,7 @@ class AppsRecyclerAdapter(val activity: Activity, val action: String?, val forAp
         View.OnClickListener {
         var textView: TextView = itemView.findViewById(R.id.choose_row_app_name)
         var img: ImageView = itemView.findViewById(R.id.choose_row_app_icon) as ImageView
+        var delete: FontAwesome = itemView.findViewById(R.id.choose_row_app_delete)
 
         override fun onClick(v: View) {
             val pos = adapterPosition
@@ -31,7 +35,7 @@ class AppsRecyclerAdapter(val activity: Activity, val action: String?, val forAp
             val appPackageName = appsList[pos].packageName.toString()
 
             when (action){
-                "launch" -> {
+                "view" -> {
                     val launchIntent: Intent = context.packageManager
                         .getLaunchIntentForPackage(appPackageName)!!
                     context.startActivity(launchIntent)
@@ -43,12 +47,6 @@ class AppsRecyclerAdapter(val activity: Activity, val action: String?, val forAp
                     activity.setResult(REQUEST_CHOOSE_APP, returnIntent)
                     activity.finish()
                 }
-                "uninstall" -> {
-                    val intent = Intent(Intent.ACTION_UNINSTALL_PACKAGE)
-                    intent.data = Uri.parse("package:$appPackageName")
-                    intent.putExtra(Intent.EXTRA_RETURN_RESULT, true)
-                    activity.startActivityForResult(intent, REQUEST_UNINSTALL)
-                }
             }
         }
 
@@ -57,12 +55,21 @@ class AppsRecyclerAdapter(val activity: Activity, val action: String?, val forAp
 
     override fun onBindViewHolder(viewHolder: ViewHolder, i: Int) {
         val appLabel = appsList[i].label.toString()
-        val appPackage = appsList[i].packageName.toString()
+        val appPackageName = appsList[i].packageName.toString()
         val appIcon = appsList[i].icon
-        val textView = viewHolder.textView
-        textView.text = appLabel
-        val imageView: ImageView = viewHolder.img
-        imageView.setImageDrawable(appIcon)
+        val isSystemApp = appsList[i].isSystemApp
+
+        viewHolder.textView.text = appLabel
+        viewHolder.img.setImageDrawable(appIcon)
+
+        viewHolder.delete.setOnClickListener{
+            val intent = Intent(Intent.ACTION_UNINSTALL_PACKAGE)
+            intent.data = Uri.parse("package:$appPackageName")
+            intent.putExtra(Intent.EXTRA_RETURN_RESULT, true)
+            activity.startActivityForResult(intent, REQUEST_UNINSTALL)
+        }
+
+        viewHolder.delete.visibility = if(isSystemApp || action == "pick") View.INVISIBLE else View.VISIBLE
     }
 
     override fun getItemCount(): Int { return appsList.size }

app/src/main/java/com/finnmglas/launcher/settings/SettingsFragmentApps.kt

@@ -42,9 +42,8 @@ class SettingsFragmentApps : Fragment() {
             setButtonColor(fragment_settings_apps_choose_vol_up_btn, vibrantColor)
             setButtonColor(fragment_settings_apps_choose_vol_down_btn, vibrantColor)
 
-            setButtonColor(fragment_settings_apps_launch_btn, vibrantColor)
+            setButtonColor(fragment_settings_apps_btn, vibrantColor)
             setButtonColor(fragment_settings_apps_install_btn, vibrantColor)
-            setButtonColor(fragment_settings_apps_remove_btn, vibrantColor)
         }
 
         // Action - selecting buttons
@@ -56,9 +55,9 @@ class SettingsFragmentApps : Fragment() {
         fragment_settings_apps_choose_vol_down_btn.setOnClickListener{ chooseApp("volumeDownApp")}
 
         // App management buttons
-        fragment_settings_apps_launch_btn.setOnClickListener{
+        fragment_settings_apps_btn.setOnClickListener{
             val intent = Intent(this.context, ChooseActivity::class.java)
-            intent.putExtra("action", "launch")
+            intent.putExtra("action", "view")
             startActivity(intent)
         }
         fragment_settings_apps_install_btn.setOnClickListener{
@@ -72,11 +71,6 @@ class SettingsFragmentApps : Fragment() {
                     .show()
             }
         }
-        fragment_settings_apps_remove_btn.setOnClickListener{
-            val intent = Intent(this.context, ChooseActivity::class.java)
-            intent.putExtra("action", "uninstall")
-            startActivity(intent)
-        }
 
         super.onStart()
     }

app/src/main/res/layout/fragment_settings_apps.xml

@@ -160,10 +160,10 @@
     </TableLayout>
 
     <Button
-        android:id="@+id/fragment_settings_apps_launch_btn"
+        android:id="@+id/fragment_settings_apps_btn"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/settings_launch"
+        android:text="@string/settings_apps"
         android:textAllCaps="false" />
 
     <Button
@@ -173,10 +173,4 @@
         android:text="@string/settings_install"
         android:textAllCaps="false" />
 
-    <Button
-        android:id="@+id/fragment_settings_apps_remove_btn"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/settings_uninstall"
-        android:textAllCaps="false" />
 </LinearLayout>

app/src/main/res/layout/recycler_apps_row.xml

@@ -17,14 +17,29 @@
 
     <TextView
         android:id="@+id/choose_row_app_name"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="60sp"
         android:layout_marginLeft="60sp"
+        android:layout_marginEnd="5dp"
+        android:layout_marginRight="5dp"
+        android:gravity="start"
         android:text=""
         android:textSize="20sp"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/choose_row_app_delete"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <com.finnmglas.launcher.extern.FontAwesome
+        android:id="@+id/choose_row_app_delete"
+        android:layout_width="20sp"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="@string/fas_trash"
+        android:textSize="20sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values-de/strings.xml

@@ -26,8 +26,7 @@
     <string name="settings_select_launcher">Launcher wählen</string>
     <string name="settings_reset">Zurücksetzen</string>
     <string name="settings_reset_message">All deine Einstellungen gehen verloren. Weitermachen?</string>
-    <string name="settings_launch">Apps öffnen</string>
-    <string name="settings_uninstall">Apps entfernen</string>
+    <string name="settings_apps">Alle Anwendungen</string>
     <string name="settings_install">Apps installieren</string>
     <string name="settings_home">Zurück</string>
 
@@ -46,8 +45,7 @@
 
     <!-- Choose Activity -->
     <string name="choose_title">App wählen</string>
-    <string name="choose_title_launch">Apps öffnen</string>
-    <string name="choose_title_remove">Apps entfernen</string>
+    <string name="choose_title_view">Alle Apps</string>
 
     <string name="choose_back_settings">Zurück</string>
 

app/src/main/res/values-fr/strings.xml

@@ -26,9 +26,8 @@
     <string name="settings_select_launcher">Choisir Launcher</string>
     <string name="settings_reset">Réinitialiser</string>
     <string name="settings_reset_message">Vous allez supprimer toutes vos préférences. Continuer?</string>
-    <string name="settings_launch">Lancer apps</string>
-    <string name="settings_uninstall">Désinstaller apps</string>
-    <string name="settings_install">Installer apps</string>
+    <string name="settings_apps">Toutes les applications</string>
+    <string name="settings_install">Installer applications</string>
     <string name="settings_home">Retourner</string>
 
     <string name="settings_toast_store_not_found">Pas trouvé le PlayStore</string>
@@ -46,8 +45,7 @@
 
     <!-- Choose Activity -->
     <string name="choose_title">Choisir App</string>
-    <string name="choose_title_launch">Lancer Apps</string>
-    <string name="choose_title_remove">Désinstaller</string>
+    <string name="choose_title_view">Applications</string>
 
     <string name="choose_back_settings">Retourner</string>
 

app/src/main/res/values/icons.xml

@@ -10,6 +10,7 @@
   <string name="fas_calendar" translatable="false">&#xf133;</string>
   <string name="fas_donate" translatable="false">&#xf4b9;</string>
   <string name="fas_share" translatable="false">&#xf064;</string>
+  <string name="fas_trash" translatable="false">&#xf1f8;</string>
 
   <!-- icons that can be used with type="brands" -->
   <string name="fab_apple" translatable="false">&#xf179;</string>

app/src/main/res/values/strings.xml

@@ -34,9 +34,8 @@
     <string name="settings_select_launcher">Select Launcher</string>
     <string name="settings_reset">Reset Settings</string>
     <string name="settings_reset_message">You are going to discard all your preferences. Continue?</string>
-    <string name="settings_launch">Launch Apps</string>
-    <string name="settings_uninstall">Uninstall Apps</string>
-    <string name="settings_install">Install Apps</string>
+    <string name="settings_apps">View all apps</string>
+    <string name="settings_install">Install apps</string>
     <string name="settings_home">Back Home</string>
 
     <string name="settings_toast_store_not_found">PlayStore not found</string>
@@ -55,8 +54,7 @@
 
     <!-- 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_title_view">All Apps</string>
 
     <string name="choose_back_settings">Back to Settings</string>