#86 feat: common modularization

Co-authored-by: plashdof <[email protected]> Co-authored-by: BENDENG1 <[email protected]>
boostcampwm2023 · Jan 26, 2024 · 1daf55d · 1daf55d
1 parent 15a52c7
commit 1daf55d
Show file tree

Hide file tree

Showing 351 changed files with 834 additions and 507 deletions.
diff --git a/Aos/.idea/gradle.xml b/Aos/.idea/gradle.xml
diff --git a/Aos/app/build.gradle.kts b/Aos/app/build.gradle.kts
@@ -6,8 +6,6 @@ plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
     id("kotlin-kapt")
-    id("dagger.hilt.android.plugin")
-    id("androidx.navigation.safeargs.kotlin")
     id("com.google.gms.google-services")
 }
 
@@ -29,7 +27,7 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField("String", "NAVER_LOGIN_CLIENT_ID", getProperty("naverLoginClientId"))
         buildConfigField("String", "NAVER_LOGIN_CLIENT_SECRET", getProperty("naverLoginClientSecret"))
-        buildConfigField("String", "NAVER_MAP_CLIENT_SECRET", getProperty("naverMapClientSecret"))
+        //buildConfigField("String", "NAVER_MAP_CLIENT_SECRET", getProperty("naverMapClientSecret"))
         manifestPlaceholders["NAVER_MAP_CLIENT_ID"] = getProperty("naverMapClientId")
     }
 
@@ -44,11 +42,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"
     }
     buildFeatures {
         dataBinding = true
@@ -61,55 +59,58 @@ fun getProperty(propertyKey: String): String {
 }
 
 dependencies {
+    implementation(project(":data"))
+    implementation(project(":domain"))
+    implementation(project(":presentation"))
 
     implementation("androidx.core:core-ktx:1.9.0")
-    implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("com.google.android.material:material:1.10.0")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
-    testImplementation("junit:junit:4.13.2")
-    androidTestImplementation("androidx.test.ext:junit:1.1.5")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
-
-    // hilt
-    val hiltVersion = "2.48"
-    implementation("com.google.dagger:hilt-android:${hiltVersion}")
-    kapt("com.google.dagger:hilt-android-compiler:${hiltVersion}")
-
-    // retrofit
-    val retrofitVersion = "2.9.0"
-    implementation("com.squareup.retrofit2:retrofit:$retrofitVersion")
-    implementation("com.squareup.retrofit2:converter-gson:$retrofitVersion")
-
-    // okHttp
-    val okHttpVersion = "5.0.0-alpha.2"
-    implementation("com.squareup.okhttp3:okhttp:$okHttpVersion")
-    implementation("com.squareup.okhttp3:logging-interceptor:$okHttpVersion")
-    implementation("com.squareup.okhttp3:okhttp-urlconnection:$okHttpVersion")
-
-    // glide
-    implementation("com.github.bumptech.glide:glide:4.16.0")
-    implementation("com.github.bumptech.glide:compose:1.0.0-beta01")
-
-    // room
-    val roomVersion = "2.6.0"
-    implementation("androidx.room:room-runtime:$roomVersion")
-    implementation("androidx.room:room-ktx:$roomVersion")
-    kapt("androidx.room:room-compiler:$roomVersion")
-
-    // navigation
-    implementation("androidx.navigation:navigation-fragment-ktx:2.5.1")
-    implementation("androidx.navigation:navigation-ui-ktx:2.5.1")
-
-    // naverMap
-    implementation("com.naver.maps:map-sdk:3.17.0")
-    implementation("com.google.android.gms:play-services-location:21.0.1")
-
-    // naver Login
-    implementation ("com.navercorp.nid:oauth:5.8.0")
-
-    // datastore preferences
-    implementation("androidx.datastore:datastore-preferences:1.0.0")
-    implementation("androidx.datastore:datastore-core:1.0.0")
+//    implementation("androidx.appcompat:appcompat:1.6.1")
+//    implementation("com.google.android.material:material:1.10.0")
+//    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
+//    testImplementation("junit:junit:4.13.2")
+//    androidTestImplementation("androidx.test.ext:junit:1.1.5")
+//    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+
+//    // hilt
+//    val hiltVersion = "2.48"
+//    implementation("com.google.dagger:hilt-android:${hiltVersion}")
+//    kapt("com.google.dagger:hilt-android-compiler:${hiltVersion}")
+//
+//    // retrofit
+//    val retrofitVersion = "2.9.0"
+//    implementation("com.squareup.retrofit2:retrofit:$retrofitVersion")
+//    implementation("com.squareup.retrofit2:converter-gson:$retrofitVersion")
+//
+//    // okHttp
+//    val okHttpVersion = "5.0.0-alpha.2"
+//    implementation("com.squareup.okhttp3:okhttp:$okHttpVersion")
+//    implementation("com.squareup.okhttp3:logging-interceptor:$okHttpVersion")
+//    implementation("com.squareup.okhttp3:okhttp-urlconnection:$okHttpVersion")
+//
+//    // glide
+//    implementation("com.github.bumptech.glide:glide:4.16.0")
+//    implementation("com.github.bumptech.glide:compose:1.0.0-beta01")
+//
+//    // room
+//    val roomVersion = "2.6.0"
+//    implementation("androidx.room:room-runtime:$roomVersion")
+//    implementation("androidx.room:room-ktx:$roomVersion")
+//    kapt("androidx.room:room-compiler:$roomVersion")
+//
+//    // navigation
+//    implementation("androidx.navigation:navigation-fragment-ktx:2.5.1")
+//    implementation("androidx.navigation:navigation-ui-ktx:2.5.1")
+//
+//    // naverMap
+//    implementation("com.naver.maps:map-sdk:3.17.0")
+//    implementation("com.google.android.gms:play-services-location:21.0.1")
+//
+//    // naver Login
+//    implementation ("com.navercorp.nid:oauth:5.8.0")
+//
+//    // datastore preferences
+//    implementation("androidx.datastore:datastore-preferences:1.0.0")
+//    implementation("androidx.datastore:datastore-core:1.0.0")
 
     // firebase
     implementation(platform("com.google.firebase:firebase-bom:32.6.0"))

diff --git a/Aos/app/src/main/AndroidManifest.xml b/Aos/app/src/main/AndroidManifest.xml
@@ -37,7 +37,7 @@
             android:windowSoftInputMode="adjustPan">
         </activity>
         <activity
-            android:name=".presentation.ui.splash.SplashActivity"
+            android:name="com.avengers.presentation.ui.splash.SplashActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/app/di/ApiModule.kt b/Aos/app/src/main/java/com/avengers/nibobnebob/app/di/ApiModule.kt
@@ -1,11 +1,11 @@
 package com.avengers.nibobnebob.app.di
 
-import com.avengers.nibobnebob.data.remote.FollowApi
-import com.avengers.nibobnebob.data.remote.IntroApi
-import com.avengers.nibobnebob.data.remote.MyPageApi
-import com.avengers.nibobnebob.data.remote.RefreshApi
-import com.avengers.nibobnebob.data.remote.RestaurantApi
-import com.avengers.nibobnebob.data.remote.ValidationApi
+import com.avengers.data.remote.FollowApi
+import com.avengers.data.remote.IntroApi
+import com.avengers.data.remote.MyPageApi
+import com.avengers.data.remote.RefreshApi
+import com.avengers.data.remote.RestaurantApi
+import com.avengers.data.remote.ValidationApi
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn

diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/app/di/NetworkModule.kt b/Aos/app/src/main/java/com/avengers/nibobnebob/app/di/NetworkModule.kt
@@ -1,7 +1,7 @@
 package com.avengers.nibobnebob.app.di
 
+import com.avengers.data.config.DataStoreManager
 import com.avengers.nibobnebob.BuildConfig
-import com.avengers.nibobnebob.app.DataStoreManager
 import com.avengers.nibobnebob.config.AccessTokenInterceptor
 import com.avengers.nibobnebob.config.BearerInterceptor
 import com.avengers.nibobnebob.presentation.util.Constants.BASE_URL

diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/app/di/RepositoryModule.kt b/Aos/app/src/main/java/com/avengers/nibobnebob/app/di/RepositoryModule.kt
@@ -1,14 +1,14 @@
 package com.avengers.nibobnebob.app.di
 
-import com.avengers.nibobnebob.data.repository.FollowRepositoryImpl
-import com.avengers.nibobnebob.data.repository.IntroRepositoryImpl
-import com.avengers.nibobnebob.data.repository.MyPageRepositoryImpl
-import com.avengers.nibobnebob.data.repository.RestaurantRepositoryImpl
-import com.avengers.nibobnebob.data.repository.ValidationRepositoryImpl
+import com.avengers.data.repository.FollowRepositoryImpl
+import com.avengers.data.repository.IntroRepositoryImpl
+import com.avengers.data.repository.MyPageRepositoryImpl
+import com.avengers.data.repository.RestaurantRepositoryImpl
+import com.avengers.data.repository.ValidationRepositoryImpl
 import com.avengers.nibobnebob.domain.repository.FollowRepository
-import com.avengers.nibobnebob.domain.repository.RestaurantRepository
 import com.avengers.nibobnebob.domain.repository.IntroRepository
 import com.avengers.nibobnebob.domain.repository.MyPageRepository
+import com.avengers.nibobnebob.domain.repository.RestaurantRepository
 import com.avengers.nibobnebob.domain.repository.ValidationRepository
 import dagger.Binds
 import dagger.Module

diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/base/BaseDataModel.kt b/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/base/BaseDataModel.kt
diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/mapper/DomainMapper.kt b/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/mapper/DomainMapper.kt
diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/FollowListResponse.kt b/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/FollowListResponse.kt
diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/Location.kt b/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/Location.kt
diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/LoginResponse.kt b/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/LoginResponse.kt
diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/MyInfoResponse.kt b/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/MyInfoResponse.kt
diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/data/remote/RefreshApi.kt b/Aos/app/src/main/java/com/avengers/nibobnebob/data/remote/RefreshApi.kt
diff --git a/Aos/build.gradle.kts b/Aos/build.gradle.kts
@@ -11,4 +11,6 @@ plugins {
     id("com.google.dagger.hilt.android") version "2.48" apply false
     id("androidx.navigation.safeargs.kotlin") version "2.5.1" apply false
     id("com.google.gms.google-services") version "4.4.0" apply false
+    id("com.android.library") version "8.1.1" apply false
+    id("org.jetbrains.kotlin.jvm") version "1.9.0" apply false
 }
diff --git a/Aos/data/.gitignore b/Aos/data/.gitignore
@@ -0,0 +1 @@
+/build