fenix/Simple-SMS-Messenger
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-SMS-Messenger.git synced 2025-03-04 03:17:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Restructure code

Browse Source
This commit is contained in:
Naveen 2022-08-29 16:32:04 +05:30
parent 93848b1894
commit b6e21507c1
3 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/VCardViewerActivity.kt
View File

@ -76,6 +76,6 @@ class VCardViewerActivity : SimpleActivity() {
} }
private fun prepareData(vCards: List<VCard>): List<VCardWrapper> { private fun prepareData(vCards: List<VCard>): List<VCardWrapper> {
return vCards.map { VCardWrapper(it) } return vCards.map { vCard -> VCardWrapper.from(this, vCard) }
} }
} }

6
app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/VCardViewerAdapter.kt
View File

@ -20,7 +20,7 @@ import kotlinx.android.synthetic.main.item_vcard_contact.view.*
import kotlinx.android.synthetic.main.item_vcard_contact_property.view.* import kotlinx.android.synthetic.main.item_vcard_contact_property.view.*
class VCardViewerAdapter( class VCardViewerAdapter(
private val activity: SimpleActivity, private var items: MutableList<Any>, private val itemClick: (Any) -> Unit activity: SimpleActivity, private var items: MutableList<Any>, private val itemClick: (Any) -> Unit
) : RecyclerView.Adapter<VCardViewerAdapter.VCardViewHolder>() { ) : RecyclerView.Adapter<VCardViewerAdapter.VCardViewHolder>() {
private var fontSize = activity.getTextSize() private var fontSize = activity.getTextSize()
@ -53,7 +53,7 @@ class VCardViewerAdapter(
} }
private fun setupVCardView(view: View, item: VCardWrapper) { private fun setupVCardView(view: View, item: VCardWrapper) {
val name = item.getFullName() val name = item.fullName
view.apply { view.apply {
item_contact_name.apply { item_contact_name.apply {
text = name text = name
@ -121,7 +121,7 @@ class VCardViewerAdapter(
} }
private fun expandOrCollapseRow(view: View, item: VCardWrapper) { private fun expandOrCollapseRow(view: View, item: VCardWrapper) {
val properties = item.getVCardProperties(context = activity) val properties = item.properties
if (item.expanded) { if (item.expanded) {
collapseRow(view, properties, item) collapseRow(view, properties, item)
} else { } else {

41
app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/VCard.kt
View File

@ -12,28 +12,33 @@ private val displayedPropertyClasses = arrayOf(
Telephone::class.java, Email::class.java, Organization::class.java, Birthday::class.java, Anniversary::class.java, Note::class.java Telephone::class.java, Email::class.java, Organization::class.java, Birthday::class.java, Anniversary::class.java, Note::class.java
) )
data class VCardWrapper(val vCard: VCard, var expanded: Boolean = false) { data class VCardWrapper(val vCard: VCard, val fullName: String?, val properties: List<VCardPropertyWrapper>, var expanded: Boolean = false) {
fun getFullName(): String? { companion object {
var formattedName = vCard.formattedName?.value private fun VCard.extractFullName(): String? {
if (formattedName.isNullOrEmpty()) { var fullName = formattedName?.value
val structured = vCard.structuredName if (fullName.isNullOrEmpty()) {
val given = structured?.given val structured = structuredName
val family = structured.family val given = structured?.given
formattedName = if (family != null) { val family = structured.family
given?.plus(" ")?.plus(family) fullName = if (family != null) {
} else { given?.plus(" ")?.plus(family)
given } else {
given
}
} }
return fullName
} }
return formattedName
}
fun getVCardProperties(context: Context): List<VCardPropertyWrapper> { fun from(context: Context, vCard: VCard): VCardWrapper {
return vCard.properties val properties = vCard.properties
.filter { displayedPropertyClasses.contains(it::class.java) } .filter { displayedPropertyClasses.contains(it::class.java) }
.map { VCardPropertyWrapper.from(context, it) } .map { VCardPropertyWrapper.from(context, it) }
.distinctBy { it.value } .distinctBy { it.value }
val fullName = vCard.extractFullName()
return VCardWrapper(vCard, fullName, properties, expanded = false)
}
} }
} }