From dee4ed8ffcef5a8fdc382511027b912f016e14f8 Mon Sep 17 00:00:00 2001 From: KanuKim97 <74421057+KanuKim97@users.noreply.github.com> Date: Wed, 7 Jun 2023 01:07:34 +0900 Subject: [PATCH 1/3] Add domain, data module Add domain, data module 1. domain module - add entity package - add repository package - add usecase package 2. add data module - add database package - add remote package - add util(Mapper) package 3. mod app module 4. fix build.gradle(app, data, domain) 5. issue : No adapter attached --- app/build.gradle | 10 +- app/src/main/AndroidManifest.xml | 10 +- .../koin_apps/data/database/TickerDataBase.kt | 11 -- .../data/di/dataSource/TickerDBDataSource.kt | 82 --------- .../di/dataSource/TickerRemoteDataSource.kt | 150 ---------------- .../data/di/repository/TickerDBRepository.kt | 25 --- .../data/di/repository/TickerRepository.kt | 65 ------- .../remote/model/ticker/LiveTickerData.kt | 7 - .../remote/model/ticker/OrderTickerData.kt | 9 - .../{data/di => }/module/AlertDialogModule.kt | 2 +- .../{data/di => }/module/DispatcherModule.kt | 8 +- .../{data/di => }/module/TickerDBModule.kt | 13 +- .../di => }/module/TickerRemoteModule.kt | 15 +- .../{data/di => }/module/ToastModule.kt | 2 +- .../DispatcherQualifier.kt | 2 +- .../koin_apps/{ => presenter}/AndroidApp.kt | 2 +- .../{ => presenter}/LiveTimeActivity.kt | 19 +- .../koin_apps/{ => presenter}/LogoActivity.kt | 7 +- .../koin_apps/{ => presenter}/MainActivity.kt | 15 +- .../{ => presenter}/OrderBookFragment.kt | 25 +-- .../{ => presenter}/SelectKoinActivity.kt | 25 +-- .../OrderBookAskListAdapter.kt | 6 +- .../OrderBookBidListAdapter.kt | 6 +- .../listViewAdapter/TransactionListAdapter.kt | 6 +- .../MainRecyclerAdapter.kt | 10 +- .../SelectRecyclerAdapter.kt | 2 +- .../presenter/viewModel/LiveTimeViewModel.kt | 36 ++++ .../viewModel}/LogoViewModel.kt | 18 +- .../presenter/viewModel/MainViewModel.kt | 30 ++++ .../presenter/viewModel/OrderBookViewModel.kt | 58 ++++++ .../viewModel}/SelectViewModel.kt | 18 +- .../viewModel/activity/LiveTimeViewModel.kt | 37 ---- .../viewModel/activity/MainViewModel.kt | 30 ---- .../viewModel/fragment/OrderBookViewModel.kt | 58 ------ .../main/res/layout/activity_live_time.xml | 2 +- app/src/main/res/layout/activity_logo.xml | 2 +- app/src/main/res/layout/activity_main.xml | 2 +- .../main/res/layout/activity_select_koin.xml | 2 +- .../main/res/layout/fragment_order_book.xml | 2 +- data/.gitignore | 1 + data/build.gradle | 62 +++++++ data/proguard-rules.pro | 21 +++ .../example/data/ExampleInstrumentedTest.kt | 24 +++ data/src/main/AndroidManifest.xml | 11 ++ .../example/data/database/TickerDataBase.kt | 11 ++ .../example}/data/database/dao/TickerDao.kt | 11 +- .../data/database/tables/TickerTables.kt | 4 +- .../example/data/remote/BithumbApiService.kt | 12 +- .../model/orderbook}/OrderAskBidData.kt | 2 +- .../data/remote/model/orderbook}/OrderData.kt | 2 +- .../data/remote/model/orderbook}/OrderRoot.kt | 2 +- .../data/remote/model/ticker/TickerRoot.kt | 4 +- .../model/transaction/TransactionData.kt | 2 +- .../model/transaction/TransactionRoot.kt | 2 +- .../BithumbApiRepositoryImpl.kt | 164 +++++++++++++++++ .../repositoryImpl/DataBaseRepositoryImpl.kt | 76 ++++++++ .../util/apiMapper/OrderBookEntityMapper.kt | 17 ++ .../util/apiMapper/TransactionEntityMapper.kt | 17 ++ .../util/databaseMapper/TickerEntityMapper.kt | 7 + .../util/databaseMapper/TickerTableMapper.kt | 7 + .../drawable-v24/ic_launcher_foreground.xml | 30 ++++ .../res/drawable/ic_launcher_background.xml | 170 ++++++++++++++++++ .../res/mipmap-anydpi-v26/ic_launcher.xml | 5 + .../mipmap-anydpi-v26/ic_launcher_round.xml | 5 + .../res/mipmap-anydpi-v33/ic_launcher.xml | 6 + .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1404 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 0 -> 2898 bytes .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 982 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 0 -> 1772 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1900 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 0 -> 3918 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 2884 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 0 -> 5914 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 3844 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 0 -> 7778 bytes data/src/main/res/values-night/themes.xml | 16 ++ data/src/main/res/values/colors.xml | 10 ++ data/src/main/res/values/strings.xml | 3 + data/src/main/res/values/themes.xml | 16 ++ .../java/com/example/data/ExampleUnitTest.kt | 17 ++ domain/.gitignore | 1 + domain/build.gradle | 51 ++++++ domain/proguard-rules.pro | 21 +++ .../example/domain/ExampleInstrumentedTest.kt | 24 +++ domain/src/main/AndroidManifest.xml | 11 ++ .../domain/entity/OrderAskBidEntity.kt | 6 + .../example/domain/entity/OrderBookEntity.kt | 10 ++ .../com/example/domain/entity/TickerEntity.kt | 3 + .../domain/entity/TickerLiveDataEntity.kt | 7 + .../domain/entity/TickerOrderDataEntity.kt | 9 + .../domain/entity/TransactionEntity.kt | 9 + .../domain/repository/BithumbApiRepository.kt | 15 ++ .../domain/repository/DataBaseRepository.kt | 12 ++ .../usecase/apiUseCase/GetOrderBookUseCase.kt | 13 ++ .../usecase/apiUseCase/GetTickerAllUseCase.kt | 13 ++ .../apiUseCase/GetTickerDetailInfoUseCase.kt | 23 +++ .../apiUseCase/GetTickerLiveInfoUseCase.kt | 21 +++ .../GetTransactionHistoryUseCase.kt | 13 ++ .../databaseUseCase/DeleteTickerUseCase.kt | 13 ++ .../databaseUseCase/InsertTickerUseCase.kt | 13 ++ .../databaseUseCase/ReadAllTickerUseCase.kt | 12 ++ .../drawable-v24/ic_launcher_foreground.xml | 30 ++++ .../res/drawable/ic_launcher_background.xml | 170 ++++++++++++++++++ .../res/mipmap-anydpi-v26/ic_launcher.xml | 5 + .../mipmap-anydpi-v26/ic_launcher_round.xml | 5 + .../res/mipmap-anydpi-v33/ic_launcher.xml | 6 + .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1404 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 0 -> 2898 bytes .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 982 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 0 -> 1772 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1900 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 0 -> 3918 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 2884 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 0 -> 5914 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 3844 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 0 -> 7778 bytes domain/src/main/res/values-night/themes.xml | 16 ++ domain/src/main/res/values/colors.xml | 10 ++ domain/src/main/res/values/strings.xml | 3 + domain/src/main/res/values/themes.xml | 16 ++ .../com/example/domain/ExampleUnitTest.kt | 17 ++ settings.gradle | 2 + 122 files changed, 1541 insertions(+), 605 deletions(-) delete mode 100644 app/src/main/java/com/example/koin_apps/data/database/TickerDataBase.kt delete mode 100644 app/src/main/java/com/example/koin_apps/data/di/dataSource/TickerDBDataSource.kt delete mode 100644 app/src/main/java/com/example/koin_apps/data/di/dataSource/TickerRemoteDataSource.kt delete mode 100644 app/src/main/java/com/example/koin_apps/data/di/repository/TickerDBRepository.kt delete mode 100644 app/src/main/java/com/example/koin_apps/data/di/repository/TickerRepository.kt delete mode 100644 app/src/main/java/com/example/koin_apps/data/remote/model/ticker/LiveTickerData.kt delete mode 100644 app/src/main/java/com/example/koin_apps/data/remote/model/ticker/OrderTickerData.kt rename app/src/main/java/com/example/koin_apps/{data/di => }/module/AlertDialogModule.kt (92%) rename app/src/main/java/com/example/koin_apps/{data/di => }/module/DispatcherModule.kt (71%) rename app/src/main/java/com/example/koin_apps/{data/di => }/module/TickerDBModule.kt (66%) rename app/src/main/java/com/example/koin_apps/{data/di => }/module/TickerRemoteModule.kt (69%) rename app/src/main/java/com/example/koin_apps/{data/di => }/module/ToastModule.kt (92%) rename app/src/main/java/com/example/koin_apps/{data/di => module}/coroutineDispatcher/DispatcherQualifier.kt (84%) rename app/src/main/java/com/example/koin_apps/{ => presenter}/AndroidApp.kt (75%) rename app/src/main/java/com/example/koin_apps/{ => presenter}/LiveTimeActivity.kt (82%) rename app/src/main/java/com/example/koin_apps/{ => presenter}/LogoActivity.kt (89%) rename app/src/main/java/com/example/koin_apps/{ => presenter}/MainActivity.kt (81%) rename app/src/main/java/com/example/koin_apps/{ => presenter}/OrderBookFragment.kt (78%) rename app/src/main/java/com/example/koin_apps/{ => presenter}/SelectKoinActivity.kt (68%) rename app/src/main/java/com/example/koin_apps/{data => presenter/adapter}/listViewAdapter/OrderBookAskListAdapter.kt (86%) rename app/src/main/java/com/example/koin_apps/{data => presenter/adapter}/listViewAdapter/OrderBookBidListAdapter.kt (86%) rename app/src/main/java/com/example/koin_apps/{data => presenter/adapter}/listViewAdapter/TransactionListAdapter.kt (87%) rename app/src/main/java/com/example/koin_apps/{data => presenter/adapter}/recyclerViewAdapter/MainRecyclerAdapter.kt (82%) rename app/src/main/java/com/example/koin_apps/{data => presenter/adapter}/recyclerViewAdapter/SelectRecyclerAdapter.kt (95%) create mode 100644 app/src/main/java/com/example/koin_apps/presenter/viewModel/LiveTimeViewModel.kt rename app/src/main/java/com/example/koin_apps/{viewModel/activity => presenter/viewModel}/LogoViewModel.kt (55%) create mode 100644 app/src/main/java/com/example/koin_apps/presenter/viewModel/MainViewModel.kt create mode 100644 app/src/main/java/com/example/koin_apps/presenter/viewModel/OrderBookViewModel.kt rename app/src/main/java/com/example/koin_apps/{viewModel/activity => presenter/viewModel}/SelectViewModel.kt (64%) delete mode 100644 app/src/main/java/com/example/koin_apps/viewModel/activity/LiveTimeViewModel.kt delete mode 100644 app/src/main/java/com/example/koin_apps/viewModel/activity/MainViewModel.kt delete mode 100644 app/src/main/java/com/example/koin_apps/viewModel/fragment/OrderBookViewModel.kt create mode 100644 data/.gitignore create mode 100644 data/build.gradle create mode 100644 data/proguard-rules.pro create mode 100644 data/src/androidTest/java/com/example/data/ExampleInstrumentedTest.kt create mode 100644 data/src/main/AndroidManifest.xml create mode 100644 data/src/main/java/com/example/data/database/TickerDataBase.kt rename {app/src/main/java/com/example/koin_apps => data/src/main/java/com/example}/data/database/dao/TickerDao.kt (51%) rename app/src/main/java/com/example/koin_apps/data/database/tables/TickerEntity.kt => data/src/main/java/com/example/data/database/tables/TickerTables.kt (72%) rename app/src/main/java/com/example/koin_apps/data/remote/IKoinApiService.kt => data/src/main/java/com/example/data/remote/BithumbApiService.kt (68%) rename {app/src/main/java/com/example/koin_apps/data/remote/model/orderBook => data/src/main/java/com/example/data/remote/model/orderbook}/OrderAskBidData.kt (57%) rename {app/src/main/java/com/example/koin_apps/data/remote/model/orderBook => data/src/main/java/com/example/data/remote/model/orderbook}/OrderData.kt (79%) rename {app/src/main/java/com/example/koin_apps/data/remote/model/orderBook => data/src/main/java/com/example/data/remote/model/orderbook}/OrderRoot.kt (63%) rename {app/src/main/java/com/example/koin_apps => data/src/main/java/com/example}/data/remote/model/ticker/TickerRoot.kt (65%) rename {app/src/main/java/com/example/koin_apps => data/src/main/java/com/example}/data/remote/model/transaction/TransactionData.kt (72%) rename {app/src/main/java/com/example/koin_apps => data/src/main/java/com/example}/data/remote/model/transaction/TransactionRoot.kt (67%) create mode 100644 data/src/main/java/com/example/data/repositoryImpl/BithumbApiRepositoryImpl.kt create mode 100644 data/src/main/java/com/example/data/repositoryImpl/DataBaseRepositoryImpl.kt create mode 100644 data/src/main/java/com/example/data/util/apiMapper/OrderBookEntityMapper.kt create mode 100644 data/src/main/java/com/example/data/util/apiMapper/TransactionEntityMapper.kt create mode 100644 data/src/main/java/com/example/data/util/databaseMapper/TickerEntityMapper.kt create mode 100644 data/src/main/java/com/example/data/util/databaseMapper/TickerTableMapper.kt create mode 100644 data/src/main/res/drawable-v24/ic_launcher_foreground.xml create mode 100644 data/src/main/res/drawable/ic_launcher_background.xml create mode 100644 data/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 data/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 data/src/main/res/mipmap-anydpi-v33/ic_launcher.xml create mode 100644 data/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 data/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 data/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 data/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 data/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 data/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 data/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 data/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 data/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 data/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 data/src/main/res/values-night/themes.xml create mode 100644 data/src/main/res/values/colors.xml create mode 100644 data/src/main/res/values/strings.xml create mode 100644 data/src/main/res/values/themes.xml create mode 100644 data/src/test/java/com/example/data/ExampleUnitTest.kt create mode 100644 domain/.gitignore create mode 100644 domain/build.gradle create mode 100644 domain/proguard-rules.pro create mode 100644 domain/src/androidTest/java/com/example/domain/ExampleInstrumentedTest.kt create mode 100644 domain/src/main/AndroidManifest.xml create mode 100644 domain/src/main/java/com/example/domain/entity/OrderAskBidEntity.kt create mode 100644 domain/src/main/java/com/example/domain/entity/OrderBookEntity.kt create mode 100644 domain/src/main/java/com/example/domain/entity/TickerEntity.kt create mode 100644 domain/src/main/java/com/example/domain/entity/TickerLiveDataEntity.kt create mode 100644 domain/src/main/java/com/example/domain/entity/TickerOrderDataEntity.kt create mode 100644 domain/src/main/java/com/example/domain/entity/TransactionEntity.kt create mode 100644 domain/src/main/java/com/example/domain/repository/BithumbApiRepository.kt create mode 100644 domain/src/main/java/com/example/domain/repository/DataBaseRepository.kt create mode 100644 domain/src/main/java/com/example/domain/usecase/apiUseCase/GetOrderBookUseCase.kt create mode 100644 domain/src/main/java/com/example/domain/usecase/apiUseCase/GetTickerAllUseCase.kt create mode 100644 domain/src/main/java/com/example/domain/usecase/apiUseCase/GetTickerDetailInfoUseCase.kt create mode 100644 domain/src/main/java/com/example/domain/usecase/apiUseCase/GetTickerLiveInfoUseCase.kt create mode 100644 domain/src/main/java/com/example/domain/usecase/apiUseCase/GetTransactionHistoryUseCase.kt create mode 100644 domain/src/main/java/com/example/domain/usecase/databaseUseCase/DeleteTickerUseCase.kt create mode 100644 domain/src/main/java/com/example/domain/usecase/databaseUseCase/InsertTickerUseCase.kt create mode 100644 domain/src/main/java/com/example/domain/usecase/databaseUseCase/ReadAllTickerUseCase.kt create mode 100644 domain/src/main/res/drawable-v24/ic_launcher_foreground.xml create mode 100644 domain/src/main/res/drawable/ic_launcher_background.xml create mode 100644 domain/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 domain/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 domain/src/main/res/mipmap-anydpi-v33/ic_launcher.xml create mode 100644 domain/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 domain/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 domain/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 domain/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 domain/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 domain/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 domain/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 domain/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 domain/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 domain/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 domain/src/main/res/values-night/themes.xml create mode 100644 domain/src/main/res/values/colors.xml create mode 100644 domain/src/main/res/values/strings.xml create mode 100644 domain/src/main/res/values/themes.xml create mode 100644 domain/src/test/java/com/example/domain/ExampleUnitTest.kt diff --git a/app/build.gradle b/app/build.gradle index 1904bbc..2020a7b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -46,16 +46,17 @@ kapt { correctErrorTypes = true } dependencies { //Android X, constraintLayout, navigation - implementation 'androidx.core:core-ktx:1.10.0' + implementation 'androidx.core:core-ktx:1.10.1' implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'com.google.android.material:material:1.8.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation "androidx.navigation:navigation-fragment-ktx:2.5.3" implementation "androidx.navigation:navigation-ui-ktx:2.5.3" // Android material - implementation 'com.google.android.material:material:1.8.0' + implementation 'com.google.android.material:material:1.9.0' + implementation project(path: ':data') + implementation project(path: ':domain') // Android Test Tool testImplementation 'junit:junit:4.13.2' @@ -73,8 +74,7 @@ dependencies { //Android Jetpack ViewModel implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1" - //Android Jetpack LiveData` - + //Android Jetpack LiveData implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.6.1" // Kotlin Coroutine diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 212eab0..32f4fd1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ @@ -25,11 +25,11 @@ > = flow { - emit(tickerDAO.readAllTicker()) - }.catch { exception -> - when (exception) { - is IOException -> emit(listOf()) - is ClassNotFoundException -> emit(listOf()) - is SQLDataException -> emit(listOf()) - else -> throw exception - } - }.retryWhen { cause, attempt -> - if (cause is SQLException && attempt < Constants.RETRY_MAX_ATTEMPT) { - delay(Constants.DELAY_TIME_MILLIS) - true - } else { - false - } - } - - fun insertTicker(ticker: TickerEntity): Flow> = flow { - tickerDAO.insertTicker(ticker) - emit(Result.success(Unit)) - }.catch { exception -> - when (exception) { - is IOException -> emit(Result.failure(exception)) - is ClassNotFoundException -> emit(Result.failure(exception)) - is SQLDataException -> emit(Result.failure(exception)) - else -> throw exception - } - }.retryWhen {cause, attempt -> - if (cause is SQLException && attempt < Constants.RETRY_MAX_ATTEMPT) { - delay(Constants.DELAY_TIME_MILLIS) - true - } else { - false - } - } - - fun deleteTicker(ticker: TickerEntity): Flow> = flow { - tickerDAO.deleteTicker(ticker) - emit(Result.success(Unit)) - }.catch { exception -> - when (exception) { - is IOException -> emit(Result.failure(exception)) - is ClassNotFoundException -> emit(Result.failure(exception)) - is SQLDataException -> emit(Result.failure(exception)) - else -> throw exception - } - }.retryWhen {cause, attempt -> - if (cause is SQLException && attempt < Constants.RETRY_MAX_ATTEMPT) { - delay(Constants.DELAY_TIME_MILLIS) - true - } else { - false - } - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/example/koin_apps/data/di/dataSource/TickerRemoteDataSource.kt b/app/src/main/java/com/example/koin_apps/data/di/dataSource/TickerRemoteDataSource.kt deleted file mode 100644 index 4b2597d..0000000 --- a/app/src/main/java/com/example/koin_apps/data/di/dataSource/TickerRemoteDataSource.kt +++ /dev/null @@ -1,150 +0,0 @@ -package com.example.koin_apps.data.di.dataSource - -import com.example.koin_apps.common.Constants -import com.example.koin_apps.data.remote.IKoinApiService -import com.example.koin_apps.data.remote.model.orderBook.OrderData -import com.example.koin_apps.data.remote.model.orderBook.OrderRoot -import com.example.koin_apps.data.remote.model.ticker.TickerRoot -import com.example.koin_apps.data.remote.model.transaction.TransactionData -import com.example.koin_apps.data.remote.model.transaction.TransactionRoot -import kotlinx.coroutines.delay -import kotlinx.coroutines.flow.flow -import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.catch -import kotlinx.coroutines.flow.retryWhen -import retrofit2.HttpException -import retrofit2.Response -import java.io.IOException -import javax.inject.Inject - -/** - * Bithumb Public API Service (Coroutine Flow Producer) - * 1. getTickerInfoAll() : Get All CryptoCurrency Ticker Code - * 2. getTickerInfo() : Get Ticker's information (ex. openingPrice, closingPrice...) - * 3. getTransactionInfo() : Get CryptoCurrency Transactions - * 4. getOrderBookInfo() : Get CryptoCurrency Order information - * */ -class TickerRemoteDataSource @Inject constructor( - private val koinApiService: IKoinApiService -) { - fun getTickerInfoAll(): Flow> = flow { - val response: Response = koinApiService.getTickerALL() - - if (response.isSuccessful && response.body()?.data != null) { - val result: MutableList = response.body()?.data?.keys!!.toMutableList() - emit(result) - } else { - if (response.body()?.data == null) { - throw (NullPointerException("response body data is Null")) - } - if (!response.isSuccessful) { - throw (HttpException(response)) - } - } - }.catch { exception -> - if (exception is IOException) { - emit(mutableListOf()) - } else { throw exception } - }.retryWhen { cause, attempt -> - when { - (cause is HttpException && attempt < Constants.RETRY_MAX_ATTEMPT) -> { - delay(Constants.DELAY_TIME_MILLIS) - true - } - else -> false - } - } - - fun getTickerInfo(ticker: String): Flow?> = flow { - val response: Response = koinApiService.getTicker(ticker) - - if (response.isSuccessful && response.body()?.data != null) { - val result: Map? = response.body()?.data - emit(result) - } else { - if (response.body()?.data == null) { - throw (NullPointerException("response body data is Null")) - } - if (!response.isSuccessful) { - throw (HttpException(response)) - } - } - }.catch { exception -> - if (exception is IOException) { - TODO("emit() what?") - } else { throw exception } - }.retryWhen { cause, attempt -> - when { - (cause is HttpException && attempt < Constants.RETRY_MAX_ATTEMPT) -> { - delay(Constants.DELAY_TIME_MILLIS) - true - } - else -> false - } - } - - fun getTransactionInfo(path: String, count: Int): Flow?> = flow { - val response: Response = koinApiService.getTransactionHistory(path, count) - - if (response.isSuccessful && response.body()?.data != null) { - val result: ArrayList? = response.body()?.data - emit(result) - } else { - if (response.body()?.data == null) { - throw (NullPointerException("response body data is Null")) - } - if (!response.isSuccessful) { - throw (HttpException(response)) - } - } - }.catch { exception -> - if (exception is IOException) { - emit(ArrayList()) - } else { throw exception } - }.retryWhen { cause, attempt -> - when { - (cause is HttpException && attempt < Constants.RETRY_MAX_ATTEMPT) -> { - delay(Constants.DELAY_TIME_MILLIS) - true - } - else -> false - } - } - - fun getOrderBookInfo(path: String, count: Int): Flow = flow { - val response: Response = koinApiService.getOrderBook(path, count) - - if (response.isSuccessful && response.body()?.data != null) { - val result: OrderData = response.body()?.data!! - emit(result) - } else { - if (response.body()?.data == null) { - throw (NullPointerException("response body data is Null")) - } - if (!response.isSuccessful) { - throw (HttpException(response)) - } - } - }.catch { exception -> - if (exception is IOException) { - emit( - OrderData( - null, - null, - null, - null, - null, - null - ) - ) - } else { throw exception } - }.retryWhen { cause, attempt -> - when { - (cause is HttpException && attempt < Constants.RETRY_MAX_ATTEMPT) -> { - delay(Constants.DELAY_TIME_MILLIS) - true - } - else -> false - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/example/koin_apps/data/di/repository/TickerDBRepository.kt b/app/src/main/java/com/example/koin_apps/data/di/repository/TickerDBRepository.kt deleted file mode 100644 index e3e7bb2..0000000 --- a/app/src/main/java/com/example/koin_apps/data/di/repository/TickerDBRepository.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.example.koin_apps.data.di.repository - -import com.example.koin_apps.data.database.tables.TickerEntity -import com.example.koin_apps.data.di.dataSource.TickerDBDataSource -import kotlinx.coroutines.flow.Flow -import javax.inject.Inject - -/** - * TickerDataBase Insert, Select, Delete Method Repository (Coroutine Flow Intermediary) - * 1. readAllTicker() : SELECT : Get All CryptoCurrency Ticker from TickerDataBase - * 2. insertTicker() : INSERT : Insert CryptoCurrency Ticker into TickerDataBase - * 3. deleteTicker() : DELETE : Delete CryptoCurrency Ticker from TickerDataBase - * */ - -class TickerDBRepository @Inject constructor( - private val tickerDBDataSource: TickerDBDataSource -) { - fun readAllTicker(): Flow> = tickerDBDataSource.readAllTicker() - - fun insertTicker(ticker: TickerEntity): Flow> = - tickerDBDataSource.insertTicker(ticker) - - fun deleteTicker(ticker: TickerEntity): Flow> = - tickerDBDataSource.deleteTicker(ticker) -} \ No newline at end of file diff --git a/app/src/main/java/com/example/koin_apps/data/di/repository/TickerRepository.kt b/app/src/main/java/com/example/koin_apps/data/di/repository/TickerRepository.kt deleted file mode 100644 index b63b2c9..0000000 --- a/app/src/main/java/com/example/koin_apps/data/di/repository/TickerRepository.kt +++ /dev/null @@ -1,65 +0,0 @@ -package com.example.koin_apps.data.di.repository - -import android.icu.text.DecimalFormat -import com.example.koin_apps.data.di.dataSource.TickerRemoteDataSource -import com.example.koin_apps.data.remote.model.orderBook.OrderData -import com.example.koin_apps.data.remote.model.ticker.LiveTickerData -import com.example.koin_apps.data.remote.model.ticker.OrderTickerData -import com.example.koin_apps.data.remote.model.transaction.TransactionData -import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.filter -import kotlinx.coroutines.flow.map -import javax.inject.Inject - -/** - * Convert Bithumb Public API Result (Coroutine Flow Intermediary) - * 1. getTickerInfoAll() - * - Get All CryptoCurrency Ticker Code - * 2. getTickerInfoLive() : - * - parameter : ticker(String) - * - Get Ticker closingPrice, Fluctate_24H, Fluctate_Rate_24H - * 3. getTickerInfoDetail() : - * - parameter : ticker(String) - * - Get Ticker closingPrice, PrevClosingPrice, MaxPrice, MinPrice, UnitsTraded24H - * 4. getTransactionInfo() : - * - parameter : ticker(String), count(Int) - * - Get Transaction Data - * 5. getOrderBookInfo() : - * - parameter : ticker(String), count(Int) - * - Get Transaction Data - * */ -class TickerRepository @Inject constructor( - private val tickerRemoteDataSource: TickerRemoteDataSource -) { - private val wonFormat = DecimalFormat("###,###") - private val unitsFormat = DecimalFormat("##.##") - - fun getTickerInfoALL(): Flow> = - tickerRemoteDataSource.getTickerInfoAll().filter { it.remove("date") } - - fun getTickerInfoLive(ticker: String): Flow = - tickerRemoteDataSource.getTickerInfo(ticker).map { result -> - LiveTickerData( - wonFormat.format(result?.get("closing_price").toString().toInt()), - wonFormat.format(result?.get("fluctate_24H").toString().toInt()), - unitsFormat.format(result?.get("fluctate_rate_24H").toString().toDouble()) - ) - } - - fun getTickerInfoDetail(ticker: String): Flow = - tickerRemoteDataSource.getTickerInfo(ticker).map { result -> - OrderTickerData( - wonFormat.format(result?.get("closing_price").toString().toInt()), - wonFormat.format(result?.get("prev_closing_price").toString().toInt()), - wonFormat.format(result?.get("max_price").toString().toInt()), - wonFormat.format(result?.get("min_price").toString().toInt()), - unitsFormat.format(result?.get("units_traded_24H").toString().toDouble()) - ) - } - - fun getTransactionInfo(ticker: String, count: Int): Flow?> = - tickerRemoteDataSource.getTransactionInfo(ticker, count) - - fun getOrderBookInfo(ticker: String, count: Int): Flow = - tickerRemoteDataSource.getOrderBookInfo(ticker, count) -} \ No newline at end of file diff --git a/app/src/main/java/com/example/koin_apps/data/remote/model/ticker/LiveTickerData.kt b/app/src/main/java/com/example/koin_apps/data/remote/model/ticker/LiveTickerData.kt deleted file mode 100644 index 6efacdd..0000000 --- a/app/src/main/java/com/example/koin_apps/data/remote/model/ticker/LiveTickerData.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.example.koin_apps.data.remote.model.ticker - -data class LiveTickerData ( - val closing_price: String, - val fluctate_24H: String, - val fluctate_rate_24H: String -) \ No newline at end of file diff --git a/app/src/main/java/com/example/koin_apps/data/remote/model/ticker/OrderTickerData.kt b/app/src/main/java/com/example/koin_apps/data/remote/model/ticker/OrderTickerData.kt deleted file mode 100644 index 61c3f93..0000000 --- a/app/src/main/java/com/example/koin_apps/data/remote/model/ticker/OrderTickerData.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.example.koin_apps.data.remote.model.ticker - -data class OrderTickerData ( - val closingPrice: String, - val prevClosingPrice: String, - val maxPrice: String, - val minPrice: String, - val unitsTraded: String -) \ No newline at end of file diff --git a/app/src/main/java/com/example/koin_apps/data/di/module/AlertDialogModule.kt b/app/src/main/java/com/example/koin_apps/module/AlertDialogModule.kt similarity index 92% rename from app/src/main/java/com/example/koin_apps/data/di/module/AlertDialogModule.kt rename to app/src/main/java/com/example/koin_apps/module/AlertDialogModule.kt index e8043c9..8b0a2e6 100644 --- a/app/src/main/java/com/example/koin_apps/data/di/module/AlertDialogModule.kt +++ b/app/src/main/java/com/example/koin_apps/module/AlertDialogModule.kt @@ -1,4 +1,4 @@ -package com.example.koin_apps.data.di.module +package com.example.koin_apps.module import android.content.Context import androidx.appcompat.app.AlertDialog diff --git a/app/src/main/java/com/example/koin_apps/data/di/module/DispatcherModule.kt b/app/src/main/java/com/example/koin_apps/module/DispatcherModule.kt similarity index 71% rename from app/src/main/java/com/example/koin_apps/data/di/module/DispatcherModule.kt rename to app/src/main/java/com/example/koin_apps/module/DispatcherModule.kt index cecfe6e..f93b0e5 100644 --- a/app/src/main/java/com/example/koin_apps/data/di/module/DispatcherModule.kt +++ b/app/src/main/java/com/example/koin_apps/module/DispatcherModule.kt @@ -1,8 +1,8 @@ -package com.example.koin_apps.data.di.module +package com.example.koin_apps.module -import com.example.koin_apps.data.di.coroutineDispatcher.DefaultDispatcher -import com.example.koin_apps.data.di.coroutineDispatcher.IoDispatcher -import com.example.koin_apps.data.di.coroutineDispatcher.MainDispatcher +import com.example.koin_apps.module.coroutineDispatcher.DefaultDispatcher +import com.example.koin_apps.module.coroutineDispatcher.IoDispatcher +import com.example.koin_apps.module.coroutineDispatcher.MainDispatcher import dagger.Module import dagger.Provides import dagger.hilt.InstallIn diff --git a/app/src/main/java/com/example/koin_apps/data/di/module/TickerDBModule.kt b/app/src/main/java/com/example/koin_apps/module/TickerDBModule.kt similarity index 66% rename from app/src/main/java/com/example/koin_apps/data/di/module/TickerDBModule.kt rename to app/src/main/java/com/example/koin_apps/module/TickerDBModule.kt index b42b724..f9882e6 100644 --- a/app/src/main/java/com/example/koin_apps/data/di/module/TickerDBModule.kt +++ b/app/src/main/java/com/example/koin_apps/module/TickerDBModule.kt @@ -1,11 +1,11 @@ -package com.example.koin_apps.data.di.module +package com.example.koin_apps.module import android.content.Context import androidx.room.Room -import com.example.koin_apps.data.database.TickerDataBase -import com.example.koin_apps.data.database.dao.TickerDao -import com.example.koin_apps.data.di.dataSource.TickerDBDataSource -import com.example.koin_apps.data.di.repository.TickerDBRepository +import com.example.data.database.TickerDataBase +import com.example.data.database.dao.TickerDao +import com.example.data.repositoryImpl.DataBaseRepositoryImpl +import com.example.domain.repository.DataBaseRepository import dagger.Module import dagger.Provides import dagger.hilt.InstallIn @@ -29,5 +29,6 @@ object TickerDBModule { @Provides @Singleton - fun providesCoinDBRepository(tickerDAO: TickerDao) = TickerDBDataSource(tickerDAO) + fun provideDaoService(tickerDao: TickerDao): DataBaseRepository = + DataBaseRepositoryImpl(tickerDao) } \ No newline at end of file diff --git a/app/src/main/java/com/example/koin_apps/data/di/module/TickerRemoteModule.kt b/app/src/main/java/com/example/koin_apps/module/TickerRemoteModule.kt similarity index 69% rename from app/src/main/java/com/example/koin_apps/data/di/module/TickerRemoteModule.kt rename to app/src/main/java/com/example/koin_apps/module/TickerRemoteModule.kt index f0d20bf..4f65759 100644 --- a/app/src/main/java/com/example/koin_apps/data/di/module/TickerRemoteModule.kt +++ b/app/src/main/java/com/example/koin_apps/module/TickerRemoteModule.kt @@ -1,8 +1,9 @@ -package com.example.koin_apps.data.di.module +package com.example.koin_apps.module +import com.example.data.remote.BithumbApiService +import com.example.data.repositoryImpl.BithumbApiRepositoryImpl +import com.example.domain.repository.BithumbApiRepository import com.example.koin_apps.common.Constants -import com.example.koin_apps.data.di.dataSource.TickerRemoteDataSource -import com.example.koin_apps.data.remote.IKoinApiService import dagger.Module import dagger.Provides import dagger.hilt.InstallIn @@ -38,11 +39,11 @@ object TickerRemoteModule { @Provides @Singleton - fun providesApiService(retrofit: Retrofit): IKoinApiService = - retrofit.create(IKoinApiService::class.java) + fun providesApiService(retrofit: Retrofit): BithumbApiService = + retrofit.create(BithumbApiService::class.java) @Provides @Singleton - fun providesDataSource(koinApiService: IKoinApiService): TickerRemoteDataSource = - TickerRemoteDataSource(koinApiService) + fun provideApiRepository(bithumbApiService: BithumbApiService): BithumbApiRepository = + BithumbApiRepositoryImpl(bithumbApiService) } \ No newline at end of file diff --git a/app/src/main/java/com/example/koin_apps/data/di/module/ToastModule.kt b/app/src/main/java/com/example/koin_apps/module/ToastModule.kt similarity index 92% rename from app/src/main/java/com/example/koin_apps/data/di/module/ToastModule.kt rename to app/src/main/java/com/example/koin_apps/module/ToastModule.kt index c5d0653..f6321fc 100644 --- a/app/src/main/java/com/example/koin_apps/data/di/module/ToastModule.kt +++ b/app/src/main/java/com/example/koin_apps/module/ToastModule.kt @@ -1,4 +1,4 @@ -package com.example.koin_apps.data.di.module +package com.example.koin_apps.module import android.content.Context import android.widget.Toast diff --git a/app/src/main/java/com/example/koin_apps/data/di/coroutineDispatcher/DispatcherQualifier.kt b/app/src/main/java/com/example/koin_apps/module/coroutineDispatcher/DispatcherQualifier.kt similarity index 84% rename from app/src/main/java/com/example/koin_apps/data/di/coroutineDispatcher/DispatcherQualifier.kt rename to app/src/main/java/com/example/koin_apps/module/coroutineDispatcher/DispatcherQualifier.kt index 75a161f..6b27b85 100644 --- a/app/src/main/java/com/example/koin_apps/data/di/coroutineDispatcher/DispatcherQualifier.kt +++ b/app/src/main/java/com/example/koin_apps/module/coroutineDispatcher/DispatcherQualifier.kt @@ -1,4 +1,4 @@ -package com.example.koin_apps.data.di.coroutineDispatcher +package com.example.koin_apps.module.coroutineDispatcher import javax.inject.Qualifier diff --git a/app/src/main/java/com/example/koin_apps/AndroidApp.kt b/app/src/main/java/com/example/koin_apps/presenter/AndroidApp.kt similarity index 75% rename from app/src/main/java/com/example/koin_apps/AndroidApp.kt rename to app/src/main/java/com/example/koin_apps/presenter/AndroidApp.kt index 1069b29..d19757d 100644 --- a/app/src/main/java/com/example/koin_apps/AndroidApp.kt +++ b/app/src/main/java/com/example/koin_apps/presenter/AndroidApp.kt @@ -1,4 +1,4 @@ -package com.example.koin_apps +package com.example.koin_apps.presenter import android.app.Application import dagger.hilt.android.HiltAndroidApp diff --git a/app/src/main/java/com/example/koin_apps/LiveTimeActivity.kt b/app/src/main/java/com/example/koin_apps/presenter/LiveTimeActivity.kt similarity index 82% rename from app/src/main/java/com/example/koin_apps/LiveTimeActivity.kt rename to app/src/main/java/com/example/koin_apps/presenter/LiveTimeActivity.kt index 73cb2fa..2bbae8f 100644 --- a/app/src/main/java/com/example/koin_apps/LiveTimeActivity.kt +++ b/app/src/main/java/com/example/koin_apps/presenter/LiveTimeActivity.kt @@ -1,12 +1,13 @@ -package com.example.koin_apps +package com.example.koin_apps.presenter import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import androidx.activity.viewModels import androidx.lifecycle.lifecycleScope -import com.example.koin_apps.data.di.coroutineDispatcher.MainDispatcher +import com.example.koin_apps.R +import com.example.koin_apps.module.coroutineDispatcher.MainDispatcher import com.example.koin_apps.databinding.ActivityLiveTimeBinding -import com.example.koin_apps.viewModel.activity.LiveTimeViewModel +import com.example.koin_apps.presenter.viewModel.LiveTimeViewModel import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.launch @@ -15,8 +16,10 @@ import javax.inject.Inject @AndroidEntryPoint class LiveTimeActivity : AppCompatActivity() { @MainDispatcher @Inject lateinit var mainDispatcher: CoroutineDispatcher + private val liveTimeBinding by lazy { ActivityLiveTimeBinding.inflate(layoutInflater) } private val liveTimeViewModel: LiveTimeViewModel by viewModels() + private val orderBookFragment = OrderBookFragment() private val fragmentBundle = Bundle() private val ticker: String by lazy { setTicker() } @@ -29,9 +32,9 @@ class LiveTimeActivity : AppCompatActivity() { updateTickerTitle() updateTickerInfo() - supportFragmentManager - .beginTransaction() + supportFragmentManager.beginTransaction() .replace(R.id.FragmentLayout, orderBookFragment) + .addToBackStack(null) .commit() setContentView(liveTimeBinding.root) @@ -49,11 +52,11 @@ class LiveTimeActivity : AppCompatActivity() { private fun updateTickerInfo() = liveTimeViewModel.tickerLiveViewData.observe(this) { lifecycleScope.launch(mainDispatcher) { liveTimeBinding.tickerWon.text = - getString(R.string.tickerWon, it.closing_price) + getString(R.string.tickerWon, it.closingPrice.toString()) liveTimeBinding.Flucatate24H.text = - getString(R.string.ticker_Flucatate_won24H, it.fluctate_24H) + getString(R.string.ticker_Flucatate_won24H, it.fluctate_24H.toString()) liveTimeBinding.FlucatateRate24H.text = - getString(R.string.ticker_Flucatate_rate24H, it.fluctate_rate_24H) + getString(R.string.ticker_Flucatate_rate24H, it.fluctate_Rate.toString()) } } diff --git a/app/src/main/java/com/example/koin_apps/LogoActivity.kt b/app/src/main/java/com/example/koin_apps/presenter/LogoActivity.kt similarity index 89% rename from app/src/main/java/com/example/koin_apps/LogoActivity.kt rename to app/src/main/java/com/example/koin_apps/presenter/LogoActivity.kt index 93856d7..a3f8de7 100644 --- a/app/src/main/java/com/example/koin_apps/LogoActivity.kt +++ b/app/src/main/java/com/example/koin_apps/presenter/LogoActivity.kt @@ -1,4 +1,4 @@ -package com.example.koin_apps +package com.example.koin_apps.presenter import android.content.Intent import androidx.appcompat.app.AppCompatActivity @@ -6,9 +6,9 @@ import android.os.Bundle import androidx.activity.viewModels import androidx.lifecycle.lifecycleScope import com.example.koin_apps.common.Constants -import com.example.koin_apps.data.di.coroutineDispatcher.MainDispatcher +import com.example.koin_apps.module.coroutineDispatcher.MainDispatcher import com.example.koin_apps.databinding.ActivityLogoBinding -import com.example.koin_apps.viewModel.activity.LogoViewModel +import com.example.koin_apps.presenter.viewModel.LogoViewModel import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.* import javax.inject.Inject @@ -16,6 +16,7 @@ import javax.inject.Inject @AndroidEntryPoint class LogoActivity : AppCompatActivity() { @MainDispatcher @Inject lateinit var mainDispatcher: CoroutineDispatcher + private val logoBinding by lazy { ActivityLogoBinding.inflate(layoutInflater) } private val logoViewModel: LogoViewModel by viewModels() diff --git a/app/src/main/java/com/example/koin_apps/MainActivity.kt b/app/src/main/java/com/example/koin_apps/presenter/MainActivity.kt similarity index 81% rename from app/src/main/java/com/example/koin_apps/MainActivity.kt rename to app/src/main/java/com/example/koin_apps/presenter/MainActivity.kt index d14b68f..c45009a 100644 --- a/app/src/main/java/com/example/koin_apps/MainActivity.kt +++ b/app/src/main/java/com/example/koin_apps/presenter/MainActivity.kt @@ -1,16 +1,16 @@ -package com.example.koin_apps +package com.example.koin_apps.presenter import android.content.Intent import androidx.appcompat.app.AppCompatActivity import android.os.Bundle -import android.util.Log import androidx.activity.viewModels import androidx.appcompat.app.AlertDialog import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager -import com.example.koin_apps.data.di.coroutineDispatcher.MainDispatcher -import com.example.koin_apps.data.recyclerViewAdapter.MainRecyclerAdapter -import com.example.koin_apps.viewModel.activity.MainViewModel +import com.example.koin_apps.R +import com.example.koin_apps.module.coroutineDispatcher.MainDispatcher +import com.example.koin_apps.presenter.adapter.recyclerViewAdapter.MainRecyclerAdapter +import com.example.koin_apps.presenter.viewModel.MainViewModel import com.example.koin_apps.databinding.ActivityMainBinding import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.CoroutineDispatcher @@ -22,6 +22,7 @@ import javax.inject.Inject class MainActivity : AppCompatActivity() { @MainDispatcher @Inject lateinit var mainDispatcher: CoroutineDispatcher @Inject lateinit var alertDialog: AlertDialog.Builder + private val mainActivityBinding by lazy { ActivityMainBinding.inflate(layoutInflater) } private val mainViewModel: MainViewModel by viewModels() @@ -40,7 +41,7 @@ class MainActivity : AppCompatActivity() { setContentView(mainActivityBinding.root) } - private fun updateUI() = mainViewModel.readAllTicker.observe(this) { ticker -> + private fun updateUI() = mainViewModel.tickerAllData.observe(this) { ticker -> if(ticker != null) { lifecycleScope.launch(mainDispatcher) { mainActivityBinding.mainRecyclerView.adapter = @@ -57,6 +58,6 @@ class MainActivity : AppCompatActivity() { .setPositiveButton(R.string.NullDialog_okBtn, null) .show() - private fun fetchTickerDB(): Job = mainViewModel.fetchDBData() + private fun fetchTickerDB(): Job = mainViewModel.fetchAllTickerData() } \ No newline at end of file diff --git a/app/src/main/java/com/example/koin_apps/OrderBookFragment.kt b/app/src/main/java/com/example/koin_apps/presenter/OrderBookFragment.kt similarity index 78% rename from app/src/main/java/com/example/koin_apps/OrderBookFragment.kt rename to app/src/main/java/com/example/koin_apps/presenter/OrderBookFragment.kt index 8ab0677..d66ffdb 100644 --- a/app/src/main/java/com/example/koin_apps/OrderBookFragment.kt +++ b/app/src/main/java/com/example/koin_apps/presenter/OrderBookFragment.kt @@ -1,4 +1,4 @@ -package com.example.koin_apps +package com.example.koin_apps.presenter import android.os.Bundle import androidx.fragment.app.Fragment @@ -7,12 +7,13 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.viewModels import androidx.lifecycle.lifecycleScope -import com.example.koin_apps.data.di.coroutineDispatcher.MainDispatcher -import com.example.koin_apps.data.listViewAdapter.OrderBookAskListAdapter -import com.example.koin_apps.data.listViewAdapter.OrderBookBidListAdapter -import com.example.koin_apps.data.listViewAdapter.TransactionListAdapter +import com.example.koin_apps.R +import com.example.koin_apps.module.coroutineDispatcher.MainDispatcher +import com.example.koin_apps.presenter.adapter.listViewAdapter.OrderBookAskListAdapter +import com.example.koin_apps.presenter.adapter.listViewAdapter.OrderBookBidListAdapter +import com.example.koin_apps.presenter.adapter.listViewAdapter.TransactionListAdapter import com.example.koin_apps.databinding.FragmentOrderBookBinding -import com.example.koin_apps.viewModel.fragment.OrderBookViewModel +import com.example.koin_apps.presenter.viewModel.OrderBookViewModel import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.launch @@ -21,9 +22,11 @@ import javax.inject.Inject @AndroidEntryPoint class OrderBookFragment : Fragment() { @MainDispatcher @Inject lateinit var mainDispatcher: CoroutineDispatcher + private var _orderBookBinding: FragmentOrderBookBinding? = null private val orderBookBinding get() = _orderBookBinding!! private val orderBookViewModel: OrderBookViewModel by viewModels() + private val ticker: String by lazy { setTicker() } override fun onCreate(savedInstanceState: Bundle?) { @@ -59,11 +62,11 @@ class OrderBookFragment : Fragment() { orderBookBinding.orderBookTickerInfo.text = getString( R.string.orderBook_Ticker_Info, - result.closingPrice, - result.prevClosingPrice, - result.maxPrice, - result.minPrice, - result.unitsTraded + result.closingPrice.toString(), + result.prevClosingPrice.toString(), + result.maxPrice.toString(), + result.minPrice.toString(), + result.unitsTraded_24H.toString() ) } } diff --git a/app/src/main/java/com/example/koin_apps/SelectKoinActivity.kt b/app/src/main/java/com/example/koin_apps/presenter/SelectKoinActivity.kt similarity index 68% rename from app/src/main/java/com/example/koin_apps/SelectKoinActivity.kt rename to app/src/main/java/com/example/koin_apps/presenter/SelectKoinActivity.kt index aca5303..ff02252 100644 --- a/app/src/main/java/com/example/koin_apps/SelectKoinActivity.kt +++ b/app/src/main/java/com/example/koin_apps/presenter/SelectKoinActivity.kt @@ -1,32 +1,30 @@ -package com.example.koin_apps +package com.example.koin_apps.presenter import android.content.Intent import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import androidx.activity.viewModels -import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager -import com.example.koin_apps.data.di.coroutineDispatcher.MainDispatcher -import com.example.koin_apps.data.recyclerViewAdapter.SelectRecyclerAdapter +import com.example.koin_apps.module.coroutineDispatcher.MainDispatcher +import com.example.koin_apps.presenter.adapter.recyclerViewAdapter.SelectRecyclerAdapter import com.example.koin_apps.databinding.ActivitySelectKoinBinding -import com.example.koin_apps.viewModel.activity.SelectViewModel +import com.example.koin_apps.presenter.viewModel.SelectViewModel import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Job -import kotlinx.coroutines.launch import javax.inject.Inject @AndroidEntryPoint class SelectKoinActivity : AppCompatActivity() { @MainDispatcher @Inject lateinit var mainDispatcher: CoroutineDispatcher + private lateinit var selectRecyclerAdapter: SelectRecyclerAdapter private val selectKoinBinding by lazy { ActivitySelectKoinBinding.inflate(layoutInflater) } private val selectViewModel: SelectViewModel by viewModels() override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - selectKoinBinding.CoinRecyclerView.layoutManager = LinearLayoutManager(this) - + initRecyclerView() updateTickerList() selectKoinBinding.compSelectBtn.setOnClickListener { @@ -37,11 +35,14 @@ class SelectKoinActivity : AppCompatActivity() { setContentView(selectKoinBinding.root) } + private fun initRecyclerView() = selectKoinBinding.CoinRecyclerView.apply { + layoutManager = LinearLayoutManager(this@SelectKoinActivity) + setHasFixedSize(true) + } + private fun updateTickerList() = selectViewModel.tickerList.observe(this) { result -> - lifecycleScope.launch(mainDispatcher) { - selectRecyclerAdapter = SelectRecyclerAdapter(result) - selectKoinBinding.CoinRecyclerView.adapter = selectRecyclerAdapter - } + selectRecyclerAdapter = SelectRecyclerAdapter(result) + selectKoinBinding.CoinRecyclerView.adapter = SelectRecyclerAdapter(result) } private fun storeTicker(): Job = diff --git a/app/src/main/java/com/example/koin_apps/data/listViewAdapter/OrderBookAskListAdapter.kt b/app/src/main/java/com/example/koin_apps/presenter/adapter/listViewAdapter/OrderBookAskListAdapter.kt similarity index 86% rename from app/src/main/java/com/example/koin_apps/data/listViewAdapter/OrderBookAskListAdapter.kt rename to app/src/main/java/com/example/koin_apps/presenter/adapter/listViewAdapter/OrderBookAskListAdapter.kt index 141373d..2c7b4eb 100644 --- a/app/src/main/java/com/example/koin_apps/data/listViewAdapter/OrderBookAskListAdapter.kt +++ b/app/src/main/java/com/example/koin_apps/presenter/adapter/listViewAdapter/OrderBookAskListAdapter.kt @@ -1,16 +1,16 @@ -package com.example.koin_apps.data.listViewAdapter +package com.example.koin_apps.presenter.adapter.listViewAdapter import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.BaseAdapter import android.widget.TextView +import com.example.domain.entity.OrderAskBidEntity import com.example.koin_apps.R -import com.example.koin_apps.data.remote.model.orderBook.OrderAskBidData import javax.inject.Inject class OrderBookAskListAdapter @Inject constructor( - private val orderAskList: ArrayList + private val orderAskList: List ): BaseAdapter() { override fun getView(position: Int, view: View?, parent: ViewGroup?): View { var convertView = view diff --git a/app/src/main/java/com/example/koin_apps/data/listViewAdapter/OrderBookBidListAdapter.kt b/app/src/main/java/com/example/koin_apps/presenter/adapter/listViewAdapter/OrderBookBidListAdapter.kt similarity index 86% rename from app/src/main/java/com/example/koin_apps/data/listViewAdapter/OrderBookBidListAdapter.kt rename to app/src/main/java/com/example/koin_apps/presenter/adapter/listViewAdapter/OrderBookBidListAdapter.kt index c5c7cef..02419a9 100644 --- a/app/src/main/java/com/example/koin_apps/data/listViewAdapter/OrderBookBidListAdapter.kt +++ b/app/src/main/java/com/example/koin_apps/presenter/adapter/listViewAdapter/OrderBookBidListAdapter.kt @@ -1,16 +1,16 @@ -package com.example.koin_apps.data.listViewAdapter +package com.example.koin_apps.presenter.adapter.listViewAdapter import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.BaseAdapter import android.widget.TextView +import com.example.domain.entity.OrderAskBidEntity import com.example.koin_apps.R -import com.example.koin_apps.data.remote.model.orderBook.OrderAskBidData import javax.inject.Inject class OrderBookBidListAdapter @Inject constructor( - private val orderBidList: ArrayList + private val orderBidList: List ): BaseAdapter() { override fun getView(position: Int, view: View?, parent: ViewGroup?): View { var convertView = view diff --git a/app/src/main/java/com/example/koin_apps/data/listViewAdapter/TransactionListAdapter.kt b/app/src/main/java/com/example/koin_apps/presenter/adapter/listViewAdapter/TransactionListAdapter.kt similarity index 87% rename from app/src/main/java/com/example/koin_apps/data/listViewAdapter/TransactionListAdapter.kt rename to app/src/main/java/com/example/koin_apps/presenter/adapter/listViewAdapter/TransactionListAdapter.kt index a705626..f441f21 100644 --- a/app/src/main/java/com/example/koin_apps/data/listViewAdapter/TransactionListAdapter.kt +++ b/app/src/main/java/com/example/koin_apps/presenter/adapter/listViewAdapter/TransactionListAdapter.kt @@ -1,16 +1,16 @@ -package com.example.koin_apps.data.listViewAdapter +package com.example.koin_apps.presenter.adapter.listViewAdapter import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.BaseAdapter import android.widget.TextView +import com.example.domain.entity.TransactionEntity import com.example.koin_apps.R -import com.example.koin_apps.data.remote.model.transaction.TransactionData import javax.inject.Inject class TransactionListAdapter @Inject constructor( - private val transactionList: ArrayList + private val transactionList: List ): BaseAdapter() { override fun getView(position: Int, view: View?, parent: ViewGroup?): View { var convertView = view diff --git a/app/src/main/java/com/example/koin_apps/data/recyclerViewAdapter/MainRecyclerAdapter.kt b/app/src/main/java/com/example/koin_apps/presenter/adapter/recyclerViewAdapter/MainRecyclerAdapter.kt similarity index 82% rename from app/src/main/java/com/example/koin_apps/data/recyclerViewAdapter/MainRecyclerAdapter.kt rename to app/src/main/java/com/example/koin_apps/presenter/adapter/recyclerViewAdapter/MainRecyclerAdapter.kt index 247d9c8..c72a250 100644 --- a/app/src/main/java/com/example/koin_apps/data/recyclerViewAdapter/MainRecyclerAdapter.kt +++ b/app/src/main/java/com/example/koin_apps/presenter/adapter/recyclerViewAdapter/MainRecyclerAdapter.kt @@ -1,12 +1,12 @@ -package com.example.koin_apps.data.recyclerViewAdapter +package com.example.koin_apps.presenter.adapter.recyclerViewAdapter import android.content.Context import android.content.Intent import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.example.koin_apps.LiveTimeActivity -import com.example.koin_apps.data.database.tables.TickerEntity +import com.example.domain.entity.TickerEntity +import com.example.koin_apps.presenter.LiveTimeActivity import com.example.koin_apps.databinding.MainCoinviewItemBinding import javax.inject.Inject @@ -19,10 +19,10 @@ class MainRecyclerAdapter @Inject constructor( :RecyclerView.ViewHolder(binding.root) { fun bind(tickerEntity: TickerEntity) { - binding.titleCoin.text = tickerEntity.Ticker + binding.titleCoin.text = tickerEntity.ticker binding.NavigateCoinDesc.setOnClickListener { Intent(context, LiveTimeActivity::class.java) - .putExtra("coinTitle", tickerEntity.Ticker) + .putExtra("coinTitle", tickerEntity.ticker) .run { context.startActivity(this) } } } diff --git a/app/src/main/java/com/example/koin_apps/data/recyclerViewAdapter/SelectRecyclerAdapter.kt b/app/src/main/java/com/example/koin_apps/presenter/adapter/recyclerViewAdapter/SelectRecyclerAdapter.kt similarity index 95% rename from app/src/main/java/com/example/koin_apps/data/recyclerViewAdapter/SelectRecyclerAdapter.kt rename to app/src/main/java/com/example/koin_apps/presenter/adapter/recyclerViewAdapter/SelectRecyclerAdapter.kt index 0f666fc..236ce01 100644 --- a/app/src/main/java/com/example/koin_apps/data/recyclerViewAdapter/SelectRecyclerAdapter.kt +++ b/app/src/main/java/com/example/koin_apps/presenter/adapter/recyclerViewAdapter/SelectRecyclerAdapter.kt @@ -1,4 +1,4 @@ -package com.example.koin_apps.data.recyclerViewAdapter +package com.example.koin_apps.presenter.adapter.recyclerViewAdapter import android.view.LayoutInflater import android.view.ViewGroup diff --git a/app/src/main/java/com/example/koin_apps/presenter/viewModel/LiveTimeViewModel.kt b/app/src/main/java/com/example/koin_apps/presenter/viewModel/LiveTimeViewModel.kt new file mode 100644 index 0000000..2a8e5ef --- /dev/null +++ b/app/src/main/java/com/example/koin_apps/presenter/viewModel/LiveTimeViewModel.kt @@ -0,0 +1,36 @@ +package com.example.koin_apps.presenter.viewModel + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.example.domain.entity.TickerLiveDataEntity +import com.example.domain.usecase.apiUseCase.GetTickerLiveInfoUseCase +import com.example.koin_apps.common.Constants +import com.example.koin_apps.module.coroutineDispatcher.IoDispatcher +import kotlinx.coroutines.* +import dagger.hilt.android.lifecycle.HiltViewModel +import javax.inject.Inject + +@HiltViewModel +class LiveTimeViewModel @Inject constructor( + private val getTickerInfoUseCase: GetTickerLiveInfoUseCase, + @IoDispatcher private val ioDispatcher: CoroutineDispatcher +): ViewModel() { + private val _tickerLiveViewData = MutableLiveData() + val tickerLiveViewData: LiveData get() = _tickerLiveViewData + + fun loadTickerInfo( + ticker: String + ): Job = viewModelScope.launch(ioDispatcher) { + while (true) { + getTickerInfoUseCase(ticker).collect { _tickerLiveViewData.postValue(it) } + delay(Constants.DELAY_TIME_MILLIS) + } + } + + override fun onCleared() { + super.onCleared() + viewModelScope.cancel() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/koin_apps/viewModel/activity/LogoViewModel.kt b/app/src/main/java/com/example/koin_apps/presenter/viewModel/LogoViewModel.kt similarity index 55% rename from app/src/main/java/com/example/koin_apps/viewModel/activity/LogoViewModel.kt rename to app/src/main/java/com/example/koin_apps/presenter/viewModel/LogoViewModel.kt index 157342e..bf63a89 100644 --- a/app/src/main/java/com/example/koin_apps/viewModel/activity/LogoViewModel.kt +++ b/app/src/main/java/com/example/koin_apps/presenter/viewModel/LogoViewModel.kt @@ -1,12 +1,12 @@ -package com.example.koin_apps.viewModel.activity +package com.example.koin_apps.presenter.viewModel -import com.example.koin_apps.data.database.tables.TickerEntity import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.example.koin_apps.data.di.coroutineDispatcher.IoDispatcher -import com.example.koin_apps.data.di.repository.TickerDBRepository +import com.example.domain.entity.TickerEntity +import com.example.domain.usecase.databaseUseCase.ReadAllTickerUseCase +import com.example.koin_apps.module.coroutineDispatcher.IoDispatcher import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Job @@ -16,16 +16,16 @@ import javax.inject.Inject @HiltViewModel class LogoViewModel @Inject constructor( - @IoDispatcher private val ioDispatcher: CoroutineDispatcher, - private val tickerDBRepo: TickerDBRepository + private val readAllTickerUseCase: ReadAllTickerUseCase, + @IoDispatcher private val ioDispatcher: CoroutineDispatcher ): ViewModel() { private val _readAllTicker = MutableLiveData>() val readAllTicker: LiveData> get() = _readAllTicker - init { fetchDBData() } + init { fetchTickerAllData() } - private fun fetchDBData(): Job = viewModelScope.launch(ioDispatcher) { - tickerDBRepo.readAllTicker().collect { result -> _readAllTicker.postValue(result) } + private fun fetchTickerAllData(): Job = viewModelScope.launch(ioDispatcher) { + readAllTickerUseCase().collect { result -> _readAllTicker.postValue(result)} } override fun onCleared() { diff --git a/app/src/main/java/com/example/koin_apps/presenter/viewModel/MainViewModel.kt b/app/src/main/java/com/example/koin_apps/presenter/viewModel/MainViewModel.kt new file mode 100644 index 0000000..0575c7d --- /dev/null +++ b/app/src/main/java/com/example/koin_apps/presenter/viewModel/MainViewModel.kt @@ -0,0 +1,30 @@ +package com.example.koin_apps.presenter.viewModel + +import androidx.lifecycle.* +import com.example.domain.entity.TickerEntity +import com.example.domain.usecase.databaseUseCase.ReadAllTickerUseCase +import com.example.koin_apps.module.coroutineDispatcher.IoDispatcher +import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.CoroutineDispatcher +import kotlinx.coroutines.Job +import kotlinx.coroutines.cancel +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class MainViewModel @Inject constructor( + private val readAllTickerUseCase: ReadAllTickerUseCase, + @IoDispatcher private val ioDispatcher: CoroutineDispatcher +): ViewModel() { + private val _tickerAllData = MutableLiveData>() + val tickerAllData: LiveData> get() = _tickerAllData + + fun fetchAllTickerData(): Job = viewModelScope.launch(ioDispatcher) { + readAllTickerUseCase().collect { result -> _tickerAllData.postValue(result) } + } + + override fun onCleared() { + super.onCleared() + viewModelScope.cancel() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/koin_apps/presenter/viewModel/OrderBookViewModel.kt b/app/src/main/java/com/example/koin_apps/presenter/viewModel/OrderBookViewModel.kt new file mode 100644 index 0000000..7f9eb37 --- /dev/null +++ b/app/src/main/java/com/example/koin_apps/presenter/viewModel/OrderBookViewModel.kt @@ -0,0 +1,58 @@ +package com.example.koin_apps.presenter.viewModel + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.example.domain.entity.OrderBookEntity +import com.example.domain.entity.TickerOrderDataEntity +import com.example.domain.entity.TransactionEntity +import com.example.domain.usecase.apiUseCase.GetOrderBookUseCase +import com.example.domain.usecase.apiUseCase.GetTickerDetailInfoUseCase +import com.example.domain.usecase.apiUseCase.GetTransactionHistoryUseCase +import com.example.koin_apps.common.Constants +import com.example.koin_apps.module.coroutineDispatcher.IoDispatcher +import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.* +import javax.inject.Inject + +@HiltViewModel +class OrderBookViewModel @Inject constructor( + private val getOrderBookUseCase: GetOrderBookUseCase, + private val getTickerDetailInfoUseCase: GetTickerDetailInfoUseCase, + private val getTransactionHistoryUseCase: GetTransactionHistoryUseCase, + @IoDispatcher private val ioDispatcher: CoroutineDispatcher +): ViewModel() { + private val _tickerData = MutableLiveData() + private val _transactionData = MutableLiveData>() + private val _orderBookData = MutableLiveData() + val tickerData: LiveData get() = _tickerData + val transactionData: LiveData> get() = _transactionData + val orderBookData: LiveData get() = _orderBookData + + fun fetchTickerData(ticker: String): Job = viewModelScope.launch(ioDispatcher) { + while (true) { + launch { + getTickerDetailInfoUseCase(ticker).collect { _tickerData.postValue(it) } + delay(Constants.DELAY_TIME_MILLIS) + }.join() + + launch { + getTransactionHistoryUseCase(ticker, 10).collect { + _transactionData.postValue(it) + } + delay(Constants.DELAY_TIME_MILLIS) + }.join() + + launch { + getOrderBookUseCase(ticker, 10).collect { _orderBookData.postValue(it) } + delay(Constants.DELAY_TIME_MILLIS) + } + } + } + + override fun onCleared() { + super.onCleared() + viewModelScope.cancel() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/koin_apps/viewModel/activity/SelectViewModel.kt b/app/src/main/java/com/example/koin_apps/presenter/viewModel/SelectViewModel.kt similarity index 64% rename from app/src/main/java/com/example/koin_apps/viewModel/activity/SelectViewModel.kt rename to app/src/main/java/com/example/koin_apps/presenter/viewModel/SelectViewModel.kt index 06462c2..b2eb72e 100644 --- a/app/src/main/java/com/example/koin_apps/viewModel/activity/SelectViewModel.kt +++ b/app/src/main/java/com/example/koin_apps/presenter/viewModel/SelectViewModel.kt @@ -1,13 +1,13 @@ -package com.example.koin_apps.viewModel.activity +package com.example.koin_apps.presenter.viewModel import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.example.koin_apps.data.database.tables.TickerEntity -import com.example.koin_apps.data.di.coroutineDispatcher.IoDispatcher -import com.example.koin_apps.data.di.repository.TickerRepository -import com.example.koin_apps.data.di.repository.TickerDBRepository +import com.example.domain.entity.TickerEntity +import com.example.domain.usecase.apiUseCase.GetTickerAllUseCase +import com.example.domain.usecase.databaseUseCase.InsertTickerUseCase +import com.example.koin_apps.module.coroutineDispatcher.IoDispatcher import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Job @@ -17,8 +17,8 @@ import javax.inject.Inject @HiltViewModel class SelectViewModel @Inject constructor( - private val tickerApiRepos: TickerRepository, - private val tickerDBRepo: TickerDBRepository, + private val getTickerAllUseCase: GetTickerAllUseCase, + private val insertTickerUseCase: InsertTickerUseCase, @IoDispatcher private val ioDispatcher: CoroutineDispatcher ): ViewModel() { private val _tickerList = MutableLiveData?>() @@ -27,12 +27,12 @@ class SelectViewModel @Inject constructor( init { loadTickerTitle() } private fun loadTickerTitle(): Job = viewModelScope.launch(ioDispatcher) { - tickerApiRepos.getTickerInfoALL().collect { _tickerList.postValue(it) } + getTickerAllUseCase().collect { _tickerList.postValue(it) } } fun storeTickerTitle(tickerList: List): Job = viewModelScope.launch(ioDispatcher) { for (ticker in tickerList) { - tickerDBRepo.insertTicker(TickerEntity(ticker)).collect{ } + insertTickerUseCase(TickerEntity(ticker)).collect { } } } diff --git a/app/src/main/java/com/example/koin_apps/viewModel/activity/LiveTimeViewModel.kt b/app/src/main/java/com/example/koin_apps/viewModel/activity/LiveTimeViewModel.kt deleted file mode 100644 index d0ea8dc..0000000 --- a/app/src/main/java/com/example/koin_apps/viewModel/activity/LiveTimeViewModel.kt +++ /dev/null @@ -1,37 +0,0 @@ -package com.example.koin_apps.viewModel.activity - -import androidx.lifecycle.LiveData -import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.ViewModel -import androidx.lifecycle.viewModelScope -import com.example.koin_apps.common.Constants -import com.example.koin_apps.data.di.coroutineDispatcher.IoDispatcher -import com.example.koin_apps.data.di.repository.TickerRepository -import kotlinx.coroutines.* -import com.example.koin_apps.data.remote.model.ticker.LiveTickerData -import dagger.hilt.android.lifecycle.HiltViewModel -import javax.inject.Inject - -@HiltViewModel -class LiveTimeViewModel @Inject constructor( - private val tickerApiRepos: TickerRepository, - @IoDispatcher private val ioDispatcher: CoroutineDispatcher -): ViewModel() { - private val _tickerLiveViewData = MutableLiveData() - val tickerLiveViewData: LiveData get() = _tickerLiveViewData - - fun loadTickerInfo(ticker: String): Job = viewModelScope.launch(ioDispatcher) { - while (true) { - tickerApiRepos.getTickerInfoLive(ticker).collect { result -> - _tickerLiveViewData.postValue(result) - } - - delay(Constants.DELAY_TIME_MILLIS) - } - } - - override fun onCleared() { - super.onCleared() - viewModelScope.cancel() - } -} \ No newline at end of file diff --git a/app/src/main/java/com/example/koin_apps/viewModel/activity/MainViewModel.kt b/app/src/main/java/com/example/koin_apps/viewModel/activity/MainViewModel.kt deleted file mode 100644 index 5f92757..0000000 --- a/app/src/main/java/com/example/koin_apps/viewModel/activity/MainViewModel.kt +++ /dev/null @@ -1,30 +0,0 @@ -package com.example.koin_apps.viewModel.activity - -import androidx.lifecycle.* -import com.example.koin_apps.data.database.tables.TickerEntity -import com.example.koin_apps.data.di.coroutineDispatcher.IoDispatcher -import com.example.koin_apps.data.di.repository.TickerDBRepository -import dagger.hilt.android.lifecycle.HiltViewModel -import kotlinx.coroutines.CoroutineDispatcher -import kotlinx.coroutines.Job -import kotlinx.coroutines.cancel -import kotlinx.coroutines.launch -import javax.inject.Inject - -@HiltViewModel -class MainViewModel @Inject constructor( - @IoDispatcher private val ioDispatcher: CoroutineDispatcher, - private val tickerDBRepo: TickerDBRepository -): ViewModel() { - private val _readAllTicker = MutableLiveData>() - val readAllTicker: LiveData> get() = _readAllTicker - - fun fetchDBData(): Job = viewModelScope.launch(ioDispatcher) { - tickerDBRepo.readAllTicker().collect { result -> _readAllTicker.postValue(result) } - } - - override fun onCleared() { - super.onCleared() - viewModelScope.cancel() - } -} \ No newline at end of file diff --git a/app/src/main/java/com/example/koin_apps/viewModel/fragment/OrderBookViewModel.kt b/app/src/main/java/com/example/koin_apps/viewModel/fragment/OrderBookViewModel.kt deleted file mode 100644 index 66a2b47..0000000 --- a/app/src/main/java/com/example/koin_apps/viewModel/fragment/OrderBookViewModel.kt +++ /dev/null @@ -1,58 +0,0 @@ -package com.example.koin_apps.viewModel.fragment - -import androidx.lifecycle.LiveData -import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.ViewModel -import androidx.lifecycle.viewModelScope -import com.example.koin_apps.common.Constants -import com.example.koin_apps.data.di.coroutineDispatcher.IoDispatcher -import com.example.koin_apps.data.di.repository.TickerRepository -import com.example.koin_apps.data.remote.model.orderBook.OrderData -import com.example.koin_apps.data.remote.model.ticker.OrderTickerData -import com.example.koin_apps.data.remote.model.transaction.TransactionData -import dagger.hilt.android.lifecycle.HiltViewModel -import kotlinx.coroutines.* -import javax.inject.Inject - -@HiltViewModel -class OrderBookViewModel @Inject constructor( - private val tickerApiRepos: TickerRepository, - @IoDispatcher private val ioDispatcher: CoroutineDispatcher -): ViewModel() { - private val _tickerData = MutableLiveData() - private val _transactionData = MutableLiveData>() - private val _orderBookData = MutableLiveData() - val tickerData: LiveData get() = _tickerData - val transactionData: LiveData> get() = _transactionData - val orderBookData: LiveData get() = _orderBookData - - fun fetchTickerData(ticker: String): Job = viewModelScope.launch (ioDispatcher) { - while (true) { - launch { - tickerApiRepos.getTickerInfoDetail(ticker).collect { - _tickerData.postValue(it) - } - delay(Constants.DELAY_TIME_MILLIS) - }.join() - - launch { - tickerApiRepos.getTransactionInfo(ticker, 10).collect { - _transactionData.postValue(it) - } - delay(Constants.DELAY_TIME_MILLIS) - }.join() - - launch { - tickerApiRepos.getOrderBookInfo(ticker, 10).collect { - _orderBookData.postValue(it) - } - delay(Constants.DELAY_TIME_MILLIS) - } - } - } - - override fun onCleared() { - super.onCleared() - viewModelScope.cancel() - } -} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_live_time.xml b/app/src/main/res/layout/activity_live_time.xml index f2b2b8c..5a866d1 100644 --- a/app/src/main/res/layout/activity_live_time.xml +++ b/app/src/main/res/layout/activity_live_time.xml @@ -8,7 +8,7 @@ android:orientation="vertical" android:background="@color/Mint_100" android:padding="20dp" - tools:context=".LiveTimeActivity" > + tools:context=".presenter.LiveTimeActivity" > + tools:context=".presenter.LogoActivity"> + tools:context=".presenter.SelectKoinActivity"> + tools:context=".presenter.OrderBookFragment"> + + + + + \ No newline at end of file diff --git a/data/src/main/java/com/example/data/database/TickerDataBase.kt b/data/src/main/java/com/example/data/database/TickerDataBase.kt new file mode 100644 index 0000000..ec0aa05 --- /dev/null +++ b/data/src/main/java/com/example/data/database/TickerDataBase.kt @@ -0,0 +1,11 @@ +package com.example.data.database + +import androidx.room.Database +import androidx.room.RoomDatabase +import com.example.data.database.tables.TickerTables +import com.example.data.database.dao.TickerDao + +@Database(entities = [TickerTables::class], version = 1, exportSchema = false) +abstract class TickerDataBase: RoomDatabase() { + abstract fun tickerDao(): TickerDao +} \ No newline at end of file diff --git a/app/src/main/java/com/example/koin_apps/data/database/dao/TickerDao.kt b/data/src/main/java/com/example/data/database/dao/TickerDao.kt similarity index 51% rename from app/src/main/java/com/example/koin_apps/data/database/dao/TickerDao.kt rename to data/src/main/java/com/example/data/database/dao/TickerDao.kt index 65ba204..75323af 100644 --- a/app/src/main/java/com/example/koin_apps/data/database/dao/TickerDao.kt +++ b/data/src/main/java/com/example/data/database/dao/TickerDao.kt @@ -1,21 +1,20 @@ -package com.example.koin_apps.data.database.dao +package com.example.data.database.dao -import androidx.lifecycle.LiveData import androidx.room.Dao import androidx.room.Delete import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query -import com.example.koin_apps.data.database.tables.TickerEntity +import com.example.data.database.tables.TickerTables @Dao interface TickerDao { @Query("SELECT * FROM Ticker_Table ORDER BY Ticker ASC") - fun readAllTicker(): List + fun readAllTicker(): List @Insert(onConflict = OnConflictStrategy.REPLACE) - suspend fun insertTicker(ticker: TickerEntity) + suspend fun insertTicker(ticker: TickerTables) @Delete - suspend fun deleteTicker(ticker: TickerEntity) + suspend fun deleteTicker(ticker: TickerTables) } \ No newline at end of file diff --git a/app/src/main/java/com/example/koin_apps/data/database/tables/TickerEntity.kt b/data/src/main/java/com/example/data/database/tables/TickerTables.kt similarity index 72% rename from app/src/main/java/com/example/koin_apps/data/database/tables/TickerEntity.kt rename to data/src/main/java/com/example/data/database/tables/TickerTables.kt index c3b1d15..a42eca6 100644 --- a/app/src/main/java/com/example/koin_apps/data/database/tables/TickerEntity.kt +++ b/data/src/main/java/com/example/data/database/tables/TickerTables.kt @@ -1,11 +1,11 @@ -package com.example.koin_apps.data.database.tables +package com.example.data.database.tables import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.PrimaryKey @Entity(tableName= "Ticker_Table") -data class TickerEntity( +data class TickerTables( @PrimaryKey @ColumnInfo(name= "Ticker") var Ticker: String diff --git a/app/src/main/java/com/example/koin_apps/data/remote/IKoinApiService.kt b/data/src/main/java/com/example/data/remote/BithumbApiService.kt similarity index 68% rename from app/src/main/java/com/example/koin_apps/data/remote/IKoinApiService.kt rename to data/src/main/java/com/example/data/remote/BithumbApiService.kt index b401e25..aca2da4 100644 --- a/app/src/main/java/com/example/koin_apps/data/remote/IKoinApiService.kt +++ b/data/src/main/java/com/example/data/remote/BithumbApiService.kt @@ -1,19 +1,19 @@ -package com.example.koin_apps.data.remote +package com.example.data.remote -import com.example.koin_apps.data.remote.model.orderBook.OrderRoot -import com.example.koin_apps.data.remote.model.ticker.TickerRoot -import com.example.koin_apps.data.remote.model.transaction.TransactionRoot +import com.example.data.remote.model.orderbook.OrderRoot +import com.example.data.remote.model.ticker.TickerRoot +import com.example.data.remote.model.transaction.TransactionRoot import retrofit2.Response import retrofit2.http.GET import retrofit2.http.Path import retrofit2.http.Query -interface IKoinApiService { +interface BithumbApiService { @GET("ticker/ALL_KRW") suspend fun getTickerALL(): Response @GET("ticker/{path}_KRW") - suspend fun getTicker( + suspend fun getTickerInfo( @Path("path") path: String ): Response diff --git a/app/src/main/java/com/example/koin_apps/data/remote/model/orderBook/OrderAskBidData.kt b/data/src/main/java/com/example/data/remote/model/orderbook/OrderAskBidData.kt similarity index 57% rename from app/src/main/java/com/example/koin_apps/data/remote/model/orderBook/OrderAskBidData.kt rename to data/src/main/java/com/example/data/remote/model/orderbook/OrderAskBidData.kt index 895748e..8235b15 100644 --- a/app/src/main/java/com/example/koin_apps/data/remote/model/orderBook/OrderAskBidData.kt +++ b/data/src/main/java/com/example/data/remote/model/orderbook/OrderAskBidData.kt @@ -1,4 +1,4 @@ -package com.example.koin_apps.data.remote.model.orderBook +package com.example.data.remote.model.orderbook data class OrderAskBidData ( val quantity: String, diff --git a/app/src/main/java/com/example/koin_apps/data/remote/model/orderBook/OrderData.kt b/data/src/main/java/com/example/data/remote/model/orderbook/OrderData.kt similarity index 79% rename from app/src/main/java/com/example/koin_apps/data/remote/model/orderBook/OrderData.kt rename to data/src/main/java/com/example/data/remote/model/orderbook/OrderData.kt index e7cd343..5b9e24e 100644 --- a/app/src/main/java/com/example/koin_apps/data/remote/model/orderBook/OrderData.kt +++ b/data/src/main/java/com/example/data/remote/model/orderbook/OrderData.kt @@ -1,4 +1,4 @@ -package com.example.koin_apps.data.remote.model.orderBook +package com.example.data.remote.model.orderbook data class OrderData( val status: String?, diff --git a/app/src/main/java/com/example/koin_apps/data/remote/model/orderBook/OrderRoot.kt b/data/src/main/java/com/example/data/remote/model/orderbook/OrderRoot.kt similarity index 63% rename from app/src/main/java/com/example/koin_apps/data/remote/model/orderBook/OrderRoot.kt rename to data/src/main/java/com/example/data/remote/model/orderbook/OrderRoot.kt index 1cd8da5..bc01efa 100644 --- a/app/src/main/java/com/example/koin_apps/data/remote/model/orderBook/OrderRoot.kt +++ b/data/src/main/java/com/example/data/remote/model/orderbook/OrderRoot.kt @@ -1,4 +1,4 @@ -package com.example.koin_apps.data.remote.model.orderBook +package com.example.data.remote.model.orderbook data class OrderRoot( val status: String, diff --git a/app/src/main/java/com/example/koin_apps/data/remote/model/ticker/TickerRoot.kt b/data/src/main/java/com/example/data/remote/model/ticker/TickerRoot.kt similarity index 65% rename from app/src/main/java/com/example/koin_apps/data/remote/model/ticker/TickerRoot.kt rename to data/src/main/java/com/example/data/remote/model/ticker/TickerRoot.kt index b64b41f..7c37290 100644 --- a/app/src/main/java/com/example/koin_apps/data/remote/model/ticker/TickerRoot.kt +++ b/data/src/main/java/com/example/data/remote/model/ticker/TickerRoot.kt @@ -1,7 +1,7 @@ -package com.example.koin_apps.data.remote.model.ticker +package com.example.data.remote.model.ticker data class TickerRoot( val status: String, val message: String?, val data: Map -) \ No newline at end of file +) diff --git a/app/src/main/java/com/example/koin_apps/data/remote/model/transaction/TransactionData.kt b/data/src/main/java/com/example/data/remote/model/transaction/TransactionData.kt similarity index 72% rename from app/src/main/java/com/example/koin_apps/data/remote/model/transaction/TransactionData.kt rename to data/src/main/java/com/example/data/remote/model/transaction/TransactionData.kt index 44451b7..23963c1 100644 --- a/app/src/main/java/com/example/koin_apps/data/remote/model/transaction/TransactionData.kt +++ b/data/src/main/java/com/example/data/remote/model/transaction/TransactionData.kt @@ -1,4 +1,4 @@ -package com.example.koin_apps.data.remote.model.transaction +package com.example.data.remote.model.transaction data class TransactionData( val transaction_date: String, diff --git a/app/src/main/java/com/example/koin_apps/data/remote/model/transaction/TransactionRoot.kt b/data/src/main/java/com/example/data/remote/model/transaction/TransactionRoot.kt similarity index 67% rename from app/src/main/java/com/example/koin_apps/data/remote/model/transaction/TransactionRoot.kt rename to data/src/main/java/com/example/data/remote/model/transaction/TransactionRoot.kt index 8ff224a..d4fbaff 100644 --- a/app/src/main/java/com/example/koin_apps/data/remote/model/transaction/TransactionRoot.kt +++ b/data/src/main/java/com/example/data/remote/model/transaction/TransactionRoot.kt @@ -1,4 +1,4 @@ -package com.example.koin_apps.data.remote.model.transaction +package com.example.data.remote.model.transaction data class TransactionRoot( val status: String, diff --git a/data/src/main/java/com/example/data/repositoryImpl/BithumbApiRepositoryImpl.kt b/data/src/main/java/com/example/data/repositoryImpl/BithumbApiRepositoryImpl.kt new file mode 100644 index 0000000..35d037d --- /dev/null +++ b/data/src/main/java/com/example/data/repositoryImpl/BithumbApiRepositoryImpl.kt @@ -0,0 +1,164 @@ +package com.example.data.repositoryImpl + +import com.example.data.remote.BithumbApiService +import com.example.data.remote.model.orderbook.OrderData +import com.example.data.remote.model.orderbook.OrderRoot +import com.example.data.remote.model.ticker.TickerRoot +import com.example.data.remote.model.transaction.TransactionData +import com.example.data.remote.model.transaction.TransactionRoot +import com.example.data.util.apiMapper.mapperToOrderBookEntity +import com.example.data.util.apiMapper.mapperToTransactionEntity +import com.example.domain.entity.OrderBookEntity +import com.example.domain.entity.TransactionEntity +import com.example.domain.repository.BithumbApiRepository +import kotlinx.coroutines.delay +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.catch +import kotlinx.coroutines.flow.flow +import kotlinx.coroutines.flow.retryWhen +import retrofit2.HttpException +import retrofit2.Response +import java.io.IOException +import javax.inject.Inject + +class BithumbApiRepositoryImpl @Inject constructor( + private val bithumbApiService: BithumbApiService +): BithumbApiRepository { + + override fun getTickerInfoAll(): Flow> = flow { + val response: Response = bithumbApiService.getTickerALL() + + if (response.isSuccessful && response.body()?.data != null) { + val responseResult: MutableList = response.body()?.data!!.keys.toMutableList() + emit(responseResult) + } else { + if (response.body()?.data == null) { + throw (NullPointerException("response body data is Null")) + } + if (!response.isSuccessful) { + throw (HttpException(response)) + } + } + }.catch { exception -> + if (exception is IOException) { + emit(mutableListOf()) + } else { + throw exception + } + }.retryWhen { cause, attempt -> + when { + (cause is HttpException && attempt < 3) -> { + delay(2000L) + true + } + else -> false + } + } + + override fun getTickerInfo(ticker: String): Flow> = flow { + val response: Response = bithumbApiService.getTickerInfo(ticker) + + if (response.isSuccessful && response.body()?.data != null) { + val responseResult: Map = response.body()!!.data + emit(responseResult) + } else { + if (response.body()?.data == null) { + throw (NullPointerException("response body data is Null")) + } + if (!response.isSuccessful) { + throw (HttpException(response)) + } + } + }.catch { exception -> + if (exception is IOException) { + emit(mapOf()) + } else { + throw exception + } + }.retryWhen { cause, attempt -> + when { + (cause is HttpException && attempt < 3) -> { + delay(2000L) + true + } + else -> false + } + } + + override fun getTransactionHistory( + ticker: String, + count: Int + ): Flow> = flow { + val response: Response = + bithumbApiService.getTransactionHistory(ticker, count) + + if (response.isSuccessful && response.body()?.data != null) { + val responseResult: ArrayList = response.body()?.data!! + emit(mapperToTransactionEntity(responseResult)) + } else { + if (response.body()?.data == null) { + throw (NullPointerException("response body data is Null")) + } + if (!response.isSuccessful) { + throw (HttpException(response)) + } + } + }.catch { exception -> + if (exception is IOException) { + emit(listOf()) + } else { + throw exception + } + }.retryWhen { cause, attempt -> + when { + (cause is HttpException && attempt < 3) -> { + delay(2000L) + true + } + else -> false + } + } + + override fun getOrderBookInfo( + ticker: String, + count: Int + ): Flow = flow { + val response: Response = bithumbApiService.getOrderBook(ticker, count) + + if (response.isSuccessful && response.body()?.data != null) { + val responseResult: OrderData = response.body()?.data!! + emit(mapperToOrderBookEntity(responseResult)) + } else { + if (response.body()?.data == null) { + throw (NullPointerException("response body data is Null")) + } + if (!response.isSuccessful) { + throw (HttpException(response)) + } + } + }.catch { exception -> + if (exception is IOException) { + emit( + OrderBookEntity( + null, + null, + null, + null, + null, + null + ) + ) + } else { + throw exception + } + }.retryWhen { cause, attempt -> + when { + (cause is HttpException && attempt < 3) -> { + delay(2000L) + true + } + else -> false + } + } + +} \ No newline at end of file diff --git a/data/src/main/java/com/example/data/repositoryImpl/DataBaseRepositoryImpl.kt b/data/src/main/java/com/example/data/repositoryImpl/DataBaseRepositoryImpl.kt new file mode 100644 index 0000000..37c5a3b --- /dev/null +++ b/data/src/main/java/com/example/data/repositoryImpl/DataBaseRepositoryImpl.kt @@ -0,0 +1,76 @@ +package com.example.data.repositoryImpl + +import android.database.SQLException +import com.example.data.database.dao.TickerDao +import com.example.data.util.databaseMapper.mapperToTickerEntity +import com.example.data.util.databaseMapper.mapperToTickerTable +import com.example.domain.entity.TickerEntity +import com.example.domain.repository.DataBaseRepository +import kotlinx.coroutines.delay +import kotlinx.coroutines.flow.* +import java.io.IOException +import java.sql.SQLDataException +import javax.inject.Inject + +class DataBaseRepositoryImpl @Inject constructor( + private val tickerDao: TickerDao +): DataBaseRepository { + override fun readAllTicker(): Flow> = flow { + val tickerResults = mapperToTickerEntity(tickerDao.readAllTicker()) + emit(tickerResults) + }.catch { exception -> + when (exception) { + is IOException -> emit(listOf()) + is SQLDataException -> emit(listOf()) + is ClassNotFoundException -> emit(listOf()) + else -> throw exception + } + }.retryWhen { cause, attempt -> + if (cause is SQLException && attempt < 3) { + delay(1000L) + true + } else { + false + } + } + + override fun insertTicker(ticker: TickerEntity): Flow> = flow { + val tickerInput = mapperToTickerTable(ticker) + tickerDao.insertTicker(tickerInput) + emit(Result.success(Unit)) + }.catch { exception -> + when (exception) { + is IOException -> emit(Result.failure(exception)) + is SQLDataException -> emit(Result.failure(exception)) + is ClassNotFoundException -> emit(Result.failure(exception)) + else -> throw exception + } + }.retryWhen { cause, attempt -> + if (cause is SQLException && attempt < 3) { + delay(1000L) + true + } else { + false + } + } + + override fun deleteTicker(ticker: TickerEntity): Flow> = flow { + val tickerInput = mapperToTickerTable(ticker) + tickerDao.deleteTicker(tickerInput) + emit(Result.success(Unit)) + }.catch { exception -> + when (exception) { + is IOException -> emit(Result.failure(exception)) + is SQLDataException -> emit(Result.failure(exception)) + is ClassNotFoundException -> emit(Result.failure(exception)) + else -> throw exception + } + }.retryWhen { cause, attempt -> + if (cause is SQLException && attempt < 3) { + delay(1000L) + true + } else { + false + } + } +} \ No newline at end of file diff --git a/data/src/main/java/com/example/data/util/apiMapper/OrderBookEntityMapper.kt b/data/src/main/java/com/example/data/util/apiMapper/OrderBookEntityMapper.kt new file mode 100644 index 0000000..bd48671 --- /dev/null +++ b/data/src/main/java/com/example/data/util/apiMapper/OrderBookEntityMapper.kt @@ -0,0 +1,17 @@ +package com.example.data.util.apiMapper + + +import com.example.data.remote.model.orderbook.OrderData +import com.example.domain.entity.OrderAskBidEntity +import com.example.domain.entity.OrderBookEntity + +fun mapperToOrderBookEntity( + orderBookData: OrderData +): OrderBookEntity = OrderBookEntity( + status = orderBookData.status, + timestamp = orderBookData.timestamp, + order_currency = orderBookData.order_currency, + payment_currency = orderBookData.payment_currency, + bids = orderBookData.bids?.map { OrderAskBidEntity(quantity = it.quantity, price = it.price) }, + asks = orderBookData.asks?.map { OrderAskBidEntity(quantity = it.quantity, price = it.price) } +) \ No newline at end of file diff --git a/data/src/main/java/com/example/data/util/apiMapper/TransactionEntityMapper.kt b/data/src/main/java/com/example/data/util/apiMapper/TransactionEntityMapper.kt new file mode 100644 index 0000000..8c3ccc1 --- /dev/null +++ b/data/src/main/java/com/example/data/util/apiMapper/TransactionEntityMapper.kt @@ -0,0 +1,17 @@ +package com.example.data.util.apiMapper + +import com.example.data.remote.model.transaction.TransactionData +import com.example.domain.entity.TransactionEntity + +fun mapperToTransactionEntity( + transactionArrayList: ArrayList +): List = transactionArrayList.map { + TransactionEntity( + transaction_date = it.transaction_date, + type = it.type, + units_traded = it.units_traded, + price = it.price, + total = it.total + ) +} + diff --git a/data/src/main/java/com/example/data/util/databaseMapper/TickerEntityMapper.kt b/data/src/main/java/com/example/data/util/databaseMapper/TickerEntityMapper.kt new file mode 100644 index 0000000..95efb79 --- /dev/null +++ b/data/src/main/java/com/example/data/util/databaseMapper/TickerEntityMapper.kt @@ -0,0 +1,7 @@ +package com.example.data.util.databaseMapper + +import com.example.data.database.tables.TickerTables +import com.example.domain.entity.TickerEntity + +fun mapperToTickerEntity(tickers: List): List = + tickers.toList().map { TickerEntity(ticker = it.Ticker) } \ No newline at end of file diff --git a/data/src/main/java/com/example/data/util/databaseMapper/TickerTableMapper.kt b/data/src/main/java/com/example/data/util/databaseMapper/TickerTableMapper.kt new file mode 100644 index 0000000..09ff18a --- /dev/null +++ b/data/src/main/java/com/example/data/util/databaseMapper/TickerTableMapper.kt @@ -0,0 +1,7 @@ +package com.example.data.util.databaseMapper + +import com.example.data.database.tables.TickerTables +import com.example.domain.entity.TickerEntity + +fun mapperToTickerTable(tickerEntity: TickerEntity): TickerTables = + TickerTables(Ticker = tickerEntity.ticker) \ No newline at end of file diff --git a/data/src/main/res/drawable-v24/ic_launcher_foreground.xml b/data/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/data/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/data/src/main/res/drawable/ic_launcher_background.xml b/data/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/data/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/data/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/data/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/data/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/data/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/data/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/data/src/main/res/mipmap-anydpi-v33/ic_launcher.xml b/data/src/main/res/mipmap-anydpi-v33/ic_launcher.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/data/src/main/res/mipmap-anydpi-v33/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/data/src/main/res/mipmap-hdpi/ic_launcher.webp b/data/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..c209e78ecd372343283f4157dcfd918ec5165bb3 GIT binary patch literal 1404 zcmV-?1%vuhNk&F=1pok7MM6+kP&il$0000G0000-002h-06|PpNX!5L00Dqw+t%{r zzW2vH!KF=w&cMnnN@{whkTw+#mAh0SV?YL=)3MimFYCWp#fpdtz~8$hD5VPuQgtcN zXl<@<#Cme5f5yr2h%@8TWh?)bSK`O z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF! z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!jH(_Z*nzTK4 zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG z?Fe{#9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~ zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG8I5h*uf{rn48Z!_@ z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqroa($ne7EUK;#3VYkXaew%Kh^3OrMhtjYN?XEoY`tRPQsAkH-DSL^QqyN0>^ zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu z4)P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6 z>%NbT+5*@L5(I9j@06@(!{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W Kmw_-CKmY()leWbG literal 0 HcmV?d00001 diff --git a/data/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/data/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9 GIT binary patch literal 2898 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 literal 0 HcmV?d00001 diff --git a/data/src/main/res/mipmap-mdpi/ic_launcher.webp b/data/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..4f0f1d64e58ba64d180ce43ee13bf9a17835fbca GIT binary patch literal 982 zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^ z^1csucXz7-Qrhzl9HuHB%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}

C%4 zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{ ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh zOBLA>$~P3r4b*NcqR;y6pwyhZ3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu z(U^&XLW^QX7F9Z*SRPpQl{B%x)_AMp^}_v~?j7 zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0 z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@ E0Of=7!TQj4N+cqN`nQhxvX7dAV-`K|Ub$-q+H-5I?Tx0g9jWxd@A|?POE8`3b8fO$T))xP* z(X?&brZw({`)WU&rdAs1iTa0x6F@PIxJ&&L|dpySV!ID|iUhjCcKz(@mE z!x@~W#3H<)4Ae(4eQJRk`Iz3<1)6^m)0b_4_TRZ+cz#eD3f8V;2r-1fE!F}W zEi0MEkTTx}8i1{`l_6vo0(Vuh0HD$I4SjZ=?^?k82R51bC)2D_{y8mi_?X^=U?2|F{Vr7s!k(AZC$O#ZMyavHhlQ7 zUR~QXuH~#o#>(b$u4?s~HLF*3IcF7023AlwAYudn0FV~|odGH^05AYPEfR)8p`i{n zwg3zPVp{+wOsxKc>)(pMupKF!Y2HoUqQ3|Yu|8lwR=?5zZuhG6J?H`bSNk_wPoM{u zSL{c@pY7+c2kck>`^q1^^gR0QB7Y?KUD{vz-uVX~;V-rW)PDcI)$_UjgVV?S?=oLR zf4}zz{#*R_{LkiJ#0RdQLNC^2Vp%JPEUvG9ra2BVZ92(p9h7Ka@!yf9(lj#}>+|u* z;^_?KWdzkM`6gqPo9;;r6&JEa)}R3X{(CWv?NvgLeOTq$cZXqf7|sPImi-7cS8DCN zGf;DVt3Am`>hH3{4-WzH43Ftx)SofNe^-#|0HdCo<+8Qs!}TZP{HH8~z5n`ExcHuT zDL1m&|DVpIy=xsLO>8k92HcmfSKhflQ0H~9=^-{#!I1g(;+44xw~=* zxvNz35vfsQE)@)Zsp*6_GjYD};Squ83<_?^SbALb{a`j<0Gn%6JY!zhp=Fg}Ga2|8 z52e1WU%^L1}15Ex0fF$e@eCT(()_P zvV?CA%#Sy08_U6VPt4EtmVQraWJX` zh=N|WQ>LgrvF~R&qOfB$!%D3cGv?;Xh_z$z7k&s4N)$WYf*k=|*jCEkO19{h_(%W4 zPuOqbCw`SeAX*R}UUsbVsgtuG?xs(#Ikx9`JZoQFz0n*7ZG@Fv@kZk`gzO$HoA9kN z8U5{-yY zvV{`&WKU2$mZeoBmiJrEdzUZAv1sRxpePdg1)F*X^Y)zp^Y*R;;z~vOv-z&)&G)JQ{m!C9cmziu1^nHA z`#`0c>@PnQ9CJKgC5NjJD8HM3|KC(g5nnCq$n0Gsu_DXk36@ql%npEye|?%RmG)

FJ$wK}0tWNB{uH;AM~i literal 0 HcmV?d00001 diff --git a/data/src/main/res/mipmap-xhdpi/ic_launcher.webp b/data/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..948a3070fe34c611c42c0d3ad3013a0dce358be0 GIT binary patch literal 1900 zcmV-y2b1_xNk&Fw2LJ$9MM6+kP&il$0000G0001A003VA06|PpNH75a00DqwTbm-~ zullQTcXxO9ki!OCRx^i?oR|n!<8G0=kI^!JSjFi-LL*`V;ET0H2IXfU0*i>o6o6Gy zRq6Ap5(_{XLdXcL-MzlN`ugSdZY_`jXhcENAu)N_0?GhF))9R;E`!bo9p?g?SRgw_ zEXHhFG$0{qYOqhdX<(wE4N@es3VIo$%il%6xP9gjiBri+2pI6aY4 zJbgh-Ud|V%3O!IcHKQx1FQH(_*TK;1>FQWbt^$K1zNn^cczkBs=QHCYZ8b&l!UV{K z{L0$KCf_&KR^}&2Fe|L&?1I7~pBENnCtCuH3sjcx6$c zwqkNkru);ie``q+_QI;IYLD9OV0ZxkuyBz|5<$1BH|vtey$> z5oto4=l-R-Aaq`Dk0}o9N0VrkqW_#;!u{!bJLDq%0092{Ghe=F;(kn} z+sQ@1=UlX30+2nWjkL$B^b!H2^QYO@iFc0{(-~yXj2TWz?VG{v`Jg zg}WyYnwGgn>{HFaG7E~pt=)sOO}*yd(UU-D(E&x{xKEl6OcU?pl)K%#U$dn1mDF19 zSw@l8G!GNFB3c3VVK0?uyqN&utT-D5%NM4g-3@Sii9tSXKtwce~uF zS&Jn746EW^wV~8zdQ1XC28~kXu8+Yo9p!<8h&(Q({J*4DBglPdpe4M_mD8AguZFn~ ztiuO~{6Bx?SfO~_ZV(GIboeR9~hAym{{fV|VM=77MxDrbW6`ujX z<3HF(>Zr;#*uCvC*bpoSr~C$h?_%nXps@A)=l_;({Fo#6Y1+Zv`!T5HB+)#^-Ud_; zBwftPN=d8Vx)*O1Mj+0oO=mZ+NVH*ptNDC-&zZ7Hwho6UQ#l-yNvc0Cm+2$$6YUk2D2t#vdZX-u3>-Be1u9gtTBiMB^xwWQ_rgvGpZ6(C@e23c!^K=>ai-Rqu zhqT`ZQof;9Bu!AD(i^PCbYV%yha9zuoKMp`U^z;3!+&d@Hud&_iy!O-$b9ZLcSRh? z)R|826w}TU!J#X6P%@Zh=La$I6zXa#h!B;{qfug}O%z@K{EZECu6zl)7CiNi%xti0 zB{OKfAj83~iJvmpTU|&q1^?^cIMn2RQ?jeSB95l}{DrEPTW{_gmU_pqTc)h@4T>~& zluq3)GM=xa(#^VU5}@FNqpc$?#SbVsX!~RH*5p0p@w z;~v{QMX0^bFT1!cXGM8K9FP+=9~-d~#TK#ZE{4umGT=;dfvWi?rYj;^l_Zxywze`W z^Cr{55U@*BalS}K%Czii_80e0#0#Zkhlij4-~I@}`-JFJ7$5{>LnoJSs??J8kWVl6|8A}RCGAu9^rAsfCE=2}tHwl93t0C?#+jMpvr7O3`2=tr{Hg$=HlnjVG^ewm|Js0J*kfPa6*GhtB>`fN!m#9J(sU!?(OSfzY*zS(FJ<-Vb zfAIg+`U)YaXv#sY(c--|X zEB+TVyZ%Ie4L$gi#Fc++`h6%vzsS$pjz9aLt+ZL(g;n$Dzy5=m=_TV(3H8^C{r0xd zp#a%}ht55dOq?yhwYPrtp-m1xXp;4X;)NhxxUpgP%XTLmO zcjaFva^}dP3$&sfFTIR_jC=2pHh9kpI@2(6V*GQo7Ws)`j)hd+tr@P~gR*2gO@+1? zG<`_tB+LJuF|SZ9tIec;h%}}6WClT`L>HSW?E{Hp1h^+mlbf_$9zA>!ug>NALJsO{ mU%z=YwVD?}XMya)Bp;vlyE5&E_6!fzx9pwrdz474!~g(M6R?N? literal 0 HcmV?d00001 diff --git a/data/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/data/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f GIT binary patch literal 3918 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�(p-{x$&=IACIfoAR!za)F-^da-t3#0Dycnp zwO~NVXwXCl;jE<}>%@xz|=8fIJAB?>+E{7)|4l${4ngA3G|=r z2Dyv;VVWSgZx9Wj>qUjleGl3Ei9K4>h!(lPS%8VOG>Xu0%6VDz^O=bjJmuP7>DeUv zrbI}MlHB^^d?{zv6d=@_ZD2lg1&G7UjnVN{1}9WkaM3H~btX0GtSzB+tZ^qRgWo4m z!GmimlG$=wgXCnr6j@m<1gAL46#T~5Bnm=2{^@>|t&`9mkEPddj zAvG~@Tv~TAm2i%VW}R-g(Z0)z-Y|szHr@rk>4MAyG*Ma*7Yh#H7(!-5>DZ@8r;_dx z{prSe<>~099F8vsYd2xff7uAS%7{S)f(|@me3t2$iy&NEc7OUEchp@9A|X;;IA>8!oX+y(BKJ$EzV* znR$z;!L$s7uy@{OT~nG#B!NRraT8(X##Ho!0r_o@gg0CA-9H^;-uE&?$2$nHv_00o z%cbuUc-tCx$Uh&EZ4Nf4Zgqv)Y6>usG3>GeQnxx_Z6+PcbX-+ysbt1hQ`K1LDpOE? zrAhIZhSN9yVIAOa22gn577tbc&i3|3V8NWy&!tw##`}9*x}gtI^h1DzZRA>UuaJG) zaZ7j)dq!O}{?#8Y7~7i6fHh4{`pL?>-18|p!S75Y#^DM>-S3)vuZG+Q7l@ek zQP~#cBpWgg#mApc_sPYjpw8odQuRokmTkzcNl`^CcKB7e&;zViV;{Y{o^Y$%7i0m# z62%#1Lq!RC?}lK>%mp}T!3Xv;L*0v*>USLm``N%>w>@fwC+#T&Tx2bN4w(20JB}oU zuSa6v^kXi0xPs?pbaOHnyiqq6By1EZY9OZ^^QA>{q-Hsd&m`pbQ%8121aWG-F5xf zlZ%;B{;C>X19|`^_?dVyCq>n+41w7|!tUS!{9rHlbhX=SZO5CQ^;!Du_E7*`GiR^Q w)2!4MKjfSAeNo!9>IaV6aUZ*?W>} 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

UmY2RIYtNPVDpE$%vda+HD#3m z&VuXJ{BK&Qe+rBa7eq}Q(bq|tn(RrJAk|ztj2(i{d>nmQnM?;HF2k&9sA6up5tmjl z7lySlzMbifH17-m-Lwa_F&e7nOH?ESi3#ckR3tsM+jsck3`oG!uMS}|eAwVXv>}qxwq?QY%QJ0}r@^;fhuUA9W z*BVl>TGo&N004@xSiwDUXUvp51sVmqO3m)=B55aPwf@0=e}cN+$-BdKxY`YrT_4)0 z_d10#i44Q*rFr8MC>*)v$EJvz``(pb{e&*6k+b zsMz%($|1+8hn8c2?P(l@;Rb&CsZeYoCI3?2!LqjbwPXW3z4G$Qfj=cT5Yb%vY0(AX oeb?AaKtwrnc|$|zzw9vfvn^aJJ!zd)XFXqqy0000001=f@-~a#s literal 0 HcmV?d00001 diff --git a/data/src/main/res/values-night/themes.xml b/data/src/main/res/values-night/themes.xml new file mode 100644 index 0000000..2647319 --- /dev/null +++ b/data/src/main/res/values-night/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/data/src/main/res/values/colors.xml b/data/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/data/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/data/src/main/res/values/strings.xml b/data/src/main/res/values/strings.xml new file mode 100644 index 0000000..ce5d8a4 --- /dev/null +++ b/data/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + data + \ No newline at end of file diff --git a/data/src/main/res/values/themes.xml b/data/src/main/res/values/themes.xml new file mode 100644 index 0000000..f5bf07d --- /dev/null +++ b/data/src/main/res/values/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/data/src/test/java/com/example/data/ExampleUnitTest.kt b/data/src/test/java/com/example/data/ExampleUnitTest.kt new file mode 100644 index 0000000..8943744 --- /dev/null +++ b/data/src/test/java/com/example/data/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package com.example.data + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/domain/.gitignore b/domain/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/domain/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/domain/build.gradle b/domain/build.gradle new file mode 100644 index 0000000..3d29b0d --- /dev/null +++ b/domain/build.gradle @@ -0,0 +1,51 @@ +plugins { + id 'com.android.library' + id 'org.jetbrains.kotlin.android' +} + +apply plugin: 'kotlin-kapt' +apply plugin: 'com.google.dagger.hilt.android' + +android { + namespace 'com.example.domain' + compileSdk 33 + + defaultConfig { + minSdk 26 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } +} + +dependencies { + implementation 'androidx.core:core-ktx:1.10.1' + + // Kotlin Coroutine + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // DI(Dependency Injection) Tool - Dagger-hilt + implementation "com.google.dagger:hilt-android:2.44.2" + kapt "com.google.dagger:hilt-android-compiler:2.44.2" + + // Android Test Tool - Junit, espresso + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.5' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' +} \ No newline at end of file diff --git a/domain/proguard-rules.pro b/domain/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/domain/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/domain/src/androidTest/java/com/example/domain/ExampleInstrumentedTest.kt b/domain/src/androidTest/java/com/example/domain/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..4d43b5b --- /dev/null +++ b/domain/src/androidTest/java/com/example/domain/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.example.domain + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("com.example.domain", appContext.packageName) + } +} \ No newline at end of file diff --git a/domain/src/main/AndroidManifest.xml b/domain/src/main/AndroidManifest.xml new file mode 100644 index 0000000..bf4d7c4 --- /dev/null +++ b/domain/src/main/AndroidManifest.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/domain/src/main/java/com/example/domain/entity/OrderAskBidEntity.kt b/domain/src/main/java/com/example/domain/entity/OrderAskBidEntity.kt new file mode 100644 index 0000000..c868d62 --- /dev/null +++ b/domain/src/main/java/com/example/domain/entity/OrderAskBidEntity.kt @@ -0,0 +1,6 @@ +package com.example.domain.entity + +data class OrderAskBidEntity( + val quantity: String, + val price: String +) \ No newline at end of file diff --git a/domain/src/main/java/com/example/domain/entity/OrderBookEntity.kt b/domain/src/main/java/com/example/domain/entity/OrderBookEntity.kt new file mode 100644 index 0000000..4ea753f --- /dev/null +++ b/domain/src/main/java/com/example/domain/entity/OrderBookEntity.kt @@ -0,0 +1,10 @@ +package com.example.domain.entity + +data class OrderBookEntity( + val status: String?, + val timestamp: String?, + val order_currency: String?, + val payment_currency: String?, + val bids: List?, + val asks: List? +) \ No newline at end of file diff --git a/domain/src/main/java/com/example/domain/entity/TickerEntity.kt b/domain/src/main/java/com/example/domain/entity/TickerEntity.kt new file mode 100644 index 0000000..21c61ba --- /dev/null +++ b/domain/src/main/java/com/example/domain/entity/TickerEntity.kt @@ -0,0 +1,3 @@ +package com.example.domain.entity + +data class TickerEntity( var ticker: String ) \ No newline at end of file diff --git a/domain/src/main/java/com/example/domain/entity/TickerLiveDataEntity.kt b/domain/src/main/java/com/example/domain/entity/TickerLiveDataEntity.kt new file mode 100644 index 0000000..412e68a --- /dev/null +++ b/domain/src/main/java/com/example/domain/entity/TickerLiveDataEntity.kt @@ -0,0 +1,7 @@ +package com.example.domain.entity + +data class TickerLiveDataEntity( + var closingPrice: Int, + var fluctate_24H: Int, + var fluctate_Rate: Double +) diff --git a/domain/src/main/java/com/example/domain/entity/TickerOrderDataEntity.kt b/domain/src/main/java/com/example/domain/entity/TickerOrderDataEntity.kt new file mode 100644 index 0000000..4dbbf3f --- /dev/null +++ b/domain/src/main/java/com/example/domain/entity/TickerOrderDataEntity.kt @@ -0,0 +1,9 @@ +package com.example.domain.entity + +data class TickerOrderDataEntity( + var closingPrice: Int, + var prevClosingPrice: Int, + var maxPrice: Int, + var minPrice: Int, + var unitsTraded_24H: Double +) \ No newline at end of file diff --git a/domain/src/main/java/com/example/domain/entity/TransactionEntity.kt b/domain/src/main/java/com/example/domain/entity/TransactionEntity.kt new file mode 100644 index 0000000..570d377 --- /dev/null +++ b/domain/src/main/java/com/example/domain/entity/TransactionEntity.kt @@ -0,0 +1,9 @@ +package com.example.domain.entity + +data class TransactionEntity( + val transaction_date: String, + val type: String, + val units_traded: String, + val price: String, + val total: String +) \ No newline at end of file diff --git a/domain/src/main/java/com/example/domain/repository/BithumbApiRepository.kt b/domain/src/main/java/com/example/domain/repository/BithumbApiRepository.kt new file mode 100644 index 0000000..7f61f3a --- /dev/null +++ b/domain/src/main/java/com/example/domain/repository/BithumbApiRepository.kt @@ -0,0 +1,15 @@ +package com.example.domain.repository + +import com.example.domain.entity.OrderBookEntity +import com.example.domain.entity.TransactionEntity +import kotlinx.coroutines.flow.Flow + +interface BithumbApiRepository { + fun getTickerInfoAll(): Flow> + + fun getTickerInfo(ticker: String): Flow> + + fun getTransactionHistory(ticker: String, count: Int): Flow> + + fun getOrderBookInfo(ticker: String, count: Int): Flow +} \ No newline at end of file diff --git a/domain/src/main/java/com/example/domain/repository/DataBaseRepository.kt b/domain/src/main/java/com/example/domain/repository/DataBaseRepository.kt new file mode 100644 index 0000000..68e1f66 --- /dev/null +++ b/domain/src/main/java/com/example/domain/repository/DataBaseRepository.kt @@ -0,0 +1,12 @@ +package com.example.domain.repository + +import com.example.domain.entity.TickerEntity +import kotlinx.coroutines.flow.Flow + +interface DataBaseRepository { + fun readAllTicker(): Flow> + + fun insertTicker(ticker: TickerEntity): Flow> + + fun deleteTicker(ticker: TickerEntity): Flow> +} \ No newline at end of file diff --git a/domain/src/main/java/com/example/domain/usecase/apiUseCase/GetOrderBookUseCase.kt b/domain/src/main/java/com/example/domain/usecase/apiUseCase/GetOrderBookUseCase.kt new file mode 100644 index 0000000..8fee882 --- /dev/null +++ b/domain/src/main/java/com/example/domain/usecase/apiUseCase/GetOrderBookUseCase.kt @@ -0,0 +1,13 @@ +package com.example.domain.usecase.apiUseCase + +import com.example.domain.entity.OrderBookEntity +import com.example.domain.repository.BithumbApiRepository +import kotlinx.coroutines.flow.Flow +import javax.inject.Inject + +class GetOrderBookUseCase @Inject constructor( + private val bithumbApiRepo: BithumbApiRepository +) { + operator fun invoke(ticker: String, count: Int): Flow = + bithumbApiRepo.getOrderBookInfo(ticker, count) +} \ No newline at end of file diff --git a/domain/src/main/java/com/example/domain/usecase/apiUseCase/GetTickerAllUseCase.kt b/domain/src/main/java/com/example/domain/usecase/apiUseCase/GetTickerAllUseCase.kt new file mode 100644 index 0000000..062a928 --- /dev/null +++ b/domain/src/main/java/com/example/domain/usecase/apiUseCase/GetTickerAllUseCase.kt @@ -0,0 +1,13 @@ +package com.example.domain.usecase.apiUseCase + +import com.example.domain.repository.BithumbApiRepository +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.filter +import javax.inject.Inject + +class GetTickerAllUseCase @Inject constructor( + private val bithumbApiRepo: BithumbApiRepository +) { + operator fun invoke(): Flow> = + bithumbApiRepo.getTickerInfoAll().filter { it.remove("data") } +} \ No newline at end of file diff --git a/domain/src/main/java/com/example/domain/usecase/apiUseCase/GetTickerDetailInfoUseCase.kt b/domain/src/main/java/com/example/domain/usecase/apiUseCase/GetTickerDetailInfoUseCase.kt new file mode 100644 index 0000000..4cad149 --- /dev/null +++ b/domain/src/main/java/com/example/domain/usecase/apiUseCase/GetTickerDetailInfoUseCase.kt @@ -0,0 +1,23 @@ +package com.example.domain.usecase.apiUseCase + +import com.example.domain.entity.TickerOrderDataEntity +import com.example.domain.repository.BithumbApiRepository +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.map +import javax.inject.Inject + +class GetTickerDetailInfoUseCase @Inject constructor( + private val bithumbApiRepo: BithumbApiRepository +) { + operator fun invoke( + ticker: String + ): Flow = bithumbApiRepo.getTickerInfo(ticker).map { + TickerOrderDataEntity( + closingPrice = it["closing_price"].toString().toInt(), + prevClosingPrice = it["prev_closing_price"].toString().toInt(), + maxPrice = it["max_price"].toString().toInt(), + minPrice = it["min_price"].toString().toInt(), + unitsTraded_24H = it["units_traded_24H"].toString().toDouble() + ) + } +} \ No newline at end of file diff --git a/domain/src/main/java/com/example/domain/usecase/apiUseCase/GetTickerLiveInfoUseCase.kt b/domain/src/main/java/com/example/domain/usecase/apiUseCase/GetTickerLiveInfoUseCase.kt new file mode 100644 index 0000000..ea2f62c --- /dev/null +++ b/domain/src/main/java/com/example/domain/usecase/apiUseCase/GetTickerLiveInfoUseCase.kt @@ -0,0 +1,21 @@ +package com.example.domain.usecase.apiUseCase + +import com.example.domain.entity.TickerLiveDataEntity +import com.example.domain.repository.BithumbApiRepository +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.map +import javax.inject.Inject + +class GetTickerLiveInfoUseCase @Inject constructor( + private val bithumbApiRepo: BithumbApiRepository +) { + operator fun invoke( + ticker: String + ): Flow = bithumbApiRepo.getTickerInfo(ticker).map { + TickerLiveDataEntity( + closingPrice = it["closing_price"].toString().toInt(), + fluctate_24H = it["fluctate_24H"].toString().toInt(), + fluctate_Rate = it["fluctate_rate_24H"].toString().toDouble() + ) + } +} \ No newline at end of file diff --git a/domain/src/main/java/com/example/domain/usecase/apiUseCase/GetTransactionHistoryUseCase.kt b/domain/src/main/java/com/example/domain/usecase/apiUseCase/GetTransactionHistoryUseCase.kt new file mode 100644 index 0000000..7294596 --- /dev/null +++ b/domain/src/main/java/com/example/domain/usecase/apiUseCase/GetTransactionHistoryUseCase.kt @@ -0,0 +1,13 @@ +package com.example.domain.usecase.apiUseCase + +import com.example.domain.entity.TransactionEntity +import com.example.domain.repository.BithumbApiRepository +import kotlinx.coroutines.flow.Flow +import javax.inject.Inject + +class GetTransactionHistoryUseCase @Inject constructor( + private val bithumbApiRepo: BithumbApiRepository +) { + operator fun invoke(ticker: String, count: Int): Flow> = + bithumbApiRepo.getTransactionHistory(ticker, count) +} \ No newline at end of file diff --git a/domain/src/main/java/com/example/domain/usecase/databaseUseCase/DeleteTickerUseCase.kt b/domain/src/main/java/com/example/domain/usecase/databaseUseCase/DeleteTickerUseCase.kt new file mode 100644 index 0000000..e52f84a --- /dev/null +++ b/domain/src/main/java/com/example/domain/usecase/databaseUseCase/DeleteTickerUseCase.kt @@ -0,0 +1,13 @@ +package com.example.domain.usecase.databaseUseCase + +import com.example.domain.entity.TickerEntity +import com.example.domain.repository.DataBaseRepository +import kotlinx.coroutines.flow.Flow +import javax.inject.Inject + +class DeleteTickerUseCase @Inject constructor( + private val DBRepos: DataBaseRepository +) { + operator fun invoke(ticker: TickerEntity): Flow> = + DBRepos.deleteTicker(ticker) +} \ No newline at end of file diff --git a/domain/src/main/java/com/example/domain/usecase/databaseUseCase/InsertTickerUseCase.kt b/domain/src/main/java/com/example/domain/usecase/databaseUseCase/InsertTickerUseCase.kt new file mode 100644 index 0000000..fa97cbe --- /dev/null +++ b/domain/src/main/java/com/example/domain/usecase/databaseUseCase/InsertTickerUseCase.kt @@ -0,0 +1,13 @@ +package com.example.domain.usecase.databaseUseCase + +import com.example.domain.entity.TickerEntity +import com.example.domain.repository.DataBaseRepository +import kotlinx.coroutines.flow.Flow +import javax.inject.Inject + +class InsertTickerUseCase @Inject constructor( + private val DBRepos: DataBaseRepository +) { + operator fun invoke(ticker: TickerEntity): Flow> = + DBRepos.insertTicker(ticker) +} \ No newline at end of file diff --git a/domain/src/main/java/com/example/domain/usecase/databaseUseCase/ReadAllTickerUseCase.kt b/domain/src/main/java/com/example/domain/usecase/databaseUseCase/ReadAllTickerUseCase.kt new file mode 100644 index 0000000..bcceb1b --- /dev/null +++ b/domain/src/main/java/com/example/domain/usecase/databaseUseCase/ReadAllTickerUseCase.kt @@ -0,0 +1,12 @@ +package com.example.domain.usecase.databaseUseCase + +import com.example.domain.entity.TickerEntity +import com.example.domain.repository.DataBaseRepository +import kotlinx.coroutines.flow.Flow +import javax.inject.Inject + +class ReadAllTickerUseCase @Inject constructor( + private val DBRepos: DataBaseRepository +) { + operator fun invoke(): Flow> = DBRepos.readAllTicker() +} \ No newline at end of file diff --git a/domain/src/main/res/drawable-v24/ic_launcher_foreground.xml b/domain/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/domain/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/domain/src/main/res/drawable/ic_launcher_background.xml b/domain/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/domain/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/domain/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/domain/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/domain/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/domain/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/domain/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/domain/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/domain/src/main/res/mipmap-anydpi-v33/ic_launcher.xml b/domain/src/main/res/mipmap-anydpi-v33/ic_launcher.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/domain/src/main/res/mipmap-anydpi-v33/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/domain/src/main/res/mipmap-hdpi/ic_launcher.webp b/domain/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..c209e78ecd372343283f4157dcfd918ec5165bb3 GIT binary patch literal 1404 zcmV-?1%vuhNk&F=1pok7MM6+kP&il$0000G0000-002h-06|PpNX!5L00Dqw+t%{r zzW2vH!KF=w&cMnnN@{whkTw+#mAh0SV?YL=)3MimFYCWp#fpdtz~8$hD5VPuQgtcN zXl<@<#Cme5f5yr2h%@8TWh?)bSK`O z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF! z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!jH(_Z*nzTK4 zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG z?Fe{#9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~ zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG8I5h*uf{rn48Z!_@ z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqroa($ne7EUK;#3VYkXaew%Kh^3OrMhtjYN?XEoY`tRPQsAkH-DSL^QqyN0>^ zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu z4)P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6 z>%NbT+5*@L5(I9j@06@(!{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W Kmw_-CKmY()leWbG literal 0 HcmV?d00001 diff --git a/domain/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/domain/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9 GIT binary patch literal 2898 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 literal 0 HcmV?d00001 diff --git a/domain/src/main/res/mipmap-mdpi/ic_launcher.webp b/domain/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..4f0f1d64e58ba64d180ce43ee13bf9a17835fbca GIT binary patch literal 982 zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^ z^1csucXz7-Qrhzl9HuHB%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}

C%4 zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{ ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh zOBLA>$~P3r4b*NcqR;y6pwyhZ3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu z(U^&XLW^QX7F9Z*SRPpQl{B%x)_AMp^}_v~?j7 zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0 z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@ E0Of=7!TQj4N+cqN`nQhxvX7dAV-`K|Ub$-q+H-5I?Tx0g9jWxd@A|?POE8`3b8fO$T))xP* z(X?&brZw({`)WU&rdAs1iTa0x6F@PIxJ&&L|dpySV!ID|iUhjCcKz(@mE z!x@~W#3H<)4Ae(4eQJRk`Iz3<1)6^m)0b_4_TRZ+cz#eD3f8V;2r-1fE!F}W zEi0MEkTTx}8i1{`l_6vo0(Vuh0HD$I4SjZ=?^?k82R51bC)2D_{y8mi_?X^=U?2|F{Vr7s!k(AZC$O#ZMyavHhlQ7 zUR~QXuH~#o#>(b$u4?s~HLF*3IcF7023AlwAYudn0FV~|odGH^05AYPEfR)8p`i{n zwg3zPVp{+wOsxKc>)(pMupKF!Y2HoUqQ3|Yu|8lwR=?5zZuhG6J?H`bSNk_wPoM{u zSL{c@pY7+c2kck>`^q1^^gR0QB7Y?KUD{vz-uVX~;V-rW)PDcI)$_UjgVV?S?=oLR zf4}zz{#*R_{LkiJ#0RdQLNC^2Vp%JPEUvG9ra2BVZ92(p9h7Ka@!yf9(lj#}>+|u* z;^_?KWdzkM`6gqPo9;;r6&JEa)}R3X{(CWv?NvgLeOTq$cZXqf7|sPImi-7cS8DCN zGf;DVt3Am`>hH3{4-WzH43Ftx)SofNe^-#|0HdCo<+8Qs!}TZP{HH8~z5n`ExcHuT zDL1m&|DVpIy=xsLO>8k92HcmfSKhflQ0H~9=^-{#!I1g(;+44xw~=* zxvNz35vfsQE)@)Zsp*6_GjYD};Squ83<_?^SbALb{a`j<0Gn%6JY!zhp=Fg}Ga2|8 z52e1WU%^L1}15Ex0fF$e@eCT(()_P zvV?CA%#Sy08_U6VPt4EtmVQraWJX` zh=N|WQ>LgrvF~R&qOfB$!%D3cGv?;Xh_z$z7k&s4N)$WYf*k=|*jCEkO19{h_(%W4 zPuOqbCw`SeAX*R}UUsbVsgtuG?xs(#Ikx9`JZoQFz0n*7ZG@Fv@kZk`gzO$HoA9kN z8U5{-yY zvV{`&WKU2$mZeoBmiJrEdzUZAv1sRxpePdg1)F*X^Y)zp^Y*R;;z~vOv-z&)&G)JQ{m!C9cmziu1^nHA z`#`0c>@PnQ9CJKgC5NjJD8HM3|KC(g5nnCq$n0Gsu_DXk36@ql%npEye|?%RmG)

FJ$wK}0tWNB{uH;AM~i literal 0 HcmV?d00001 diff --git a/domain/src/main/res/mipmap-xhdpi/ic_launcher.webp b/domain/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..948a3070fe34c611c42c0d3ad3013a0dce358be0 GIT binary patch literal 1900 zcmV-y2b1_xNk&Fw2LJ$9MM6+kP&il$0000G0001A003VA06|PpNH75a00DqwTbm-~ zullQTcXxO9ki!OCRx^i?oR|n!<8G0=kI^!JSjFi-LL*`V;ET0H2IXfU0*i>o6o6Gy zRq6Ap5(_{XLdXcL-MzlN`ugSdZY_`jXhcENAu)N_0?GhF))9R;E`!bo9p?g?SRgw_ zEXHhFG$0{qYOqhdX<(wE4N@es3VIo$%il%6xP9gjiBri+2pI6aY4 zJbgh-Ud|V%3O!IcHKQx1FQH(_*TK;1>FQWbt^$K1zNn^cczkBs=QHCYZ8b&l!UV{K z{L0$KCf_&KR^}&2Fe|L&?1I7~pBENnCtCuH3sjcx6$c zwqkNkru);ie``q+_QI;IYLD9OV0ZxkuyBz|5<$1BH|vtey$> z5oto4=l-R-Aaq`Dk0}o9N0VrkqW_#;!u{!bJLDq%0092{Ghe=F;(kn} z+sQ@1=UlX30+2nWjkL$B^b!H2^QYO@iFc0{(-~yXj2TWz?VG{v`Jg zg}WyYnwGgn>{HFaG7E~pt=)sOO}*yd(UU-D(E&x{xKEl6OcU?pl)K%#U$dn1mDF19 zSw@l8G!GNFB3c3VVK0?uyqN&utT-D5%NM4g-3@Sii9tSXKtwce~uF zS&Jn746EW^wV~8zdQ1XC28~kXu8+Yo9p!<8h&(Q({J*4DBglPdpe4M_mD8AguZFn~ ztiuO~{6Bx?SfO~_ZV(GIboeR9~hAym{{fV|VM=77MxDrbW6`ujX z<3HF(>Zr;#*uCvC*bpoSr~C$h?_%nXps@A)=l_;({Fo#6Y1+Zv`!T5HB+)#^-Ud_; zBwftPN=d8Vx)*O1Mj+0oO=mZ+NVH*ptNDC-&zZ7Hwho6UQ#l-yNvc0Cm+2$$6YUk2D2t#vdZX-u3>-Be1u9gtTBiMB^xwWQ_rgvGpZ6(C@e23c!^K=>ai-Rqu zhqT`ZQof;9Bu!AD(i^PCbYV%yha9zuoKMp`U^z;3!+&d@Hud&_iy!O-$b9ZLcSRh? z)R|826w}TU!J#X6P%@Zh=La$I6zXa#h!B;{qfug}O%z@K{EZECu6zl)7CiNi%xti0 zB{OKfAj83~iJvmpTU|&q1^?^cIMn2RQ?jeSB95l}{DrEPTW{_gmU_pqTc)h@4T>~& zluq3)GM=xa(#^VU5}@FNqpc$?#SbVsX!~RH*5p0p@w z;~v{QMX0^bFT1!cXGM8K9FP+=9~-d~#TK#ZE{4umGT=;dfvWi?rYj;^l_Zxywze`W z^Cr{55U@*BalS}K%Czii_80e0#0#Zkhlij4-~I@}`-JFJ7$5{>LnoJSs??J8kWVl6|8A}RCGAu9^rAsfCE=2}tHwl93t0C?#+jMpvr7O3`2=tr{Hg$=HlnjVG^ewm|Js0J*kfPa6*GhtB>`fN!m#9J(sU!?(OSfzY*zS(FJ<-Vb zfAIg+`U)YaXv#sY(c--|X zEB+TVyZ%Ie4L$gi#Fc++`h6%vzsS$pjz9aLt+ZL(g;n$Dzy5=m=_TV(3H8^C{r0xd zp#a%}ht55dOq?yhwYPrtp-m1xXp;4X;)NhxxUpgP%XTLmO zcjaFva^}dP3$&sfFTIR_jC=2pHh9kpI@2(6V*GQo7Ws)`j)hd+tr@P~gR*2gO@+1? zG<`_tB+LJuF|SZ9tIec;h%}}6WClT`L>HSW?E{Hp1h^+mlbf_$9zA>!ug>NALJsO{ mU%z=YwVD?}XMya)Bp;vlyE5&E_6!fzx9pwrdz474!~g(M6R?N? literal 0 HcmV?d00001 diff --git a/domain/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/domain/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f GIT binary patch literal 3918 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�(p-{x$&=IACIfoAR!za)F-^da-t3#0Dycnp zwO~NVXwXCl;jE<}>%@xz|=8fIJAB?>+E{7)|4l${4ngA3G|=r z2Dyv;VVWSgZx9Wj>qUjleGl3Ei9K4>h!(lPS%8VOG>Xu0%6VDz^O=bjJmuP7>DeUv zrbI}MlHB^^d?{zv6d=@_ZD2lg1&G7UjnVN{1}9WkaM3H~btX0GtSzB+tZ^qRgWo4m z!GmimlG$=wgXCnr6j@m<1gAL46#T~5Bnm=2{^@>|t&`9mkEPddj zAvG~@Tv~TAm2i%VW}R-g(Z0)z-Y|szHr@rk>4MAyG*Ma*7Yh#H7(!-5>DZ@8r;_dx z{prSe<>~099F8vsYd2xff7uAS%7{S)f(|@me3t2$iy&NEc7OUEchp@9A|X;;IA>8!oX+y(BKJ$EzV* znR$z;!L$s7uy@{OT~nG#B!NRraT8(X##Ho!0r_o@gg0CA-9H^;-uE&?$2$nHv_00o z%cbuUc-tCx$Uh&EZ4Nf4Zgqv)Y6>usG3>GeQnxx_Z6+PcbX-+ysbt1hQ`K1LDpOE? zrAhIZhSN9yVIAOa22gn577tbc&i3|3V8NWy&!tw##`}9*x}gtI^h1DzZRA>UuaJG) zaZ7j)dq!O}{?#8Y7~7i6fHh4{`pL?>-18|p!S75Y#^DM>-S3)vuZG+Q7l@ek zQP~#cBpWgg#mApc_sPYjpw8odQuRokmTkzcNl`^CcKB7e&;zViV;{Y{o^Y$%7i0m# z62%#1Lq!RC?}lK>%mp}T!3Xv;L*0v*>USLm``N%>w>@fwC+#T&Tx2bN4w(20JB}oU zuSa6v^kXi0xPs?pbaOHnyiqq6By1EZY9OZ^^QA>{q-Hsd&m`pbQ%8121aWG-F5xf zlZ%;B{;C>X19|`^_?dVyCq>n+41w7|!tUS!{9rHlbhX=SZO5CQ^;!Du_E7*`GiR^Q w)2!4MKjfSAeNo!9>IaV6aUZ*?W>} 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

UmY2RIYtNPVDpE$%vda+HD#3m z&VuXJ{BK&Qe+rBa7eq}Q(bq|tn(RrJAk|ztj2(i{d>nmQnM?;HF2k&9sA6up5tmjl z7lySlzMbifH17-m-Lwa_F&e7nOH?ESi3#ckR3tsM+jsck3`oG!uMS}|eAwVXv>}qxwq?QY%QJ0}r@^;fhuUA9W z*BVl>TGo&N004@xSiwDUXUvp51sVmqO3m)=B55aPwf@0=e}cN+$-BdKxY`YrT_4)0 z_d10#i44Q*rFr8MC>*)v$EJvz``(pb{e&*6k+b zsMz%($|1+8hn8c2?P(l@;Rb&CsZeYoCI3?2!LqjbwPXW3z4G$Qfj=cT5Yb%vY0(AX oeb?AaKtwrnc|$|zzw9vfvn^aJJ!zd)XFXqqy0000001=f@-~a#s literal 0 HcmV?d00001 diff --git a/domain/src/main/res/values-night/themes.xml b/domain/src/main/res/values-night/themes.xml new file mode 100644 index 0000000..2647319 --- /dev/null +++ b/domain/src/main/res/values-night/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/domain/src/main/res/values/colors.xml b/domain/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/domain/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/domain/src/main/res/values/strings.xml b/domain/src/main/res/values/strings.xml new file mode 100644 index 0000000..e9a792b --- /dev/null +++ b/domain/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + domain + \ No newline at end of file diff --git a/domain/src/main/res/values/themes.xml b/domain/src/main/res/values/themes.xml new file mode 100644 index 0000000..f5bf07d --- /dev/null +++ b/domain/src/main/res/values/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/domain/src/test/java/com/example/domain/ExampleUnitTest.kt b/domain/src/test/java/com/example/domain/ExampleUnitTest.kt new file mode 100644 index 0000000..cd437eb --- /dev/null +++ b/domain/src/test/java/com/example/domain/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package com.example.domain + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 01514a1..8550a49 100644 --- a/settings.gradle +++ b/settings.gradle @@ -9,3 +9,5 @@ dependencyResolutionManagement { } rootProject.name = "Koin_Apps" include ':app' +include ':data' +include ':domain' From 0ea1a443bd539d040bdb33c75c17872544346767 Mon Sep 17 00:00:00 2001 From: KanuKim97 <74421057+KanuKim97@users.noreply.github.com> Date: Wed, 7 Jun 2023 19:40:20 +0900 Subject: [PATCH 2/3] Fix Issue #26 Fix Issue #26 --- .../com/example/koin_apps/common/Constants.kt | 2 +- .../koin_apps/presenter/SelectKoinActivity.kt | 7 ++++++- .../SelectRecyclerAdapter.kt | 17 +++++++++++++---- .../presenter/viewModel/SelectViewModel.kt | 8 ++++---- .../usecase/apiUseCase/GetTickerAllUseCase.kt | 2 +- 5 files changed, 25 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/example/koin_apps/common/Constants.kt b/app/src/main/java/com/example/koin_apps/common/Constants.kt index 2b3ee9b..de99496 100644 --- a/app/src/main/java/com/example/koin_apps/common/Constants.kt +++ b/app/src/main/java/com/example/koin_apps/common/Constants.kt @@ -3,7 +3,7 @@ package com.example.koin_apps.common object Constants { const val BITHUMB_PUBLIC_API_URL: String = "https://api.bithumb.com/public/" const val DELAY_TIME_MILLIS: Long = 1000L - const val RETRY_MAX_ATTEMPT: Int = 3 const val LOG_TAG: String = "로그" const val LOG_ERROR_TAG: String = "에러" + const val RETRY_MAX_ATTEMPT = 3 } \ No newline at end of file diff --git a/app/src/main/java/com/example/koin_apps/presenter/SelectKoinActivity.kt b/app/src/main/java/com/example/koin_apps/presenter/SelectKoinActivity.kt index ff02252..53f47da 100644 --- a/app/src/main/java/com/example/koin_apps/presenter/SelectKoinActivity.kt +++ b/app/src/main/java/com/example/koin_apps/presenter/SelectKoinActivity.kt @@ -3,8 +3,10 @@ package com.example.koin_apps.presenter import android.content.Intent import androidx.appcompat.app.AppCompatActivity import android.os.Bundle +import android.util.Log import androidx.activity.viewModels import androidx.recyclerview.widget.LinearLayoutManager +import com.example.koin_apps.common.Constants import com.example.koin_apps.module.coroutineDispatcher.MainDispatcher import com.example.koin_apps.presenter.adapter.recyclerViewAdapter.SelectRecyclerAdapter import com.example.koin_apps.databinding.ActivitySelectKoinBinding @@ -29,6 +31,7 @@ class SelectKoinActivity : AppCompatActivity() { selectKoinBinding.compSelectBtn.setOnClickListener { storeTicker() + Log.d(Constants.LOG_TAG, "${getSelectedItems()}") startActivity(Intent(this, MainActivity::class.java)) } @@ -42,9 +45,11 @@ class SelectKoinActivity : AppCompatActivity() { private fun updateTickerList() = selectViewModel.tickerList.observe(this) { result -> selectRecyclerAdapter = SelectRecyclerAdapter(result) - selectKoinBinding.CoinRecyclerView.adapter = SelectRecyclerAdapter(result) + selectKoinBinding.CoinRecyclerView.adapter = selectRecyclerAdapter } + private fun getSelectedItems() = selectRecyclerAdapter.getSelectedItems() + private fun storeTicker(): Job = selectViewModel.storeTickerTitle(selectRecyclerAdapter.getSelectedItems()) diff --git a/app/src/main/java/com/example/koin_apps/presenter/adapter/recyclerViewAdapter/SelectRecyclerAdapter.kt b/app/src/main/java/com/example/koin_apps/presenter/adapter/recyclerViewAdapter/SelectRecyclerAdapter.kt index 236ce01..96716af 100644 --- a/app/src/main/java/com/example/koin_apps/presenter/adapter/recyclerViewAdapter/SelectRecyclerAdapter.kt +++ b/app/src/main/java/com/example/koin_apps/presenter/adapter/recyclerViewAdapter/SelectRecyclerAdapter.kt @@ -1,13 +1,15 @@ package com.example.koin_apps.presenter.adapter.recyclerViewAdapter +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView +import com.example.koin_apps.common.Constants import com.example.koin_apps.databinding.SelectCoinviewItemBinding import javax.inject.Inject class SelectRecyclerAdapter @Inject constructor( - private var tickerList: List?, + private val tickerList: List?, ): RecyclerView.Adapter() { private val selectedTickerList: MutableList = mutableListOf() @@ -17,13 +19,20 @@ class SelectRecyclerAdapter @Inject constructor( fun bind(ticker: String) { binding.titleCoin.text = ticker binding.checkCoin.setOnCheckedChangeListener { _, isChecked -> - if (isChecked) { selectedTickerList.add(ticker) } - else { selectedTickerList.remove(ticker) } + if (isChecked) { + selectedTickerList.add(ticker) + Log.d(Constants.LOG_TAG, "$selectedTickerList") + } else { + selectedTickerList.remove(ticker) + Log.d(Constants.LOG_TAG, "$selectedTickerList") + } } } } - fun getSelectedItems(): List = selectedTickerList + fun getSelectedItems(): List { + return selectedTickerList.toList() + } override fun onCreateViewHolder( parent: ViewGroup, diff --git a/app/src/main/java/com/example/koin_apps/presenter/viewModel/SelectViewModel.kt b/app/src/main/java/com/example/koin_apps/presenter/viewModel/SelectViewModel.kt index b2eb72e..8546886 100644 --- a/app/src/main/java/com/example/koin_apps/presenter/viewModel/SelectViewModel.kt +++ b/app/src/main/java/com/example/koin_apps/presenter/viewModel/SelectViewModel.kt @@ -1,5 +1,6 @@ package com.example.koin_apps.presenter.viewModel +import android.util.Log import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel @@ -7,6 +8,7 @@ import androidx.lifecycle.viewModelScope import com.example.domain.entity.TickerEntity import com.example.domain.usecase.apiUseCase.GetTickerAllUseCase import com.example.domain.usecase.databaseUseCase.InsertTickerUseCase +import com.example.koin_apps.common.Constants import com.example.koin_apps.module.coroutineDispatcher.IoDispatcher import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.CoroutineDispatcher @@ -27,13 +29,11 @@ class SelectViewModel @Inject constructor( init { loadTickerTitle() } private fun loadTickerTitle(): Job = viewModelScope.launch(ioDispatcher) { - getTickerAllUseCase().collect { _tickerList.postValue(it) } + getTickerAllUseCase().collect { _tickerList.postValue(it.toList()) } } fun storeTickerTitle(tickerList: List): Job = viewModelScope.launch(ioDispatcher) { - for (ticker in tickerList) { - insertTickerUseCase(TickerEntity(ticker)).collect { } - } + tickerList.forEach { insertTickerUseCase(TickerEntity(it)) } } override fun onCleared() { diff --git a/domain/src/main/java/com/example/domain/usecase/apiUseCase/GetTickerAllUseCase.kt b/domain/src/main/java/com/example/domain/usecase/apiUseCase/GetTickerAllUseCase.kt index 062a928..e5ab89c 100644 --- a/domain/src/main/java/com/example/domain/usecase/apiUseCase/GetTickerAllUseCase.kt +++ b/domain/src/main/java/com/example/domain/usecase/apiUseCase/GetTickerAllUseCase.kt @@ -9,5 +9,5 @@ class GetTickerAllUseCase @Inject constructor( private val bithumbApiRepo: BithumbApiRepository ) { operator fun invoke(): Flow> = - bithumbApiRepo.getTickerInfoAll().filter { it.remove("data") } + bithumbApiRepo.getTickerInfoAll().filter { it.remove("date") } } \ No newline at end of file From c1025ca75f07585538790f568f3f5c23a1763aeb Mon Sep 17 00:00:00 2001 From: KanuKim97 <74421057+KanuKim97@users.noreply.github.com> Date: Fri, 9 Jun 2023 20:28:34 +0900 Subject: [PATCH 3/3] 1. fix Gradle Version - JAVA VERSION 1.8 -> VERSION 17 2. fix #27 Issue 3. fix domain, data AndroidManifest.xml - delete tag 4. add annotation on DispatcherModule.kt, DispatcherQualifier.kt, AlertDialogModule.kt 5. rename TickerRemoteModule.kt -> BithumbApiModule.kt 6. delete MainDispatcher Each Views --- app/build.gradle | 10 ++-- .../koin_apps/module/AlertDialogModule.kt | 2 +- ...kerRemoteModule.kt => BithumbApiModule.kt} | 2 +- .../koin_apps/module/DispatcherModule.kt | 2 +- .../koin_apps/module/TickerDBModule.kt | 2 +- .../DispatcherQualifier.kt | 4 +- .../koin_apps/presenter/LiveTimeActivity.kt | 23 ++----- .../koin_apps/presenter/LogoActivity.kt | 31 +++------- .../koin_apps/presenter/MainActivity.kt | 47 +++++++-------- .../koin_apps/presenter/OrderBookFragment.kt | 60 +++++++------------ .../koin_apps/presenter/SelectKoinActivity.kt | 22 +++---- .../SelectRecyclerAdapter.kt | 8 +-- .../presenter/viewModel/SelectViewModel.kt | 4 +- build.gradle | 2 +- data/build.gradle | 8 +-- data/src/main/AndroidManifest.xml | 9 +-- domain/build.gradle | 8 +-- domain/src/main/AndroidManifest.xml | 9 +-- gradle.properties | 22 ++----- gradle/wrapper/gradle-wrapper.properties | 3 +- 20 files changed, 90 insertions(+), 188 deletions(-) rename app/src/main/java/com/example/koin_apps/module/{TickerRemoteModule.kt => BithumbApiModule.kt} (98%) diff --git a/app/build.gradle b/app/build.gradle index 2020a7b..85d631b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,13 +28,13 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { freeCompilerArgs += [ "-Xjvm-default=all"] - jvmTarget = '1.8' + jvmTarget = '17' } buildFeatures { viewBinding = true } @@ -50,8 +50,8 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - implementation "androidx.navigation:navigation-fragment-ktx:2.5.3" - implementation "androidx.navigation:navigation-ui-ktx:2.5.3" + implementation "androidx.navigation:navigation-fragment-ktx:2.6.0" + implementation "androidx.navigation:navigation-ui-ktx:2.6.0" // Android material implementation 'com.google.android.material:material:1.9.0' diff --git a/app/src/main/java/com/example/koin_apps/module/AlertDialogModule.kt b/app/src/main/java/com/example/koin_apps/module/AlertDialogModule.kt index 8b0a2e6..e0f8fe4 100644 --- a/app/src/main/java/com/example/koin_apps/module/AlertDialogModule.kt +++ b/app/src/main/java/com/example/koin_apps/module/AlertDialogModule.kt @@ -9,7 +9,7 @@ import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.components.SingletonComponent import javax.inject.Singleton -/** AlertDialog Module **/ +/** AlertDialogBuilder Module **/ @Module @InstallIn(SingletonComponent::class) object AlertDialogModule { diff --git a/app/src/main/java/com/example/koin_apps/module/TickerRemoteModule.kt b/app/src/main/java/com/example/koin_apps/module/BithumbApiModule.kt similarity index 98% rename from app/src/main/java/com/example/koin_apps/module/TickerRemoteModule.kt rename to app/src/main/java/com/example/koin_apps/module/BithumbApiModule.kt index 4f65759..32ea570 100644 --- a/app/src/main/java/com/example/koin_apps/module/TickerRemoteModule.kt +++ b/app/src/main/java/com/example/koin_apps/module/BithumbApiModule.kt @@ -17,7 +17,7 @@ import javax.inject.Singleton /** Bithumb Public Api Module **/ @Module @InstallIn(SingletonComponent::class) -object TickerRemoteModule { +object BithumbApiModule { @Provides fun providesBaseUrl(): String = Constants.BITHUMB_PUBLIC_API_URL diff --git a/app/src/main/java/com/example/koin_apps/module/DispatcherModule.kt b/app/src/main/java/com/example/koin_apps/module/DispatcherModule.kt index f93b0e5..8bde424 100644 --- a/app/src/main/java/com/example/koin_apps/module/DispatcherModule.kt +++ b/app/src/main/java/com/example/koin_apps/module/DispatcherModule.kt @@ -10,7 +10,7 @@ import dagger.hilt.components.SingletonComponent import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Dispatchers -/** Coroutine Dispatcher Module **/ +/** Coroutine Dispatcher Module (IO, Main, Default) **/ @Module @InstallIn(SingletonComponent::class) object DispatcherModule { diff --git a/app/src/main/java/com/example/koin_apps/module/TickerDBModule.kt b/app/src/main/java/com/example/koin_apps/module/TickerDBModule.kt index f9882e6..f5e3bfd 100644 --- a/app/src/main/java/com/example/koin_apps/module/TickerDBModule.kt +++ b/app/src/main/java/com/example/koin_apps/module/TickerDBModule.kt @@ -13,7 +13,7 @@ import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.components.SingletonComponent import javax.inject.Singleton -/** Room Database Module **/ +/** Room ORM (Local Database) Module **/ @Module @InstallIn(SingletonComponent::class) object TickerDBModule { diff --git a/app/src/main/java/com/example/koin_apps/module/coroutineDispatcher/DispatcherQualifier.kt b/app/src/main/java/com/example/koin_apps/module/coroutineDispatcher/DispatcherQualifier.kt index 6b27b85..247ad93 100644 --- a/app/src/main/java/com/example/koin_apps/module/coroutineDispatcher/DispatcherQualifier.kt +++ b/app/src/main/java/com/example/koin_apps/module/coroutineDispatcher/DispatcherQualifier.kt @@ -2,15 +2,17 @@ package com.example.koin_apps.module.coroutineDispatcher import javax.inject.Qualifier -/** Coroutine Dispatcher Qualifier **/ +/** Coroutine IoDispatcher Qualifier **/ @Retention(AnnotationRetention.RUNTIME) @Qualifier annotation class IoDispatcher +/** Coroutine DefaultDispatcher Qualifier **/ @Retention(AnnotationRetention.RUNTIME) @Qualifier annotation class DefaultDispatcher +/** Coroutine MainDispatcher Qualifier **/ @Retention(AnnotationRetention.RUNTIME) @Qualifier annotation class MainDispatcher diff --git a/app/src/main/java/com/example/koin_apps/presenter/LiveTimeActivity.kt b/app/src/main/java/com/example/koin_apps/presenter/LiveTimeActivity.kt index 2bbae8f..3102d35 100644 --- a/app/src/main/java/com/example/koin_apps/presenter/LiveTimeActivity.kt +++ b/app/src/main/java/com/example/koin_apps/presenter/LiveTimeActivity.kt @@ -3,25 +3,18 @@ package com.example.koin_apps.presenter import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import androidx.activity.viewModels -import androidx.lifecycle.lifecycleScope import com.example.koin_apps.R -import com.example.koin_apps.module.coroutineDispatcher.MainDispatcher import com.example.koin_apps.databinding.ActivityLiveTimeBinding import com.example.koin_apps.presenter.viewModel.LiveTimeViewModel import dagger.hilt.android.AndroidEntryPoint -import kotlinx.coroutines.CoroutineDispatcher -import kotlinx.coroutines.launch -import javax.inject.Inject @AndroidEntryPoint class LiveTimeActivity : AppCompatActivity() { - @MainDispatcher @Inject lateinit var mainDispatcher: CoroutineDispatcher - private val liveTimeBinding by lazy { ActivityLiveTimeBinding.inflate(layoutInflater) } private val liveTimeViewModel: LiveTimeViewModel by viewModels() - private val orderBookFragment = OrderBookFragment() - private val fragmentBundle = Bundle() + private val orderBookFragment: OrderBookFragment = OrderBookFragment() + private val fragmentBundle: Bundle = Bundle() private val ticker: String by lazy { setTicker() } override fun onCreate(savedInstanceState: Bundle?) { @@ -34,7 +27,6 @@ class LiveTimeActivity : AppCompatActivity() { supportFragmentManager.beginTransaction() .replace(R.id.FragmentLayout, orderBookFragment) - .addToBackStack(null) .commit() setContentView(liveTimeBinding.root) @@ -50,14 +42,9 @@ class LiveTimeActivity : AppCompatActivity() { private fun updateTickerTitle() { liveTimeBinding.coinTitle.text = ticker } private fun updateTickerInfo() = liveTimeViewModel.tickerLiveViewData.observe(this) { - lifecycleScope.launch(mainDispatcher) { - liveTimeBinding.tickerWon.text = - getString(R.string.tickerWon, it.closingPrice.toString()) - liveTimeBinding.Flucatate24H.text = - getString(R.string.ticker_Flucatate_won24H, it.fluctate_24H.toString()) - liveTimeBinding.FlucatateRate24H.text = - getString(R.string.ticker_Flucatate_rate24H, it.fluctate_Rate.toString()) - } + liveTimeBinding.tickerWon.text = getString(R.string.tickerWon, it.closingPrice.toString()) + liveTimeBinding.Flucatate24H.text = getString(R.string.ticker_Flucatate_won24H, it.fluctate_24H.toString()) + liveTimeBinding.FlucatateRate24H.text = getString(R.string.ticker_Flucatate_rate24H, it.fluctate_Rate.toString()) } } diff --git a/app/src/main/java/com/example/koin_apps/presenter/LogoActivity.kt b/app/src/main/java/com/example/koin_apps/presenter/LogoActivity.kt index a3f8de7..5b01dbe 100644 --- a/app/src/main/java/com/example/koin_apps/presenter/LogoActivity.kt +++ b/app/src/main/java/com/example/koin_apps/presenter/LogoActivity.kt @@ -4,44 +4,29 @@ import android.content.Intent import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import androidx.activity.viewModels -import androidx.lifecycle.lifecycleScope -import com.example.koin_apps.common.Constants -import com.example.koin_apps.module.coroutineDispatcher.MainDispatcher import com.example.koin_apps.databinding.ActivityLogoBinding import com.example.koin_apps.presenter.viewModel.LogoViewModel import dagger.hilt.android.AndroidEntryPoint -import kotlinx.coroutines.* -import javax.inject.Inject @AndroidEntryPoint class LogoActivity : AppCompatActivity() { - @MainDispatcher @Inject lateinit var mainDispatcher: CoroutineDispatcher - private val logoBinding by lazy { ActivityLogoBinding.inflate(layoutInflater) } private val logoViewModel: LogoViewModel by viewModels() override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - updateUI() - setContentView(logoBinding.root) - } - private fun updateUI() { - logoViewModel.readAllTicker.observe(this) { ticker -> - if (ticker != null) { - lifecycleScope.launch(mainDispatcher) { - delay(Constants.DELAY_TIME_MILLIS) - startActivity(Intent(this@LogoActivity, MainActivity::class.java)) - finish() - } + logoViewModel.readAllTicker.observe(this) { tickerList -> + if (tickerList != null) { + startActivity(Intent(this, MainActivity::class.java)) + finish() } else { - lifecycleScope.launch(mainDispatcher) { - delay(Constants.DELAY_TIME_MILLIS) - startActivity(Intent(this@LogoActivity, SelectKoinActivity::class.java)) - finish() - } + startActivity(Intent(this, SelectKoinActivity::class.java)) + finish() } } + + setContentView(logoBinding.root) } } \ No newline at end of file diff --git a/app/src/main/java/com/example/koin_apps/presenter/MainActivity.kt b/app/src/main/java/com/example/koin_apps/presenter/MainActivity.kt index c45009a..5bb85f2 100644 --- a/app/src/main/java/com/example/koin_apps/presenter/MainActivity.kt +++ b/app/src/main/java/com/example/koin_apps/presenter/MainActivity.kt @@ -5,34 +5,36 @@ import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import androidx.activity.viewModels import androidx.appcompat.app.AlertDialog -import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView import com.example.koin_apps.R -import com.example.koin_apps.module.coroutineDispatcher.MainDispatcher import com.example.koin_apps.presenter.adapter.recyclerViewAdapter.MainRecyclerAdapter import com.example.koin_apps.presenter.viewModel.MainViewModel import com.example.koin_apps.databinding.ActivityMainBinding import dagger.hilt.android.AndroidEntryPoint -import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Job -import kotlinx.coroutines.launch import javax.inject.Inject @AndroidEntryPoint class MainActivity : AppCompatActivity() { - @MainDispatcher @Inject lateinit var mainDispatcher: CoroutineDispatcher @Inject lateinit var alertDialog: AlertDialog.Builder private val mainActivityBinding by lazy { ActivityMainBinding.inflate(layoutInflater) } + private val mainRecyclerView by lazy { mainActivityBinding.mainRecyclerView } private val mainViewModel: MainViewModel by viewModels() override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - - mainActivityBinding.mainRecyclerView.layoutManager = LinearLayoutManager(this) - fetchTickerDB() - updateUI() + initRecyclerView() + + mainViewModel.tickerAllData.observe(this) { tickerList -> + if (tickerList != null) { + mainRecyclerView.adapter = MainRecyclerAdapter(this, tickerList) + } else { + showDataNullDialog() + } + } mainActivityBinding.addCoinBtn.setOnClickListener { startActivity(Intent(this, SelectKoinActivity::class.java)) @@ -41,23 +43,18 @@ class MainActivity : AppCompatActivity() { setContentView(mainActivityBinding.root) } - private fun updateUI() = mainViewModel.tickerAllData.observe(this) { ticker -> - if(ticker != null) { - lifecycleScope.launch(mainDispatcher) { - mainActivityBinding.mainRecyclerView.adapter = - MainRecyclerAdapter(this@MainActivity, ticker) - } - } else { lifecycleScope.launch(mainDispatcher) { showDataNullDialog() } } - } + private fun fetchTickerDB(): Job = mainViewModel.fetchAllTickerData() - private fun showDataNullDialog(): AlertDialog = - alertDialog - .setIcon(R.drawable.ic_dangerous) - .setTitle(R.string.NullDialog_Title) - .setMessage(R.string.NullDialog_Content) - .setPositiveButton(R.string.NullDialog_okBtn, null) - .show() + private fun initRecyclerView(): RecyclerView = mainActivityBinding.mainRecyclerView.apply { + layoutManager = LinearLayoutManager(this@MainActivity) + setHasFixedSize(true) + } - private fun fetchTickerDB(): Job = mainViewModel.fetchAllTickerData() + private fun showDataNullDialog(): AlertDialog = alertDialog + .setIcon(R.drawable.ic_dangerous) + .setTitle(R.string.NullDialog_Title) + .setMessage(R.string.NullDialog_Content) + .setPositiveButton(R.string.NullDialog_okBtn, null) + .show() } \ No newline at end of file diff --git a/app/src/main/java/com/example/koin_apps/presenter/OrderBookFragment.kt b/app/src/main/java/com/example/koin_apps/presenter/OrderBookFragment.kt index d66ffdb..caafc10 100644 --- a/app/src/main/java/com/example/koin_apps/presenter/OrderBookFragment.kt +++ b/app/src/main/java/com/example/koin_apps/presenter/OrderBookFragment.kt @@ -6,23 +6,16 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.viewModels -import androidx.lifecycle.lifecycleScope import com.example.koin_apps.R -import com.example.koin_apps.module.coroutineDispatcher.MainDispatcher import com.example.koin_apps.presenter.adapter.listViewAdapter.OrderBookAskListAdapter import com.example.koin_apps.presenter.adapter.listViewAdapter.OrderBookBidListAdapter import com.example.koin_apps.presenter.adapter.listViewAdapter.TransactionListAdapter import com.example.koin_apps.databinding.FragmentOrderBookBinding import com.example.koin_apps.presenter.viewModel.OrderBookViewModel import dagger.hilt.android.AndroidEntryPoint -import kotlinx.coroutines.CoroutineDispatcher -import kotlinx.coroutines.launch -import javax.inject.Inject @AndroidEntryPoint class OrderBookFragment : Fragment() { - @MainDispatcher @Inject lateinit var mainDispatcher: CoroutineDispatcher - private var _orderBookBinding: FragmentOrderBookBinding? = null private val orderBookBinding get() = _orderBookBinding!! private val orderBookViewModel: OrderBookViewModel by viewModels() @@ -44,9 +37,26 @@ class OrderBookFragment : Fragment() { } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - updateTickerTextView() - updateTransactionList() - updateOrderBookList() + orderBookViewModel.tickerData.observe(viewLifecycleOwner) { result -> + orderBookBinding.orderBookTickerInfo.text = getString( + R.string.orderBook_Ticker_Info, + result.closingPrice.toString(), + result.prevClosingPrice.toString(), + result.maxPrice.toString(), + result.minPrice.toString(), + result.unitsTraded_24H.toString() + ) + } + + orderBookViewModel.transactionData.observe(viewLifecycleOwner) { result -> + orderBookBinding.transactionList.adapter = TransactionListAdapter(result) + } + + orderBookViewModel.orderBookData.observe(viewLifecycleOwner) { result -> + orderBookBinding.orderBookAskList.adapter = OrderBookAskListAdapter(result.asks!!) + orderBookBinding.orderBookBidList.adapter = OrderBookBidListAdapter(result.bids!!) + } + } override fun onDestroyView() { @@ -56,34 +66,4 @@ class OrderBookFragment : Fragment() { private fun setTicker(): String = arguments?.getString("coinTitle").toString() - private fun updateTickerTextView() = orderBookViewModel.tickerData - .observe(viewLifecycleOwner) { result -> - lifecycleScope.launch(mainDispatcher) { - orderBookBinding.orderBookTickerInfo.text = - getString( - R.string.orderBook_Ticker_Info, - result.closingPrice.toString(), - result.prevClosingPrice.toString(), - result.maxPrice.toString(), - result.minPrice.toString(), - result.unitsTraded_24H.toString() - ) - } - } - - private fun updateTransactionList() = orderBookViewModel.transactionData - .observe(viewLifecycleOwner) { result -> - lifecycleScope.launch(mainDispatcher) { - orderBookBinding.transactionList.adapter = TransactionListAdapter(result) - } - } - - private fun updateOrderBookList() = orderBookViewModel.orderBookData - .observe(viewLifecycleOwner) { result -> - lifecycleScope.launch(mainDispatcher) { - orderBookBinding.orderBookAskList.adapter = OrderBookAskListAdapter(result.asks!!) - orderBookBinding.orderBookBidList.adapter = OrderBookBidListAdapter(result.bids!!) - } - } - } \ No newline at end of file diff --git a/app/src/main/java/com/example/koin_apps/presenter/SelectKoinActivity.kt b/app/src/main/java/com/example/koin_apps/presenter/SelectKoinActivity.kt index 53f47da..2f7be9c 100644 --- a/app/src/main/java/com/example/koin_apps/presenter/SelectKoinActivity.kt +++ b/app/src/main/java/com/example/koin_apps/presenter/SelectKoinActivity.kt @@ -3,35 +3,30 @@ package com.example.koin_apps.presenter import android.content.Intent import androidx.appcompat.app.AppCompatActivity import android.os.Bundle -import android.util.Log import androidx.activity.viewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.example.koin_apps.common.Constants -import com.example.koin_apps.module.coroutineDispatcher.MainDispatcher import com.example.koin_apps.presenter.adapter.recyclerViewAdapter.SelectRecyclerAdapter import com.example.koin_apps.databinding.ActivitySelectKoinBinding import com.example.koin_apps.presenter.viewModel.SelectViewModel import dagger.hilt.android.AndroidEntryPoint -import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Job -import javax.inject.Inject @AndroidEntryPoint class SelectKoinActivity : AppCompatActivity() { - @MainDispatcher @Inject lateinit var mainDispatcher: CoroutineDispatcher - - private lateinit var selectRecyclerAdapter: SelectRecyclerAdapter private val selectKoinBinding by lazy { ActivitySelectKoinBinding.inflate(layoutInflater) } private val selectViewModel: SelectViewModel by viewModels() + private lateinit var selectRecyclerAdapter: SelectRecyclerAdapter + private val selectedTickerList: List by lazy { selectRecyclerAdapter.getSelectedItems() } + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) initRecyclerView() updateTickerList() + selectKoinBinding.compSelectBtn.setOnClickListener { - storeTicker() - Log.d(Constants.LOG_TAG, "${getSelectedItems()}") + storeTicker(selectedTickerList) startActivity(Intent(this, MainActivity::class.java)) } @@ -48,9 +43,6 @@ class SelectKoinActivity : AppCompatActivity() { selectKoinBinding.CoinRecyclerView.adapter = selectRecyclerAdapter } - private fun getSelectedItems() = selectRecyclerAdapter.getSelectedItems() - - private fun storeTicker(): Job = - selectViewModel.storeTickerTitle(selectRecyclerAdapter.getSelectedItems()) - + private fun storeTicker(selectedTickers: List): Job = + selectViewModel.storeTickerTitle(selectedTickers) } \ No newline at end of file diff --git a/app/src/main/java/com/example/koin_apps/presenter/adapter/recyclerViewAdapter/SelectRecyclerAdapter.kt b/app/src/main/java/com/example/koin_apps/presenter/adapter/recyclerViewAdapter/SelectRecyclerAdapter.kt index 96716af..ef603e6 100644 --- a/app/src/main/java/com/example/koin_apps/presenter/adapter/recyclerViewAdapter/SelectRecyclerAdapter.kt +++ b/app/src/main/java/com/example/koin_apps/presenter/adapter/recyclerViewAdapter/SelectRecyclerAdapter.kt @@ -1,10 +1,8 @@ package com.example.koin_apps.presenter.adapter.recyclerViewAdapter -import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.example.koin_apps.common.Constants import com.example.koin_apps.databinding.SelectCoinviewItemBinding import javax.inject.Inject @@ -21,18 +19,14 @@ class SelectRecyclerAdapter @Inject constructor( binding.checkCoin.setOnCheckedChangeListener { _, isChecked -> if (isChecked) { selectedTickerList.add(ticker) - Log.d(Constants.LOG_TAG, "$selectedTickerList") } else { selectedTickerList.remove(ticker) - Log.d(Constants.LOG_TAG, "$selectedTickerList") } } } } - fun getSelectedItems(): List { - return selectedTickerList.toList() - } + fun getSelectedItems(): List = selectedTickerList.toList() override fun onCreateViewHolder( parent: ViewGroup, diff --git a/app/src/main/java/com/example/koin_apps/presenter/viewModel/SelectViewModel.kt b/app/src/main/java/com/example/koin_apps/presenter/viewModel/SelectViewModel.kt index 8546886..88ea433 100644 --- a/app/src/main/java/com/example/koin_apps/presenter/viewModel/SelectViewModel.kt +++ b/app/src/main/java/com/example/koin_apps/presenter/viewModel/SelectViewModel.kt @@ -1,6 +1,5 @@ package com.example.koin_apps.presenter.viewModel -import android.util.Log import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel @@ -8,7 +7,6 @@ import androidx.lifecycle.viewModelScope import com.example.domain.entity.TickerEntity import com.example.domain.usecase.apiUseCase.GetTickerAllUseCase import com.example.domain.usecase.databaseUseCase.InsertTickerUseCase -import com.example.koin_apps.common.Constants import com.example.koin_apps.module.coroutineDispatcher.IoDispatcher import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.CoroutineDispatcher @@ -33,7 +31,7 @@ class SelectViewModel @Inject constructor( } fun storeTickerTitle(tickerList: List): Job = viewModelScope.launch(ioDispatcher) { - tickerList.forEach { insertTickerUseCase(TickerEntity(it)) } + tickerList.forEach { insertTickerUseCase(TickerEntity(it)).collect { } } } override fun onCleared() { diff --git a/build.gradle b/build.gradle index dbb1640..2959af7 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.0.2' classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0' } } diff --git a/data/build.gradle b/data/build.gradle index b455fcd..af1448d 100644 --- a/data/build.gradle +++ b/data/build.gradle @@ -13,8 +13,6 @@ android { defaultConfig { minSdk 26 targetSdk 33 - versionCode 1 - versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -26,11 +24,11 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '17' } } diff --git a/data/src/main/AndroidManifest.xml b/data/src/main/AndroidManifest.xml index bf4d7c4..ecebd57 100644 --- a/data/src/main/AndroidManifest.xml +++ b/data/src/main/AndroidManifest.xml @@ -1,11 +1,4 @@ - - - + \ No newline at end of file diff --git a/domain/build.gradle b/domain/build.gradle index 3d29b0d..e0a7dda 100644 --- a/domain/build.gradle +++ b/domain/build.gradle @@ -13,8 +13,6 @@ android { defaultConfig { minSdk 26 targetSdk 33 - versionCode 1 - versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -26,11 +24,11 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '17' } } diff --git a/domain/src/main/AndroidManifest.xml b/domain/src/main/AndroidManifest.xml index bf4d7c4..ecebd57 100644 --- a/domain/src/main/AndroidManifest.xml +++ b/domain/src/main/AndroidManifest.xml @@ -1,11 +1,4 @@ - - - + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index ca36a32..8eabed2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,22 +1,8 @@ -# Project-wide Gradle settings. -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. More details, visit -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true -# AndroidX package structure to make it clearer which packages are bundled with the -# Android operating system, and which are packaged with your app"s APK -# https://developer.android.com/topic/libraries/support-library/androidx-rn android.useAndroidX=true -# Automatically convert third-party libraries to use AndroidX android.enableJetifier=true -# Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -org.gradle.unsafe.configuration-cache=true \ No newline at end of file +org.gradle.unsafe.configuration-cache=true +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2c45cea..3ffebc8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Fri Sep 16 21:52:29 KST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME