[FEAT] 연락처 작업 #31
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| package com.alarmy.near.data.mapper | ||
|
|
||
| import com.alarmy.near.local.entity.ContactEntity | ||
| import com.alarmy.near.model.contact.Contact | ||
|
|
||
| fun ContactEntity.toModel(): Contact = | ||
| Contact( | ||
| id = id, | ||
| name = name, | ||
| phones = phones, | ||
| photoUri = photoUri, | ||
| birthDay = birthDay, | ||
| memo = memo, | ||
| ) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| package com.alarmy.near.data.repository | ||
|
|
||
| import com.alarmy.near.model.contact.Contact | ||
| import kotlinx.coroutines.flow.Flow | ||
|
|
||
| interface ContactRepository { | ||
| fun fetchAllContacts(): Flow<List<Contact>> | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| package com.alarmy.near.data.repository | ||
|
|
||
| import com.alarmy.near.data.mapper.toModel | ||
| import com.alarmy.near.local.contact.ContactLocalDataSource | ||
| import com.alarmy.near.model.contact.Contact | ||
| import kotlinx.coroutines.flow.Flow | ||
| import kotlinx.coroutines.flow.flow | ||
| import javax.inject.Inject | ||
|
|
||
| class DefaultContactRepository | ||
| @Inject | ||
| constructor( | ||
| private val contactDataSource: ContactLocalDataSource, | ||
| ) : ContactRepository { | ||
| override fun fetchAllContacts(): Flow<List<Contact>> = | ||
| flow { | ||
| emit( | ||
| contactDataSource.getAllContacts().map { | ||
| it.toModel() | ||
| }, | ||
| ) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,198 @@ | ||
| package com.alarmy.near.local.contact | ||
|
|
||
| import android.content.ContentResolver | ||
| import android.provider.ContactsContract | ||
| import com.alarmy.near.local.entity.ContactEntity | ||
| import com.alarmy.near.local.entity.ImportantDate | ||
| import javax.inject.Inject | ||
|
|
||
| class ContactLocalDataSource | ||
| @Inject | ||
| constructor( | ||
| private val contentResolver: ContentResolver, | ||
| ) { | ||
| fun getAllContacts(): List<ContactEntity> { | ||
| val contacts = mutableListOf<ContactEntity>() | ||
|
|
||
| val cursor = | ||
| contentResolver.query( | ||
| ContactsContract.Contacts.CONTENT_URI, | ||
| null, | ||
| null, | ||
| null, | ||
| "${ContactsContract.Contacts.DISPLAY_NAME} ASC", | ||
| ) | ||
|
|
||
| cursor?.use { | ||
| val idIndex = it.getColumnIndex(ContactsContract.Contacts._ID) | ||
| val nameIndex = it.getColumnIndex(ContactsContract.Contacts.DISPLAY_NAME) | ||
| val hasPhoneIndex = it.getColumnIndex(ContactsContract.Contacts.HAS_PHONE_NUMBER) | ||
| val photoIndex = it.getColumnIndex(ContactsContract.Contacts.PHOTO_URI) | ||
|
|
||
| while (it.moveToNext()) { | ||
| val id = it.getLong(idIndex) | ||
| val name = it.getString(nameIndex) ?: "" | ||
| val hasPhone = it.getInt(hasPhoneIndex) > 0 | ||
| val photoUri = it.getString(photoIndex) | ||
|
|
||
| // 전화번호 | ||
| val phones = mutableListOf<String>() | ||
| if (hasPhone) { | ||
| val phoneCursor = | ||
| contentResolver.query( | ||
| ContactsContract.CommonDataKinds.Phone.CONTENT_URI, | ||
| null, | ||
| "${ContactsContract.CommonDataKinds.Phone.CONTACT_ID} = ?", | ||
| arrayOf(id.toString()), | ||
| null, | ||
| ) | ||
| phoneCursor?.use { pc -> | ||
| val phoneIndex = | ||
| pc.getColumnIndex(ContactsContract.CommonDataKinds.Phone.NUMBER) | ||
| while (pc.moveToNext()) { | ||
| phones.add(pc.getString(phoneIndex)) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // 메모 | ||
| var memo: String? = null | ||
| val noteCursor = | ||
| contentResolver.query( | ||
| ContactsContract.Data.CONTENT_URI, | ||
| arrayOf(ContactsContract.CommonDataKinds.Note.NOTE), | ||
| "${ContactsContract.Data.CONTACT_ID} = ? AND ${ContactsContract.Data.MIMETYPE} = ?", | ||
| arrayOf(id.toString(), ContactsContract.CommonDataKinds.Note.CONTENT_ITEM_TYPE), | ||
| null, | ||
| ) | ||
| noteCursor?.use { nc -> | ||
| if (nc.moveToFirst()) { | ||
| memo = nc.getString(0) | ||
| } | ||
| } | ||
|
|
||
| // 생일 | ||
| var birthDay: String? = null | ||
| val birthdayCursor = | ||
| contentResolver.query( | ||
| ContactsContract.Data.CONTENT_URI, | ||
| arrayOf(ContactsContract.CommonDataKinds.Event.START_DATE), | ||
| "${ContactsContract.Data.CONTACT_ID} = ? AND ${ContactsContract.Data.MIMETYPE} = ? AND ${ContactsContract.CommonDataKinds.Event.TYPE} = ?", | ||
| arrayOf( | ||
| id.toString(), | ||
| ContactsContract.CommonDataKinds.Event.CONTENT_ITEM_TYPE, | ||
| ContactsContract.CommonDataKinds.Event.TYPE_BIRTHDAY | ||
| .toString(), | ||
| ), | ||
| null, | ||
| ) | ||
| birthdayCursor?.use { bc -> | ||
| if (bc.moveToFirst()) { | ||
| birthDay = bc.getString(0) | ||
| } | ||
| } | ||
|
|
||
| // 그룹 | ||
| val groups = mutableListOf<String>() | ||
| val groupCursor = | ||
| contentResolver.query( | ||
| ContactsContract.Data.CONTENT_URI, | ||
| arrayOf(ContactsContract.CommonDataKinds.GroupMembership.GROUP_ROW_ID), | ||
| "${ContactsContract.Data.CONTACT_ID} = ? AND ${ContactsContract.Data.MIMETYPE} = ?", | ||
| arrayOf( | ||
| id.toString(), | ||
| ContactsContract.CommonDataKinds.GroupMembership.CONTENT_ITEM_TYPE, | ||
| ), | ||
| null, | ||
| ) | ||
| groupCursor?.use { gc -> | ||
| val groupIdIndex = | ||
| gc.getColumnIndex( | ||
| ContactsContract.CommonDataKinds.GroupMembership.GROUP_ROW_ID, | ||
| ) | ||
| while (gc.moveToNext()) { | ||
| val groupId = gc.getLong(groupIdIndex) | ||
| val groupNameCursor = | ||
| contentResolver.query( | ||
| ContactsContract.Groups.CONTENT_URI, | ||
| arrayOf(ContactsContract.Groups.TITLE), | ||
| "${ContactsContract.Groups._ID} = ?", | ||
| arrayOf(groupId.toString()), | ||
| null, | ||
| ) | ||
| groupNameCursor?.use { gnc -> | ||
| if (gnc.moveToFirst()) { | ||
| groups.add(gnc.getString(0)) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // 중요한 날 (기념일) | ||
| val importantDates = mutableListOf<ImportantDate>() | ||
| val eventCursor = | ||
| contentResolver.query( | ||
| ContactsContract.Data.CONTENT_URI, | ||
| arrayOf( | ||
| ContactsContract.CommonDataKinds.Event.START_DATE, | ||
| ContactsContract.CommonDataKinds.Event.TYPE, | ||
| ContactsContract.CommonDataKinds.Event.LABEL, | ||
| ), | ||
| "${ContactsContract.Data.CONTACT_ID} = ? AND ${ContactsContract.Data.MIMETYPE} = ?", | ||
| arrayOf( | ||
| id.toString(), | ||
| ContactsContract.CommonDataKinds.Event.CONTENT_ITEM_TYPE, | ||
| ), | ||
| null, | ||
| ) | ||
| eventCursor?.use { ec -> | ||
| val dateIndex = | ||
| ec.getColumnIndex(ContactsContract.CommonDataKinds.Event.START_DATE) | ||
| val typeIndex = | ||
| ec.getColumnIndex(ContactsContract.CommonDataKinds.Event.TYPE) | ||
| val labelIndex = | ||
| ec.getColumnIndex(ContactsContract.CommonDataKinds.Event.LABEL) | ||
|
|
||
| while (ec.moveToNext()) { | ||
| val date = ec.getString(dateIndex) | ||
| val type = ec.getInt(typeIndex) | ||
| val customLabel = ec.getString(labelIndex) | ||
|
|
||
| val label = | ||
| when (type) { | ||
| ContactsContract.CommonDataKinds.Event.TYPE_BIRTHDAY -> { | ||
| continue // 위에서 생일은 포함했으므로 스킵 | ||
| } | ||
|
|
||
| ContactsContract.CommonDataKinds.Event.TYPE_ANNIVERSARY -> "기념일" | ||
| ContactsContract.CommonDataKinds.Event.TYPE_OTHER -> | ||
| customLabel | ||
| ?: "기타" | ||
|
|
||
| else -> "알 수 없음" | ||
| } | ||
|
|
||
| if (date != null) { | ||
| importantDates.add(ImportantDate(label, date)) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| contacts.add( | ||
| ContactEntity( | ||
| id = id, | ||
| name = name, | ||
| phones = phones, | ||
| photoUri = photoUri, | ||
| birthDay = birthDay, | ||
| memo = memo, | ||
| groups = groups, | ||
| importantDates = importantDates, | ||
| ), | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| return contacts | ||
| } | ||
|
Comment on lines
+14
to
+197
There was a problem hiding this comment.
이 문제를 해결하려면, |
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| package com.alarmy.near.local.contact.di | ||
|
|
||
| import android.content.ContentResolver | ||
| import android.content.Context | ||
| import dagger.Module | ||
| import dagger.Provides | ||
| import dagger.hilt.InstallIn | ||
| import dagger.hilt.android.qualifiers.ApplicationContext | ||
| import dagger.hilt.components.SingletonComponent | ||
| import javax.inject.Singleton | ||
|
|
||
| @Module | ||
| @InstallIn(SingletonComponent::class) | ||
| object ContactDataSourceModule { | ||
| @Provides | ||
| @Singleton | ||
| fun provideContentResolver( | ||
| @ApplicationContext context: Context, | ||
| ): ContentResolver = context.contentResolver | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| package com.alarmy.near.local.entity | ||
|
|
||
| data class ContactEntity( | ||
| val id: Long, | ||
| val name: String, | ||
| val phones: List<String>, | ||
| val photoUri: String?, // 사진 | ||
| val birthDay: String?, // 생일 | ||
| val memo: String?, // 메모 | ||
| val groups: List<String>, // 그룹 (ex. 가족, 친구, 회사) | ||
| val importantDates: List<ImportantDate>, | ||
| ) | ||
|
|
||
| data class ImportantDate( | ||
| val label: String, | ||
| val date: String, | ||
| ) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| package com.alarmy.near.model.contact | ||
|
|
||
| import android.os.Parcelable | ||
| import kotlinx.parcelize.Parcelize | ||
|
|
||
| @Parcelize | ||
| data class Contact( | ||
| val id: Long, | ||
| val name: String, | ||
| val phones: List<String>, | ||
| val photoUri: String?, // 사진 | ||
| val birthDay: String?, // 생일 | ||
| val memo: String?, // 메모 | ||
| ) : Parcelable |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fetchAllContacts함수 내에서contactDataSource.getAllContacts()를 호출하고 있는데, 이는 디스크 I/O를 유발하는 블로킹(blocking) 작업입니다.flow빌더는 기본적으로 수집자(collector)의 코루틴 컨텍스트에서 실행되므로, 이 코드가 메인 스레드에서 실행될 경우 UI 멈춤(ANR)을 유발할 수 있습니다.flowOn(Dispatchers.IO)를 사용하여 이 작업을 백그라운드 스레드에서 실행하도록 변경하는 것이 좋습니다.