Improve footer of add apps screen

app/src/main/java/io/timelimit/android/ui/manage/category/apps/add/AddCategoryAppsFragment.kt

@@ -30,7 +30,10 @@ import io.timelimit.android.data.Database
 import io.timelimit.android.data.model.UserType
 import io.timelimit.android.databinding.FragmentAddCategoryAppsBinding
 import io.timelimit.android.extensions.showSafe
-import io.timelimit.android.livedata.*
+import io.timelimit.android.livedata.ignoreUnchanged
+import io.timelimit.android.livedata.liveDataFromValue
+import io.timelimit.android.livedata.map
+import io.timelimit.android.livedata.switchMap
 import io.timelimit.android.logic.DefaultAppLogic
 import io.timelimit.android.sync.actions.AddCategoryAppsAction
 import io.timelimit.android.ui.main.ActivityViewModel
@@ -138,11 +141,7 @@ class AddCategoryAppsFragment : DialogFragment() {
             adapter.categoryTitleByPackageName = it
         })
 
-        return AlertDialog.Builder(context!!, R.style.AppTheme)
+        binding.addAppsButton.setOnClickListener {
-                .setView(binding.root)
-                .setPositiveButton(R.string.category_apps_add_dialog_btn_positive) {
-                    _, _->
-
             val packageNames = adapter.selectedApps.toList()
 
             if (packageNames.isNotEmpty()) {
@@ -153,21 +152,25 @@ class AddCategoryAppsFragment : DialogFragment() {
                         )
                 )
             }
+
+            dismiss()
         }
-                .setNegativeButton(R.string.generic_cancel, null)
+
-                .setNeutralButton(R.string.category_apps_add_dialog_select_all, null)
+        binding.cancelButton.setOnClickListener {
-                .create()
+            dismiss()
-                .apply {
+        }
-                    setOnShowListener {
+
-                        getButton(AlertDialog.BUTTON_NEUTRAL).setOnClickListener {
+        binding.selectAllButton.setOnClickListener {
             adapter.selectedApps.addAll(
                     adapter.data?.map { it.packageName } ?: emptySet()
             )
 
             adapter.notifyDataSetChanged()
         }
-                    }
+
-                }
+        return AlertDialog.Builder(context!!, R.style.AppTheme)
+                .setView(binding.root)
+                .create()
     }
 
     fun show(manager: FragmentManager) {

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

@@ -77,5 +77,37 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
+        <LinearLayout
+            style="?android:buttonBarStyle"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <Button
+                style="?android:buttonBarButtonStyle"
+                android:layout_weight="1"
+                android:text="@string/category_apps_add_dialog_select_all"
+                android:id="@+id/select_all_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+
+            <Button
+                style="?android:buttonBarButtonStyle"
+                android:layout_weight="1"
+                android:text="@string/generic_cancel"
+                android:id="@+id/cancel_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+
+            <Button
+                style="?android:buttonBarButtonStyle"
+                android:layout_weight="1"
+                android:text="@string/category_apps_add_dialog_btn_positive"
+                android:id="@+id/add_apps_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+
+        </LinearLayout>
+
     </LinearLayout>
 </layout>