Merge pull request #25 from KanuKim97/refactor/clean_architecture

Convert complete
KanuKim97 · Jun 9, 2023 · 2a11f43 · 2a11f43
2 parents 86d1b92 + c1025ca
commit 2a11f43
Show file tree

Hide file tree

Showing 129 changed files with 1,688 additions and 836 deletions.
diff --git 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 }
@@ -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"
+    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.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
@@ -3,7 +3,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
-        android:name=".AndroidApp"
+        android:name=".presenter.AndroidApp"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -12,11 +12,11 @@
         android:theme="@style/Theme.Koin_Apps">
 
         <activity
-            android:name=".SelectKoinActivity"
+            android:name=".presenter.SelectKoinActivity"
             android:exported="false" />
 
         <activity
-            android:name=".LogoActivity"
+            android:name=".presenter.LogoActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -25,11 +25,11 @@
         </activity>
 
         <activity
-            android:name=".LiveTimeActivity"
+            android:name=".presenter.LiveTimeActivity"
             android:exported="false" />
 
         <activity
-            android:name=".MainActivity"
+            android:name=".presenter.MainActivity"
             android:exported="false" />
 
         <meta-data

diff --git a/app/src/main/java/com/example/koin_apps/LogoActivity.kt b/app/src/main/java/com/example/koin_apps/LogoActivity.kt
diff --git a/app/src/main/java/com/example/koin_apps/MainActivity.kt b/app/src/main/java/com/example/koin_apps/MainActivity.kt
diff --git a/app/src/main/java/com/example/koin_apps/OrderBookFragment.kt b/app/src/main/java/com/example/koin_apps/OrderBookFragment.kt
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
@@ -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
 }
diff --git a/app/src/main/java/com/example/koin_apps/data/database/TickerDataBase.kt b/app/src/main/java/com/example/koin_apps/data/database/TickerDataBase.kt
diff --git a/app/src/main/java/com/example/koin_apps/data/di/dataSource/TickerDBDataSource.kt b/app/src/main/java/com/example/koin_apps/data/di/dataSource/TickerDBDataSource.kt