Merge pull request #344 from pavelpoley/task/sorting

Sort by dialog

app/build.gradle

@@ -61,6 +61,6 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:e3376e4f56'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:6c96be277f'
     implementation 'com.github.tibbi:IndicatorFastScroll:4524cd0b61'
 }

app/src/main/kotlin/com/simplemobiletools/dialer/activities/MainActivity.kt

@@ -25,9 +25,11 @@ import com.simplemobiletools.commons.dialogs.ConfirmationDialog
 import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.commons.helpers.*
 import com.simplemobiletools.commons.models.FAQItem
+import com.simplemobiletools.commons.models.SimpleContact
 import com.simplemobiletools.dialer.BuildConfig
 import com.simplemobiletools.dialer.R
 import com.simplemobiletools.dialer.adapters.ViewPagerAdapter
+import com.simplemobiletools.dialer.dialogs.ChangeSortingDialog
 import com.simplemobiletools.dialer.extensions.config
 import com.simplemobiletools.dialer.fragments.MyViewPagerFragment
 import com.simplemobiletools.dialer.helpers.OPEN_DIAL_PAD_AT_LAUNCH
@@ -43,6 +45,7 @@ class MainActivity : SimpleActivity() {
     private var launchedDialer = false
     private var searchMenuItem: MenuItem? = null
     private var storedShowTabs = 0
+    private var searchQuery = ""
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -69,6 +72,8 @@ class MainActivity : SimpleActivity() {
         }
 
         hideTabs()
+
+        SimpleContact.sorting = config.sorting
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
@@ -123,6 +128,7 @@ class MainActivity : SimpleActivity() {
         menuInflater.inflate(R.menu.menu, menu)
         menu.apply {
             findItem(R.id.clear_call_history).isVisible = getCurrentFragment() == recents_fragment
+            findItem(R.id.sort).isVisible = getCurrentFragment() != recents_fragment
 
             setupSearch(this)
             updateMenuItemColors(this)
@@ -135,6 +141,7 @@ class MainActivity : SimpleActivity() {
             R.id.clear_call_history -> clearCallHistory()
             R.id.settings -> launchSettings()
             R.id.about -> launchAbout()
+            R.id.sort -> showSortingDialog()
             else -> return super.onOptionsItemSelected(item)
         }
         return true
@@ -171,6 +178,7 @@ class MainActivity : SimpleActivity() {
 
                 override fun onQueryTextChange(newText: String): Boolean {
                     if (isSearchOpen) {
+                        searchQuery = newText
                         getCurrentFragment()?.onSearchQueryChanged(newText)
                     }
                     return true
@@ -467,4 +475,19 @@ class MainActivity : SimpleActivity() {
 
         startAboutActivity(R.string.app_name, licenses, BuildConfig.VERSION_NAME, faqItems, true)
     }
+
+    private fun showSortingDialog() {
+        ChangeSortingDialog(this) {
+            favorites_fragment?.refreshItems {
+                if (isSearchOpen){
+                    getCurrentFragment()?.onSearchQueryChanged(searchQuery)
+                }
+            }
+            contacts_fragment?.refreshItems {
+                if (isSearchOpen){
+                    getCurrentFragment()?.onSearchQueryChanged(searchQuery)
+                }
+            }
+        }
+    }
 }

app/src/main/kotlin/com/simplemobiletools/dialer/dialogs/ChangeSortingDialog.kt

@@ -0,0 +1,64 @@
+package com.simplemobiletools.dialer.dialogs
+
+import androidx.appcompat.app.AlertDialog
+import com.simplemobiletools.commons.activities.BaseSimpleActivity
+import com.simplemobiletools.commons.extensions.setupDialogStuff
+import com.simplemobiletools.commons.helpers.*
+import com.simplemobiletools.commons.models.SimpleContact
+import com.simplemobiletools.dialer.R
+import com.simplemobiletools.dialer.extensions.config
+import kotlinx.android.synthetic.main.dialog_change_sorting.view.*
+
+class ChangeSortingDialog(val activity: BaseSimpleActivity, private val callback: () -> Unit) {
+    private var currSorting = 0
+    private var config = activity.config
+    private var view = activity.layoutInflater.inflate(R.layout.dialog_change_sorting, null)
+
+    init {
+        AlertDialog.Builder(activity)
+            .setPositiveButton(R.string.ok) { dialog, which -> dialogConfirmed() }
+            .setNegativeButton(R.string.cancel, null)
+            .create().apply {
+                activity.setupDialogStuff(view, this, R.string.sort_by)
+            }
+
+        currSorting = config.sorting
+        setupSortRadio()
+        setupOrderRadio()
+    }
+
+    private fun setupSortRadio() {
+        val sortingRadio = view.sorting_dialog_radio_sorting
+        val sortBtn = when {
+            currSorting and SORT_BY_FULL_NAME != 0 -> sortingRadio.sorting_dialog_radio_full_name
+            else -> sortingRadio.sorting_dialog_radio_date_created
+        }
+        sortBtn.isChecked = true
+    }
+
+    private fun setupOrderRadio() {
+        val orderRadio = view.sorting_dialog_radio_order
+        var orderBtn = orderRadio.sorting_dialog_radio_ascending
+
+        if (currSorting and SORT_DESCENDING != 0) {
+            orderBtn = orderRadio.sorting_dialog_radio_descending
+        }
+        orderBtn.isChecked = true
+    }
+
+    private fun dialogConfirmed() {
+        val sortingRadio = view.sorting_dialog_radio_sorting
+        var sorting = when (sortingRadio.checkedRadioButtonId) {
+            R.id.sorting_dialog_radio_full_name -> SORT_BY_FULL_NAME
+            else -> SORT_BY_DATE_CREATED
+        }
+
+        if (view.sorting_dialog_radio_order.checkedRadioButtonId == R.id.sorting_dialog_radio_descending) {
+            sorting = sorting or SORT_DESCENDING
+        }
+
+        config.sorting = sorting
+        SimpleContact.sorting = sorting
+        callback()
+    }
+}

app/src/main/kotlin/com/simplemobiletools/dialer/fragments/ContactsFragment.kt

@@ -72,7 +72,7 @@ class ContactsFragment(context: Context, attributeSet: AttributeSet) : MyViewPag
         )
     }
 
-    override fun refreshItems() {
+    override fun refreshItems(callback: (() -> Unit)?) {
         val privateCursor = context?.getMyContactsCursor(false, true)
         SimpleContactsHelper(context).getAvailableContacts(false) { contacts ->
             allContacts = contacts
@@ -85,6 +85,7 @@ class ContactsFragment(context: Context, attributeSet: AttributeSet) : MyViewPag
 
             activity?.runOnUiThread {
                 gotContacts(contacts)
+                callback?.invoke()
             }
         }
     }

app/src/main/kotlin/com/simplemobiletools/dialer/fragments/FavoritesFragment.kt

@@ -46,7 +46,7 @@ class FavoritesFragment(context: Context, attributeSet: AttributeSet) : MyViewPa
         letter_fastscroller_thumb.thumbColor = properPrimaryColor.getColorStateList()
     }
 
-    override fun refreshItems() {
+    override fun refreshItems(callback: (() -> Unit)?) {
         val privateCursor = context?.getMyContactsCursor(true, true)
         SimpleContactsHelper(context).getAvailableContacts(true) { contacts ->
             allContacts = contacts
@@ -59,6 +59,7 @@ class FavoritesFragment(context: Context, attributeSet: AttributeSet) : MyViewPa
 
             activity?.runOnUiThread {
                 gotContacts(contacts)
+                callback?.invoke()
             }
         }
     }

app/src/main/kotlin/com/simplemobiletools/dialer/fragments/RecentsFragment.kt

@@ -45,7 +45,7 @@ class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
         }
     }
 
-    override fun refreshItems() {
+    override fun refreshItems(callback: (() -> Unit)?) {
         val privateCursor = context?.getMyContactsCursor(false, true)
         val groupSubsequentCalls = context?.config?.groupSubsequentCalls ?: false
         RecentsHelper(context).getRecentCalls(groupSubsequentCalls) { recents ->

app/src/main/kotlin/com/simplemobiletools/dialer/interfaces/RefreshItemsListener.kt

@@ -1,5 +1,5 @@
 package com.simplemobiletools.dialer.interfaces
 
 interface RefreshItemsListener {
-    fun refreshItems()
+    fun refreshItems(callback: (() -> Unit)? = null)
 }

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

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/sorting_dialog_scrollview"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:id="@+id/sorting_dialog_holder"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingStart="@dimen/activity_margin"
+        android:paddingTop="@dimen/activity_margin"
+        android:paddingEnd="@dimen/activity_margin">
+
+        <RadioGroup
+            android:id="@+id/sorting_dialog_radio_sorting"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/medium_margin">
+
+            <com.simplemobiletools.commons.views.MyCompatRadioButton
+                android:id="@+id/sorting_dialog_radio_full_name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="@dimen/medium_margin"
+                android:paddingBottom="@dimen/medium_margin"
+                android:text="@string/full_name" />
+
+            <com.simplemobiletools.commons.views.MyCompatRadioButton
+                android:id="@+id/sorting_dialog_radio_date_created"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="@dimen/medium_margin"
+                android:paddingBottom="@dimen/medium_margin"
+                android:text="@string/date_created" />
+
+        </RadioGroup>
+
+        <include layout="@layout/divider" />
+
+        <RadioGroup
+            android:id="@+id/sorting_dialog_radio_order"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/medium_margin"
+            android:paddingBottom="@dimen/medium_margin">
+
+            <com.simplemobiletools.commons.views.MyCompatRadioButton
+                android:id="@+id/sorting_dialog_radio_ascending"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="@dimen/medium_margin"
+                android:paddingBottom="@dimen/medium_margin"
+                android:text="@string/ascending" />
+
+            <com.simplemobiletools.commons.views.MyCompatRadioButton
+                android:id="@+id/sorting_dialog_radio_descending"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="@dimen/medium_margin"
+                android:paddingBottom="@dimen/medium_margin"
+                android:text="@string/descending" />
+        </RadioGroup>
+    </LinearLayout>
+</ScrollView>

app/src/main/res/menu/menu.xml

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/sort"
+        android:icon="@drawable/ic_sort_vector"
+        android:title="@string/sort_by"
+        app:showAsAction="always" />
     <item
         android:id="@+id/clear_call_history"
         android:icon="@drawable/ic_delete_vector"

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

@@ -1,3 +1,4 @@
 <resources>
     <integer name="default_font_size">2</integer>
+    <integer name="default_sorting">65536</integer>
 </resources>