mirror/Phone
1
0
Fork 0
mirror of https://github.com/FossifyOrg/Phone.git synced 2026-04-23 08:47:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use helper method from commons

Browse Source
This commit is contained in:
Naveen Singh
2025-01-12 20:28:15 +05:30
parent 7e31866e1a
commit beabfd97e9
4 changed files with 20 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/kotlin/org/fossify/phone/extensions/FastScrollerView.kt Normal file
View File

@@ -0,0 +1,15 @@
package org.fossify.phone.extensions
import androidx.recyclerview.widget.RecyclerView
import com.reddit.indicatorfastscroll.FastScrollItemIndicator
import com.reddit.indicatorfastscroll.FastScrollerView
import org.fossify.commons.models.contacts.Contact
fun FastScrollerView.setupWithContacts(
recyclerView: RecyclerView,
contacts: List<Contact>,
) = setupWithRecyclerView(recyclerView, { position ->
val contact = contacts[position]
val initialLetter = contact.getFirstLetter()
FastScrollItemIndicator.Text(initialLetter)
})

28
app/src/main/kotlin/org/fossify/phone/fragments/ContactsFragment.kt
View File

@@ -2,7 +2,6 @@ package org.fossify.phone.fragments
import android.content.Context
import android.util.AttributeSet
import com.reddit.indicatorfastscroll.FastScrollItemIndicator
import org.fossify.commons.adapters.MyRecyclerViewAdapter
import org.fossify.commons.extensions.*
import org.fossify.commons.helpers.*
@@ -13,11 +12,10 @@ import org.fossify.phone.activities.SimpleActivity
import org.fossify.phone.adapters.ContactsAdapter
import org.fossify.phone.databinding.FragmentContactsBinding
import org.fossify.phone.databinding.FragmentLettersLayoutBinding
import org.fossify.phone.extensions.config
import org.fossify.phone.extensions.launchCreateNewContactIntent
import org.fossify.phone.extensions.setupWithContacts
import org.fossify.phone.extensions.startContactDetailsIntent
import org.fossify.phone.interfaces.RefreshItemsListener
import java.util.Locale
class ContactsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerFragment<MyViewPagerFragment.LettersInnerBinding>(context, attributeSet),
RefreshItemsListener {
@@ -131,29 +129,7 @@ class ContactsFragment(context: Context, attributeSet: AttributeSet) : MyViewPag
}
private fun setupLetterFastScroller(contacts: ArrayList<Contact>) {
val sorting = context.config.sorting
binding.letterFastscroller.setupWithRecyclerView(binding.fragmentList, { position ->
try {
val contact = contacts[position]
var name = when {
contact.isABusinessContact() -> contact.getFullCompany()
sorting and SORT_BY_SURNAME != 0 && contact.surname.isNotEmpty() -> contact.surname
sorting and SORT_BY_MIDDLE_NAME != 0 && contact.middleName.isNotEmpty() -> contact.middleName
sorting and SORT_BY_FIRST_NAME != 0 && contact.firstName.isNotEmpty() -> contact.firstName
context.config.startNameWithSurname -> contact.surname
else -> contact.firstName
}
if (name.isEmpty()) {
name = contact.getNameToDisplay()
}
val character = if (name.isNotEmpty()) name.substring(0, 1) else ""
FastScrollItemIndicator.Text(character.uppercase(Locale.getDefault()).normalizeString())
} catch (e: Exception) {
FastScrollItemIndicator.Text("")
}
})
binding.letterFastscroller.setupWithContacts(binding.fragmentList, contacts)
}
override fun onSearchClosed() {

27
app/src/main/kotlin/org/fossify/phone/fragments/FavoritesFragment.kt
View File

@@ -3,7 +3,6 @@ package org.fossify.phone.fragments
import android.content.Context
import android.util.AttributeSet
import com.google.gson.Gson
import com.reddit.indicatorfastscroll.FastScrollItemIndicator
import org.fossify.commons.adapters.MyRecyclerViewAdapter
import org.fossify.commons.dialogs.CallConfirmationDialog
import org.fossify.commons.extensions.*
@@ -17,8 +16,8 @@ import org.fossify.phone.adapters.ContactsAdapter
import org.fossify.phone.databinding.FragmentFavoritesBinding
import org.fossify.phone.databinding.FragmentLettersLayoutBinding
import org.fossify.phone.extensions.config
import org.fossify.phone.extensions.setupWithContacts
import org.fossify.phone.interfaces.RefreshItemsListener
import java.util.Locale
class FavoritesFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerFragment<MyViewPagerFragment.LettersInnerBinding>(context, attributeSet),
RefreshItemsListener {
@@ -181,29 +180,7 @@ class FavoritesFragment(context: Context, attributeSet: AttributeSet) : MyViewPa
}
private fun setupLetterFastScroller(contacts: List<Contact>) {
val sorting = context.config.sorting
binding.letterFastscroller.setupWithRecyclerView(binding.fragmentList, { position ->
try {
val contact = contacts[position]
var name = when {
contact.isABusinessContact() -> contact.getFullCompany()
sorting and SORT_BY_SURNAME != 0 && contact.surname.isNotEmpty() -> contact.surname
sorting and SORT_BY_MIDDLE_NAME != 0 && contact.middleName.isNotEmpty() -> contact.middleName
sorting and SORT_BY_FIRST_NAME != 0 && contact.firstName.isNotEmpty() -> contact.firstName
context.config.startNameWithSurname -> contact.surname
else -> contact.firstName
}
if (name.isEmpty()) {
name = contact.getNameToDisplay()
}
val character = if (name.isNotEmpty()) name.substring(0, 1) else ""
FastScrollItemIndicator.Text(character.uppercase(Locale.getDefault()).normalizeString())
} catch (e: Exception) {
FastScrollItemIndicator.Text("")
}
})
binding.letterFastscroller.setupWithContacts(binding.fragmentList, contacts)
}
override fun onSearchClosed() {

2
gradle/libs.versions.toml
View File

@@ -7,7 +7,7 @@ detekt = "1.23.3"
#Eventbus
eventbus = "3.3.1"
#Fossify
commons = "c4110dc7c2"
commons = "30b338e429"
#Gradle
gradlePlugins-agp = "8.7.1"
#Other