From 73af5fdf5ad53f51fa7c236a23efd47a7beab998 Mon Sep 17 00:00:00 2001
From: Bindu <code@bindu.io>
Date: Sat, 9 Apr 2022 10:02:11 -0700
Subject: [PATCH 01/20] Group recent calls

---
 .../www/chooloolib/adapter/RecentsAdapter.kt  | 14 +++++-
 .../chooloo/www/chooloolib/model/ListData.kt  | 43 +++++++++++++++++--
 .../www/chooloolib/model/RecentAccount.kt     |  1 +
 .../ui/recents/RecentsHistoryFragment.kt      | 11 +++++
 .../ui/widgets/listitem/ListItem.kt           |  4 +-
 5 files changed, 65 insertions(+), 8 deletions(-)

diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/RecentsAdapter.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/RecentsAdapter.kt
index 3ad39f889..9072a0741 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/RecentsAdapter.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/RecentsAdapter.kt
@@ -23,10 +23,19 @@ class RecentsAdapter @Inject constructor(
     private val preferences: PreferencesInteractor
 ) : ListAdapter<RecentAccount>(animations) {
 
+    private var _showHistory: Boolean = false
+
+    var showHistory: Boolean
+        get() = _showHistory
+        set(value) {
+            _showHistory = value
+        }
+
     override fun onBindListItem(listItem: ListItem, item: RecentAccount) {
         listItem.apply {
             isCompact = preferences.isCompact
-            captionText = if (item.date != null) context.getHoursString(item.date) else null
+            val date = if (item.date != null) context.getHoursString(item.date) else ""
+            captionText = if (item.callCount > 1) "(${item.callCount}) $date" else date
             phones.lookupAccount(item.number) {
                 titleText = it?.name ?: item.number
                 it?.let {
@@ -42,5 +51,6 @@ class RecentsAdapter @Inject constructor(
         }
     }
 
-    override fun convertDataToListData(data: List<RecentAccount>) = ListData.fromRecents(data)
+    override fun convertDataToListData(data: List<RecentAccount>) =
+        ListData.fromRecents(data, !showHistory)
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/ListData.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/ListData.kt
index ee875d9ea..497269a7d 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/ListData.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/ListData.kt
@@ -24,10 +24,45 @@ data class ListData<DataType>(
             return ListData(contacts, headersToCounts)
         }
 
-        fun fromRecents(recents: List<RecentAccount>) = ListData(
-            recents,
-            recents.groupingBy { getRelativeDateString(it.date) }.eachCount()
-        )
+        fun fromRecents(recents: List<RecentAccount>, isGrouped: Boolean) =
+            if (isGrouped && recents.size > 1) getGroupedRecents(recents)
+            else ListData(
+                recents,
+                recents.groupingBy { getRelativeDateString(it.date) }.eachCount()
+            )
+
+        private fun getGroupedRecents(recents: List<RecentAccount>): ListData<RecentAccount> {
+            var prevItem: RecentAccount = recents[0]
+            var prevDate = getRelativeDateString(prevItem.date)
+            var count = 1
+            val groupedRecents: MutableList<RecentAccount> = ArrayList()
+            recents.drop(1).forEach {
+                val date = getRelativeDateString(it.date)
+                if (prevItem.number == it.number && prevDate == date) {
+                    count++
+                } else {
+                    groupedRecents.add(
+                        RecentAccount(
+                            prevItem.number, prevItem.type, prevItem.id,
+                            prevItem.duration, prevItem.date, prevItem.cachedName, count
+                        )
+                    )
+                    count = 1
+                    prevItem = it
+                }
+                prevDate = date
+            }
+            groupedRecents.add(
+                RecentAccount(
+                    prevItem.number, prevItem.type, prevItem.id,
+                    prevItem.duration, prevItem.date, prevItem.cachedName, count
+                )
+            )
+            return ListData(
+                groupedRecents,
+                groupedRecents.groupingBy { getRelativeDateString(it.date) }.eachCount()
+            )
+        }
 
         fun fromPhones(phones: List<PhoneAccount>): ListData<PhoneAccount> {
             val phones = phones.toList().distinctBy { it.normalizedNumber }
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/RecentAccount.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/RecentAccount.kt
index 7d780a926..e0534ed61 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/RecentAccount.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/RecentAccount.kt
@@ -13,6 +13,7 @@ data class RecentAccount(
     val duration: Long = 0,
     val date: Date? = null,
     val cachedName: String? = null,
+    val callCount: Int = 1,
 ) : Serializable {
 
     @kotlin.annotation.Retention(AnnotationRetention.SOURCE)
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recents/RecentsHistoryFragment.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recents/RecentsHistoryFragment.kt
index b4c6e9d46..c5e17477c 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recents/RecentsHistoryFragment.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recents/RecentsHistoryFragment.kt
@@ -2,12 +2,23 @@ package com.chooloo.www.chooloolib.ui.recents
 
 import android.os.Bundle
 import androidx.fragment.app.activityViewModels
+import com.chooloo.www.chooloolib.adapter.RecentsAdapter
 import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
 
 @AndroidEntryPoint
 class RecentsHistoryFragment : RecentsFragment() {
     override val viewState: RecentsHistoryViewState by activityViewModels()
 
+    @Inject
+    override lateinit var adapter: RecentsAdapter
+
+    override fun onSetup() {
+        super.onSetup()
+
+        adapter.showHistory = true
+    }
+
     companion object {
         fun newInstance(filter: String? = null) = RecentsHistoryFragment().apply {
             arguments = Bundle().apply {
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/listitem/ListItem.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/listitem/ListItem.kt
index 75a5cc49c..f5f097340 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/listitem/ListItem.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/listitem/ListItem.kt
@@ -297,13 +297,13 @@ open class ListItem : LinearLayout {
 
             caption.id.also {
                 connect(it, TOP, title.id, BOTTOM)
-                connect(it, START, title.id, START)
+                connect(it, START, captionImage.id, END)
                 connect(it, BOTTOM, PARENT_ID, BOTTOM)
             }
 
             captionImage.id.also {
                 connect(it, TOP, caption.id, TOP)
-                connect(it, START, caption.id, END)
+                connect(it, START, title.id, START)
                 connect(it, BOTTOM, caption.id, BOTTOM)
             }
 

From ba437153cb3f2d4af4db040455353d77ec8424d3 Mon Sep 17 00:00:00 2001
From: Roei Edri <roeiedr5@gmail.com>
Date: Wed, 6 Apr 2022 20:47:30 +0300
Subject: [PATCH 02/20] Fixed PRs code

---
 .../www/chooloolib/ui/dialpad/DialpadFragment.kt  |  7 +------
 .../www/chooloolib/ui/dialpad/DialpadViewState.kt |  6 +++++-
 .../www/chooloolib/ui/widgets/SearchBar.kt        | 15 +++++++--------
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/dialpad/DialpadFragment.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/dialpad/DialpadFragment.kt
index 9461a2df8..3f4269c44 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/dialpad/DialpadFragment.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/dialpad/DialpadFragment.kt
@@ -1,7 +1,5 @@
 package com.chooloo.www.chooloolib.ui.dialpad
 
-import android.content.ClipboardManager
-import android.content.Context
 import android.view.View
 import androidx.core.view.isVisible
 import androidx.fragment.app.activityViewModels
@@ -77,9 +75,6 @@ open class DialpadFragment @Inject constructor() : BaseFragment<DialpadViewState
     }
 
     override fun onPaste() {
-        val clipboard = activity?.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager
-        val item = clipboard?.primaryClip?.getItemAt(0)
-        val text = item?.text.toString().replace(Regex("[^+#*0-9]"), "")
-        viewState.onTextPasted(text)
+        viewState.onTextPasted()
     }
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/dialpad/DialpadViewState.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/dialpad/DialpadViewState.kt
index 86b7f4943..72c424d62 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/dialpad/DialpadViewState.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/dialpad/DialpadViewState.kt
@@ -1,5 +1,6 @@
 package com.chooloo.www.chooloolib.ui.dialpad
 
+import android.content.ClipboardManager
 import androidx.lifecycle.MutableLiveData
 import com.chooloo.www.chooloolib.interactor.audio.AudiosInteractor
 import com.chooloo.www.chooloolib.interactor.preferences.PreferencesInteractor
@@ -10,6 +11,7 @@ import javax.inject.Inject
 @HiltViewModel
 open class DialpadViewState @Inject constructor(
     private val audios: AudiosInteractor,
+    private val clipboardManager: ClipboardManager,
     private val preferences: PreferencesInteractor
 ) :
     BaseViewState() {
@@ -27,7 +29,9 @@ open class DialpadViewState @Inject constructor(
 
     open fun onLongKeyClick(char: Char) = true
 
-    open fun onTextPasted(text: String) {
+    open fun onTextPasted() {
+        val item = clipboardManager.primaryClip?.getItemAt(0)
+        val text = item?.text.toString().replace(Regex("[^+#*0-9]"), "")
         onTextChanged(text)
     }
 
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/SearchBar.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/SearchBar.kt
index a0ff55a43..0984e33da 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/SearchBar.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/SearchBar.kt
@@ -50,15 +50,14 @@ class SearchBar : TextInputLayout {
             hint = resources.getString(R.string.hint_search)
             layoutParams = LayoutParams(MATCH_PARENT, WRAP_CONTENT)
             compoundDrawableTintList = ColorStateList.valueOf(colorForeground)
-            filters =
-                arrayOf(InputFilter { source, _, _, _, _, _ ->
-                    source.forEach { char ->
-                        if (!(char.isLetterOrDigit() || char == ' ')) {
-                            return@InputFilter ""
-                        }
+            filters = arrayOf(InputFilter { source, _, _, _, _, _ ->
+                source.forEach { char ->
+                    if (!(char.isLetterOrDigit() || char == ' ')) {
+                        return@InputFilter ""
                     }
-                    return@InputFilter null
-                })
+                }
+                return@InputFilter null
+            })
 
             setTextAppearance(R.style.Chooloo_Text_Subtitle1)
             setPadding(spacingSmall, 0, spacingSmall, 0)

From 86912a3dd50f957388d8ed73a881d5c3444ada8b Mon Sep 17 00:00:00 2001
From: Roei Edri <roeiedr5@gmail.com>
Date: Wed, 6 Apr 2022 21:03:39 +0300
Subject: [PATCH 03/20] Fix numbers custom label showing as 'custom', Fixes
 #397

---
 .../com/chooloo/www/chooloolib/adapter/PhonesAdapter.kt     | 2 +-
 .../com/chooloo/www/chooloolib/adapter/RecentsAdapter.kt    | 5 ++---
 .../contentresolver/PhoneLookupContentResolver.kt           | 2 ++
 .../www/chooloolib/contentresolver/PhonesContentResolver.kt | 2 ++
 .../java/com/chooloo/www/chooloolib/model/PhoneAccount.kt   | 1 +
 .../com/chooloo/www/chooloolib/model/PhoneLookupAccount.kt  | 1 +
 .../com/chooloo/www/chooloolib/ui/dialer/DialerViewState.kt | 4 +++-
 chooloolib/src/main/res/values/styles.xml                   | 6 +++---
 8 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/PhonesAdapter.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/PhonesAdapter.kt
index 70d8943da..033a2257d 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/PhonesAdapter.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/PhonesAdapter.kt
@@ -18,7 +18,7 @@ class PhonesAdapter @Inject constructor(
             imageVisibility = false
             titleText = item.number
             isRightButtonVisible = true
-            captionText = strings.getString(Phone.getTypeLabelResource(item.type))
+            captionText = Phone.getTypeLabel(resources, item.type, item.label).toString()
 
             setTitleBold(true)
             setBackground(null)
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/RecentsAdapter.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/RecentsAdapter.kt
index d57ef0381..8e96f675a 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/RecentsAdapter.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/RecentsAdapter.kt
@@ -28,9 +28,8 @@ class RecentsAdapter @Inject constructor(
             phones.lookupAccount(item.number) {
                 titleText = it?.name ?: item.number
                 it?.let {
-                    captionText = "$captionText · ${
-                        strings.getString(Phone.getTypeLabelResource(it.type))
-                    }"
+                    captionText =
+                        "$captionText · ${Phone.getTypeLabel(resources, it.type, it.label)}"
                 }
             }
 
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/contentresolver/PhoneLookupContentResolver.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/contentresolver/PhoneLookupContentResolver.kt
index cc38d1864..e2a5353d2 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/contentresolver/PhoneLookupContentResolver.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/contentresolver/PhoneLookupContentResolver.kt
@@ -17,6 +17,7 @@ class PhoneLookupContentResolver(context: Context, number: String?) :
     override val uri: Uri = PhoneLookup.CONTENT_FILTER_URI.buildUpon().appendPath(number).build()
     override val projection: Array<String> = arrayOf(
         PhoneLookup.TYPE,
+        PhoneLookup.LABEL,
         PhoneLookup.NUMBER,
         PhoneLookup.STARRED,
         PhoneLookup.PHOTO_URI,
@@ -26,6 +27,7 @@ class PhoneLookupContentResolver(context: Context, number: String?) :
 
     @SuppressLint("Range")
     override fun convertCursorToItem(cursor: Cursor) = PhoneLookupAccount(
+        label = cursor.getString(cursor.getColumnIndex(PhoneLookup.LABEL)),
         number = cursor.getString(cursor.getColumnIndex(PhoneLookup.NUMBER)),
         name = cursor.getString(cursor.getColumnIndex(PhoneLookup.DISPLAY_NAME)),
         contactId = cursor.getLong(cursor.getColumnIndex(PhoneLookup.CONTACT_ID)),
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/contentresolver/PhonesContentResolver.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/contentresolver/PhonesContentResolver.kt
index 2553ea3a0..e96cc70ab 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/contentresolver/PhonesContentResolver.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/contentresolver/PhonesContentResolver.kt
@@ -18,6 +18,7 @@ class PhonesContentResolver(context: Context, contactId: Long? = null) :
     override val selection = SelectionBuilder().addSelection(Phone.CONTACT_ID, contactId).build()
     override val projection: Array<String> = arrayOf(
         Phone.TYPE,
+        Phone.LABEL,
         Phone.NUMBER,
         Phone.CONTACT_ID,
         Phone.NORMALIZED_NUMBER,
@@ -27,6 +28,7 @@ class PhonesContentResolver(context: Context, contactId: Long? = null) :
     @SuppressLint("Range")
     override fun convertCursorToItem(cursor: Cursor) = PhoneAccount(
         type = cursor.getInt(cursor.getColumnIndex(Phone.TYPE)),
+        label = cursor.getString(cursor.getColumnIndex(Phone.LABEL)),
         number = cursor.getString(cursor.getColumnIndex(Phone.NUMBER)),
         contactId = cursor.getLong(cursor.getColumnIndex(Phone.CONTACT_ID)),
         displayName = cursor.getString(cursor.getColumnIndex(Phone.DISPLAY_NAME_PRIMARY)),
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/PhoneAccount.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/PhoneAccount.kt
index 8883e6c14..893b52d66 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/PhoneAccount.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/PhoneAccount.kt
@@ -6,6 +6,7 @@ data class PhoneAccount(
     val number: String,
     val contactId: Long,
     val displayName: String,
+    val label: String? = null,
     val normalizedNumber: String?,
     val type: Int = Phone.TYPE_OTHER
 )
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/PhoneLookupAccount.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/PhoneLookupAccount.kt
index ef4db6715..b2518e530 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/PhoneLookupAccount.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/PhoneLookupAccount.kt
@@ -4,6 +4,7 @@ import android.provider.ContactsContract.CommonDataKinds.Phone
 
 data class PhoneLookupAccount(
     val name: String?,
+    val label: String? = null,
     val number: String? = null,
     val contactId: Long? = null,
     val photoUri: String? = null,
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/dialer/DialerViewState.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/dialer/DialerViewState.kt
index d98a409fb..a23c900ad 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/dialer/DialerViewState.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/dialer/DialerViewState.kt
@@ -1,5 +1,6 @@
 package com.chooloo.www.chooloolib.ui.dialer
 
+import android.content.ClipboardManager
 import androidx.lifecycle.MutableLiveData
 import com.chooloo.www.chooloolib.interactor.audio.AudiosInteractor
 import com.chooloo.www.chooloolib.interactor.navigation.NavigationsInteractor
@@ -17,9 +18,10 @@ class DialerViewState @Inject constructor(
     audios: AudiosInteractor,
     preferences: PreferencesInteractor,
     private val recents: RecentsInteractor,
+    private val clipboardManager: ClipboardManager,
     private val navigations: NavigationsInteractor
 ) :
-    DialpadViewState(audios, preferences) {
+    DialpadViewState(audios, clipboardManager, preferences) {
 
     val callVoicemailEvent = LiveEvent()
     val callNumberEvent = DataLiveEvent<String>()
diff --git a/chooloolib/src/main/res/values/styles.xml b/chooloolib/src/main/res/values/styles.xml
index dfb58413e..cd64acbb7 100644
--- a/chooloolib/src/main/res/values/styles.xml
+++ b/chooloolib/src/main/res/values/styles.xml
@@ -81,9 +81,9 @@
 
     <!--region list view -->
     <style name="Chooloo.ListView">
-        <item name="android:requiresFadingEdge">vertical</item>
-        <item name="android:fadingMode">fade_in_out</item>
-        <item name="android:fadingEdge">vertical</item>
+        <!--        <item name="android:requiresFadingEdge">vertical</item>-->
+        <!--        <item name="android:fadingMode">fade_in_out</item>-->
+        <!--        <item name="android:fadingEdge">vertical</item>-->
         <item name="android:scrollbars">none</item>
         <item name="layoutManager">androidx.recyclerview.widget.LinearLayoutManager</item>
         <item name="android:divider">@android:color/transparent</item>

From 0c1c5245fe5ffe12c75409425663904a723fed9b Mon Sep 17 00:00:00 2001
From: Bindu <code@bindu.io>
Date: Fri, 8 Apr 2022 07:17:48 -0700
Subject: [PATCH 04/20] fix: settings text color not visible in dark theme mode

---
 .../interactor/color/ColorsInteractorImpl.kt      | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/color/ColorsInteractorImpl.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/color/ColorsInteractorImpl.kt
index 50328ceb6..093a62d43 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/color/ColorsInteractorImpl.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/color/ColorsInteractorImpl.kt
@@ -1,7 +1,9 @@
 package com.chooloo.www.chooloolib.interactor.color
 
 import android.content.Context
+import android.content.res.Configuration
 import android.util.TypedValue
+import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.content.ContextCompat
 import com.chooloo.www.chooloolib.util.baseobservable.BaseObservable
 import dagger.hilt.android.qualifiers.ApplicationContext
@@ -13,7 +15,18 @@ class ColorsInteractorImpl @Inject constructor(
     @ApplicationContext private val context: Context
 ) : BaseObservable<ColorsInteractor.Listener>(), ColorsInteractor {
 
-    override fun getColor(colorRes: Int) = ContextCompat.getColor(context, colorRes)
+    private fun getThemedContext(): Context {
+        val configuration = Configuration(context.resources.configuration)
+        configuration.uiMode = when (AppCompatDelegate.getDefaultNightMode()) {
+            AppCompatDelegate.MODE_NIGHT_NO -> Configuration.UI_MODE_NIGHT_NO
+            AppCompatDelegate.MODE_NIGHT_YES -> Configuration.UI_MODE_NIGHT_YES
+            else -> configuration.uiMode
+        }
+        return context.createConfigurationContext(configuration)
+    }
+
+    override fun getColor(colorRes: Int) = ContextCompat.getColor(getThemedContext(), colorRes)
+
     override fun getAttrColor(colorRes: Int) =
         TypedValue().also { context.theme.resolveAttribute(colorRes, it, true) }.data
 }
\ No newline at end of file

From 84f3e681615d07c62313755a69355a40df5aeedf Mon Sep 17 00:00:00 2001
From: Roei Edri <roeiedr5@gmail.com>
Date: Fri, 8 Apr 2022 18:27:54 +0300
Subject: [PATCH 05/20] Changed recent type image to be the contact's image,
 and moved the type image

---
 .../www/chooloolib/adapter/RecentsAdapter.kt  |  8 +++++--
 .../chooloolib/ui/recent/RecentFragment.kt    |  3 ++-
 .../chooloolib/ui/recent/RecentViewState.kt   |  9 ++++---
 .../ui/widgets/listitem/ListItem.kt           | 21 ++++++++++++++++
 chooloolib/src/main/res/layout/recent.xml     | 24 +++++++++++++++----
 5 files changed, 54 insertions(+), 11 deletions(-)

diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/RecentsAdapter.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/RecentsAdapter.kt
index 8e96f675a..3ad39f889 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/RecentsAdapter.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/RecentsAdapter.kt
@@ -1,6 +1,7 @@
 package com.chooloo.www.chooloolib.adapter
 
 import android.graphics.Color
+import android.net.Uri
 import android.provider.ContactsContract.CommonDataKinds.Phone
 import com.chooloo.www.chooloolib.interactor.animation.AnimationsInteractor
 import com.chooloo.www.chooloolib.interactor.phoneaccounts.PhonesInteractor
@@ -11,6 +12,7 @@ import com.chooloo.www.chooloolib.model.ListData
 import com.chooloo.www.chooloolib.model.RecentAccount
 import com.chooloo.www.chooloolib.ui.widgets.listitem.ListItem
 import com.chooloo.www.chooloolib.util.getHoursString
+import com.chooloo.www.chooloolib.util.initials
 import javax.inject.Inject
 
 class RecentsAdapter @Inject constructor(
@@ -29,12 +31,14 @@ class RecentsAdapter @Inject constructor(
                 titleText = it?.name ?: item.number
                 it?.let {
                     captionText =
-                        "$captionText · ${Phone.getTypeLabel(resources, it.type, it.label)}"
+                        "$captionText · ${Phone.getTypeLabel(resources, it.type, it.label)} ·"
+                    setImageInitials(it.name?.initials())
+                    setImageUri(if (it.photoUri != null) Uri.parse(it.photoUri) else null)
                 }
             }
 
             setImageBackgroundColor(Color.TRANSPARENT)
-            setImageResource(recents.getCallTypeImage(item.type))
+            setCaptionImageRes(recents.getCallTypeImage(item.type))
         }
     }
 
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recent/RecentFragment.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recent/RecentFragment.kt
index a18f500e1..d1f52e576 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recent/RecentFragment.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recent/RecentFragment.kt
@@ -61,7 +61,8 @@ class RecentFragment @Inject constructor() : BaseFragment<RecentViewState>() {
 
         viewState.apply {
             recentId.value = args.getLong(ARG_RECENT_ID)
-            image.observe(this@RecentFragment, binding.recentTypeImage::setImageDrawable)
+            imageUri.observe(this@RecentFragment, binding.recentContactImage::setImageURI)
+            typeImage.observe(this@RecentFragment, binding.recentTypeImage::setImageDrawable)
 
             name.observe(this@RecentFragment) {
                 binding.recentTextName.text = it
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recent/RecentViewState.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recent/RecentViewState.kt
index 90508ba95..ec7957a05 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recent/RecentViewState.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recent/RecentViewState.kt
@@ -2,6 +2,7 @@ package com.chooloo.www.chooloolib.ui.recent
 
 import android.Manifest.permission.WRITE_CALL_LOG
 import android.graphics.drawable.Drawable
+import android.net.Uri
 import androidx.lifecycle.MutableLiveData
 import com.chooloo.www.chooloolib.R
 import com.chooloo.www.chooloolib.interactor.blocked.BlockedInteractor
@@ -31,9 +32,10 @@ class RecentViewState @Inject constructor(
     BaseViewState() {
 
     val name = MutableLiveData<String?>()
+    val imageUri = MutableLiveData<Uri>()
     val recentId = MutableLiveData(0L)
-    val image = MutableLiveData<Drawable?>()
     val timeString = MutableLiveData<String?>()
+    val typeImage = MutableLiveData<Drawable?>()
     val durationString = MutableLiveData<String?>()
     val isContactVisible = MutableLiveData(false)
     val isAddContactVisible = MutableLiveData(false)
@@ -56,12 +58,13 @@ class RecentViewState @Inject constructor(
         timeString.value = _recent!!.relativeTime
         durationString.value =
             if (_recent!!.duration > 0L) getElapsedTimeString(_recent!!.duration) else null
-        image.value =
-            drawables.getDrawable(recents.getCallTypeImage(_recent!!.type))
         name.value =
             if (_recent!!.cachedName?.isNotEmpty() == true) _recent!!.cachedName else _recent!!.number
+        typeImage.value =
+            drawables.getDrawable(recents.getCallTypeImage(_recent!!.type))
 
         phones.lookupAccount(_recent!!.number) {
+            it?.photoUri?.let { imageUri.value = Uri.parse(it) }
             isContactVisible.value = it?.name != null
             isAddContactVisible.value = it?.name == null
         }
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/listitem/ListItem.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/listitem/ListItem.kt
index 1c66cfa5b..75a5cc49c 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/listitem/ListItem.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/listitem/ListItem.kt
@@ -12,6 +12,7 @@ import android.util.AttributeSet
 import android.view.View
 import android.view.ViewGroup.LayoutParams.MATCH_PARENT
 import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
+import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.annotation.ColorInt
@@ -52,6 +53,7 @@ open class ListItem : LinearLayout {
     protected val image: AvatarImageView
     protected val buttonLeft: IconButton
     protected val buttonRight: IconButton
+    protected val captionImage: ImageView
     protected val personLayout: ConstraintLayout
 
     protected val dimenSpacing by lazy { resources.getDimensionPixelSize(R.dimen.default_spacing) }
@@ -201,6 +203,13 @@ open class ListItem : LinearLayout {
             setPadding(0, context.getSizeInDp(2), 0, 0)
         }
 
+        captionImage = ImageView(context, attrs, defStyleRes).apply {
+            id = View.generateViewId()
+            layoutParams = ConstraintLayout.LayoutParams(WRAP_CONTENT, 0).apply {
+                setMargins(2, 0, 0, 0)
+            }
+        }
+
         image = AvatarImageView(context, attrs).apply {
             state = SHOW_INITIAL
             id = generateViewId()
@@ -266,6 +275,7 @@ open class ListItem : LinearLayout {
             addView(caption)
             addView(buttonLeft)
             addView(buttonRight)
+            addView(captionImage)
         }
 
         ConstraintSet().apply {
@@ -291,6 +301,12 @@ open class ListItem : LinearLayout {
                 connect(it, BOTTOM, PARENT_ID, BOTTOM)
             }
 
+            captionImage.id.also {
+                connect(it, TOP, caption.id, TOP)
+                connect(it, START, caption.id, END)
+                connect(it, BOTTOM, caption.id, BOTTOM)
+            }
+
             buttonRight.id.also {
                 connect(it, END, PARENT_ID, END)
                 connect(it, TOP, PARENT_ID, TOP)
@@ -421,10 +437,15 @@ open class ListItem : LinearLayout {
         title.setTextColor(color)
     }
 
+
     fun setImageResource(@DrawableRes res: Int) {
         image.setImageResource(res)
     }
 
+    fun setCaptionImageRes(@DrawableRes res: Int) {
+        captionImage.setImageResource(res)
+    }
+
     fun setTitleTextAppearance(@StyleRes resId: Int) {
         title.setTextAppearance(resId)
     }
diff --git a/chooloolib/src/main/res/layout/recent.xml b/chooloolib/src/main/res/layout/recent.xml
index 9c019ac01..3b7b60fd2 100644
--- a/chooloolib/src/main/res/layout/recent.xml
+++ b/chooloolib/src/main/res/layout/recent.xml
@@ -7,12 +7,12 @@
     android:layout_height="wrap_content">
 
     <com.google.android.material.imageview.ShapeableImageView
-        android:id="@+id/recent_type_image"
+        android:id="@+id/recent_contact_image"
         style="@style/Chooloo.Bottom.Image"
         android:layout_width="@dimen/image_size_big"
         android:layout_height="0dp"
-        android:layout_margin="@dimen/default_spacing_small"
-        android:src="@drawable/round_call_missed_20"
+        android:layout_margin="@dimen/default_spacing_big"
+        android:visibility="gone"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -29,7 +29,7 @@
         app:layout_constraintBottom_toTopOf="@id/recent_image_time"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/recent_type_image"
+        app:layout_constraintTop_toBottomOf="@id/recent_contact_image"
         app:layout_constraintVertical_chainStyle="packed"
         tools:text="Jesus" />
 
@@ -77,13 +77,27 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/default_spacing_small"
         app:layout_constraintBottom_toBottomOf="@id/recent_image_time"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/recent_type_image"
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toEndOf="@id/recent_image_duration"
         app:layout_constraintTop_toTopOf="@id/recent_image_time"
         tools:text="15 minutes"
         tools:visibility="visible" />
 
+    <com.google.android.material.imageview.ShapeableImageView
+        android:id="@+id/recent_type_image"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_marginStart="@dimen/default_spacing_small"
+        android:src="@drawable/round_call_missed_20"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintStart_toEndOf="@id/recent_text_duration"
+        app:layout_constraintTop_toTopOf="@id/recent_image_time"
+        app:shapeAppearanceOverlay="@style/Chooloo.Image.Profile"
+        tools:visibility="visible" />
+
     <com.chooloo.www.chooloolib.ui.widgets.IconButton
         android:id="@+id/recent_button_call"
         android:layout_width="wrap_content"

From 05608b23e7b5c758f307bd92dfc2948a1eabd35d Mon Sep 17 00:00:00 2001
From: Roei Edri <roeiedr5@gmail.com>
Date: Fri, 8 Apr 2022 18:31:47 +0300
Subject: [PATCH 06/20] Removed numbers background from dialpad

---
 .../com/chooloo/www/chooloolib/ui/widgets/DialpadEditText.kt    | 1 -
 .../java/com/chooloo/www/chooloolib/ui/widgets/DialpadKey.kt    | 2 +-
 chooloolib/src/main/res/layout/dialpad.xml                      | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/DialpadEditText.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/DialpadEditText.kt
index 63f56fe4a..1b33672a5 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/DialpadEditText.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/DialpadEditText.kt
@@ -30,7 +30,6 @@ class DialpadEditText : AppCompatEditText {
         textAlignment = TEXT_ALIGNMENT_CENTER
         inputType = InputType.TYPE_CLASS_PHONE
         background = ContextCompat.getDrawable(context, R.drawable.round_outline)
-        backgroundTintList = ColorStateList.valueOf(context.getAttrColor(R.attr.colorSurface))
         filters = arrayOf(InputFilter { source, _, _, _, _, _ ->
             source.filter { char -> char.isDigit() || char in arrayOf('*', '#', '+') }
         })
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/DialpadKey.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/DialpadKey.kt
index f4d6b6fd8..6a1502911 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/DialpadKey.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/DialpadKey.kt
@@ -42,8 +42,8 @@ class DialpadKey : LinearLayout {
         _lettersTextView = TextView(context, attrs, defStyleRes).apply {
             layoutParams = LayoutParams(WRAP_CONTENT, WRAP_CONTENT)
 
-            setPadding(0, context.getSizeInDp(5), 0, 0)
             setTextAppearance(R.style.Chooloo_Text_Caption)
+            setPadding(0, context.getSizeInDp(2), 0, 0)
             typeface = ResourcesCompat.getFont(context, R.font.google_sans_medium)
         }.also {
             addView(it)
diff --git a/chooloolib/src/main/res/layout/dialpad.xml b/chooloolib/src/main/res/layout/dialpad.xml
index 5c789b739..110f19665 100644
--- a/chooloolib/src/main/res/layout/dialpad.xml
+++ b/chooloolib/src/main/res/layout/dialpad.xml
@@ -28,7 +28,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/default_spacing_big"
         android:layout_marginEnd="@dimen/default_spacing_big"
-        android:layout_marginBottom="@dimen/default_spacing_big"
+        android:layout_marginBottom="@dimen/default_spacing_small"
         android:minWidth="200dp"
         app:layout_constraintBottom_toTopOf="@id/dialpad_keys_layout"
         app:layout_constraintEnd_toEndOf="parent"

From 88ae99d327004df0e86a510614fda7a3441ae1ca Mon Sep 17 00:00:00 2001
From: Roei Edri <roeiedr5@gmail.com>
Date: Fri, 8 Apr 2022 18:44:45 +0300
Subject: [PATCH 07/20] Fixed search bar icon position

---
 .../java/com/chooloo/www/chooloolib/ui/widgets/SearchBar.kt   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/SearchBar.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/SearchBar.kt
index 0984e33da..b86efb1e5 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/SearchBar.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/SearchBar.kt
@@ -26,6 +26,7 @@ class SearchBar : TextInputLayout {
 
     private val colorBackground by lazy { context.getAttrColor(R.attr.colorLightBackground) }
     private val colorForeground by lazy { context.getAttrColor(R.attr.colorLightForeground) }
+    private val spacing by lazy { resources.getDimensionPixelSize(R.dimen.default_spacing) }
     private val spacingSmall by lazy { resources.getDimensionPixelSize(R.dimen.default_spacing_small) }
 
 
@@ -60,7 +61,7 @@ class SearchBar : TextInputLayout {
             })
 
             setTextAppearance(R.style.Chooloo_Text_Subtitle1)
-            setPadding(spacingSmall, 0, spacingSmall, 0)
+            setPadding(spacing, 0, spacingSmall, 0)
             setHintTextColor(ColorStateList.valueOf(colorForeground))
             setTextColor(context.getAttrColor(R.attr.colorOnSurface))
 
@@ -81,6 +82,7 @@ class SearchBar : TextInputLayout {
         endIconDrawable = ContextCompat.getDrawable(context, R.drawable.round_close_24)
         startIconDrawable = ContextCompat.getDrawable(context, R.drawable.round_search_24)
 
+        setPadding(spacingSmall, 0, 0, 0)
         setEndIconTintList(ColorStateList.valueOf(colorForeground))
         setStartIconTintList(ColorStateList.valueOf(colorForeground))
     }

From 129c40e3bf3a691cdba55bbc0b4492c34bfecb8f Mon Sep 17 00:00:00 2001
From: Roei Edri <roeiedr5@gmail.com>
Date: Fri, 8 Apr 2022 18:47:34 +0300
Subject: [PATCH 08/20] Fixed dialpad reverse on rtl, fixes #392

---
 chooloolib/src/main/res/layout/dialpad.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/chooloolib/src/main/res/layout/dialpad.xml b/chooloolib/src/main/res/layout/dialpad.xml
index 110f19665..ea68aed2a 100644
--- a/chooloolib/src/main/res/layout/dialpad.xml
+++ b/chooloolib/src/main/res/layout/dialpad.xml
@@ -38,6 +38,7 @@
 
     <TableLayout
         android:id="@+id/dialpad_keys_layout"
+        android:layoutDirection="ltr"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/default_spacing_big"

From 06813c9532c42c83bf4f26633578a6e7caeaf801 Mon Sep 17 00:00:00 2001
From: Mojienjoynent <68327458+Mojienjoynent@users.noreply.github.com>
Date: Wed, 30 Mar 2022 12:19:25 +0430
Subject: [PATCH 09/20] update Persian translation

---
 chooloolib/src/main/res/values-fa/strings.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/chooloolib/src/main/res/values-fa/strings.xml b/chooloolib/src/main/res/values-fa/strings.xml
index 30462c6d6..d4ac8db53 100644
--- a/chooloolib/src/main/res/values-fa/strings.xml
+++ b/chooloolib/src/main/res/values-fa/strings.xml
@@ -47,7 +47,7 @@
     <string name="hint_search_contacts">جستجو در مخاطبین</string>
     <string name="hint_compact_mode">فهرست را فشرده تر کنید</string>
     <string name="hint_search_items">جستجوی مخاطبین &amp; گزارش ها</string>
-    <string name="hint_dialpad_vibrate">لرزش هنگام فشردن شماره گیرد</string>
+    <string name="hint_dialpad_vibrate">لرزش هنگام فشردن شماره گیر</string>
     <string name="hint_should_ask_sim">انتخاب سیم کارت قبل هر تماس</string>
     <string name="hint_dialpad_tones">صدا هنگام فشردن شماره گیر</string>
     <string name="hint_show_blocked">نمایش گزینه مسدودسازی/رفع مسدودی برای شماره ها (می بایست برنامه پیش فرض تماس باشد).</string>
@@ -55,7 +55,7 @@
 
     <!--region warning-->
     <string name="explain_is_on_hold">%s در انتظار است</string>
-    <string name="explain_choose_theme_mode">حالت نمایه را تنظیم کنید، برنامه را دوباره بار کنید تا تغییرات را ببینید</string>
+    <string name="explain_choose_theme_mode">حالت نمایه را تنظیم کنید، برنامه را دوباره باز کنید تا تغییرات را ببینید</string>
     <string name="explain_choose_sim_account">تماس با سیم کارت متفاوت</string>
     <string name="explain_choose_audio_route">تغییر منبع صوتی</string>
     <string name="explain_choose_phone_account">تماس فعلی را با استفاده از سیم کارت خاصی ادامه  دهید</string>
@@ -114,7 +114,6 @@
     <string name="pref_title_theme_mode">حالت نمایه</string>
     <string name="pref_title_email">به ما ایمیل بزنید</string>
     <string name="pref_title_report_bugs">گزارش مشکل</string>
-    <string name="pref_title_manage_blocked">مدیرت شماره های مسدودشده</string>
     <!--endregion-->
 
     <!--region pref summary -->

From 1318483308e8001126081b84499dc387ff3d1d24 Mon Sep 17 00:00:00 2001
From: Mojienjoynent <68327458+Mojienjoynent@users.noreply.github.com>
Date: Wed, 30 Mar 2022 12:32:23 +0430
Subject: [PATCH 10/20] Update Persian translation

---
 chooloolib/src/main/res/values-fa/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/chooloolib/src/main/res/values-fa/strings.xml b/chooloolib/src/main/res/values-fa/strings.xml
index d4ac8db53..ac375eeb3 100644
--- a/chooloolib/src/main/res/values-fa/strings.xml
+++ b/chooloolib/src/main/res/values-fa/strings.xml
@@ -114,6 +114,7 @@
     <string name="pref_title_theme_mode">حالت نمایه</string>
     <string name="pref_title_email">به ما ایمیل بزنید</string>
     <string name="pref_title_report_bugs">گزارش مشکل</string>
+    <string name="pref_title_manage_blocked">مدیریت شماره های مسدودشده</string>
     <!--endregion-->
 
     <!--region pref summary -->

From 6790b8cd48c6e1cfd8c6bd209590f2ce37286dad Mon Sep 17 00:00:00 2001
From: Roei Edri <roeiedr5@gmail.com>
Date: Fri, 8 Apr 2022 18:53:22 +0300
Subject: [PATCH 11/20] Increased app version

---
 koler/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/koler/build.gradle b/koler/build.gradle
index d79450118..91c5ddb3f 100644
--- a/koler/build.gradle
+++ b/koler/build.gradle
@@ -9,8 +9,8 @@ android {
     compileSdk 31
 
     defaultConfig {
-        versionCode 75
-        versionName "v1.4.3"
+        versionCode 76
+        versionName "v1.4.4"
 
         minSdk 25
         targetSdk 31

From 336d470291956b55dc55d40b3322dcce732cab73 Mon Sep 17 00:00:00 2001
From: Sourav Das <esarve.srv@gmail.com>
Date: Wed, 13 Apr 2022 19:38:51 +0600
Subject: [PATCH 12/20] removed unnecesarry window flags and implemented a
 working one

---
 .../www/chooloolib/ui/base/BaseActivity.kt    | 22 ++++++++++++++-----
 chooloolib/src/main/res/values/themes.xml     |  2 +-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/base/BaseActivity.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/base/BaseActivity.kt
index e1ee33c2b..478a3267f 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/base/BaseActivity.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/base/BaseActivity.kt
@@ -1,15 +1,20 @@
 package com.chooloo.www.chooloolib.ui.base
 
 import android.graphics.Color
+import android.os.Build
 import android.os.Bundle
+import android.util.TypedValue
 import android.view.View
+import android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS
 import android.view.WindowManager
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
+import com.chooloo.www.chooloolib.R
 import com.chooloo.www.chooloolib.interactor.preferences.PreferencesInteractor
 import com.chooloo.www.chooloolib.interactor.string.StringsInteractor
 import io.reactivex.disposables.CompositeDisposable
+import javax.annotation.meta.TypeQualifier
 import javax.inject.Inject
 
 abstract class BaseActivity<VM : BaseViewState> : AppCompatActivity(), BaseView<VM> {
@@ -20,12 +25,6 @@ abstract class BaseActivity<VM : BaseViewState> : AppCompatActivity(), BaseView<
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        window.apply {
-            clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS)
-            addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
-            decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-            statusBarColor = Color.TRANSPARENT
-        }
         applicationContext.setTheme(preferences.accentTheme.theme)
         setTheme(preferences.accentTheme.theme)
         AppCompatDelegate.setDefaultNightMode(preferences.themeMode.mode)
@@ -46,6 +45,17 @@ abstract class BaseActivity<VM : BaseViewState> : AppCompatActivity(), BaseView<
                 it.ifNew?.let(this@BaseActivity::showMessage)
             }
         }
+
+        val typedValue = TypedValue()
+        theme.resolveAttribute(android.R.attr.windowBackground, typedValue, true)
+        val windowColor: Int = if (typedValue.type >= TypedValue.TYPE_FIRST_COLOR_INT && typedValue.type <= TypedValue.TYPE_LAST_COLOR_INT){
+            typedValue.data;
+        }else -1
+
+        window.apply {
+            statusBarColor = windowColor
+        }
+
     }
 
     override fun onStop() {
diff --git a/chooloolib/src/main/res/values/themes.xml b/chooloolib/src/main/res/values/themes.xml
index 6a2f19c95..0ffc71279 100644
--- a/chooloolib/src/main/res/values/themes.xml
+++ b/chooloolib/src/main/res/values/themes.xml
@@ -12,7 +12,7 @@
         <item name="colorControlHighlight">?colorLightBackground</item>
         <item name="colorOnBackground">@color/color_on_background</item>
 
-        <item name="android:windowLightStatusBar">false</item>
+        <item name="android:windowLightStatusBar">true</item>
         <item name="android:fontFamily">@font/google_sans_regular</item>
 
         <item name="alertDialogTheme">@style/Chooloo.AlertDialog</item>

From 4d343ea437ba8e2231b3550f489373c2007dca3b Mon Sep 17 00:00:00 2001
From: Roei Edri <roeiedr5@gmail.com>
Date: Wed, 13 Apr 2022 21:44:15 +0300
Subject: [PATCH 13/20] Fixed and improved status bar color pr

---
 .../interactor/color/ColorsInteractor.kt      |  2 ++
 .../interactor/color/ColorsInteractorImpl.kt  | 13 ++++++++++
 .../www/chooloolib/ui/base/BaseActivity.kt    | 26 +++++--------------
 .../www/chooloolib/ui/call/CallViewState.kt   |  1 -
 4 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/color/ColorsInteractor.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/color/ColorsInteractor.kt
index ca93b41f3..5ccbb3edc 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/color/ColorsInteractor.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/color/ColorsInteractor.kt
@@ -7,6 +7,8 @@ import com.chooloo.www.chooloolib.interactor.base.BaseInteractor
 interface ColorsInteractor : BaseInteractor<ColorsInteractor.Listener> {
     interface Listener
 
+    val windowColor: Int
+
     fun getColor(@ColorRes colorRes: Int): Int
     fun getAttrColor(@AttrRes colorRes: Int): Int
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/color/ColorsInteractorImpl.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/color/ColorsInteractorImpl.kt
index 093a62d43..11f668db0 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/color/ColorsInteractorImpl.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/color/ColorsInteractorImpl.kt
@@ -25,6 +25,19 @@ class ColorsInteractorImpl @Inject constructor(
         return context.createConfigurationContext(configuration)
     }
 
+    override val windowColor: Int
+        get() {
+            val typedValue = TypedValue()
+            context.theme.resolveAttribute(
+                android.R.attr.windowBackground,
+                typedValue,
+                true
+            )
+            return if (typedValue.type in TypedValue.TYPE_FIRST_COLOR_INT..TypedValue.TYPE_LAST_COLOR_INT) {
+                typedValue.data;
+            } else -1
+        }
+
     override fun getColor(colorRes: Int) = ContextCompat.getColor(getThemedContext(), colorRes)
 
     override fun getAttrColor(colorRes: Int) =
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/base/BaseActivity.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/base/BaseActivity.kt
index 478a3267f..b0739a294 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/base/BaseActivity.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/base/BaseActivity.kt
@@ -1,35 +1,34 @@
 package com.chooloo.www.chooloolib.ui.base
 
-import android.graphics.Color
-import android.os.Build
 import android.os.Bundle
-import android.util.TypedValue
 import android.view.View
-import android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS
-import android.view.WindowManager
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
-import com.chooloo.www.chooloolib.R
+import com.chooloo.www.chooloolib.interactor.color.ColorsInteractor
 import com.chooloo.www.chooloolib.interactor.preferences.PreferencesInteractor
 import com.chooloo.www.chooloolib.interactor.string.StringsInteractor
 import io.reactivex.disposables.CompositeDisposable
-import javax.annotation.meta.TypeQualifier
 import javax.inject.Inject
 
 abstract class BaseActivity<VM : BaseViewState> : AppCompatActivity(), BaseView<VM> {
+    @Inject lateinit var colors: ColorsInteractor
     @Inject lateinit var strings: StringsInteractor
     @Inject lateinit var disposables: CompositeDisposable
     @Inject lateinit var preferences: PreferencesInteractor
 
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+
         applicationContext.setTheme(preferences.accentTheme.theme)
         setTheme(preferences.accentTheme.theme)
+        window.statusBarColor = colors.windowColor
         AppCompatDelegate.setDefaultNightMode(preferences.themeMode.mode)
+
         contentView?.let { setContentView(it) }
+
         onSetup()
+
         viewState.apply {
             attach()
 
@@ -45,17 +44,6 @@ abstract class BaseActivity<VM : BaseViewState> : AppCompatActivity(), BaseView<
                 it.ifNew?.let(this@BaseActivity::showMessage)
             }
         }
-
-        val typedValue = TypedValue()
-        theme.resolveAttribute(android.R.attr.windowBackground, typedValue, true)
-        val windowColor: Int = if (typedValue.type >= TypedValue.TYPE_FIRST_COLOR_INT && typedValue.type <= TypedValue.TYPE_LAST_COLOR_INT){
-            typedValue.data;
-        }else -1
-
-        window.apply {
-            statusBarColor = windowColor
-        }
-
     }
 
     override fun onStop() {
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/call/CallViewState.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/call/CallViewState.kt
index 4fa1e8c78..7607ba594 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/call/CallViewState.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/call/CallViewState.kt
@@ -100,7 +100,6 @@ class CallViewState @Inject constructor(
             callAudios.audioRoute?.let(this@CallViewState::onAudioRouteChanged)
         }
 
-
         isManageEnabled.value = false
     }
 

From 880ba76d605a8e0c556e5db19a58f88caa2e5a01 Mon Sep 17 00:00:00 2001
From: inkhorn <103287762+inkh0rn@users.noreply.github.com>
Date: Thu, 14 Apr 2022 17:09:42 -0300
Subject: [PATCH 14/20] ptbr update

---
 .../src/main/res/values-pt-rBR/strings.xml    | 134 ++++++++++++++----
 1 file changed, 109 insertions(+), 25 deletions(-)

diff --git a/chooloolib/src/main/res/values-pt-rBR/strings.xml b/chooloolib/src/main/res/values-pt-rBR/strings.xml
index 778fb78d5..58cc157c3 100644
--- a/chooloolib/src/main/res/values-pt-rBR/strings.xml
+++ b/chooloolib/src/main/res/values-pt-rBR/strings.xml
@@ -3,10 +3,21 @@
     <!--region titles-->
     <string name="recents">Recentes</string>
     <string name="contacts">Contatos</string>
+    <string name="conference">Conferência</string>
+    <string name="default_page">Padrão</string>
+    <string name="settings">Configurações</string>
+    <string name="theme_mode_dark">Escuro</string>
+    <string name="theme_mode_light">Claro</string>
+    <string name="theme_mode_system">Sistema</string>
+    <!--endregion-->
+
+    <!--region prompt-->
+    <string name="prompt_yes_or_no">Sim ou Não?</string>
+    <string name="prompt_are_you_sure">Tem certeza?</string>
     <!--endregion-->
 
     <!--region messages-->
-    <string name="number_copied_to_clipboard">O número foi copiado ao Clipboard</string>
+    <string name="number_copied_to_clipboard">O número foi copiado ao clipboard</string>
     <!--endregion-->
 
     <!--region actions-->
@@ -14,6 +25,11 @@
     <string name="action_hangup">Desligar</string>
     <string name="action_yes">Sim</string>
     <string name="action_no">Não</string>
+    <string name="action_show_history">Mostrar histórico</string>
+    <string name="action_block_number">Bloquear número</string>
+    <string name="action_unblock_number">Desbloquear número</string>
+    <string name="action_choose_audio_route">Escolha a via de áudio</string>
+    <string name="action_choose_phone_account">Escolha uma conta de telefone</string>
     <!--endregion-->
 
     <!--region Koler-->
@@ -23,6 +39,29 @@
 
     <!--region hints-->
     <string name="hint_search">Procurar</string>
+    <string name="hint_theme_mode">Tipo de tema</string>
+    <string name="hint_sim_account">Conta de SIM</string>
+    <string name="hint_default_page">Página padrão</string>
+    <string name="hint_animations">Mostrar animações</string>
+    <string name="hint_search_recents">Buscar em recentes</string>
+    <string name="hint_search_contacts">Buscar em contatos</string>
+    <string name="hint_compact_mode">Fazer lista de itens compacta</string>
+    <string name="hint_search_items">Buscar em contatos &amp; recentes</string>
+    <string name="hint_dialpad_vibrate">Vibrar ao tocar no discador</string>
+    <string name="hint_should_ask_sim">Pergunte qual SIM usar antes de cada ligação</string>
+    <string name="hint_dialpad_tones">Ativar tons de discagem</string>
+    <string name="hint_show_blocked">Mostrar opção de bloqueio/desbloqueio de números (requer discador padrão).</string>
+    <!--endregion-->
+
+    <!--region warning-->
+    <string name="explain_is_on_hold">%s está em espera</string>
+    <string name="explain_choose_theme_mode">Definir o tema no Koler, reinicie app para efetuar a mudança</string>
+    <string name="explain_choose_sim_account">Ligar via SIM diferente</string>
+    <string name="explain_choose_audio_route">Encaminhar áudio para uma fonte diferente</string>
+    <string name="explain_choose_phone_account">Continuar a ligação atual usando uma conta de telefone específica</string>
+    <string name="explain_delete_contact">Este contato será excluído permanentemente</string>
+    <string name="explain_delete_recent">Este registro de ligações será excluído permanentemente</string>
+    <string name="explain_choose_default_page">Esta página sempre será mostrada ao reabrir o Koler</string>
     <!--endregion-->
 
     <!--region urls-->
@@ -35,24 +74,36 @@
     <string name="call_action_mute">Silenciar</string>
     <string name="call_action_unmute">Não silenciar</string>
     <string name="call_action_speaker">Alto-falante</string>
-    <string name="call_action_speaker_off">Desligar alto-falante</string>
+    <string name="call_action_speaker_off">Alto-falante desligado</string>
     <!--endregion-->
 
     <!--region call state-->
-    <string name="call_status_dialing">Conectando…</string>
-    <string name="call_status_holding">Chamada em espera</string>
-    <string name="call_status_incoming">Chamada recebida</string>
-    <string name="call_status_disconnected">Chamada concluída</string>
-    <string name="call_status_active">Chamada em andamento</string>
+    <string name="call_status_new">Nova ligação</string>
+    <string name="call_status_dialing">Discando…</string>
+    <string name="call_status_holding">Ligação em espera</string>
+    <string name="call_status_connecting">Conectando…</string>
+    <string name="call_status_incoming">Ligação recebida</string>
+    <string name="call_status_active">Ligação em andamento</string>
+    <string name="call_status_disconnected">Ligação concluída</string>
+    <string name="call_status_pulling_call">Estabelecendo ligação…</string>
+    <string name="call_status_unknown">Status da ligação desconhecido</string>
+    <string name="call_status_disconnecting">A ligação está desconectando…</string>
+    <string name="call_status_phone_account">Selecione conta de telefone</string>
     <!--endregion-->
 
     <!--region pref key-->
-    <string name="pref_key_rate">avaliar</string>
-    <string name="pref_key_compact">compacto</string>
-    <string name="pref_key_color">destacar_a_cor</string>
-    <string name="pref_key_animations">animações</string>
-    <string name="pref_key_report_bugs">relatar_bugs</string>
-    <string name="pref_key_default_page">tela_padrão</string>
+    <string name="pref_key_rate">rate</string>
+    <string name="pref_key_compact">compact</string>
+    <string name="pref_key_ask_sim">ask_sim</string>
+    <string name="pref_key_color">accent_color</string>
+    <string name="pref_key_animations">animations</string>
+    <string name="pref_key_theme_mode">theme_mode</string>
+    <string name="pref_key_report_bugs">report_bugs</string>
+    <string name="pref_key_show_blocked">show_blocked</string>
+    <string name="pref_key_default_page">default_page</string>
+    <string name="pref_key_dialpad_tones">dialpad_tones</string>
+    <string name="pref_key_manage_blocked">manage_blocked</string>
+    <string name="pref_key_dialpad_vibrate">dialpad_vibrate</string>
     <!--endregion-->
 
     <!--region pref title-->
@@ -60,33 +111,53 @@
     <string name="pref_title_compact">Modo compacto</string>
     <string name="pref_title_animations">Animações</string>
     <string name="pref_title_app_color">Destacar a cor</string>
+    <string name="pref_title_theme_mode">Tipo de tema</string>
     <string name="pref_title_email">Envie um e-mail</string>
-    <string name="pref_title_report_bugs">Relatar bugs</string>
+    <string name="pref_title_report_bugs">Relatório de falhas</string>
+    <string name="pref_title_manage_blocked">Gerenciar números bloqueados</string>
+    <!--endregion-->
+
+    <!--region pref summary -->
     <!--endregion-->
 
     <!--region pref default value-->
     <!--endregion-->
 
     <!--region errors-->
-    <string name="error_no_results">Nenhum resultado :/</string>
-    <string name="error_no_results_phones">Nenhum número de telefone :/</string>
-    <string name="error_no_results_contacts">Nenhum contato :/</string>
-    <string name="error_no_results_recents">Não há recentes :/</string>
+    <string name="error_no_results">Nenhum resultado</string>
+    <string name="error_no_results_recents">Nenhum recente</string>
+    <string name="error_no_results_contacts">Nenhum contato</string>
+    <string name="error_no_results_phones">Nenhum número de telefone</string>
+    <string name="error_not_default_dialer_blocked">Defina o Koler como discador padrão para poder ver números bloqueados</string>
+    <string name="error_not_default_dialer_call">Defina o Koler como discador padrão para fazer ligações</string>
 
-    <string name="error_no_permissions_contacts">Preciso de permissão para ler os contatos :)</string>
-    <string name="error_no_permissions_recents">Preciso de permissão para ler o registro de chamadas :)</string>
-    <string name="error_no_permissions_phones">Preciso de permissão para ler os contatos :)</string>
+    <string name="error_no_permissions_edit_call_log">Nenhuma permissão concedida para alterar o registro de ligação</string>
+    <string name="error_no_permissions_make_call">Nenhuma permissão concedida para fazer ligação</string>
+    <string name="error_no_permissions_phones">Permissão exigida para ler os contatos</string>
+    <string name="error_no_permissions_recents">Permissão exigida para ler o registro de ligações</string>
+    <string name="error_no_permissions_contacts">Permissão exigida para ler os contatos</string>
 
+    <string name="error_no_number_to_call">Nenhum número foi encontrado</string>
+
+    <string name="error_cant_hold_call">Não é possível colocar ligação em espera</string>
+    <string name="error_cant_swap_calls">Não é possível trocar ligações</string>
+    <string name="error_cant_merge_call">Não pode unir ligações</string>
+
+    <string name="error_couldnt_get_number_from_intent">Não foi possível encontrar o número</string>
     <!--endregion-->
 
     <!--region pref color values-->
     <!--endregion-->
 
     <!--region pref values-->
+    <string name="pref_value_page_contacts">contatos</string>
+    <string name="pref_value_page_recents">recentes</string>
+    <string name="pref_value_page_default">@string/pref_value_page_contacts</string>
     <!--endregion-->
 
     <!--region dialpad letters-->
     <string name="dialpad_0_letters">+</string>
+    <string name="dialpad_1_letters">Correio de voz</string>
     <string name="dialpad_2_letters">ABC</string>
     <string name="dialpad_3_letters">DEF</string>
     <string name="dialpad_4_letters">GHI</string>
@@ -100,15 +171,28 @@
     <!--endregion-->
 
     <!--region content descriptions -->
-    <string name="content_description_answer_button">Botão para atender</string>
-    <string name="content_description_reject_button">Botão de recusar</string>
+    <string name="content_description_menu_button">Botão de menu</string>
+    <string name="content_description_answer_button">Botão de responder</string>
+    <string name="content_description_reject_button">Botão de rejeitar</string>
+    <string name="content_description_call_actions_button">Opções de ligação</string>
     <!--endregion-->
 
     <!--region notification-->
-    <string name="call_notification_channel_name">Notificação de chamada</string>
-    <string name="call_notification_channel_description">Notificação de chamada ativada, para uso mais confortável</string>
+    <string name="call_notification_channel_name">Notificação de ligação</string>
+    <string name="call_notification_channel_description">Notificação da ligação ativa para facilitar uso mais confortável</string>
     <!--endregion-->
 
     <!--region phone type-->
     <!--endregion-->
+    <!--region audio route-->
+    <string name="audio_route_speaker">Alto-falante</string>
+    <string name="audio_route_earpiece">Fone de ouvido</string>
+    <string name="audio_route_bluetooth">Bluetooth</string>
+    <string name="audio_route_wired_headset">Fone de ouvido com fio</string>
+    <string name="audio_route_wired_or_earpiece">Fone de ouvido ou por cabo</string>
+    <!--endregion-->
+
+    <!--region content description-->
+    <string name="content_description_favorite_star">Estrela de favorito</string>
+    <string name="content_description_empty_list_icon">Ícone de lista vazia</string>
 </resources>

From 410e7f5cf841c25237836f969ed687a41cfa4f40 Mon Sep 17 00:00:00 2001
From: inkhorn <103287762+inkh0rn@users.noreply.github.com>
Date: Thu, 14 Apr 2022 19:08:38 -0300
Subject: [PATCH 15/20] few fixes

---
 chooloolib/src/main/res/values-pt-rBR/strings.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/chooloolib/src/main/res/values-pt-rBR/strings.xml b/chooloolib/src/main/res/values-pt-rBR/strings.xml
index 58cc157c3..f644e0b22 100644
--- a/chooloolib/src/main/res/values-pt-rBR/strings.xml
+++ b/chooloolib/src/main/res/values-pt-rBR/strings.xml
@@ -45,7 +45,7 @@
     <string name="hint_animations">Mostrar animações</string>
     <string name="hint_search_recents">Buscar em recentes</string>
     <string name="hint_search_contacts">Buscar em contatos</string>
-    <string name="hint_compact_mode">Fazer lista de itens compacta</string>
+    <string name="hint_compact_mode">Mostrar lista de itens compatada</string>
     <string name="hint_search_items">Buscar em contatos &amp; recentes</string>
     <string name="hint_dialpad_vibrate">Vibrar ao tocar no discador</string>
     <string name="hint_should_ask_sim">Pergunte qual SIM usar antes de cada ligação</string>
@@ -113,7 +113,7 @@
     <string name="pref_title_app_color">Destacar a cor</string>
     <string name="pref_title_theme_mode">Tipo de tema</string>
     <string name="pref_title_email">Envie um e-mail</string>
-    <string name="pref_title_report_bugs">Relatório de falhas</string>
+    <string name="pref_title_report_bugs">Relatar falhas</string>
     <string name="pref_title_manage_blocked">Gerenciar números bloqueados</string>
     <!--endregion-->
 
@@ -131,7 +131,7 @@
     <string name="error_not_default_dialer_blocked">Defina o Koler como discador padrão para poder ver números bloqueados</string>
     <string name="error_not_default_dialer_call">Defina o Koler como discador padrão para fazer ligações</string>
 
-    <string name="error_no_permissions_edit_call_log">Nenhuma permissão concedida para alterar o registro de ligação</string>
+    <string name="error_no_permissions_edit_call_log">Nenhuma permissão concedida para alterar o registro de ligações</string>
     <string name="error_no_permissions_make_call">Nenhuma permissão concedida para fazer ligação</string>
     <string name="error_no_permissions_phones">Permissão exigida para ler os contatos</string>
     <string name="error_no_permissions_recents">Permissão exigida para ler o registro de ligações</string>
@@ -172,8 +172,8 @@
 
     <!--region content descriptions -->
     <string name="content_description_menu_button">Botão de menu</string>
-    <string name="content_description_answer_button">Botão de responder</string>
-    <string name="content_description_reject_button">Botão de rejeitar</string>
+    <string name="content_description_answer_button">Botão de atender</string>
+    <string name="content_description_reject_button">Botão de recusar</string>
     <string name="content_description_call_actions_button">Opções de ligação</string>
     <!--endregion-->
 

From a25c251b4f49939614804edbe1db4a6e9afb5577 Mon Sep 17 00:00:00 2001
From: Roei Edri <roeiedr5@gmail.com>
Date: Fri, 15 Apr 2022 19:06:30 +0300
Subject: [PATCH 16/20] Added group recents preference and improved groups ux

---
 .../www/chooloolib/adapter/RecentsAdapter.kt  | 19 ++++----
 .../di/factory/fragment/FragmentFactory.kt    |  4 +-
 .../factory/fragment/FragmentFactoryImpl.kt   |  7 ++-
 .../preferences/PreferencesInteractor.kt      |  1 +
 .../preferences/PreferencesInteractorImpl.kt  |  9 ++++
 .../chooloo/www/chooloolib/model/ListData.kt  | 48 +++++++++----------
 .../www/chooloolib/model/RecentAccount.kt     | 11 +++--
 .../www/chooloolib/ui/list/ListFragment.kt    |  6 ++-
 .../chooloolib/ui/recent/RecentFragment.kt    |  6 +--
 .../chooloolib/ui/recents/RecentsFragment.kt  | 33 +++++++++----
 .../chooloolib/ui/recents/RecentsViewState.kt |  5 +-
 .../RecentsHistoryFragment.kt                 | 11 ++---
 .../RecentsHistoryViewState.kt                |  8 ++--
 .../ui/settings/SettingsViewState.kt          | 36 +++++++-------
 .../drawable-xhdpi/round_recent_actors_20.xml | 16 +++++++
 .../drawable-xhdpi/round_recent_actors_24.xml | 10 ++++
 chooloolib/src/main/res/values/bools.xml      |  1 +
 chooloolib/src/main/res/values/strings.xml    |  2 +
 .../www/koler/ui/settings/SettingsFragment.kt |  9 ++++
 .../koler/ui/settings/SettingsViewState.kt    | 24 +++++-----
 koler/src/main/res/menu/menu_koler.xml        |  5 ++
 koler/src/main/res/values/strings.xml         |  1 +
 22 files changed, 172 insertions(+), 100 deletions(-)
 rename chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/{recents => recentshistory}/RecentsHistoryFragment.kt (70%)
 rename chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/{recents => recentshistory}/RecentsHistoryViewState.kt (80%)
 create mode 100644 chooloolib/src/main/res/drawable-xhdpi/round_recent_actors_20.xml
 create mode 100644 chooloolib/src/main/res/drawable-xhdpi/round_recent_actors_24.xml

diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/RecentsAdapter.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/RecentsAdapter.kt
index 9072a0741..cb7a8ee01 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/RecentsAdapter.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/RecentsAdapter.kt
@@ -7,7 +7,6 @@ import com.chooloo.www.chooloolib.interactor.animation.AnimationsInteractor
 import com.chooloo.www.chooloolib.interactor.phoneaccounts.PhonesInteractor
 import com.chooloo.www.chooloolib.interactor.preferences.PreferencesInteractor
 import com.chooloo.www.chooloolib.interactor.recents.RecentsInteractor
-import com.chooloo.www.chooloolib.interactor.string.StringsInteractor
 import com.chooloo.www.chooloolib.model.ListData
 import com.chooloo.www.chooloolib.model.RecentAccount
 import com.chooloo.www.chooloolib.ui.widgets.listitem.ListItem
@@ -18,24 +17,26 @@ import javax.inject.Inject
 class RecentsAdapter @Inject constructor(
     animations: AnimationsInteractor,
     private val phones: PhonesInteractor,
-    private val strings: StringsInteractor,
     private val recents: RecentsInteractor,
     private val preferences: PreferencesInteractor
 ) : ListAdapter<RecentAccount>(animations) {
 
-    private var _showHistory: Boolean = false
+    private var _groupSimilar: Boolean = false
 
-    var showHistory: Boolean
-        get() = _showHistory
+    var groupSimilar: Boolean
+        get() = _groupSimilar
         set(value) {
-            _showHistory = value
+            _groupSimilar = value
         }
 
+
     override fun onBindListItem(listItem: ListItem, item: RecentAccount) {
         listItem.apply {
+            val date = context.getHoursString(item.date)
+
             isCompact = preferences.isCompact
-            val date = if (item.date != null) context.getHoursString(item.date) else ""
-            captionText = if (item.callCount > 1) "(${item.callCount}) $date" else date
+            captionText = if (item.groupCount > 1) "(${item.groupCount}) $date" else date
+
             phones.lookupAccount(item.number) {
                 titleText = it?.name ?: item.number
                 it?.let {
@@ -52,5 +53,5 @@ class RecentsAdapter @Inject constructor(
     }
 
     override fun convertDataToListData(data: List<RecentAccount>) =
-        ListData.fromRecents(data, !showHistory)
+        ListData.fromRecents(data, groupSimilar)
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/factory/fragment/FragmentFactory.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/factory/fragment/FragmentFactory.kt
index e3df046e4..560017134 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/factory/fragment/FragmentFactory.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/factory/fragment/FragmentFactory.kt
@@ -12,7 +12,7 @@ import com.chooloo.www.chooloolib.ui.phones.PhonesFragment
 import com.chooloo.www.chooloolib.ui.prompt.PromptFragment
 import com.chooloo.www.chooloolib.ui.recent.RecentFragment
 import com.chooloo.www.chooloolib.ui.recents.RecentsFragment
-import com.chooloo.www.chooloolib.ui.recents.RecentsHistoryFragment
+import com.chooloo.www.chooloolib.ui.recentshistory.RecentsHistoryFragment
 import com.chooloo.www.chooloolib.ui.settings.SettingsFragment
 
 interface FragmentFactory {
@@ -23,11 +23,11 @@ interface FragmentFactory {
     fun getRecentFragment(recentId: Long): RecentFragment
     fun getDialerFragment(text: String? = null): DialerFragment
     fun getPhonesFragment(contactId: Long? = null): PhonesFragment
-    fun getRecentsFragment(filter: String? = null): RecentsFragment
     fun getContactsSuggestionsFragment(): ContactsSuggestionsFragment
     fun getBriefContactFragment(contactId: Long): BriefContactFragment
     fun getPromptFragment(title: String, subtitle: String): PromptFragment
     fun getRecentsHistoryFragment(filter: String? = null): RecentsHistoryFragment
+    fun getRecentsFragment(filter: String? = null, isGrouped: Boolean? = null): RecentsFragment
     fun getChoicesFragment(
         @StringRes titleRes: Int,
         @StringRes subtitleRes: Int?,
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/factory/fragment/FragmentFactoryImpl.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/factory/fragment/FragmentFactoryImpl.kt
index d2012eba6..0507a7acd 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/factory/fragment/FragmentFactoryImpl.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/factory/fragment/FragmentFactoryImpl.kt
@@ -11,7 +11,7 @@ import com.chooloo.www.chooloolib.ui.phones.PhonesFragment
 import com.chooloo.www.chooloolib.ui.prompt.PromptFragment
 import com.chooloo.www.chooloolib.ui.recent.RecentFragment
 import com.chooloo.www.chooloolib.ui.recents.RecentsFragment
-import com.chooloo.www.chooloolib.ui.recents.RecentsHistoryFragment
+import com.chooloo.www.chooloolib.ui.recentshistory.RecentsHistoryFragment
 import com.chooloo.www.chooloolib.ui.settings.SettingsFragment
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -25,8 +25,8 @@ class FragmentFactoryImpl @Inject constructor() : FragmentFactory {
     override fun getContactsSuggestionsFragment() = ContactsSuggestionsFragment()
     override fun getDialerFragment(text: String?) = DialerFragment.newInstance(text)
     override fun getRecentFragment(recentId: Long) = RecentFragment.newInstance(recentId)
-    override fun getRecentsFragment(filter: String?) = RecentsFragment.newInstance(filter)
     override fun getPhonesFragment(contactId: Long?) = PhonesFragment.newInstance(contactId)
+
     override fun getBriefContactFragment(contactId: Long) =
         BriefContactFragment.newInstance(contactId)
 
@@ -36,6 +36,9 @@ class FragmentFactoryImpl @Inject constructor() : FragmentFactory {
     override fun getRecentsHistoryFragment(filter: String?) =
         RecentsHistoryFragment.newInstance(filter)
 
+    override fun getRecentsFragment(filter: String?, isGrouped: Boolean?): RecentsFragment =
+        RecentsFragment.newInstance(filter, isGrouped)
+
     override fun getChoicesFragment(
         titleRes: Int,
         subtitleRes: Int?,
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/preferences/PreferencesInteractor.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/preferences/PreferencesInteractor.kt
index 36a75c741..6828a09d0 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/preferences/PreferencesInteractor.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/preferences/PreferencesInteractor.kt
@@ -10,6 +10,7 @@ interface PreferencesInteractor : BaseInteractor<PreferencesInteractor.Listener>
     var isCompact: Boolean
     var isAnimations: Boolean
     var isShowBlocked: Boolean
+    var isGroupRecents: Boolean
     var isDialpadTones: Boolean
     var isDialpadVibrate: Boolean
 
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/preferences/PreferencesInteractorImpl.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/preferences/PreferencesInteractorImpl.kt
index 322ad66b3..f7853d819 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/preferences/PreferencesInteractorImpl.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/preferences/PreferencesInteractorImpl.kt
@@ -42,6 +42,15 @@ class PreferencesInteractorImpl @Inject constructor(
             preferencesManager.putBoolean(R.string.pref_key_show_blocked, value)
         }
 
+    override var isGroupRecents: Boolean
+        get() = preferencesManager.getBoolean(
+            R.string.pref_key_group_recents,
+            R.bool.pref_default_value_group_recents
+        )
+        set(value) {
+            preferencesManager.putBoolean(R.string.pref_key_group_recents, value)
+        }
+
     override var isDialpadTones: Boolean
         get() = preferencesManager.getBoolean(
             R.string.pref_key_dialpad_tones,
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/ListData.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/ListData.kt
index 497269a7d..f624f7d51 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/ListData.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/ListData.kt
@@ -25,39 +25,35 @@ data class ListData<DataType>(
         }
 
         fun fromRecents(recents: List<RecentAccount>, isGrouped: Boolean) =
-            if (isGrouped && recents.size > 1) getGroupedRecents(recents)
-            else ListData(
-                recents,
-                recents.groupingBy { getRelativeDateString(it.date) }.eachCount()
-            )
+            if (isGrouped && recents.size > 1) {
+                getGroupedRecents(recents)
+            } else {
+                ListData(
+                    recents,
+                    recents.groupingBy { getRelativeDateString(it.date) }.eachCount()
+                )
+            }
 
         private fun getGroupedRecents(recents: List<RecentAccount>): ListData<RecentAccount> {
             var prevItem: RecentAccount = recents[0]
+            val currentGroup = mutableListOf(prevItem)
             var prevDate = getRelativeDateString(prevItem.date)
-            var count = 1
-            val groupedRecents: MutableList<RecentAccount> = ArrayList()
-            recents.drop(1).forEach {
-                val date = getRelativeDateString(it.date)
-                if (prevItem.number == it.number && prevDate == date) {
-                    count++
+            val groupedRecents = mutableListOf<RecentAccount>()
+
+            recents.drop(1).forEach { curItem ->
+                val curDate = getRelativeDateString(curItem.date)
+                if (prevItem.number == curItem.number && prevDate == curDate) {
+                    currentGroup.add(curItem)
                 } else {
-                    groupedRecents.add(
-                        RecentAccount(
-                            prevItem.number, prevItem.type, prevItem.id,
-                            prevItem.duration, prevItem.date, prevItem.cachedName, count
-                        )
-                    )
-                    count = 1
-                    prevItem = it
+                    groupedRecents.add(prevItem.copy(groupAccounts = currentGroup.map { it.copy() }))
+                    currentGroup.clear()
+                    currentGroup.add(curItem)
+                    prevItem = curItem
                 }
-                prevDate = date
+                prevDate = curDate
             }
-            groupedRecents.add(
-                RecentAccount(
-                    prevItem.number, prevItem.type, prevItem.id,
-                    prevItem.duration, prevItem.date, prevItem.cachedName, count
-                )
-            )
+            groupedRecents.add(prevItem.copy(groupAccounts = currentGroup))
+
             return ListData(
                 groupedRecents,
                 groupedRecents.groupingBy { getRelativeDateString(it.date) }.eachCount()
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/RecentAccount.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/RecentAccount.kt
index e0534ed61..5d5c739e7 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/RecentAccount.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/RecentAccount.kt
@@ -7,13 +7,13 @@ import java.io.Serializable
 import java.util.*
 
 data class RecentAccount(
+    val date: Date,
+    val id: Long = 0,
     val number: String,
     @CallType val type: Int,
-    val id: Long = 0,
     val duration: Long = 0,
-    val date: Date? = null,
     val cachedName: String? = null,
-    val callCount: Int = 1,
+    val groupAccounts: List<RecentAccount> = listOf()
 ) : Serializable {
 
     @kotlin.annotation.Retention(AnnotationRetention.SOURCE)
@@ -28,8 +28,9 @@ data class RecentAccount(
     )
     annotation class CallType
 
-    val relativeTime: String?
-        get() = date?.time?.let { getTimeAgo(it) }
+    val groupCount get() = groupAccounts.size
+
+    val relativeTime by lazy { getTimeAgo(date.time) }
 
     companion object {
         const val TYPE_UNKNOWN = 7
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/list/ListFragment.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/list/ListFragment.kt
index a93c12f9d..3a0037c2c 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/list/ListFragment.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/list/ListFragment.kt
@@ -6,7 +6,6 @@ import com.chooloo.www.chooloolib.databinding.ItemsBinding
 import com.chooloo.www.chooloolib.ui.base.BaseFragment
 
 abstract class ListFragment<ItemType, VS : ListViewState<ItemType>> : BaseFragment<VS>() {
-
     override val contentView by lazy { binding.root }
     protected val binding by lazy { ItemsBinding.inflate(layoutInflater) }
 
@@ -33,7 +32,9 @@ abstract class ListFragment<ItemType, VS : ListViewState<ItemType>> : BaseFragme
                 ev.ifNew?.let { adapter.items = it }
             }
 
-            getItemsObservable { it.observe(this@ListFragment, viewState::onItemsChanged) }
+            if (args.getBoolean(ARG_OBSERVE, true)) {
+                getItemsObservable { it.observe(this@ListFragment, viewState::onItemsChanged) }
+            }
         }
 
         adapter.apply {
@@ -61,5 +62,6 @@ abstract class ListFragment<ItemType, VS : ListViewState<ItemType>> : BaseFragme
 
     companion object {
         const val ARG_FILTER = "filter"
+        const val ARG_OBSERVE = "is_observe"
     }
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recent/RecentFragment.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recent/RecentFragment.kt
index d1f52e576..638e9dd60 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recent/RecentFragment.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recent/RecentFragment.kt
@@ -10,7 +10,7 @@ import com.chooloo.www.chooloolib.interactor.call.CallNavigationsInteractor
 import com.chooloo.www.chooloolib.interactor.dialog.DialogsInteractor
 import com.chooloo.www.chooloolib.interactor.prompt.PromptsInteractor
 import com.chooloo.www.chooloolib.ui.base.BaseFragment
-import com.chooloo.www.chooloolib.ui.recents.RecentsHistoryViewState
+import com.chooloo.www.chooloolib.ui.recents.RecentsViewState
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
@@ -19,7 +19,7 @@ class RecentFragment @Inject constructor() : BaseFragment<RecentViewState>() {
     override val contentView by lazy { binding.root }
     override val viewState: RecentViewState by viewModels()
 
-    private val historyViewState: RecentsHistoryViewState by viewModels()
+    private val historyViewState: RecentsViewState by viewModels()
     private val binding by lazy { RecentBinding.inflate(layoutInflater) }
 
     @Inject lateinit var prompts: PromptsInteractor
@@ -112,7 +112,7 @@ class RecentFragment @Inject constructor() : BaseFragment<RecentViewState>() {
 
             showHistoryEvent.observe(this@RecentFragment) { ev ->
                 ev.ifNew?.let {
-                    prompts.showFragment(fragmentFactory.getRecentsHistoryFragment(it))
+                    prompts.showFragment(fragmentFactory.getRecentsFragment(it))
                 }
             }
 
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recents/RecentsFragment.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recents/RecentsFragment.kt
index 87dc9a6d6..92765e134 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recents/RecentsFragment.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recents/RecentsFragment.kt
@@ -4,36 +4,53 @@ import android.os.Bundle
 import androidx.fragment.app.activityViewModels
 import com.chooloo.www.chooloolib.adapter.RecentsAdapter
 import com.chooloo.www.chooloolib.di.factory.fragment.FragmentFactory
+import com.chooloo.www.chooloolib.interactor.preferences.PreferencesInteractor
 import com.chooloo.www.chooloolib.interactor.prompt.PromptsInteractor
 import com.chooloo.www.chooloolib.model.RecentAccount
 import com.chooloo.www.chooloolib.ui.list.ListFragment
+import com.chooloo.www.chooloolib.ui.recentshistory.RecentsHistoryViewState
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
 @AndroidEntryPoint
 open class RecentsFragment @Inject constructor() : ListFragment<RecentAccount, RecentsViewState>() {
-    @Inject lateinit var prompts: PromptsInteractor
     @Inject override lateinit var adapter: RecentsAdapter
-    @Inject lateinit var fragmentFactory: FragmentFactory
-
     override val viewState: RecentsViewState by activityViewModels()
 
+    @Inject lateinit var prompts: PromptsInteractor
+    @Inject lateinit var fragmentFactory: FragmentFactory
+    @Inject lateinit var preferences: PreferencesInteractor
+    private val recentsHistoryViewState: RecentsHistoryViewState by activityViewModels()
+
 
     override fun onSetup() {
         super.onSetup()
+        adapter.groupSimilar = args.getBoolean(ARG_IS_GROUPED, preferences.isGroupRecents)
 
         viewState.showRecentEvent.observe(this@RecentsFragment) { ev ->
             ev.ifNew?.let {
-                prompts.showFragment(fragmentFactory.getRecentFragment(it))
+                if (it.groupCount > 1) {
+                    prompts.showFragment(fragmentFactory.getRecentsHistoryFragment().apply {
+                        arguments = arguments ?: Bundle()
+                        requireArguments().putBoolean(ARG_OBSERVE, false)
+                    })
+                    recentsHistoryViewState.onItemsChanged(it.groupAccounts)
+                } else {
+                    prompts.showFragment(fragmentFactory.getRecentFragment(it.id))
+                }
             }
         }
     }
 
     companion object {
-        fun newInstance(filter: String? = null) = RecentsFragment().apply {
-            arguments = Bundle().apply {
-                putString(ARG_FILTER, filter)
+        private const val ARG_IS_GROUPED = "is_grouped"
+
+        fun newInstance(filter: String? = null, isGrouped: Boolean? = null) =
+            RecentsFragment().apply {
+                arguments = Bundle().apply {
+                    putString(ARG_FILTER, filter)
+                    isGrouped?.let { putBoolean(ARG_IS_GROUPED, it) }
+                }
             }
-        }
     }
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recents/RecentsViewState.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recents/RecentsViewState.kt
index 8d9d2ad23..05f82f2cd 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recents/RecentsViewState.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recents/RecentsViewState.kt
@@ -4,7 +4,6 @@ import android.content.ClipData
 import android.content.ClipboardManager
 import androidx.lifecycle.LiveData
 import com.chooloo.www.chooloolib.R
-import com.chooloo.www.chooloolib.interactor.navigation.NavigationsInteractor
 import com.chooloo.www.chooloolib.interactor.permission.PermissionsInteractor
 import com.chooloo.www.chooloolib.livedata.contentprovider.RecentsProviderLiveData
 import com.chooloo.www.chooloolib.model.RecentAccount
@@ -28,7 +27,7 @@ open class RecentsViewState @Inject constructor(
 
     private val recentsLiveData = recentsRepository.getRecents() as RecentsProviderLiveData
 
-    val showRecentEvent = DataLiveEvent<Long>()
+    val showRecentEvent = DataLiveEvent<RecentAccount>()
 
 
     override fun onFilterChanged(filter: String?) {
@@ -38,7 +37,7 @@ open class RecentsViewState @Inject constructor(
 
     override fun onItemClick(item: RecentAccount) {
         super.onItemClick(item)
-        showRecentEvent.call(item.id)
+        showRecentEvent.call(item)
     }
 
     override fun onItemLongClick(item: RecentAccount) {
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recents/RecentsHistoryFragment.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recentshistory/RecentsHistoryFragment.kt
similarity index 70%
rename from chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recents/RecentsHistoryFragment.kt
rename to chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recentshistory/RecentsHistoryFragment.kt
index c5e17477c..a66a58b3f 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recents/RecentsHistoryFragment.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recentshistory/RecentsHistoryFragment.kt
@@ -1,22 +1,17 @@
-package com.chooloo.www.chooloolib.ui.recents
+package com.chooloo.www.chooloolib.ui.recentshistory
 
 import android.os.Bundle
 import androidx.fragment.app.activityViewModels
-import com.chooloo.www.chooloolib.adapter.RecentsAdapter
+import com.chooloo.www.chooloolib.ui.recents.RecentsFragment
 import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
 
 @AndroidEntryPoint
 class RecentsHistoryFragment : RecentsFragment() {
     override val viewState: RecentsHistoryViewState by activityViewModels()
 
-    @Inject
-    override lateinit var adapter: RecentsAdapter
-
     override fun onSetup() {
         super.onSetup()
-
-        adapter.showHistory = true
+        adapter.groupSimilar = false
     }
 
     companion object {
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recents/RecentsHistoryViewState.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recentshistory/RecentsHistoryViewState.kt
similarity index 80%
rename from chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recents/RecentsHistoryViewState.kt
rename to chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recentshistory/RecentsHistoryViewState.kt
index 5ef532700..bfa389689 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recents/RecentsHistoryViewState.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recentshistory/RecentsHistoryViewState.kt
@@ -1,14 +1,16 @@
-package com.chooloo.www.chooloolib.ui.recents
+package com.chooloo.www.chooloolib.ui.recentshistory
 
 import android.content.ClipboardManager
 import com.chooloo.www.chooloolib.interactor.permission.PermissionsInteractor
 import com.chooloo.www.chooloolib.repository.recents.RecentsRepository
+import com.chooloo.www.chooloolib.ui.recents.RecentsViewState
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 
 @HiltViewModel
 class RecentsHistoryViewState @Inject constructor(
-    clipboardManager: ClipboardManager,
     permissions: PermissionsInteractor,
+    clipboardManager: ClipboardManager,
     recentsRepository: RecentsRepository
-) : RecentsViewState(recentsRepository, permissions, clipboardManager)
\ No newline at end of file
+) : RecentsViewState(recentsRepository, permissions, clipboardManager) {
+}
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/settings/SettingsViewState.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/settings/SettingsViewState.kt
index 2f3f6a5e6..365bbb4f9 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/settings/SettingsViewState.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/settings/SettingsViewState.kt
@@ -15,9 +15,9 @@ import javax.inject.Inject
 
 @HiltViewModel
 open class SettingsViewState @Inject constructor(
-    private val colorsInteractor: ColorsInteractor,
-    private val navigationsInteractor: NavigationsInteractor,
-    private val preferencesInteractor: PreferencesInteractor
+    protected val colors: ColorsInteractor,
+    protected val navigations: NavigationsInteractor,
+    protected val preferences: PreferencesInteractor
 ) :
     BaseViewState() {
 
@@ -31,39 +31,39 @@ open class SettingsViewState @Inject constructor(
 
     open fun onMenuItemClick(menuItem: MenuItem) {
         when (menuItem.itemId) {
-            R.id.menu_chooloo_rate -> navigationsInteractor.rateApp()
+            R.id.menu_chooloo_rate -> navigations.rateApp()
             R.id.menu_chooloo_theme_mode -> askForThemeModeEvent.call()
             R.id.menu_chooloo_compact_mode -> askForCompactEvent.call()
             R.id.menu_chooloo_animations -> askForAnimationsEvent.call()
-            R.id.menu_chooloo_email -> navigationsInteractor.sendEmail()
-            R.id.menu_chooloo_report_bugs -> navigationsInteractor.reportBug()
+            R.id.menu_chooloo_email -> navigations.sendEmail()
+            R.id.menu_chooloo_report_bugs -> navigations.reportBug()
             R.id.menu_chooloo_accent_color -> askForColorEvent.call(R.array.accent_colors)
         }
     }
 
     fun onColorResponse(color: Int) {
-        preferencesInteractor.accentTheme = when (color) {
-            colorsInteractor.getColor(R.color.red_background) -> RED
-            colorsInteractor.getColor(R.color.blue_background) -> BLUE
-            colorsInteractor.getColor(R.color.green_background) -> GREEN
-            colorsInteractor.getColor(R.color.orange_background) -> ORANGE
-            colorsInteractor.getColor(R.color.purple_background) -> PURPLE
+        preferences.accentTheme = when (color) {
+            colors.getColor(R.color.red_background) -> RED
+            colors.getColor(R.color.blue_background) -> BLUE
+            colors.getColor(R.color.green_background) -> GREEN
+            colors.getColor(R.color.orange_background) -> ORANGE
+            colors.getColor(R.color.purple_background) -> PURPLE
             else -> DEFAULT
         }
-        navigationsInteractor.goToLauncherActivity()
+        navigations.goToLauncherActivity()
     }
 
     fun onCompactResponse(response: Boolean) {
-        preferencesInteractor.isCompact = response
-        navigationsInteractor.goToLauncherActivity()
+        preferences.isCompact = response
+        navigations.goToLauncherActivity()
     }
 
     fun onAnimationsResponse(response: Boolean) {
-        preferencesInteractor.isAnimations = response
+        preferences.isAnimations = response
     }
 
     fun onThemeModeResponse(response: ThemeMode) {
-        preferencesInteractor.themeMode = response
-        navigationsInteractor.goToLauncherActivity()
+        preferences.themeMode = response
+        navigations.goToLauncherActivity()
     }
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/res/drawable-xhdpi/round_recent_actors_20.xml b/chooloolib/src/main/res/drawable-xhdpi/round_recent_actors_20.xml
new file mode 100644
index 000000000..a05503856
--- /dev/null
+++ b/chooloolib/src/main/res/drawable-xhdpi/round_recent_actors_20.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M17.5,4.75v10.5c0,0.41 0.34,0.75 0.75,0.75l0,0c0.41,0 0.75,-0.34 0.75,-0.75V4.75C19,4.34 18.66,4 18.25,4l0,0C17.84,4 17.5,4.34 17.5,4.75z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M15.25,16L15.25,16c0.41,0 0.75,-0.34 0.75,-0.75V4.75C16,4.34 15.66,4 15.25,4h0c-0.41,0 -0.75,0.34 -0.75,0.75v10.5C14.5,15.66 14.84,16 15.25,16z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M11.5,4h-9C1.67,4 1,4.67 1,5.5v9C1,15.33 1.67,16 2.5,16h9c0.83,0 1.5,-0.67 1.5,-1.5v-9C13,4.67 12.33,4 11.5,4zM7,6c1.38,0 2.5,1.12 2.5,2.5S8.38,11 7,11S4.5,9.88 4.5,8.5S5.62,6 7,6zM11.5,14.5h-9v-0.26c0,-0.56 0.31,-1.08 0.81,-1.34C4.42,12.33 5.67,12 7,12s2.58,0.33 3.69,0.9c0.5,0.26 0.81,0.78 0.81,1.34V14.5z"/>
+</vector>
diff --git a/chooloolib/src/main/res/drawable-xhdpi/round_recent_actors_24.xml b/chooloolib/src/main/res/drawable-xhdpi/round_recent_actors_24.xml
new file mode 100644
index 000000000..f67890259
--- /dev/null
+++ b/chooloolib/src/main/res/drawable-xhdpi/round_recent_actors_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M21,6v12c0,0.55 0.45,1 1,1s1,-0.45 1,-1L23,6c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1zM18,19c0.55,0 1,-0.45 1,-1L19,6c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v12c0,0.55 0.45,1 1,1zM14,5L2,5c-0.55,0 -1,0.45 -1,1v12c0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1L15,6c0,-0.55 -0.45,-1 -1,-1zM8,7.75c1.24,0 2.25,1.01 2.25,2.25S9.24,12.25 8,12.25 5.75,11.24 5.75,10 6.76,7.75 8,7.75zM12.5,17h-9v-0.75c0,-1.5 3,-2.25 4.5,-2.25s4.5,0.75 4.5,2.25L12.5,17z"/>
+</vector>
diff --git a/chooloolib/src/main/res/values/bools.xml b/chooloolib/src/main/res/values/bools.xml
index b454bba8f..2063e32c2 100644
--- a/chooloolib/src/main/res/values/bools.xml
+++ b/chooloolib/src/main/res/values/bools.xml
@@ -4,6 +4,7 @@
     <bool name="pref_default_value_animations">true</bool>
     <bool name="pref_default_value_show_blocked">false</bool>
     <bool name="pref_default_value_dialpad_tones">true</bool>
+    <bool name="pref_default_value_group_recents">false</bool>
     <bool name="pref_default_value_dialpad_vibrate">true</bool>
     <bool name="pref_default_value_should_ask_sim">false</bool>
 </resources>
\ No newline at end of file
diff --git a/chooloolib/src/main/res/values/strings.xml b/chooloolib/src/main/res/values/strings.xml
index aeb2de5f9..6bfc9519f 100644
--- a/chooloolib/src/main/res/values/strings.xml
+++ b/chooloolib/src/main/res/values/strings.xml
@@ -50,6 +50,7 @@
     <string name="hint_dialpad_vibrate">Vibrate on dialpad clicks</string>
     <string name="hint_should_ask_sim">Ask for a sim before each call</string>
     <string name="hint_dialpad_tones">Enabled sound tones on dialpad clicks</string>
+    <string name="hint_group_recents">Group recents strikes from the same person</string>
     <string name="hint_show_blocked">Show block/unblock option for numbers (requires default dialer).</string>
     <!--endregion-->
 
@@ -101,6 +102,7 @@
     <string name="pref_key_report_bugs">report_bugs</string>
     <string name="pref_key_show_blocked">show_blocked</string>
     <string name="pref_key_default_page">default_page</string>
+    <string name="pref_key_group_recents">group_recents</string>
     <string name="pref_key_dialpad_tones">dialpad_tones</string>
     <string name="pref_key_manage_blocked">manage_blocked</string>
     <string name="pref_key_dialpad_vibrate">dialpad_vibrate</string>
diff --git a/koler/src/main/java/com/chooloo/www/koler/ui/settings/SettingsFragment.kt b/koler/src/main/java/com/chooloo/www/koler/ui/settings/SettingsFragment.kt
index 83163a9ae..a58668fdc 100644
--- a/koler/src/main/java/com/chooloo/www/koler/ui/settings/SettingsFragment.kt
+++ b/koler/src/main/java/com/chooloo/www/koler/ui/settings/SettingsFragment.kt
@@ -38,6 +38,15 @@ class SettingsFragment @Inject constructor() : ChoolooSettingsFragment() {
                     )
                 }
             }
+
+            askForGroupRecentsEvent.observe(this@SettingsFragment) {
+                it.ifNew?.let {
+                    dialogs.askForBoolean(
+                        R.string.hint_group_recents,
+                        viewState::onGroupRecents
+                    )
+                }
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/koler/src/main/java/com/chooloo/www/koler/ui/settings/SettingsViewState.kt b/koler/src/main/java/com/chooloo/www/koler/ui/settings/SettingsViewState.kt
index 59f4acb29..b375c03be 100644
--- a/koler/src/main/java/com/chooloo/www/koler/ui/settings/SettingsViewState.kt
+++ b/koler/src/main/java/com/chooloo/www/koler/ui/settings/SettingsViewState.kt
@@ -14,31 +14,28 @@ import javax.inject.Inject
 
 @HiltViewModel
 class SettingsViewState @Inject constructor(
-    colorsInteractor: ColorsInteractor,
-    navigationsInteractor: NavigationsInteractor,
-    private val preferences: PreferencesInteractor,
-    private val permissionsInteractor: PermissionsInteractor,
+    colors: ColorsInteractor,
+    navigations: NavigationsInteractor,
+    preferences: PreferencesInteractor,
+    private val permissions: PermissionsInteractor
 ) :
-    SettingsViewState(
-        colorsInteractor,
-        navigationsInteractor,
-        preferences
-    ) {
+    SettingsViewState(colors, navigations, preferences) {
 
     override val menuResList = arrayListOf(R.menu.menu_koler) + super.menuResList
 
     val askForShowBlockedEvent = LiveEvent()
     val askForDefaultPageEvent = LiveEvent()
+    val askForGroupRecentsEvent = LiveEvent()
     val askForDialpadTonesEvent = LiveEvent()
     val askForDialpadVibrateEvent = LiveEvent()
 
-
     override fun onMenuItemClick(menuItem: MenuItem) {
         when (menuItem.itemId) {
             R.id.menu_koler_default_page -> askForDefaultPageEvent.call()
             R.id.menu_koler_dialpad_tones -> askForDialpadTonesEvent.call()
+            R.id.menu_koler_group_recents -> askForGroupRecentsEvent.call()
             R.id.menu_koler_dialpad_vibrate -> askForDialpadVibrateEvent.call()
-            R.id.menu_koler_show_blocked -> permissionsInteractor.runWithDefaultDialer {
+            R.id.menu_koler_show_blocked -> permissions.runWithDefaultDialer {
                 askForShowBlockedEvent.call()
             }
             else -> super.onMenuItemClick(menuItem)
@@ -60,4 +57,9 @@ class SettingsViewState @Inject constructor(
     fun onDialpadVibrate(response: Boolean) {
         preferences.isDialpadVibrate = response
     }
+
+    fun onGroupRecents(response: Boolean) {
+        preferences.isGroupRecents = response
+        navigations.goToLauncherActivity()
+    }
 }
diff --git a/koler/src/main/res/menu/menu_koler.xml b/koler/src/main/res/menu/menu_koler.xml
index 59ca23659..11e8da0d6 100644
--- a/koler/src/main/res/menu/menu_koler.xml
+++ b/koler/src/main/res/menu/menu_koler.xml
@@ -19,4 +19,9 @@
         android:id="@+id/menu_koler_dialpad_vibrate"
         android:icon="@drawable/round_vibration_20"
         android:title="@string/pref_title_dialpad_vibrate" />
+
+    <item
+        android:id="@+id/menu_koler_group_recents"
+        android:icon="@drawable/round_recent_actors_20"
+        android:title="@string/pref_title_group_recents" />
 </menu>
\ No newline at end of file
diff --git a/koler/src/main/res/values/strings.xml b/koler/src/main/res/values/strings.xml
index b61ccb6ba..ca341b6b8 100644
--- a/koler/src/main/res/values/strings.xml
+++ b/koler/src/main/res/values/strings.xml
@@ -3,6 +3,7 @@
     <string name="pref_title_default_page">Default Page</string>
     <string name="pref_title_ask_sim">Should ask for sim</string>
     <string name="pref_title_dialpad_tones">Dialpad click tones</string>
+    <string name="pref_title_group_recents">Group similar recents</string>
     <string name="pref_title_show_blocked">Show block number option</string>
     <string name="pref_title_dialpad_vibrate">Vibrate on dialpad clicks</string>
 </resources>
\ No newline at end of file

From 03386932816e0a9b34f8f445739267fb76d0b64b Mon Sep 17 00:00:00 2001
From: Roei Edri <roeiedr5@gmail.com>
Date: Fri, 15 Apr 2022 19:13:51 +0300
Subject: [PATCH 17/20] Fixed some recents image renders as a black image

---
 .../java/com/chooloo/www/chooloolib/adapter/RecentsAdapter.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/RecentsAdapter.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/RecentsAdapter.kt
index 3ad39f889..c33899f5f 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/RecentsAdapter.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/RecentsAdapter.kt
@@ -33,8 +33,8 @@ class RecentsAdapter @Inject constructor(
                     captionText =
                         "$captionText · ${Phone.getTypeLabel(resources, it.type, it.label)} ·"
                     setImageInitials(it.name?.initials())
-                    setImageUri(if (it.photoUri != null) Uri.parse(it.photoUri) else null)
                 }
+                setImageUri(if (it?.photoUri != null) Uri.parse(it.photoUri) else null)
             }
 
             setImageBackgroundColor(Color.TRANSPARENT)

From 277790420446c77a01da49411ef50cec48b1d9ff Mon Sep 17 00:00:00 2001
From: Roei Edri <roeiedr5@gmail.com>
Date: Fri, 15 Apr 2022 19:25:00 +0300
Subject: [PATCH 18/20] Fixed call type icon position

---
 .../chooloo/www/chooloolib/ui/widgets/listitem/ListItem.kt    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/listitem/ListItem.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/listitem/ListItem.kt
index f5f097340..75a5cc49c 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/listitem/ListItem.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/listitem/ListItem.kt
@@ -297,13 +297,13 @@ open class ListItem : LinearLayout {
 
             caption.id.also {
                 connect(it, TOP, title.id, BOTTOM)
-                connect(it, START, captionImage.id, END)
+                connect(it, START, title.id, START)
                 connect(it, BOTTOM, PARENT_ID, BOTTOM)
             }
 
             captionImage.id.also {
                 connect(it, TOP, caption.id, TOP)
-                connect(it, START, title.id, START)
+                connect(it, START, caption.id, END)
                 connect(it, BOTTOM, caption.id, BOTTOM)
             }
 

From 6aaf68d39a8f7b1373a3bb9bed4c27ce5d30e0ab Mon Sep 17 00:00:00 2001
From: Roei Edri <roeiedr5@gmail.com>
Date: Fri, 15 Apr 2022 19:44:19 +0300
Subject: [PATCH 19/20] Fixed permissions related crashes, fixes #408

---
 .../www/chooloolib/adapter/RecentsAdapter.kt  |  4 +++-
 .../ui/contacts/ContactsViewState.kt          |  6 ++++-
 .../www/chooloolib/ui/list/ListViewState.kt   |  9 +++++---
 .../chooloolib/ui/recents/RecentsViewState.kt | 22 ++++++++++++++-----
 chooloolib/src/main/res/values/strings.xml    |  1 +
 5 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/RecentsAdapter.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/RecentsAdapter.kt
index f0c0588e7..716e86306 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/RecentsAdapter.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/RecentsAdapter.kt
@@ -4,6 +4,7 @@ import android.graphics.Color
 import android.net.Uri
 import android.provider.ContactsContract.CommonDataKinds.Phone
 import com.chooloo.www.chooloolib.interactor.animation.AnimationsInteractor
+import com.chooloo.www.chooloolib.interactor.permission.PermissionsInteractor
 import com.chooloo.www.chooloolib.interactor.phoneaccounts.PhonesInteractor
 import com.chooloo.www.chooloolib.interactor.preferences.PreferencesInteractor
 import com.chooloo.www.chooloolib.interactor.recents.RecentsInteractor
@@ -18,7 +19,8 @@ class RecentsAdapter @Inject constructor(
     animations: AnimationsInteractor,
     private val phones: PhonesInteractor,
     private val recents: RecentsInteractor,
-    private val preferences: PreferencesInteractor
+    private val preferences: PreferencesInteractor,
+    private val permissions: PermissionsInteractor
 ) : ListAdapter<RecentAccount>(animations) {
 
     private var _groupSimilar: Boolean = false
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/contacts/ContactsViewState.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/contacts/ContactsViewState.kt
index 84524c8a6..25567bf4e 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/contacts/ContactsViewState.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/contacts/ContactsViewState.kt
@@ -1,5 +1,6 @@
 package com.chooloo.www.chooloolib.ui.contacts
 
+import android.Manifest.permission.READ_CONTACTS
 import androidx.lifecycle.LiveData
 import com.chooloo.www.chooloolib.R
 import com.chooloo.www.chooloolib.interactor.permission.PermissionsInteractor
@@ -29,7 +30,10 @@ open class ContactsViewState @Inject constructor(
 
     override fun onFilterChanged(filter: String?) {
         super.onFilterChanged(filter)
-        contactsLiveData.filter = filter
+        if (permissions.hasSelfPermission(READ_CONTACTS)) {
+            onPermissionsChanged(true)
+            contactsLiveData.filter = filter
+        }
     }
 
     override fun onItemClick(item: ContactAccount) {
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/list/ListViewState.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/list/ListViewState.kt
index c4b6c2e50..b31d5e921 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/list/ListViewState.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/list/ListViewState.kt
@@ -17,6 +17,10 @@ abstract class ListViewState<ItemType> : BaseViewState() {
     val itemLongClickedEvent = DataLiveEvent<ItemType>()
     val itemsChangedEvent = DataLiveEvent<List<ItemType>>()
 
+    protected open val noResultsIconRes: Int? = null
+    protected open val noResultsTextRes: Int? = null
+    protected open val noPermissionsTextRes: Int? = null
+    
 
     override fun attach() {
         emptyIcon.value = noResultsIconRes
@@ -43,12 +47,11 @@ abstract class ListViewState<ItemType> : BaseViewState() {
 
     fun onPermissionsChanged(hasPermissions: Boolean) {
         emptyMessage.value = if (hasPermissions) noResultsTextRes else noPermissionsTextRes
+        isEmpty.value = !hasPermissions
     }
+
     open fun onItemLeftClick(item: ItemType) {}
     open fun onItemRightClick(item: ItemType) {}
 
-    protected open val noResultsIconRes: Int? = null
-    protected open val noResultsTextRes: Int? = null
-    protected open val noPermissionsTextRes: Int? = null
     abstract fun getItemsObservable(callback: (LiveData<List<ItemType>>) -> Unit)
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recents/RecentsViewState.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recents/RecentsViewState.kt
index 05f82f2cd..461e2ee4a 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recents/RecentsViewState.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recents/RecentsViewState.kt
@@ -1,5 +1,7 @@
 package com.chooloo.www.chooloolib.ui.recents
 
+import android.Manifest.permission.READ_CALL_LOG
+import android.Manifest.permission.READ_CONTACTS
 import android.content.ClipData
 import android.content.ClipboardManager
 import androidx.lifecycle.LiveData
@@ -23,7 +25,7 @@ open class RecentsViewState @Inject constructor(
 
     override val noResultsIconRes = R.drawable.round_history_24
     override val noResultsTextRes = R.string.error_no_results_recents
-    override val noPermissionsTextRes = R.string.error_no_permissions_recents
+    override var noPermissionsTextRes = R.string.error_no_permissions_recents
 
     private val recentsLiveData = recentsRepository.getRecents() as RecentsProviderLiveData
 
@@ -32,12 +34,15 @@ open class RecentsViewState @Inject constructor(
 
     override fun onFilterChanged(filter: String?) {
         super.onFilterChanged(filter)
-        recentsLiveData.filter = filter
+        if (permissions.hasSelfPermissions(arrayOf(READ_CONTACTS, READ_CALL_LOG))) {
+            onPermissionsChanged(true)
+            recentsLiveData.filter = filter
+        }
     }
 
     override fun onItemClick(item: RecentAccount) {
         super.onItemClick(item)
-        showRecentEvent.call(item)
+        permissions.runWithReadCallLogPermissions { showRecentEvent.call(item) }
     }
 
     override fun onItemLongClick(item: RecentAccount) {
@@ -47,9 +52,14 @@ open class RecentsViewState @Inject constructor(
     }
 
     override fun getItemsObservable(callback: (LiveData<List<RecentAccount>>) -> Unit) {
-        permissions.runWithReadCallLogPermissions {
-            onPermissionsChanged(it)
-            if (it) callback.invoke(recentsLiveData)
+        permissions.runWithReadCallLogPermissions { clp ->
+            if (!clp) noPermissionsTextRes = R.string.error_no_permissions_recents
+            onPermissionsChanged(clp)
+            permissions.runWithReadContactsPermissions { rcp ->
+                if (!rcp) noPermissionsTextRes = R.string.error_no_permissions_contacts
+                onPermissionsChanged(clp && rcp)
+                if (clp && rcp) callback.invoke(recentsLiveData)
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/res/values/strings.xml b/chooloolib/src/main/res/values/strings.xml
index 6bfc9519f..d67e63916 100644
--- a/chooloolib/src/main/res/values/strings.xml
+++ b/chooloolib/src/main/res/values/strings.xml
@@ -138,6 +138,7 @@
     <string name="error_no_permissions_phones">I need permission to read contacts :)</string>
     <string name="error_no_permissions_recents">I need permission to read call log :)</string>
     <string name="error_no_permissions_contacts">I need permission to read contacts :)</string>
+    <string name="error_no_permissions_contacts_and_call_log">I need permission to read contacts and call log :)</string>
 
     <string name="error_no_number_to_call">No number was found :(</string>
 

From c3ff2f0d00eb96da24b9b43e285cca8142af8f42 Mon Sep 17 00:00:00 2001
From: Roei Edri <roeiedr5@gmail.com>
Date: Fri, 15 Apr 2022 20:06:08 +0300
Subject: [PATCH 20/20] Increased app version

---
 koler/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/koler/build.gradle b/koler/build.gradle
index 91c5ddb3f..1d39e60b1 100644
--- a/koler/build.gradle
+++ b/koler/build.gradle
@@ -9,8 +9,8 @@ android {
     compileSdk 31
 
     defaultConfig {
-        versionCode 76
-        versionName "v1.4.4"
+        versionCode 77
+        versionName "v1.4.5"
 
         minSdk 25
         targetSdk 31