Show app name in the list

2 files changed, 24 insertions, 3 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppListAdapter.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppListAdapter.kt
index f77490714f..8f065a8646 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppListAdapter.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppListAdapter.kt
@@ -25,10 +25,12 @@ class AppListAdapter(context: Context) : Adapter<AppListItemHolder>() {
         val inflater = LayoutInflater.from(parentView.context)
         val view = inflater.inflate(R.layout.app_list_item, parentView, false)
 
-        return AppListItemItemHolder(view)
+        return AppListItemHolder(packageManager, view)
     }
 
-    override fun onBindViewHolder(holder: AppListItemHolder, position: Int) {}
+    override fun onBindViewHolder(holder: AppListItemHolder, position: Int) {
+        holder.appInfo = appList.get(position)
+    }
 
     private fun populateAppList(context: Context) {
         val applications = context.packageManager.getInstalledApplications(0)
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppListItemHolder.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppListItemHolder.kt
index 1becf9330c..58b0778e94 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppListItemHolder.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppListItemHolder.kt
@@ -1,6 +1,25 @@
 package net.mullvad.mullvadvpn.applist
 
+import android.content.pm.ApplicationInfo
+import android.content.pm.PackageManager
 import android.support.v7.widget.RecyclerView.ViewHolder
 import android.view.View
+import android.widget.ImageView
+import android.widget.TextView
+import kotlin.properties.Delegates.observable
+import net.mullvad.mullvadvpn.R
+import net.mullvad.mullvadvpn.ui.CellSwitch
 
-class AppListItemHolder(view: View) : ViewHolder(view)
+class AppListItemHolder(private val packageManager: PackageManager, view: View) : ViewHolder(view) {
+    private val icon: ImageView = view.findViewById(R.id.icon)
+    private val name: TextView = view.findViewById(R.id.name)
+    private val excluded: CellSwitch = view.findViewById(R.id.excluded)
+
+    var appInfo by observable<ApplicationInfo?>(null) { _, _, info ->
+        if (info != null) {
+            name.text = packageManager.getApplicationLabel(info)
+        } else {
+            name.text = ""
+        }
+    }
+}