-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #118 from THT-Team/feature/TOP-93_setting_list
TOP-93 feature 설정 관리 화면 디자인 구현
- Loading branch information
Showing
46 changed files
with
1,467 additions
and
133 deletions.
There are no files selected for viewing
This file contains 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,21 @@ | ||
| { | ||
| "items": [ | ||
| { | ||
| "type": "SettingItemSectionEntity", | ||
| "title": "계정 관리", | ||
| "description": null, | ||
| "items": [ | ||
| { | ||
| "type": "SettingItemEntity", | ||
| "title": "로그아웃", | ||
| "key": "Logout" | ||
| }, | ||
| { | ||
| "type": "SettingItemEntity", | ||
| "title": "계정 탈퇴", | ||
| "key": "DisActive" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } |
This file contains 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,130 @@ | ||
| { | ||
| "items": [ | ||
| { | ||
| "type": "SettingItemSectionEntity", | ||
| "title": "계정 설정", | ||
| "description": null, | ||
| "items": [ | ||
| { | ||
| "type": "SettingContentItemItemEntity", | ||
| "title": "연동된 SNS", | ||
| "content": null, | ||
| "key": "Sns" | ||
| }, | ||
| { | ||
| "type": "SettingContentItemItemEntity", | ||
| "title": "핸드폰 번호", | ||
| "content": null, | ||
| "key": "Phone" | ||
| },{ | ||
| "type": "SettingContentItemItemEntity", | ||
| "title": "이메일", | ||
| "content": null, | ||
| "key": "Email" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "type": "SettingItemSectionEntity", | ||
| "title": "활동", | ||
| "description": "나의 연락처에 저장된 지인들을 폴링에서 보고 싶지 않다면 서로에게 노출되지 않도록 설정 할 수 있어요.", | ||
| "items": [ | ||
| { | ||
| "type": "SettingItemEntity", | ||
| "title": "저장된 연락처 차단하기", | ||
| "key": "ContactBlock" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "type": "SettingItemSectionEntity", | ||
| "title": "내 위치 설정", | ||
| "description": "나의 위치를 업데이트해서 상대방과 매칭률을 높혀보세요.", | ||
| "items": [ | ||
| { | ||
| "type": "SettingLocationItemItemEntity", | ||
| "title": "내 위치", | ||
| "location": null, | ||
| "key": "Location" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "type": "SettingItemSectionEntity", | ||
| "title": "알림 설정", | ||
| "description": null, | ||
| "items": [ | ||
| { | ||
| "type": "SettingItemEntity", | ||
| "title": "알림 설정", | ||
| "key": "AlarmSetting" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "type": "SettingItemSectionEntity", | ||
| "title": "고객 지원", | ||
| "description": null, | ||
| "items": [ | ||
| { | ||
| "type": "SettingItemEntity", | ||
| "title": "자주 묻는 질문", | ||
| "key": "Question" | ||
| }, | ||
| { | ||
| "type": "SettingItemEntity", | ||
| "title": "문의 및 피드백 보내기", | ||
| "key": "Feedback" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "type": "SettingItemSectionEntity", | ||
| "title": "법적 고지", | ||
| "description": null, | ||
| "items": [ | ||
| { | ||
| "type": "SettingItemEntity", | ||
| "title": "서비스 이용약관", | ||
| "key": "UseTerms" | ||
| }, | ||
| { | ||
| "type": "SettingItemEntity", | ||
| "title": "개인정보 처리방침", | ||
| "key": "PrivacyTerms" | ||
| }, | ||
| { | ||
| "type": "SettingItemEntity", | ||
| "title": "위치정보 이용약관", | ||
| "key": "LocationTerms" | ||
| }, | ||
| { | ||
| "type": "SettingItemEntity", | ||
| "title": "라이센스", | ||
| "key": "Licence" | ||
| }, | ||
| { | ||
| "type": "SettingItemEntity", | ||
| "title": "사업자 정보", | ||
| "key": "CompanyInfo" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "type": "SettingImageBannerItemEntity", | ||
| "banner": "Falling" | ||
| }, | ||
| { | ||
| "type": "SettingItemSectionEntity", | ||
| "title": "계정 관리", | ||
| "description": null, | ||
| "items": [ | ||
| { | ||
| "type": "SettingItemEntity", | ||
| "title": "계정 관리", | ||
| "key": "AccountManager" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } |
This file contains 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 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 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 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 |
|---|---|---|
| @@ -1,24 +1,33 @@ | ||
| package com.tht.tht.data.di | ||
|
|
||
| import com.tht.tht.data.remote.service.location.LocationService | ||
| import com.tht.tht.data.remote.service.location.LocationServiceImpl | ||
| import com.tht.tht.data.local.service.SettingItemListService | ||
| import com.tht.tht.data.local.service.SettingItemListServiceImpl | ||
| import com.tht.tht.data.local.service.TermsService | ||
| import com.tht.tht.data.local.service.TermsServiceImpl | ||
| import com.tht.tht.data.remote.service.email.EmailService | ||
| import com.tht.tht.data.remote.service.email.EmailServiceImpl | ||
| import com.tht.tht.data.remote.service.location.LocationService | ||
| import com.tht.tht.data.remote.service.location.LocationServiceImpl | ||
| import dagger.Binds | ||
| import dagger.Module | ||
| import dagger.hilt.InstallIn | ||
| import dagger.hilt.components.SingletonComponent | ||
| import javax.inject.Singleton | ||
|
|
||
| @Module | ||
| @InstallIn(SingletonComponent::class) | ||
| abstract class ServiceModule { | ||
|
|
||
| @Binds | ||
| @Singleton | ||
| abstract fun bindLocationService(impl: LocationServiceImpl): LocationService | ||
|
|
||
| @Binds | ||
| @Singleton | ||
| abstract fun bindEmailService(impl: EmailServiceImpl): EmailService | ||
|
|
||
| @Binds | ||
| abstract fun bindTermsService(impl: TermsServiceImpl): TermsService | ||
|
|
||
| @Binds | ||
| abstract fun bindSettingItemListService( | ||
| impl: SettingItemListServiceImpl | ||
| ): SettingItemListService | ||
| } |
This file contains 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 was deleted.
Oops, something went wrong.
9 changes: 9 additions & 0 deletions
9
data/src/main/java/com/tht/tht/data/local/datasource/SettingItemDataSource.kt
This file contains 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,9 @@ | ||
| package com.tht.tht.data.local.datasource | ||
|
|
||
| import com.tht.tht.data.local.entity.setting.SettingItemsListResponse | ||
|
|
||
| interface SettingItemDataSource { | ||
| suspend fun fetchSettingMangerItemList(): SettingItemsListResponse | ||
|
|
||
| suspend fun fetchSettingAccountManagerItemList(): SettingItemsListResponse | ||
| } |
25 changes: 25 additions & 0 deletions
25
data/src/main/java/com/tht/tht/data/local/datasource/SettingItemDataSourceImpl.kt
This file contains 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,25 @@ | ||
| package com.tht.tht.data.local.datasource | ||
|
|
||
| import com.tht.tht.data.di.IODispatcher | ||
| import com.tht.tht.data.local.entity.setting.SettingItemsListResponse | ||
| import com.tht.tht.data.local.service.SettingItemListService | ||
| import kotlinx.coroutines.CoroutineDispatcher | ||
| import kotlinx.coroutines.withContext | ||
| import javax.inject.Inject | ||
|
|
||
| class SettingItemDataSourceImpl @Inject constructor( | ||
| private val service: SettingItemListService, | ||
| @IODispatcher private val dispatcher: CoroutineDispatcher | ||
| ) : SettingItemDataSource { | ||
| override suspend fun fetchSettingMangerItemList(): SettingItemsListResponse { | ||
| return withContext(dispatcher) { | ||
| service.fetchSettingMangerItemList() | ||
| } | ||
| } | ||
|
|
||
| override suspend fun fetchSettingAccountManagerItemList(): SettingItemsListResponse { | ||
| return withContext(dispatcher) { | ||
| service.fetchSettingAccountManagerItemList() | ||
| } | ||
| } | ||
| } |
6 changes: 3 additions & 3 deletions
6
data/src/main/java/com/tht/tht/data/local/datasource/TermsDataSourceImpl.kt
This file contains 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 |
|---|---|---|
| @@ -1,20 +1,20 @@ | ||
| package com.tht.tht.data.local.datasource | ||
|
|
||
| import com.tht.tht.data.di.IODispatcher | ||
| import com.tht.tht.data.local.dao.TermsDao | ||
| import com.tht.tht.data.local.service.TermsService | ||
| import com.tht.tht.data.local.entity.TermsEntity | ||
| import kotlinx.coroutines.CoroutineDispatcher | ||
| import kotlinx.coroutines.withContext | ||
| import javax.inject.Inject | ||
|
|
||
| class TermsDataSourceImpl @Inject constructor( | ||
| private val termsDao: TermsDao, | ||
| private val termsService: TermsService, | ||
| @IODispatcher private val dispatcher: CoroutineDispatcher | ||
| ) : TermsDataSource { | ||
|
|
||
| override suspend fun fetchSignupTerms(): TermsEntity { | ||
| return withContext(dispatcher) { | ||
| termsDao.fetchTerms() | ||
| termsService.fetchTerms() | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.