Merge pull request #12080 from nextcloud/feature/use-m3-SortingOrderD…

…ialogFragment

Use Material Design 3 For Sorting Order Dialog Fragment

app/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.kt

@@ -571,8 +571,8 @@ open class FolderPickerActivity :
         }
     }
 
-    override fun onSortingOrderChosen(selection: FileSortOrder) {
-        listOfFilesFragment!!.sortFiles(selection)
+    override fun onSortingOrderChosen(selection: FileSortOrder?) {
+        listOfFilesFragment?.sortFiles(selection)
     }
 
     companion object {

app/src/main/java/com/owncloud/android/ui/dialog/SortingOrderDialogFragment.kt

@@ -0,0 +1,134 @@
+/*
+ * Nextcloud Android client application
+ *
+ * @author Andy Scherzinger
+ * Copyright (C) 2017 Andy Scherzinger
+ * Copyright (C) 2017 Nextcloud
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.owncloud.android.ui.dialog
+
+import android.app.Dialog
+import android.os.Bundle
+import android.view.View
+import androidx.fragment.app.DialogFragment
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.nextcloud.client.di.Injectable
+import com.owncloud.android.R
+import com.owncloud.android.databinding.SortingOrderFragmentBinding
+import com.owncloud.android.lib.common.utils.Log_OC
+import com.owncloud.android.utils.FileSortOrder
+import com.owncloud.android.utils.theme.ViewThemeUtils
+import javax.inject.Inject
+
+/**
+ * Dialog to show and choose the sorting order for the file listing.
+ */
+class SortingOrderDialogFragment : DialogFragment(), Injectable {
+
+    private var binding: SortingOrderFragmentBinding? = null
+
+    private var currentSortOrderName: String? = null
+
+    @JvmField
+    @Inject
+    var viewThemeUtils: ViewThemeUtils? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        // keep the state of the fragment on configuration changes
+        retainInstance = true
+
+        binding = null
+        currentSortOrderName = requireArguments().getString(KEY_SORT_ORDER, FileSortOrder.sort_a_to_z.name)
+    }
+
+    /**
+     * find all relevant UI elements and set their values.
+     *
+     * @param binding the parent binding
+     */
+    private fun setupDialogElements(binding: SortingOrderFragmentBinding) {
+        val bindings = listOf(
+            binding.sortByNameAscending to FileSortOrder.sort_a_to_z,
+            binding.sortByNameDescending to FileSortOrder.sort_z_to_a,
+            binding.sortByModificationDateAscending to FileSortOrder.sort_old_to_new,
+            binding.sortByModificationDateDescending to FileSortOrder.sort_new_to_old,
+            binding.sortBySizeAscending to FileSortOrder.sort_small_to_big,
+            binding.sortBySizeDescending to FileSortOrder.sort_big_to_small
+        )
+
+        bindings.forEach { (view, sortOrder) ->
+            view.tag = sortOrder
+            view.let {
+                it.setOnClickListener(OnSortOrderClickListener())
+                viewThemeUtils?.material?.colorMaterialButtonPrimaryBorderless(it)
+            }
+        }
+
+        viewThemeUtils?.material?.colorMaterialButtonPrimaryTonal(binding.cancel)
+        binding.cancel.setOnClickListener { dismiss() }
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        binding = SortingOrderFragmentBinding.inflate(requireActivity().layoutInflater, null, false)
+        setupDialogElements(binding!!)
+
+        val builder = MaterialAlertDialogBuilder(requireContext())
+        builder.setView(binding?.root)
+
+        viewThemeUtils?.dialog?.colorMaterialAlertDialogBackground(requireContext(), builder)
+
+        return builder.create()
+    }
+
+    override fun onDestroyView() {
+        Log_OC.d(TAG, "destroy SortingOrderDialogFragment view")
+
+        if (dialog != null && retainInstance) {
+            dialog?.setDismissMessage(null)
+        }
+
+        super.onDestroyView()
+    }
+
+    private inner class OnSortOrderClickListener : View.OnClickListener {
+        override fun onClick(v: View) {
+            dismissAllowingStateLoss()
+            (activity as OnSortingOrderListener?)?.onSortingOrderChosen(v.tag as FileSortOrder)
+        }
+    }
+
+    interface OnSortingOrderListener {
+        fun onSortingOrderChosen(selection: FileSortOrder?)
+    }
+
+    companion object {
+
+        private val TAG = SortingOrderDialogFragment::class.java.simpleName
+        const val SORTING_ORDER_FRAGMENT = "SORTING_ORDER_FRAGMENT"
+        private const val KEY_SORT_ORDER = "SORT_ORDER"
+
+        @JvmStatic
+        fun newInstance(sortOrder: FileSortOrder): SortingOrderDialogFragment {
+            val dialogFragment = SortingOrderDialogFragment()
+            val args = Bundle()
+            args.putString(KEY_SORT_ORDER, sortOrder.name)
+            dialogFragment.arguments = args
+            dialogFragment.setStyle(STYLE_NORMAL, R.style.Theme_ownCloud_Dialog)
+            return dialogFragment
+        }
+    }
+}