Chooloo · Jun 4, 2022 · Jun 4, 2022 · Jun 12, 2022 · Jun 27, 2022 · Jun 27, 2022
diff --git a/chooloolib/build.gradle b/chooloolib/build.gradle
@@ -72,6 +72,7 @@ dependencies {
     )
 
     implementation(
+            'com.squareup.picasso:picasso:2.5.2',
             'androidx.core:core-ktx:1.7.0',
             'dev.sasikanth:colorsheet:1.0.1',
             'androidx.appcompat:appcompat:1.4.1',
@@ -82,7 +83,7 @@ dependencies {
             'io.github.l4digital:fastscroll:2.0.1',
             'io.reactivex.rxjava2:rxandroid:2.0.1',
             'com.google.dagger:hilt-android:2.38.1',
-            'com.google.android.material:material:1.4.0',
+            'com.google.android.material:material:1.6.0',
             'com.github.abdularis:circularimageview:1.5',
             'com.daimajia.androidanimations:library:2.4@aar',
             'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0',

diff --git a/chooloolib/src/main/AndroidManifest.xml b/chooloolib/src/main/AndroidManifest.xml
@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.chooloo.www.chooloolib">
 
+    <uses-permission android:name="android.permission.CALL_PHONE" />
+    <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.VIBRATE" />
 

diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/BaseApp.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/BaseApp.kt
@@ -1,17 +1,17 @@
 package com.chooloo.www.chooloolib
 
 import android.app.Application
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.preference.PreferenceManager
 import com.chooloo.www.chooloolib.interactor.preferences.PreferencesInteractor
+import com.chooloo.www.chooloolib.interactor.theme.ThemesInteractor
 import javax.inject.Inject
 
 abstract class BaseApp : Application() {
+    @Inject lateinit var themes: ThemesInteractor
     @Inject lateinit var preferences: PreferencesInteractor
 
     override fun onCreate() {
         super.onCreate()
-        AppCompatDelegate.setDefaultNightMode(preferences.themeMode.mode)
-        PreferenceManager.setDefaultValues(this, R.xml.preferences_chooloo, false)
+        preferences.setDefaultValues()
+        themes.applyThemeMode(preferences.themeMode)
     }
 }
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/AccountsAdapter.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/AccountsAdapter.kt
@@ -5,30 +5,26 @@ import com.chooloo.www.chooloolib.interactor.animation.AnimationsInteractor
 import com.chooloo.www.chooloolib.interactor.string.StringsInteractor
 import com.chooloo.www.chooloolib.model.ListData
 import com.chooloo.www.chooloolib.model.RawContactAccount
-import com.chooloo.www.chooloolib.ui.widgets.listitem.ListItem
+import com.chooloo.www.chooloolib.ui.widgets.listitemholder.ListItemHolder
 import javax.inject.Inject
 
 class AccountsAdapter @Inject constructor(
     animations: AnimationsInteractor,
     private val strings: StringsInteractor
 ) : ListAdapter<RawContactAccount>(animations) {
-    override fun onBindListItem(listItem: ListItem, item: RawContactAccount) {
-        listItem.apply {
-            background = null
+    override fun onBindListItem(listItemHolder: ListItemHolder, item: RawContactAccount) {
+        listItemHolder.apply {
             captionText = null
-            imageVisibility = false
+            isImageVisible = false
             isRightButtonVisible = true
             titleText = strings.getString(item.type.titleStringRes)
 
-            setTitleBold(true)
             if (item.type == RawContactAccount.RawContactType.WHATSAPP) {
-                setRightButtonDrawable(R.drawable.round_whatsapp_20)
-                setRightButtonTintColor(R.color.green_foreground)
-                setRightButtonBackgroundTintColor(R.color.green_background)
+                setRightButtonIcon(R.drawable.whatsapp)
             }
         }
     }
 
     override fun convertDataToListData(data: List<RawContactAccount>) =
-        ListData.fromRawContacts(data, accounts = true)
+        ListData.fromRawContacts(data, accounts = true, withHeader = false)
 }
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/CallItemsAdapter.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/CallItemsAdapter.kt
@@ -9,22 +9,20 @@ import com.chooloo.www.chooloolib.interactor.drawable.DrawablesInteractor
 import com.chooloo.www.chooloolib.interactor.phoneaccounts.PhonesInteractor
 import com.chooloo.www.chooloolib.model.Call
 import com.chooloo.www.chooloolib.model.ListData
-import com.chooloo.www.chooloolib.ui.widgets.listitem.ListItem
+import com.chooloo.www.chooloolib.ui.widgets.listitemholder.ListItemHolder
 import javax.inject.Inject
 
 class CallItemsAdapter @Inject constructor(
     animationsInteractor: AnimationsInteractor,
     private val phonesInteractor: PhonesInteractor,
-    private val colorsInteractor: ColorsInteractor,
-    private val drawablesInteractor: DrawablesInteractor,
 ) : ListAdapter<Call>(animationsInteractor) {
-    override fun onBindListItem(listItem: ListItem, item: Call) {
-        listItem.apply {
+    override fun onBindListItem(listItemHolder: ListItemHolder, item: Call) {
+        listItemHolder.apply {
             phonesInteractor.lookupAccount(item.number) { account ->
                 account?.photoUri?.let {
                     setImageUri(Uri.parse(it))
                 } ?: run {
-                    imageDrawable = drawablesInteractor.getDrawable(R.drawable.round_person_20)
+                    setImageResource(R.drawable.person)
                 }
 
                 account?.displayString?.let {
@@ -35,20 +33,14 @@ class CallItemsAdapter @Inject constructor(
                 }
             }
 
-//            imageSize = ViewUtils.dpToPx(context, 30).toInt()
-            setImageTint(colorsInteractor.getColor(R.color.color_opposite))
-
             isLeftButtonVisible = true
-            isLeftButtonEnabled = item.isCapable(CAPABILITY_SEPARATE_FROM_CONFERENCE)
-            setLeftButtonDrawable(R.drawable.round_call_split_24)
-            setLeftButtonTintColor(R.color.orange_foreground)
-            setLeftButtonBackgroundTintColor(R.color.orange_background)
-
             isRightButtonVisible = true
             isRightButtonEnabled = true
-            setRightButtonDrawable(R.drawable.round_call_end_24)
-            setRightButtonTintColor(R.color.red_foreground)
-            setRightButtonBackgroundTintColor(R.color.red_background)
+            isLeftButtonEnabled = item.isCapable(CAPABILITY_SEPARATE_FROM_CONFERENCE)
+
+            setLeftButtonIcon(R.drawable.call_split)
+            setRightButtonIcon(R.drawable.call_end)
+            setRightButtonIconTint(R.color.negative_foreground)
         }
     }
 

diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/ChoicesAdapter.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/ChoicesAdapter.kt
@@ -1,28 +1,37 @@
 package com.chooloo.www.chooloolib.adapter
 
 import android.annotation.SuppressLint
-import com.chooloo.www.chooloolib.R
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.chooloo.www.chooloolib.databinding.ListItemBinding
 import com.chooloo.www.chooloolib.interactor.animation.AnimationsInteractor
-import com.chooloo.www.chooloolib.interactor.color.ColorsInteractor
 import com.chooloo.www.chooloolib.model.ListData
-import com.chooloo.www.chooloolib.ui.widgets.listitem.ListItem
-import com.google.android.material.internal.ViewUtils
+import com.chooloo.www.chooloolib.ui.widgets.listitemholder.ChoiceItemHolder
+import com.chooloo.www.chooloolib.ui.widgets.listitemholder.ListItemHolder
 import javax.inject.Inject
 
 @SuppressLint("RestrictedApi")
 class ChoicesAdapter @Inject constructor(
     animations: AnimationsInteractor,
-    private val colors: ColorsInteractor,
 ) : ListAdapter<String>(animations) {
+    private var _selectedIndex: Int? = null
 
-    override fun onBindListItem(listItem: ListItem, item: String) {
-        listItem.apply {
-            setTitleBold(true)
-            setTitleColor(colors.getAttrColor(R.attr.colorOnSecondary))
+    var selectedIndex: Int?
+        get() = _selectedIndex
+        set(value) {
+            _selectedIndex = if (value == -1) null else value
+        }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ChoiceItemHolder(
+        ListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+    )
 
-            titleText = item
-            imageVisibility = false
-            imageSize = ViewUtils.dpToPx(context, 30).toInt()
+    override fun onBindListItem(listItemHolder: ListItemHolder, item: String) {
+        listItemHolder.titleText = item
+        selectedIndex?.let {
+            if (items[it] == item) {
+                listItemHolder.setSelected()
+            }
         }
     }
 

diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/ContactsAdapter.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/ContactsAdapter.kt
@@ -6,15 +6,14 @@ import com.chooloo.www.chooloolib.interactor.phoneaccounts.PhonesInteractor
 import com.chooloo.www.chooloolib.interactor.preferences.PreferencesInteractor
 import com.chooloo.www.chooloolib.model.ContactAccount
 import com.chooloo.www.chooloolib.model.ListData
-import com.chooloo.www.chooloolib.ui.widgets.listitem.ListItem
+import com.chooloo.www.chooloolib.ui.widgets.listitemholder.ListItemHolder
 import com.chooloo.www.chooloolib.util.initials
 import javax.inject.Inject
 
 
 open class ContactsAdapter @Inject constructor(
     animations: AnimationsInteractor,
     private val phones: PhonesInteractor,
-    private val preferences: PreferencesInteractor,
 ) : ListAdapter<ContactAccount>(animations) {
     private var _withFavs: Boolean = true
     private var _withHeaders: Boolean = true
@@ -32,15 +31,14 @@ open class ContactsAdapter @Inject constructor(
         }
 
 
-    override fun onBindListItem(listItem: ListItem, item: ContactAccount) {
-        listItem.apply {
+    override fun onBindListItem(listItemHolder: ListItemHolder, item: ContactAccount) {
+        listItemHolder.apply {
             titleText = item.name
-            isCompact = preferences.isCompact
-            phones.getContactAccounts(item.id) { accounts ->
-                captionText = accounts?.firstOrNull()?.number
+            imageInitials = item.name?.initials()
+            phones.getContactAccounts(item.id) {
+                captionText = it?.firstOrNull()?.number
             }
 
-            setImageInitials(item.name?.initials())
             setImageUri(if (item.photoUri != null) Uri.parse(item.photoUri) else null)
         }
     }

diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/ListAdapter.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/ListAdapter.kt
@@ -1,17 +1,17 @@
 package com.chooloo.www.chooloolib.adapter
 
+import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.chooloo.www.chooloolib.model.ListData
+import com.chooloo.www.chooloolib.databinding.ListItemBinding
 import com.chooloo.www.chooloolib.interactor.animation.AnimationsInteractor
-import com.chooloo.www.chooloolib.ui.widgets.listitem.ListItem
-import com.chooloo.www.chooloolib.ui.widgets.listitem.ListItemHolder
+import com.chooloo.www.chooloolib.model.ListData
+import com.chooloo.www.chooloolib.ui.widgets.listitemholder.ListItemHolder
 import com.l4digital.fastscroll.FastScroller
 
 abstract class ListAdapter<ItemType>(
     private val animations: AnimationsInteractor
 ) : RecyclerView.Adapter<ListItemHolder>(), FastScroller.SectionIndexer {
-    private var _isCompact: Boolean = false
     private var _titleFilter: String? = null
     private var _data: ListData<ItemType> = ListData()
     private var _onItemClickListener: (item: ItemType) -> Unit = {}
@@ -33,20 +33,16 @@ abstract class ListAdapter<ItemType>(
             notifyDataSetChanged()
         }
 
-    var isCompact: Boolean
-        get() = _isCompact
-        set(value) {
-            _isCompact = value
-        }
 
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) =
-        ListItemHolder(parent.context)
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ListItemHolder(
+        ListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+    )
 
     override fun onBindViewHolder(holder: ListItemHolder, position: Int) {
         val dataItem = getItem(position)
-        holder.listItem.apply {
-            isCompact = _isCompact
+        holder.apply {
+            _titleFilter?.let(this::highlightTitleText)
+
             headerText = getHeader(position)
 
             setOnClickListener { _onItemClickListener.invoke(dataItem) }
@@ -57,11 +53,9 @@ abstract class ListAdapter<ItemType>(
                 true
             }
 
-            animations.show(this, false)
+            animations.show(itemView, false)
 
             onBindListItem(this, dataItem)
-
-            _titleFilter?.let { highlightTitleText(it) }
         }
     }
 
@@ -111,5 +105,5 @@ abstract class ListAdapter<ItemType>(
 
     open fun convertDataToListData(items: List<ItemType>) = ListData(items)
 
-    abstract fun onBindListItem(listItem: ListItem, item: ItemType)
+    abstract fun onBindListItem(listItemHolder: ListItemHolder, item: ItemType)
 }
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/MenuAdapter.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/MenuAdapter.kt
@@ -1,34 +1,35 @@
 package com.chooloo.www.chooloolib.adapter
 
 import android.annotation.SuppressLint
-import android.graphics.Color
+import android.os.Build.VERSION.SDK_INT
+import android.os.Build.VERSION_CODES
+import android.view.LayoutInflater
 import android.view.MenuItem
-import com.chooloo.www.chooloolib.R
+import android.view.ViewGroup
+import com.chooloo.www.chooloolib.databinding.ListItemBinding
 import com.chooloo.www.chooloolib.interactor.animation.AnimationsInteractor
-import com.chooloo.www.chooloolib.interactor.color.ColorsInteractor
 import com.chooloo.www.chooloolib.model.ListData
-import com.chooloo.www.chooloolib.ui.widgets.listitem.ListItem
-import com.google.android.material.internal.ViewUtils
+import com.chooloo.www.chooloolib.ui.widgets.listitemholder.ListItemHolder
+import com.chooloo.www.chooloolib.ui.widgets.listitemholder.MenuItemHolder
 import javax.inject.Inject
 
 @SuppressLint("RestrictedApi")
 class MenuAdapter @Inject constructor(
-    animationsInteractor: AnimationsInteractor,
-    private val colorsInteractor: ColorsInteractor
+    animationsInteractor: AnimationsInteractor
 ) : ListAdapter<MenuItem>(animationsInteractor) {
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = MenuItemHolder(
+        ListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+    )
 
-    override fun onBindListItem(listItem: ListItem, item: MenuItem) {
-        listItem.apply {
-            setBackgroundColor(Color.TRANSPARENT)
-            setTitleTextAppearance(R.style.Chooloo_Text_Subtitle1)
-            setImageTint(colorsInteractor.getColor(R.color.color_opposite))
-            setTitleColor(colorsInteractor.getColor(R.color.color_opposite))
-
-            paddingTop = 28
-            paddingBottom = 28
-            imageDrawable = item.icon
+    override fun onBindListItem(listItemHolder: ListItemHolder, item: MenuItem) {
+        listItemHolder.apply {
+            isClickable = item.isEnabled
             titleText = item.title.toString()
-            imageSize = ViewUtils.dpToPx(context, 30).toInt()
+            if (SDK_INT >= VERSION_CODES.O) {
+                captionText = item.contentDescription?.toString()
+            }
+
+            setImageDrawable(item.icon)
         }
     }
 

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
@@ -1,29 +1,31 @@
 package com.chooloo.www.chooloolib.adapter
 
+import android.content.Context
 import android.provider.ContactsContract.CommonDataKinds.Phone
 import com.chooloo.www.chooloolib.R
 import com.chooloo.www.chooloolib.interactor.animation.AnimationsInteractor
-import com.chooloo.www.chooloolib.interactor.string.StringsInteractor
 import com.chooloo.www.chooloolib.model.ListData
 import com.chooloo.www.chooloolib.model.PhoneAccount
-import com.chooloo.www.chooloolib.ui.widgets.listitem.ListItem
+import com.chooloo.www.chooloolib.ui.widgets.listitemholder.ListItemHolder
+import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
 class PhonesAdapter @Inject constructor(
     animationsInteractor: AnimationsInteractor,
+    @ApplicationContext private val context: Context
 ) : ListAdapter<PhoneAccount>(animationsInteractor) {
-    override fun onBindListItem(listItem: ListItem, item: PhoneAccount) {
-        listItem.apply {
-            background = null
-            imageVisibility = false
+    override fun onBindListItem(listItemHolder: ListItemHolder, item: PhoneAccount) {
+        listItemHolder.apply {
+            isImageVisible = false
             titleText = item.number
             isRightButtonVisible = true
-            captionText = Phone.getTypeLabel(resources, item.type, item.label).toString()
+            isRightButtonEnabled = true
+            captionText = Phone.getTypeLabel(context.resources, item.type, item.label).toString()
 
-            setTitleBold(true)
-            setRightButtonDrawable(R.drawable.round_call_20)
+            setRightButtonIcon(R.drawable.call)
         }
     }
 
-    override fun convertDataToListData(data: List<PhoneAccount>) = ListData.fromPhones(data)
+    override fun convertDataToListData(data: List<PhoneAccount>) =
+        ListData.fromPhones(data, withHeader = false)
 }