diff --git a/Aos/.idea/gradle.xml b/Aos/.idea/gradle.xml index ae388c2..70227ed 100644 --- a/Aos/.idea/gradle.xml +++ b/Aos/.idea/gradle.xml @@ -12,6 +12,9 @@ diff --git a/Aos/app/build.gradle.kts b/Aos/app/build.gradle.kts index 5f9c026..e3f3ec9 100644 --- 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 index f246071..27df562 100644 --- a/Aos/app/src/main/AndroidManifest.xml +++ b/Aos/app/src/main/AndroidManifest.xml @@ -37,7 +37,7 @@ android:windowSoftInputMode="adjustPan"> 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 index f625e61..986a760 100644 --- 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 index f3fc593..832cfb6 100644 --- 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 index b5054b2..945c6e5 100644 --- 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 deleted file mode 100644 index 7344343..0000000 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/base/BaseDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.avengers.nibobnebob.data.model.base - -interface BaseDataModel \ No newline at end of file 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 deleted file mode 100644 index b4d7c70..0000000 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/mapper/DomainMapper.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.avengers.nibobnebob.data.model.mapper - -import com.avengers.nibobnebob.data.model.base.BaseDataModel -import com.avengers.nibobnebob.domain.model.base.BaseDomainModel - -interface DomainMapper { - fun R.toDomainModel() : D -} \ No newline at end of file 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 deleted file mode 100644 index cf8949a..0000000 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/FollowListResponse.kt +++ /dev/null @@ -1,21 +0,0 @@ -package com.avengers.nibobnebob.data.model.response - -import com.avengers.nibobnebob.data.model.base.BaseDataModel -import com.avengers.nibobnebob.data.model.mapper.DomainMapper -import com.avengers.nibobnebob.domain.model.FollowListData - -data class FollowListResponse( - val nickName: String, - val region: String, - val isFollow: Boolean, - val profileImage: String -) : BaseDataModel { - companion object : DomainMapper { - override fun FollowListResponse.toDomainModel(): FollowListData = FollowListData( - nickName = nickName, - region = region, - isFollow = isFollow, - profileImage = profileImage - ) - } -} 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 deleted file mode 100644 index 9df90c1..0000000 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/Location.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.avengers.nibobnebob.data.model.response - -import com.avengers.nibobnebob.data.model.base.BaseDataModel -import com.avengers.nibobnebob.data.model.mapper.DomainMapper -import com.avengers.nibobnebob.domain.model.LocationData -import com.google.gson.annotations.SerializedName - -data class Location( - @SerializedName("coordinates") val coordinates: List, - @SerializedName("type") val type: String -): BaseDataModel { - companion object : DomainMapper { - override fun Location.toDomainModel(): LocationData = LocationData( - coordinates = coordinates, - type = type - ) - } -} \ No newline at end of file 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 deleted file mode 100644 index 33159e1..0000000 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/LoginResponse.kt +++ /dev/null @@ -1,19 +0,0 @@ -package com.avengers.nibobnebob.data.model.response - -import com.avengers.nibobnebob.data.model.base.BaseDataModel -import com.avengers.nibobnebob.data.model.mapper.DomainMapper -import com.avengers.nibobnebob.domain.model.LoginData -import com.google.gson.annotations.SerializedName - - -data class LoginResponse( - @SerializedName("accessToken") val accessToken: String?, - @SerializedName("refreshToken") val refreshToken: String? -) : BaseDataModel { - companion object : DomainMapper { - override fun LoginResponse.toDomainModel(): LoginData = LoginData( - accessToken = accessToken, - refreshToken = refreshToken - ) - } -} 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 deleted file mode 100644 index eafd5fe..0000000 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/MyInfoResponse.kt +++ /dev/null @@ -1,39 +0,0 @@ -package com.avengers.nibobnebob.data.model.response - -import com.avengers.nibobnebob.data.model.base.BaseDataModel -import com.avengers.nibobnebob.data.model.mapper.DomainMapper -import com.avengers.nibobnebob.data.model.response.UserInfo.Companion.toDomainModel -import com.avengers.nibobnebob.domain.model.MyInfoData -import com.avengers.nibobnebob.domain.model.UserInfoData -import com.google.gson.annotations.SerializedName - - -data class MyInfoResponse( - @SerializedName("userInfo") val userInfo: UserInfo -) : BaseDataModel { - companion object : DomainMapper { - override fun MyInfoResponse.toDomainModel(): MyInfoData = MyInfoData( - userInfo = userInfo.toDomainModel() - ) - } -} - -data class UserInfo( - @SerializedName("nickName") val nickName: String, - @SerializedName("birthdate") val birthdate: String, - @SerializedName("region") val region: String, - @SerializedName("isMale") val isMale: Boolean, - @SerializedName("profileImage") val profileImage: String -) : BaseDataModel { - companion object : DomainMapper { - override fun UserInfo.toDomainModel(): UserInfoData = UserInfoData( - nickName = nickName, - birthdate = birthdate, - region = region, - isMale = isMale, - profileImage = profileImage - ) - } - -} - 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 deleted file mode 100644 index da47eec..0000000 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/data/remote/RefreshApi.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.avengers.nibobnebob.data.remote - -import com.avengers.nibobnebob.data.model.request.RefreshTokenRequest -import com.avengers.nibobnebob.data.model.response.BaseResponse -import com.avengers.nibobnebob.data.model.response.LoginResponse -import retrofit2.Response -import retrofit2.http.Body -import retrofit2.http.POST - -interface RefreshApi { - - @POST("api/auth/refresh-token") - suspend fun refreshAccessToken(@Body refreshToken: RefreshTokenRequest) : Response> -} \ No newline at end of file diff --git a/Aos/build.gradle.kts b/Aos/build.gradle.kts index 0cf50de..91138ed 100644 --- 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 } \ No newline at end of file diff --git a/Aos/data/.gitignore b/Aos/data/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/Aos/data/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/Aos/data/build.gradle.kts b/Aos/data/build.gradle.kts new file mode 100644 index 0000000..5c0f504 --- /dev/null +++ b/Aos/data/build.gradle.kts @@ -0,0 +1,61 @@ +plugins { + id("com.android.library") + id("org.jetbrains.kotlin.android") + id("kotlin-kapt") + id("dagger.hilt.android.plugin") +} + +android { + namespace = "com.avengers.data" + compileSdk = 34 + + defaultConfig { + minSdk = 24 + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles("consumer-rules.pro") + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + kotlinOptions { + jvmTarget = "17" + } +} + +dependencies { + + // implementation("androidx.core:core-ktx:1.9.0") + implementation(project(":domain")) + + // hilt + val hiltVersion = "2.48" + api("com.google.dagger:hilt-android:${hiltVersion}") + kapt("com.google.dagger:hilt-android-compiler:${hiltVersion}") + + // retrofit + val retrofitVersion = "2.9.0" + api("com.squareup.retrofit2:retrofit:$retrofitVersion") + api("com.squareup.retrofit2:converter-gson:$retrofitVersion") + + // okHttp + val okHttpVersion = "5.0.0-alpha.2" + api("com.squareup.okhttp3:okhttp:$okHttpVersion") + api("com.squareup.okhttp3:logging-interceptor:$okHttpVersion") + api("com.squareup.okhttp3:okhttp-urlconnection:$okHttpVersion") + + // datastore preferences + api("androidx.datastore:datastore-preferences:1.0.0") + api("androidx.datastore:datastore-core:1.0.0") +} \ No newline at end of file diff --git a/Aos/data/consumer-rules.pro b/Aos/data/consumer-rules.pro new file mode 100644 index 0000000..e69de29 diff --git a/Aos/data/proguard-rules.pro b/Aos/data/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/Aos/data/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/Aos/data/src/androidTest/java/com/avengers/data/ExampleInstrumentedTest.kt b/Aos/data/src/androidTest/java/com/avengers/data/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..5eca279 --- /dev/null +++ b/Aos/data/src/androidTest/java/com/avengers/data/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.avengers.data + +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.avengers.data.test", appContext.packageName) + } +} \ No newline at end of file diff --git a/Aos/data/src/main/AndroidManifest.xml b/Aos/data/src/main/AndroidManifest.xml new file mode 100644 index 0000000..8c4c982 --- /dev/null +++ b/Aos/data/src/main/AndroidManifest.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/config/AccessTokenInterceptor.kt b/Aos/data/src/main/java/com/avengers/data/config/AccessTokenInterceptor.kt similarity index 82% rename from Aos/app/src/main/java/com/avengers/nibobnebob/config/AccessTokenInterceptor.kt rename to Aos/data/src/main/java/com/avengers/data/config/AccessTokenInterceptor.kt index 86fe2d1..fc2ade3 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/config/AccessTokenInterceptor.kt +++ b/Aos/data/src/main/java/com/avengers/data/config/AccessTokenInterceptor.kt @@ -1,9 +1,9 @@ package com.avengers.nibobnebob.config import android.util.Log -import com.avengers.nibobnebob.app.DataStoreManager -import com.avengers.nibobnebob.presentation.util.Constants.AUTHORIZATION -import com.avengers.nibobnebob.presentation.util.Constants.BEARER +import com.avengers.data.config.DataStoreManager +import com.avengers.data.model.Constants.AUTHORIZATION +import com.avengers.data.model.Constants.BEARER import kotlinx.coroutines.flow.first import kotlinx.coroutines.runBlocking import okhttp3.Interceptor diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/config/BearerInterceptor.kt b/Aos/data/src/main/java/com/avengers/data/config/BearerInterceptor.kt similarity index 73% rename from Aos/app/src/main/java/com/avengers/nibobnebob/config/BearerInterceptor.kt rename to Aos/data/src/main/java/com/avengers/data/config/BearerInterceptor.kt index fab6271..fb8e61b 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/config/BearerInterceptor.kt +++ b/Aos/data/src/main/java/com/avengers/data/config/BearerInterceptor.kt @@ -1,17 +1,11 @@ package com.avengers.nibobnebob.config -import android.content.Intent -import com.avengers.nibobnebob.app.App -import com.avengers.nibobnebob.app.DataStoreManager -import com.avengers.nibobnebob.data.model.request.RefreshTokenRequest -import com.avengers.nibobnebob.data.model.response.LoginResponse -import com.avengers.nibobnebob.data.model.response.BaseResponse -import com.avengers.nibobnebob.data.model.runRemote -import com.avengers.nibobnebob.data.remote.RefreshApi +import com.avengers.data.config.DataStoreManager +import com.avengers.data.model.Constants +import com.avengers.data.model.runRemote +import com.avengers.data.remote.RefreshApi import com.avengers.nibobnebob.domain.model.base.BaseState -import com.avengers.nibobnebob.presentation.ui.intro.IntroActivity -import com.avengers.nibobnebob.presentation.util.Constants import kotlinx.coroutines.flow.first import kotlinx.coroutines.runBlocking import okhttp3.Interceptor @@ -52,9 +46,9 @@ class BearerInterceptor @Inject constructor( dataStoreManager.deleteAccessToken() dataStoreManager.deleteRefreshToken() - val intent = Intent(App.getContext(), IntroActivity::class.java) - intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK - App.getContext().startActivity(intent) +// val intent = Intent(App.getContext(), IntroActivity::class.java) +// intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK +// App.getContext().startActivity(intent) } } } @@ -71,7 +65,7 @@ class BearerInterceptor @Inject constructor( } - private suspend fun getNewAccessToken(refreshToken: String?): BaseState> { + private suspend fun getNewAccessToken(refreshToken: String?): BaseState> { val loggingInterceptor = HttpLoggingInterceptor() loggingInterceptor.level = HttpLoggingInterceptor.Level.BODY val okHttpClient = OkHttpClient.Builder().addInterceptor(loggingInterceptor).build() @@ -82,7 +76,11 @@ class BearerInterceptor @Inject constructor( .client(okHttpClient) .build() val api = retrofit.create(RefreshApi::class.java) - return runRemote { api.refreshAccessToken(RefreshTokenRequest(refreshToken)) } + return runRemote { api.refreshAccessToken( + com.avengers.data.model.request.RefreshTokenRequest( + refreshToken + ) + ) } } companion object { diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/app/DataStoreManager.kt b/Aos/data/src/main/java/com/avengers/data/config/DataStoreManager.kt similarity index 88% rename from Aos/app/src/main/java/com/avengers/nibobnebob/app/DataStoreManager.kt rename to Aos/data/src/main/java/com/avengers/data/config/DataStoreManager.kt index e44e0e2..b148085 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/app/DataStoreManager.kt +++ b/Aos/data/src/main/java/com/avengers/data/config/DataStoreManager.kt @@ -1,13 +1,13 @@ -package com.avengers.nibobnebob.app +package com.avengers.data.config import androidx.datastore.core.DataStore import androidx.datastore.preferences.core.Preferences import androidx.datastore.preferences.core.booleanPreferencesKey import androidx.datastore.preferences.core.edit import androidx.datastore.preferences.core.stringPreferencesKey -import com.avengers.nibobnebob.presentation.util.Constants.ACCESS_TOKEN -import com.avengers.nibobnebob.presentation.util.Constants.AUTO_LOGIN -import com.avengers.nibobnebob.presentation.util.Constants.REFRESH_TOKEN +import com.avengers.data.model.Constants.ACCESS_TOKEN +import com.avengers.data.model.Constants.AUTO_LOGIN +import com.avengers.data.model.Constants.REFRESH_TOKEN import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map import javax.inject.Inject diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/app/NetworkManager.kt b/Aos/data/src/main/java/com/avengers/data/config/NetworkManager.kt similarity index 97% rename from Aos/app/src/main/java/com/avengers/nibobnebob/app/NetworkManager.kt rename to Aos/data/src/main/java/com/avengers/data/config/NetworkManager.kt index 0ba1414..203b114 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/app/NetworkManager.kt +++ b/Aos/data/src/main/java/com/avengers/data/config/NetworkManager.kt @@ -1,4 +1,4 @@ -package com.avengers.nibobnebob.app +package com.avengers.data.config import android.net.ConnectivityManager import android.net.Network diff --git a/Aos/data/src/main/java/com/avengers/data/model/Constants.kt b/Aos/data/src/main/java/com/avengers/data/model/Constants.kt new file mode 100644 index 0000000..3c4f007 --- /dev/null +++ b/Aos/data/src/main/java/com/avengers/data/model/Constants.kt @@ -0,0 +1,26 @@ +package com.avengers.data.model + +object Constants { + const val APP_NAME = "NibobNebob" + const val BASE_URL = "https://www.nibobnebob.site/" + + const val AUTO_LOGIN = "AUTOLOGIN" + const val ACCESS = "Access" + + const val ACCESS_TOKEN = "ACCESSTOKEN" + const val REFRESH_TOKEN = "REFRESHTOKEN" + const val NAVER_TOKEN = "NAVERTOKEN" + + const val AUTHORIZATION = "authorization" + const val BEARER = "Bearer" + const val MY_LIST = "마이 리스트" + const val NEAR_RESTAURANT = "근처 음식점" + + const val ERROR_MSG = "네트워크 통신에 실패했습니다." + + const val FILTER_NEW = "TIME_DESC" + const val FILTER_OLD = "TIME_ASC" + const val FILTER_BEST = "REVIEW_DESC" + const val FILTER_WORST = "REVIEW_ASC" + +} \ No newline at end of file diff --git a/Aos/data/src/main/java/com/avengers/data/model/base/BaseDataModel.kt b/Aos/data/src/main/java/com/avengers/data/model/base/BaseDataModel.kt new file mode 100644 index 0000000..751f78c --- /dev/null +++ b/Aos/data/src/main/java/com/avengers/data/model/base/BaseDataModel.kt @@ -0,0 +1,3 @@ +package com.avengers.data.model.base + +interface BaseDataModel \ No newline at end of file diff --git a/Aos/data/src/main/java/com/avengers/data/model/mapper/DomainMapper.kt b/Aos/data/src/main/java/com/avengers/data/model/mapper/DomainMapper.kt new file mode 100644 index 0000000..c6ec064 --- /dev/null +++ b/Aos/data/src/main/java/com/avengers/data/model/mapper/DomainMapper.kt @@ -0,0 +1,8 @@ +package com.avengers.data.model.mapper + +import com.avengers.data.model.base.BaseDataModel +import com.avengers.nibobnebob.domain.model.base.BaseDomainModel + +interface DomainMapper { + fun R.toDomainModel() : D +} \ No newline at end of file diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/request/BasicLoginRequest.kt b/Aos/data/src/main/java/com/avengers/data/model/request/BasicLoginRequest.kt similarity index 61% rename from Aos/app/src/main/java/com/avengers/nibobnebob/data/model/request/BasicLoginRequest.kt rename to Aos/data/src/main/java/com/avengers/data/model/request/BasicLoginRequest.kt index 734e027..7408a84 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/request/BasicLoginRequest.kt +++ b/Aos/data/src/main/java/com/avengers/data/model/request/BasicLoginRequest.kt @@ -1,4 +1,4 @@ -package com.avengers.nibobnebob.data.model.request +package com.avengers.data.model.request data class BasicLoginRequest( val email: String, diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/request/RefreshTokenRequest.kt b/Aos/data/src/main/java/com/avengers/data/model/request/RefreshTokenRequest.kt similarity index 55% rename from Aos/app/src/main/java/com/avengers/nibobnebob/data/model/request/RefreshTokenRequest.kt rename to Aos/data/src/main/java/com/avengers/data/model/request/RefreshTokenRequest.kt index e250ba6..33f3a1f 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/request/RefreshTokenRequest.kt +++ b/Aos/data/src/main/java/com/avengers/data/model/request/RefreshTokenRequest.kt @@ -1,4 +1,4 @@ -package com.avengers.nibobnebob.data.model.request +package com.avengers.data.model.request data class RefreshTokenRequest( val refreshToken: String? diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/BaseResponse.kt b/Aos/data/src/main/java/com/avengers/data/model/response/BaseResponse.kt similarity index 78% rename from Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/BaseResponse.kt rename to Aos/data/src/main/java/com/avengers/data/model/response/BaseResponse.kt index 0f835e3..ce930bd 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/BaseResponse.kt +++ b/Aos/data/src/main/java/com/avengers/data/model/response/BaseResponse.kt @@ -1,4 +1,4 @@ -package com.avengers.nibobnebob.data.model.response +package com.avengers.data.model.response import com.google.gson.annotations.SerializedName diff --git a/Aos/data/src/main/java/com/avengers/data/model/response/FollowListResponse.kt b/Aos/data/src/main/java/com/avengers/data/model/response/FollowListResponse.kt new file mode 100644 index 0000000..07f7e5a --- /dev/null +++ b/Aos/data/src/main/java/com/avengers/data/model/response/FollowListResponse.kt @@ -0,0 +1,22 @@ +package com.avengers.data.model.response + +import com.avengers.data.model.base.BaseDataModel +import com.avengers.data.model.mapper.DomainMapper +import com.avengers.nibobnebob.domain.model.FollowListData + +data class FollowListResponse( + val nickName: String, + val region: String, + val isFollow: Boolean, + val profileImage: String +) : com.avengers.data.model.base.BaseDataModel { + companion object : + com.avengers.data.model.mapper.DomainMapper { + override fun com.avengers.data.model.response.FollowListResponse.toDomainModel(): FollowListData = FollowListData( + nickName = nickName, + region = region, + isFollow = isFollow, + profileImage = profileImage + ) + } +} diff --git a/Aos/data/src/main/java/com/avengers/data/model/response/Location.kt b/Aos/data/src/main/java/com/avengers/data/model/response/Location.kt new file mode 100644 index 0000000..8466f34 --- /dev/null +++ b/Aos/data/src/main/java/com/avengers/data/model/response/Location.kt @@ -0,0 +1,19 @@ +package com.avengers.data.model.response + +import com.avengers.data.model.base.BaseDataModel +import com.avengers.data.model.mapper.DomainMapper +import com.avengers.nibobnebob.domain.model.LocationData +import com.google.gson.annotations.SerializedName + +data class Location( + @SerializedName("coordinates") val coordinates: List, + @SerializedName("type") val type: String +): com.avengers.data.model.base.BaseDataModel { + companion object : + com.avengers.data.model.mapper.DomainMapper { + override fun com.avengers.data.model.response.Location.toDomainModel(): LocationData = LocationData( + coordinates = coordinates, + type = type + ) + } +} \ No newline at end of file diff --git a/Aos/data/src/main/java/com/avengers/data/model/response/LoginResponse.kt b/Aos/data/src/main/java/com/avengers/data/model/response/LoginResponse.kt new file mode 100644 index 0000000..0cb1a84 --- /dev/null +++ b/Aos/data/src/main/java/com/avengers/data/model/response/LoginResponse.kt @@ -0,0 +1,20 @@ +package com.avengers.data.model.response + +import com.avengers.data.model.base.BaseDataModel +import com.avengers.data.model.mapper.DomainMapper +import com.avengers.nibobnebob.domain.model.LoginData +import com.google.gson.annotations.SerializedName + + +data class LoginResponse( + @SerializedName("accessToken") val accessToken: String?, + @SerializedName("refreshToken") val refreshToken: String? +) : com.avengers.data.model.base.BaseDataModel { + companion object : + com.avengers.data.model.mapper.DomainMapper { + override fun com.avengers.data.model.response.LoginResponse.toDomainModel(): LoginData = LoginData( + accessToken = accessToken, + refreshToken = refreshToken + ) + } +} diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/MyDefaultInfoResponse.kt b/Aos/data/src/main/java/com/avengers/data/model/response/MyDefaultInfoResponse.kt similarity index 51% rename from Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/MyDefaultInfoResponse.kt rename to Aos/data/src/main/java/com/avengers/data/model/response/MyDefaultInfoResponse.kt index 0bc8d89..7b3d170 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/MyDefaultInfoResponse.kt +++ b/Aos/data/src/main/java/com/avengers/data/model/response/MyDefaultInfoResponse.kt @@ -1,17 +1,18 @@ -package com.avengers.nibobnebob.data.model.response +package com.avengers.data.model.response -import com.avengers.nibobnebob.data.model.base.BaseDataModel -import com.avengers.nibobnebob.data.model.mapper.DomainMapper -import com.avengers.nibobnebob.data.model.response.UserEditInfo.Companion.toDomainModel +import com.avengers.data.model.base.BaseDataModel +import com.avengers.data.model.mapper.DomainMapper +import com.avengers.data.model.response.UserEditInfo.Companion.toDomainModel import com.avengers.nibobnebob.domain.model.MyDefaultInfoData import com.avengers.nibobnebob.domain.model.UserEditInfoData import com.google.gson.annotations.SerializedName data class MyDefaultInfoResponse( - @SerializedName("userInfo") val userInfo: UserEditInfo -) : BaseDataModel { - companion object : DomainMapper { - override fun MyDefaultInfoResponse.toDomainModel(): MyDefaultInfoData = MyDefaultInfoData( + @SerializedName("userInfo") val userInfo: com.avengers.data.model.response.UserEditInfo +) : com.avengers.data.model.base.BaseDataModel { + companion object : + com.avengers.data.model.mapper.DomainMapper { + override fun com.avengers.data.model.response.MyDefaultInfoResponse.toDomainModel(): MyDefaultInfoData = MyDefaultInfoData( userInfo = userInfo.toDomainModel() ) } @@ -26,9 +27,10 @@ data class UserEditInfo( @SerializedName("isMale") val isMale: Boolean, @SerializedName("password") val password: Int, @SerializedName("profileImage") val profileImage: String -) : BaseDataModel { - companion object : DomainMapper { - override fun UserEditInfo.toDomainModel(): UserEditInfoData = UserEditInfoData( +) : com.avengers.data.model.base.BaseDataModel { + companion object : + com.avengers.data.model.mapper.DomainMapper { + override fun com.avengers.data.model.response.UserEditInfo.toDomainModel(): UserEditInfoData = UserEditInfoData( nickName = nickName, email = email, provider = provider, diff --git a/Aos/data/src/main/java/com/avengers/data/model/response/MyInfoResponse.kt b/Aos/data/src/main/java/com/avengers/data/model/response/MyInfoResponse.kt new file mode 100644 index 0000000..0fae416 --- /dev/null +++ b/Aos/data/src/main/java/com/avengers/data/model/response/MyInfoResponse.kt @@ -0,0 +1,41 @@ +package com.avengers.data.model.response + +import com.avengers.data.model.base.BaseDataModel +import com.avengers.data.model.mapper.DomainMapper +import com.avengers.data.model.response.UserInfo.Companion.toDomainModel +import com.avengers.nibobnebob.domain.model.MyInfoData +import com.avengers.nibobnebob.domain.model.UserInfoData +import com.google.gson.annotations.SerializedName + + +data class MyInfoResponse( + @SerializedName("userInfo") val userInfo: com.avengers.data.model.response.UserInfo +) : com.avengers.data.model.base.BaseDataModel { + companion object : + com.avengers.data.model.mapper.DomainMapper { + override fun com.avengers.data.model.response.MyInfoResponse.toDomainModel(): MyInfoData = MyInfoData( + userInfo = userInfo.toDomainModel() + ) + } +} + +data class UserInfo( + @SerializedName("nickName") val nickName: String, + @SerializedName("birthdate") val birthdate: String, + @SerializedName("region") val region: String, + @SerializedName("isMale") val isMale: Boolean, + @SerializedName("profileImage") val profileImage: String +) : com.avengers.data.model.base.BaseDataModel { + companion object : + com.avengers.data.model.mapper.DomainMapper { + override fun com.avengers.data.model.response.UserInfo.toDomainModel(): UserInfoData = UserInfoData( + nickName = nickName, + birthdate = birthdate, + region = region, + isMale = isMale, + profileImage = profileImage + ) + } + +} + diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/MyRestaurantResponse.kt b/Aos/data/src/main/java/com/avengers/data/model/response/MyRestaurantResponse.kt similarity index 54% rename from Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/MyRestaurantResponse.kt rename to Aos/data/src/main/java/com/avengers/data/model/response/MyRestaurantResponse.kt index 991e142..dedf05b 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/MyRestaurantResponse.kt +++ b/Aos/data/src/main/java/com/avengers/data/model/response/MyRestaurantResponse.kt @@ -1,19 +1,20 @@ -package com.avengers.nibobnebob.data.model.response +package com.avengers.data.model.response -import com.avengers.nibobnebob.data.model.base.BaseDataModel -import com.avengers.nibobnebob.data.model.mapper.DomainMapper -import com.avengers.nibobnebob.data.model.response.Location.Companion.toDomainModel -import com.avengers.nibobnebob.data.model.response.MyRestaurantItem.Companion.toDomainModel +import com.avengers.data.model.base.BaseDataModel +import com.avengers.data.model.mapper.DomainMapper +import com.avengers.data.model.response.Location.Companion.toDomainModel +import com.avengers.data.model.response.MyRestaurantItem.Companion.toDomainModel import com.avengers.nibobnebob.domain.model.MyRestaurantData import com.avengers.nibobnebob.domain.model.MyRestaurantItemData import com.google.gson.annotations.SerializedName data class MyRestaurantResponse( @SerializedName("hasNext") val hasNext: Boolean, - @SerializedName("items") val restaurantItems: List? -) : BaseDataModel { - companion object : DomainMapper { - override fun MyRestaurantResponse.toDomainModel(): MyRestaurantData = MyRestaurantData( + @SerializedName("items") val restaurantItems: List? +) : com.avengers.data.model.base.BaseDataModel { + companion object : + com.avengers.data.model.mapper.DomainMapper { + override fun com.avengers.data.model.response.MyRestaurantResponse.toDomainModel(): MyRestaurantData = MyRestaurantData( hasNext = hasNext, restaurantItemsData = restaurantItems?.map { it.toDomainModel() } ) @@ -28,13 +29,14 @@ data class MyRestaurantItem( @SerializedName("restaurant_category") val category: String, @SerializedName("restaurant_id") val id: Int, @SerializedName("created_at") val createdAt: String?, - @SerializedName("restaurant_location") val location: Location, + @SerializedName("restaurant_location") val location: com.avengers.data.model.response.Location, @SerializedName("restaurant_name") val name: String, @SerializedName("restaurant_phoneNumber") val phoneNumber: String, @SerializedName("restaurant_reviewImage") val restaurantImage: String -) : BaseDataModel { - companion object : DomainMapper { - override fun MyRestaurantItem.toDomainModel(): MyRestaurantItemData = MyRestaurantItemData( +) : com.avengers.data.model.base.BaseDataModel { + companion object : + com.avengers.data.model.mapper.DomainMapper { + override fun com.avengers.data.model.response.MyRestaurantItem.toDomainModel(): MyRestaurantItemData = MyRestaurantItemData( isMy = isMy, isWish = isWish, reviewCnt = reviewCnt, diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/RecommendFollowListResponse.kt b/Aos/data/src/main/java/com/avengers/data/model/response/RecommendFollowListResponse.kt similarity index 68% rename from Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/RecommendFollowListResponse.kt rename to Aos/data/src/main/java/com/avengers/data/model/response/RecommendFollowListResponse.kt index be56e12..e584170 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/RecommendFollowListResponse.kt +++ b/Aos/data/src/main/java/com/avengers/data/model/response/RecommendFollowListResponse.kt @@ -1,7 +1,7 @@ -package com.avengers.nibobnebob.data.model.response +package com.avengers.data.model.response -import com.avengers.nibobnebob.data.model.base.BaseDataModel -import com.avengers.nibobnebob.data.model.mapper.DomainMapper +import com.avengers.data.model.base.BaseDataModel +import com.avengers.data.model.mapper.DomainMapper import com.avengers.nibobnebob.domain.model.RecommendFollowListData import com.google.gson.annotations.SerializedName @@ -14,8 +14,9 @@ data class RecommendFollowListResponse( val isFollow: Boolean, @SerializedName("user_profileImage") val profileImage: String -) : BaseDataModel { - companion object : DomainMapper { +) : com.avengers.data.model.base.BaseDataModel { + companion object : + com.avengers.data.model.mapper.DomainMapper { override fun RecommendFollowListResponse.toDomainModel(): RecommendFollowListData = RecommendFollowListData( nickName = nickName, diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/RecommendRestaurantResponse.kt b/Aos/data/src/main/java/com/avengers/data/model/response/RecommendRestaurantResponse.kt similarity index 66% rename from Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/RecommendRestaurantResponse.kt rename to Aos/data/src/main/java/com/avengers/data/model/response/RecommendRestaurantResponse.kt index d5aafb2..36a5535 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/RecommendRestaurantResponse.kt +++ b/Aos/data/src/main/java/com/avengers/data/model/response/RecommendRestaurantResponse.kt @@ -1,7 +1,7 @@ -package com.avengers.nibobnebob.data.model.response +package com.avengers.data.model.response -import com.avengers.nibobnebob.data.model.base.BaseDataModel -import com.avengers.nibobnebob.data.model.mapper.DomainMapper +import com.avengers.data.model.base.BaseDataModel +import com.avengers.data.model.mapper.DomainMapper import com.avengers.nibobnebob.domain.model.RecommendRestaurantData import com.google.gson.annotations.SerializedName @@ -10,8 +10,9 @@ data class RecommendRestaurantResponse( @SerializedName("restaurant_id") val id: Int, @SerializedName("restaurant_name") val name: String, @SerializedName("restaurant_reviewImage") val reviewImage: String -) : BaseDataModel { - companion object : DomainMapper { +) : com.avengers.data.model.base.BaseDataModel { + companion object : + com.avengers.data.model.mapper.DomainMapper { override fun RecommendRestaurantResponse.toDomainModel() = RecommendRestaurantData( category = category, id = id, diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/RestaurantDetailResponse.kt b/Aos/data/src/main/java/com/avengers/data/model/response/RestaurantDetailResponse.kt similarity index 81% rename from Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/RestaurantDetailResponse.kt rename to Aos/data/src/main/java/com/avengers/data/model/response/RestaurantDetailResponse.kt index 27762f3..30fdcb6 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/RestaurantDetailResponse.kt +++ b/Aos/data/src/main/java/com/avengers/data/model/response/RestaurantDetailResponse.kt @@ -1,9 +1,7 @@ -package com.avengers.nibobnebob.data.model.response +package com.avengers.data.model.response -import com.avengers.nibobnebob.data.model.base.BaseDataModel -import com.avengers.nibobnebob.data.model.mapper.DomainMapper -import com.avengers.nibobnebob.data.model.response.Location.Companion.toDomainModel -import com.avengers.nibobnebob.data.model.response.Reviews.Companion.toDomainModel +import com.avengers.data.model.response.Location.Companion.toDomainModel +import com.avengers.data.model.response.Reviews.Companion.toDomainModel import com.avengers.nibobnebob.domain.model.RestaurantDetailData import com.avengers.nibobnebob.domain.model.ReviewSortData import com.avengers.nibobnebob.domain.model.ReviewsData @@ -15,13 +13,14 @@ data class RestaurantDetailResponse( @SerializedName("restaurant_address") val address: String, @SerializedName("restaurant_category") val category: String, @SerializedName("restaurant_id") val id: Int, - @SerializedName("restaurant_location") val location: Location, + @SerializedName("restaurant_location") val location: com.avengers.data.model.response.Location, @SerializedName("restaurant_name") val name: String, @SerializedName("restaurant_phoneNumber") val phoneNumber: String, @SerializedName("restaurant_reviewCnt") val reviewCnt: Int, @SerializedName("reviews") val reviews: List? -) : BaseDataModel { - companion object : DomainMapper { +) : com.avengers.data.model.base.BaseDataModel { + companion object : + com.avengers.data.model.mapper.DomainMapper { override fun RestaurantDetailResponse.toDomainModel(): RestaurantDetailData = RestaurantDetailData( isMy = isMy, @@ -41,8 +40,9 @@ data class RestaurantDetailResponse( data class ReviewSortResponse( @SerializedName("hasNext") val hasNext: Boolean, @SerializedName("items") val reviewItems: List -) : BaseDataModel { - companion object : DomainMapper { +) : com.avengers.data.model.base.BaseDataModel { + companion object : + com.avengers.data.model.mapper.DomainMapper { override fun ReviewSortResponse.toDomainModel(): ReviewSortData = ReviewSortData( hasNext = hasNext, reviewItems = reviewItems.map { it.toDomainModel() } @@ -66,8 +66,8 @@ data class Reviews( @SerializedName("islike") val isLike: Boolean?, @SerializedName("likeCount") val likeCount: Int, @SerializedName("dislikeCount") val dislikeCount: Int, -) : BaseDataModel { - companion object : DomainMapper { +) : com.avengers.data.model.base.BaseDataModel { + companion object : com.avengers.data.model.mapper.DomainMapper { override fun Reviews.toDomainModel(): ReviewsData = ReviewsData( id = id, createdAt = createdAt, diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/RestaurantIsWishResponse.kt b/Aos/data/src/main/java/com/avengers/data/model/response/RestaurantIsWishResponse.kt similarity index 54% rename from Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/RestaurantIsWishResponse.kt rename to Aos/data/src/main/java/com/avengers/data/model/response/RestaurantIsWishResponse.kt index 027b722..c6206f3 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/RestaurantIsWishResponse.kt +++ b/Aos/data/src/main/java/com/avengers/data/model/response/RestaurantIsWishResponse.kt @@ -1,14 +1,15 @@ -package com.avengers.nibobnebob.data.model.response +package com.avengers.data.model.response -import com.avengers.nibobnebob.data.model.base.BaseDataModel -import com.avengers.nibobnebob.data.model.mapper.DomainMapper +import com.avengers.data.model.base.BaseDataModel +import com.avengers.data.model.mapper.DomainMapper import com.avengers.nibobnebob.domain.model.RestaurantIsWishData import com.google.gson.annotations.SerializedName data class RestaurantIsWishResponse( @SerializedName("isWish") val isWish: Boolean -) : BaseDataModel { - companion object : DomainMapper { +) : com.avengers.data.model.base.BaseDataModel { + companion object : + com.avengers.data.model.mapper.DomainMapper { override fun RestaurantIsWishResponse.toDomainModel(): RestaurantIsWishData = RestaurantIsWishData( isWish = isWish diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/RestaurantItemResponse.kt b/Aos/data/src/main/java/com/avengers/data/model/response/RestaurantItemResponse.kt similarity index 70% rename from Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/RestaurantItemResponse.kt rename to Aos/data/src/main/java/com/avengers/data/model/response/RestaurantItemResponse.kt index da9627b..dde2681 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/RestaurantItemResponse.kt +++ b/Aos/data/src/main/java/com/avengers/data/model/response/RestaurantItemResponse.kt @@ -1,8 +1,8 @@ -package com.avengers.nibobnebob.data.model.response +package com.avengers.data.model.response -import com.avengers.nibobnebob.data.model.base.BaseDataModel -import com.avengers.nibobnebob.data.model.mapper.DomainMapper -import com.avengers.nibobnebob.data.model.response.Location.Companion.toDomainModel +import com.avengers.data.model.base.BaseDataModel +import com.avengers.data.model.mapper.DomainMapper +import com.avengers.data.model.response.Location.Companion.toDomainModel import com.avengers.nibobnebob.domain.model.RestaurantItemsData import com.google.gson.annotations.SerializedName @@ -14,12 +14,13 @@ data class RestaurantItemResponse( @SerializedName("restaurant_address") val address: String, @SerializedName("restaurant_category") val category: String, @SerializedName("restaurant_id") val id: Int, - @SerializedName("restaurant_location") val location: Location, + @SerializedName("restaurant_location") val location: com.avengers.data.model.response.Location, @SerializedName("restaurant_name") val name: String, @SerializedName("restaurant_phoneNumber") val phoneNumber: String, @SerializedName("restaurant_reviewImage") val restaurantImage: String -) : BaseDataModel { - companion object : DomainMapper { +) : com.avengers.data.model.base.BaseDataModel { + companion object : + com.avengers.data.model.mapper.DomainMapper { override fun RestaurantItemResponse.toDomainModel(): RestaurantItemsData = RestaurantItemsData( isMy = isMy, isWish = isWish, diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/SearchRestaurantResponse.kt b/Aos/data/src/main/java/com/avengers/data/model/response/SearchRestaurantResponse.kt similarity index 67% rename from Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/SearchRestaurantResponse.kt rename to Aos/data/src/main/java/com/avengers/data/model/response/SearchRestaurantResponse.kt index fdbd4cb..63fa0e1 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/SearchRestaurantResponse.kt +++ b/Aos/data/src/main/java/com/avengers/data/model/response/SearchRestaurantResponse.kt @@ -1,27 +1,27 @@ -package com.avengers.nibobnebob.data.model.response +package com.avengers.data.model.response -import com.avengers.nibobnebob.data.model.base.BaseDataModel -import com.avengers.nibobnebob.data.model.mapper.DomainMapper -import com.avengers.nibobnebob.domain.model.SearchRestaurantData +import com.avengers.data.model.response.Location.Companion.toDomainModel +import com.avengers.domain.model.SearchRestaurantData import com.google.gson.annotations.SerializedName data class SearchRestaurantResponse( @SerializedName("restaurant_id") val id: Int, @SerializedName("restaurant_name") val name: String, - @SerializedName("restaurant_location") val location: Location, + @SerializedName("restaurant_location") val location: com.avengers.data.model.response.Location, @SerializedName("restaurant_address") val address: String, @SerializedName("restaurant_phoneNumber") val phoneNumber: String, @SerializedName("restaurant_reviewCnt") val reviewCnt: Int, @SerializedName("restaurant_category") val category: String, @SerializedName("isMy") val isMy: Boolean, @SerializedName("restaurant_reviewImage") val restaurantImage: String -) : BaseDataModel { - companion object : DomainMapper { +) : com.avengers.data.model.base.BaseDataModel { + companion object : + com.avengers.data.model.mapper.DomainMapper { override fun SearchRestaurantResponse.toDomainModel(): SearchRestaurantData = SearchRestaurantData( id = id, name = name, - location = location, + location = location.toDomainModel(), address = address, phoneNumber = phoneNumber, reviewCnt = reviewCnt, diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/UserDetailResponse.kt b/Aos/data/src/main/java/com/avengers/data/model/response/UserDetailResponse.kt similarity index 70% rename from Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/UserDetailResponse.kt rename to Aos/data/src/main/java/com/avengers/data/model/response/UserDetailResponse.kt index ae50af5..067a60c 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/UserDetailResponse.kt +++ b/Aos/data/src/main/java/com/avengers/data/model/response/UserDetailResponse.kt @@ -1,8 +1,7 @@ -package com.avengers.nibobnebob.data.model.response +package com.avengers.data.model.response -import com.avengers.nibobnebob.data.model.base.BaseDataModel -import com.avengers.nibobnebob.data.model.mapper.DomainMapper -import com.avengers.nibobnebob.data.model.response.UserDetailRestaurantResponse.Companion.toDomainModel +import com.avengers.data.model.response.Location.Companion.toDomainModel +import com.avengers.data.model.response.UserDetailRestaurantResponse.Companion.toDomainModel import com.avengers.nibobnebob.domain.model.UserDetailData import com.avengers.nibobnebob.domain.model.UserDetailRestaurantData import com.google.gson.annotations.SerializedName @@ -15,8 +14,9 @@ data class UserDetailResponse( val isFollow: Boolean, val restaurants: List, val profileImage: String -) : BaseDataModel { - companion object : DomainMapper { +) : com.avengers.data.model.base.BaseDataModel { + companion object : + com.avengers.data.model.mapper.DomainMapper { override fun UserDetailResponse.toDomainModel(): UserDetailData = UserDetailData( nickName = nickName, birthdate = birthdate, @@ -33,19 +33,20 @@ data class UserDetailResponse( data class UserDetailRestaurantResponse( @SerializedName("restaurant_id") val id: Int, @SerializedName("restaurant_name") val name: String, - @SerializedName("restaurant_location") val location: Location, + @SerializedName("restaurant_location") val location: com.avengers.data.model.response.Location, @SerializedName("restaurant_address") val address: String, @SerializedName("restaurant_phoneNumber") val phoneNumber: String, @SerializedName("restaurant_reviewCnt") val reviewCnt: Int, @SerializedName("restaurant_category") val category: String, @SerializedName("isMy") val isMy: Boolean -) : BaseDataModel { - companion object : DomainMapper { +) : com.avengers.data.model.base.BaseDataModel { + companion object : + com.avengers.data.model.mapper.DomainMapper { override fun UserDetailRestaurantResponse.toDomainModel(): UserDetailRestaurantData = UserDetailRestaurantData( id = id, name = name, - location = location, + location = location.toDomainModel(), address = address, phoneNumber = phoneNumber, reviewCnt = reviewCnt, diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/ValidationResponse.kt b/Aos/data/src/main/java/com/avengers/data/model/response/ValidationResponse.kt similarity index 52% rename from Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/ValidationResponse.kt rename to Aos/data/src/main/java/com/avengers/data/model/response/ValidationResponse.kt index 9200497..6c5715d 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/ValidationResponse.kt +++ b/Aos/data/src/main/java/com/avengers/data/model/response/ValidationResponse.kt @@ -1,15 +1,15 @@ -package com.avengers.nibobnebob.data.model.response +package com.avengers.data.model.response -import com.avengers.nibobnebob.data.model.base.BaseDataModel -import com.avengers.nibobnebob.data.model.mapper.DomainMapper +import com.avengers.data.model.base.BaseDataModel +import com.avengers.data.model.mapper.DomainMapper import com.avengers.nibobnebob.domain.model.ValidateData import com.google.gson.annotations.SerializedName data class ValidateResponse( @SerializedName("isexist") val isExist: Boolean -) : BaseDataModel { - companion object : DomainMapper { +) : com.avengers.data.model.base.BaseDataModel { + companion object : com.avengers.data.model.mapper.DomainMapper { override fun ValidateResponse.toDomainModel(): ValidateData = ValidateData( isExist = isExist ) diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/WishRestaurantResponse.kt b/Aos/data/src/main/java/com/avengers/data/model/response/WishRestaurantResponse.kt similarity index 70% rename from Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/WishRestaurantResponse.kt rename to Aos/data/src/main/java/com/avengers/data/model/response/WishRestaurantResponse.kt index 2fb954a..6c43b80 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/response/WishRestaurantResponse.kt +++ b/Aos/data/src/main/java/com/avengers/data/model/response/WishRestaurantResponse.kt @@ -1,9 +1,7 @@ -package com.avengers.nibobnebob.data.model.response +package com.avengers.data.model.response -import com.avengers.nibobnebob.data.model.base.BaseDataModel -import com.avengers.nibobnebob.data.model.mapper.DomainMapper -import com.avengers.nibobnebob.data.model.response.Location.Companion.toDomainModel -import com.avengers.nibobnebob.data.model.response.WishRestaurantItems.Companion.toDomainModel +import com.avengers.data.model.response.Location.Companion.toDomainModel +import com.avengers.data.model.response.WishRestaurantItems.Companion.toDomainModel import com.avengers.nibobnebob.domain.model.WishRestaurantData import com.avengers.nibobnebob.domain.model.WishRestaurantItemsData import com.google.gson.annotations.SerializedName @@ -11,8 +9,9 @@ import com.google.gson.annotations.SerializedName data class WishRestaurantResponse( @SerializedName("hasNext") val hasNext: Boolean, @SerializedName("items") val wishRestaurantItems: List? -) : BaseDataModel { - companion object : DomainMapper { +) : com.avengers.data.model.base.BaseDataModel { + companion object : + com.avengers.data.model.mapper.DomainMapper { override fun WishRestaurantResponse.toDomainModel(): WishRestaurantData = WishRestaurantData( hasNext = hasNext, @@ -27,11 +26,12 @@ data class WishRestaurantItems( @SerializedName("restaurant_address") val address: String, @SerializedName("restaurant_category") val category: String, @SerializedName("restaurant_id") val id: Int, - @SerializedName("restaurant_location") val location: Location, + @SerializedName("restaurant_location") val location: com.avengers.data.model.response.Location, @SerializedName("restaurant_name") val name: String, @SerializedName("restaurant_phoneNumber") val phoneNumber: String -) : BaseDataModel { - companion object : DomainMapper { +) : com.avengers.data.model.base.BaseDataModel { + companion object : + com.avengers.data.model.mapper.DomainMapper { override fun WishRestaurantItems.toDomainModel(): WishRestaurantItemsData = WishRestaurantItemsData( isMy = isMy, diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/runRemote.kt b/Aos/data/src/main/java/com/avengers/data/model/runRemote.kt similarity index 95% rename from Aos/app/src/main/java/com/avengers/nibobnebob/data/model/runRemote.kt rename to Aos/data/src/main/java/com/avengers/data/model/runRemote.kt index a0a1938..5615e58 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/data/model/runRemote.kt +++ b/Aos/data/src/main/java/com/avengers/data/model/runRemote.kt @@ -1,4 +1,4 @@ -package com.avengers.nibobnebob.data.model +package com.avengers.data.model import com.avengers.nibobnebob.domain.model.base.BaseState import com.avengers.nibobnebob.domain.model.base.StatusCode diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/data/remote/FollowApi.kt b/Aos/data/src/main/java/com/avengers/data/remote/FollowApi.kt similarity index 79% rename from Aos/app/src/main/java/com/avengers/nibobnebob/data/remote/FollowApi.kt rename to Aos/data/src/main/java/com/avengers/data/remote/FollowApi.kt index 95dc193..630b8b0 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/data/remote/FollowApi.kt +++ b/Aos/data/src/main/java/com/avengers/data/remote/FollowApi.kt @@ -1,9 +1,9 @@ -package com.avengers.nibobnebob.data.remote +package com.avengers.data.remote -import com.avengers.nibobnebob.data.model.response.BaseResponse -import com.avengers.nibobnebob.data.model.response.FollowListResponse -import com.avengers.nibobnebob.data.model.response.RecommendFollowListResponse -import com.avengers.nibobnebob.data.model.response.UserDetailResponse +import com.avengers.data.model.response.BaseResponse +import com.avengers.data.model.response.FollowListResponse +import com.avengers.data.model.response.RecommendFollowListResponse +import com.avengers.data.model.response.UserDetailResponse import retrofit2.Response import retrofit2.http.DELETE import retrofit2.http.GET diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/data/remote/IntroApi.kt b/Aos/data/src/main/java/com/avengers/data/remote/IntroApi.kt similarity index 63% rename from Aos/app/src/main/java/com/avengers/nibobnebob/data/remote/IntroApi.kt rename to Aos/data/src/main/java/com/avengers/data/remote/IntroApi.kt index d053528..ce87aff 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/data/remote/IntroApi.kt +++ b/Aos/data/src/main/java/com/avengers/data/remote/IntroApi.kt @@ -1,8 +1,8 @@ -package com.avengers.nibobnebob.data.remote +package com.avengers.data.remote -import com.avengers.nibobnebob.data.model.request.BasicLoginRequest -import com.avengers.nibobnebob.data.model.response.BaseResponse -import com.avengers.nibobnebob.data.model.response.LoginResponse +import com.avengers.data.model.request.BasicLoginRequest +import com.avengers.data.model.response.BaseResponse +import com.avengers.data.model.response.LoginResponse import okhttp3.MultipartBody import okhttp3.RequestBody import retrofit2.Response @@ -25,7 +25,7 @@ interface IntroApi { @Part("birthdate") birthdate: RequestBody, @Part("isMale") isMale: Boolean, @Part profileImage: MultipartBody.Part - ): Response> + ): Response> @Multipart @POST("api/user") @@ -37,15 +37,15 @@ interface IntroApi { @Part("region") region: RequestBody, @Part("birthdate") birthdate: RequestBody, @Part("isMale") isMale: Boolean, - ): Response> + ): Response> @POST("api/auth/social-login") suspend fun loginNaver( @Header("Authorization") token: String - ): Response> + ): Response> @POST("api/auth/login") suspend fun loginBasic( - @Body params: BasicLoginRequest - ): Response> + @Body params: com.avengers.data.model.request.BasicLoginRequest + ): Response> } \ No newline at end of file diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/data/remote/MyPageApi.kt b/Aos/data/src/main/java/com/avengers/data/remote/MyPageApi.kt similarity index 67% rename from Aos/app/src/main/java/com/avengers/nibobnebob/data/remote/MyPageApi.kt rename to Aos/data/src/main/java/com/avengers/data/remote/MyPageApi.kt index 7d8b33b..24ac8b9 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/data/remote/MyPageApi.kt +++ b/Aos/data/src/main/java/com/avengers/data/remote/MyPageApi.kt @@ -1,8 +1,8 @@ -package com.avengers.nibobnebob.data.remote +package com.avengers.data.remote -import com.avengers.nibobnebob.data.model.response.BaseResponse -import com.avengers.nibobnebob.data.model.response.MyDefaultInfoResponse -import com.avengers.nibobnebob.data.model.response.MyInfoResponse +import com.avengers.data.model.response.BaseResponse +import com.avengers.data.model.response.MyDefaultInfoResponse +import com.avengers.data.model.response.MyInfoResponse import okhttp3.MultipartBody import okhttp3.RequestBody import retrofit2.Response @@ -15,10 +15,10 @@ import retrofit2.http.Part interface MyPageApi { @GET("api/user/details") - suspend fun getMyInfo(): Response> + suspend fun getMyInfo(): Response> @GET("api/user") - suspend fun getMyDefaultInfo(): Response> + suspend fun getMyDefaultInfo(): Response> @Multipart @PUT("api/user") diff --git a/Aos/data/src/main/java/com/avengers/data/remote/RefreshApi.kt b/Aos/data/src/main/java/com/avengers/data/remote/RefreshApi.kt new file mode 100644 index 0000000..8a20439 --- /dev/null +++ b/Aos/data/src/main/java/com/avengers/data/remote/RefreshApi.kt @@ -0,0 +1,14 @@ +package com.avengers.data.remote + +import com.avengers.data.model.request.RefreshTokenRequest +import com.avengers.data.model.response.BaseResponse +import com.avengers.data.model.response.LoginResponse +import retrofit2.Response +import retrofit2.http.Body +import retrofit2.http.POST + +interface RefreshApi { + + @POST("api/auth/refresh-token") + suspend fun refreshAccessToken(@Body refreshToken: com.avengers.data.model.request.RefreshTokenRequest) : Response> +} \ No newline at end of file diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/data/remote/RestaurantApi.kt b/Aos/data/src/main/java/com/avengers/data/remote/RestaurantApi.kt similarity index 68% rename from Aos/app/src/main/java/com/avengers/nibobnebob/data/remote/RestaurantApi.kt rename to Aos/data/src/main/java/com/avengers/data/remote/RestaurantApi.kt index d6a7290..2ee415e 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/data/remote/RestaurantApi.kt +++ b/Aos/data/src/main/java/com/avengers/data/remote/RestaurantApi.kt @@ -1,15 +1,13 @@ -package com.avengers.nibobnebob.data.remote - - -import com.avengers.nibobnebob.data.model.response.BaseResponse -import com.avengers.nibobnebob.data.model.response.MyRestaurantResponse -import com.avengers.nibobnebob.data.model.response.RecommendRestaurantResponse -import com.avengers.nibobnebob.data.model.response.RestaurantDetailResponse -import com.avengers.nibobnebob.data.model.response.RestaurantIsWishResponse -import com.avengers.nibobnebob.data.model.response.RestaurantItemResponse -import com.avengers.nibobnebob.data.model.response.ReviewSortResponse -import com.avengers.nibobnebob.data.model.response.SearchRestaurantResponse -import com.avengers.nibobnebob.data.model.response.WishRestaurantResponse +package com.avengers.data.remote + + +import com.avengers.data.model.response.RecommendRestaurantResponse +import com.avengers.data.model.response.RestaurantDetailResponse +import com.avengers.data.model.response.RestaurantIsWishResponse +import com.avengers.data.model.response.RestaurantItemResponse +import com.avengers.data.model.response.ReviewSortResponse +import com.avengers.data.model.response.SearchRestaurantResponse +import com.avengers.data.model.response.WishRestaurantResponse import okhttp3.MultipartBody import okhttp3.RequestBody import retrofit2.Response @@ -26,7 +24,7 @@ interface RestaurantApi { @GET("api/restaurant/{restaurantId}/details") suspend fun restaurantDetail( @Path("restaurantId") restaurantId: Int - ): Response> + ): Response> @GET("api/review/{restaurantId}") suspend fun sortReview( @@ -34,7 +32,7 @@ interface RestaurantApi { @Query("limit") limit: Int? = null, @Query("page") page: Int? = null, @Query("sort") sort: String? = null - ): Response> + ): Response> @Multipart @POST("api/user/restaurant/{restaurantId}") @@ -48,7 +46,7 @@ interface RestaurantApi { @Part("restroomCleanliness") restroomCleanliness: Int, @Part("overallExperience") overallExperience: RequestBody, @Part reviewImage: MultipartBody.Part - ): Response> + ): Response> @Multipart @POST("api/user/restaurant/{restaurantId}") @@ -61,12 +59,12 @@ interface RestaurantApi { @Part("service") service: Int, @Part("restroomCleanliness") restroomCleanliness: Int, @Part("overallExperience") overallExperience: RequestBody, - ): Response> + ): Response> @DELETE("api/user/restaurant/{restaurantid}") suspend fun deleteRestaurant( @Path("restaurantid") restaurantId: Int - ): Response> + ): Response> // 내 맛집 리스트 @GET("api/user/restaurant") @@ -76,7 +74,7 @@ interface RestaurantApi { @Query("limit") limit: Int? = null, @Query("page") page: Int? = null, @Query("sort") sort: String? = null, - ): Response> + ): Response> // 내 위시 리스트 @GET("api/user/wish-restaurant") @@ -84,22 +82,22 @@ interface RestaurantApi { @Query("limit") limit: Int? = null, @Query("page") page: Int? = null, @Query("sort") sort: String? = null, - ): Response> + ): Response> @POST("api/user/wish-restaurant/{restaurantId}") suspend fun addWishRestaurant( @Path("restaurantId") restaurantId: Int - ): Response> + ): Response> @DELETE("api/user/wish-restaurant/{restaurantId}") suspend fun deleteWishRestaurant( @Path("restaurantId") restaurantId: Int - ): Response> + ): Response> @GET("api/user/state/wish-restaurant") suspend fun getRestaurantIsWish( @Query("restaurantid") id: Int - ): Response> + ): Response> @GET("api/restaurant/autocomplete/{partialRestaurantName}") @@ -108,7 +106,7 @@ interface RestaurantApi { @Query("radius") radius: String?, @Query("longitude") longitude: String?, @Query("latitude") latitude: String? - ): Response>> + ): Response>> //filter 맛집 리스트 @GET("api/restaurant") @@ -116,7 +114,7 @@ interface RestaurantApi { @Query("filter") filter: String, @Query("location") location: String, @Query("radius") radius: Int - ): Response>> + ): Response>> //위치기반 맛집 리스트 @GET("api/restaurant/all") @@ -125,19 +123,19 @@ interface RestaurantApi { @Query("radius") radius: String, @Query("longitude") longitude: String, @Query("latitude") latitude: String - ): Response>> + ): Response>> @POST("api/review/{reviewId}/like") suspend fun likeReview( @Path("reviewId") reviewId: Int - ): Response> + ): Response> @POST("api/review/{reviewId}/unlike") suspend fun unlikeReview( @Path("reviewId") reviewId: Int - ): Response> + ): Response> @GET("api/user/recommend-food") suspend fun recommendRestaurantList() - : Response>> + : Response>> } \ No newline at end of file diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/data/remote/ValidationApi.kt b/Aos/data/src/main/java/com/avengers/data/remote/ValidationApi.kt similarity index 55% rename from Aos/app/src/main/java/com/avengers/nibobnebob/data/remote/ValidationApi.kt rename to Aos/data/src/main/java/com/avengers/data/remote/ValidationApi.kt index 8823d9c..4c6fef1 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/data/remote/ValidationApi.kt +++ b/Aos/data/src/main/java/com/avengers/data/remote/ValidationApi.kt @@ -1,7 +1,6 @@ -package com.avengers.nibobnebob.data.remote +package com.avengers.data.remote -import com.avengers.nibobnebob.data.model.response.BaseResponse -import com.avengers.nibobnebob.data.model.response.ValidateResponse +import com.avengers.data.model.response.ValidateResponse import retrofit2.Response import retrofit2.http.GET import retrofit2.http.Path @@ -11,10 +10,10 @@ interface ValidationApi { @GET("api/user/nickname/{nickname}/exists") suspend fun nickValidation( @Path("nickname") nickname: String - ): Response> + ): Response> @GET("api/user/email/{email}/exists") suspend fun emailValidation( @Path("email") email: String - ): Response> + ): Response> } \ No newline at end of file diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/data/repository/FollowRepositoryImpl.kt b/Aos/data/src/main/java/com/avengers/data/repository/FollowRepositoryImpl.kt similarity index 90% rename from Aos/app/src/main/java/com/avengers/nibobnebob/data/repository/FollowRepositoryImpl.kt rename to Aos/data/src/main/java/com/avengers/data/repository/FollowRepositoryImpl.kt index 6a18fc1..38c9f73 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/data/repository/FollowRepositoryImpl.kt +++ b/Aos/data/src/main/java/com/avengers/data/repository/FollowRepositoryImpl.kt @@ -1,10 +1,10 @@ -package com.avengers.nibobnebob.data.repository +package com.avengers.data.repository -import com.avengers.nibobnebob.data.model.response.FollowListResponse.Companion.toDomainModel -import com.avengers.nibobnebob.data.model.response.RecommendFollowListResponse.Companion.toDomainModel -import com.avengers.nibobnebob.data.model.response.UserDetailResponse.Companion.toDomainModel -import com.avengers.nibobnebob.data.model.runRemote -import com.avengers.nibobnebob.data.remote.FollowApi +import com.avengers.data.model.response.FollowListResponse.Companion.toDomainModel +import com.avengers.data.model.response.RecommendFollowListResponse.Companion.toDomainModel +import com.avengers.data.model.response.UserDetailResponse.Companion.toDomainModel +import com.avengers.data.model.runRemote +import com.avengers.data.remote.FollowApi import com.avengers.nibobnebob.domain.model.FollowListData import com.avengers.nibobnebob.domain.model.RecommendFollowListData import com.avengers.nibobnebob.domain.model.UserDetailData diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/data/repository/IntroRepositoryImpl.kt b/Aos/data/src/main/java/com/avengers/data/repository/IntroRepositoryImpl.kt similarity index 87% rename from Aos/app/src/main/java/com/avengers/nibobnebob/data/repository/IntroRepositoryImpl.kt rename to Aos/data/src/main/java/com/avengers/data/repository/IntroRepositoryImpl.kt index c9f12c0..14e95ed 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/data/repository/IntroRepositoryImpl.kt +++ b/Aos/data/src/main/java/com/avengers/data/repository/IntroRepositoryImpl.kt @@ -1,14 +1,13 @@ -package com.avengers.nibobnebob.data.repository +package com.avengers.data.repository -import com.avengers.nibobnebob.data.model.request.BasicLoginRequest -import com.avengers.nibobnebob.data.model.response.LoginResponse.Companion.toDomainModel -import com.avengers.nibobnebob.data.model.runRemote -import com.avengers.nibobnebob.data.remote.IntroApi +import com.avengers.data.model.Constants.ACCESS +import com.avengers.data.model.response.LoginResponse.Companion.toDomainModel +import com.avengers.data.model.runRemote +import com.avengers.data.remote.IntroApi import com.avengers.nibobnebob.domain.model.LoginData import com.avengers.nibobnebob.domain.model.base.BaseState import com.avengers.nibobnebob.domain.model.base.StatusCode import com.avengers.nibobnebob.domain.repository.IntroRepository -import com.avengers.nibobnebob.presentation.util.Constants.ACCESS import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import okhttp3.MultipartBody @@ -94,7 +93,12 @@ class IntroRepositoryImpl @Inject constructor( } override fun loginBasic(email: String, password: String): Flow> = flow { - when (val result = runRemote { api.loginBasic(BasicLoginRequest(email, password)) }) { + when (val result = runRemote { api.loginBasic( + com.avengers.data.model.request.BasicLoginRequest( + email, + password + ) + ) }) { is BaseState.Success -> { result.data.body?.let { body -> emit(BaseState.Success(body.toDomainModel())) diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/data/repository/MyPageRepositoryImpl.kt b/Aos/data/src/main/java/com/avengers/data/repository/MyPageRepositoryImpl.kt similarity index 80% rename from Aos/app/src/main/java/com/avengers/nibobnebob/data/repository/MyPageRepositoryImpl.kt rename to Aos/data/src/main/java/com/avengers/data/repository/MyPageRepositoryImpl.kt index 207cf63..81d4751 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/data/repository/MyPageRepositoryImpl.kt +++ b/Aos/data/src/main/java/com/avengers/data/repository/MyPageRepositoryImpl.kt @@ -1,17 +1,15 @@ -package com.avengers.nibobnebob.data.repository +package com.avengers.data.repository -import com.avengers.nibobnebob.app.DataStoreManager -import com.avengers.nibobnebob.data.model.response.MyDefaultInfoResponse.Companion.toDomainModel -import com.avengers.nibobnebob.data.model.response.MyInfoResponse.Companion.toDomainModel -import com.avengers.nibobnebob.data.model.runRemote -import com.avengers.nibobnebob.data.remote.MyPageApi +import com.avengers.data.config.DataStoreManager +import com.avengers.data.model.response.MyDefaultInfoResponse.Companion.toDomainModel +import com.avengers.data.model.response.MyInfoResponse.Companion.toDomainModel +import com.avengers.data.model.runRemote +import com.avengers.data.remote.MyPageApi import com.avengers.nibobnebob.domain.model.MyDefaultInfoData import com.avengers.nibobnebob.domain.model.MyInfoData import com.avengers.nibobnebob.domain.model.base.BaseState import com.avengers.nibobnebob.domain.model.base.StatusCode import com.avengers.nibobnebob.domain.repository.MyPageRepository -import com.navercorp.nid.oauth.NidOAuthLogin -import com.navercorp.nid.oauth.OAuthLoginCallback import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import okhttp3.MultipartBody @@ -98,13 +96,13 @@ class MyPageRepositoryImpl @Inject constructor( dataStoreManager.deleteRefreshToken() dataStoreManager.deleteAutoLogin() - NidOAuthLogin().callDeleteTokenApi(object : OAuthLoginCallback { - override fun onError(errorCode: Int, message: String) {} - - override fun onFailure(httpStatus: Int, message: String) {} - - override fun onSuccess() {} - }) +// NidOAuthLogin().callDeleteTokenApi(object : OAuthLoginCallback { +// override fun onError(errorCode: Int, message: String) {} +// +// override fun onFailure(httpStatus: Int, message: String) {} +// +// override fun onSuccess() {} +// }) emit(result) } diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/data/repository/RestaurantRepositoryImpl.kt b/Aos/data/src/main/java/com/avengers/data/repository/RestaurantRepositoryImpl.kt similarity index 91% rename from Aos/app/src/main/java/com/avengers/nibobnebob/data/repository/RestaurantRepositoryImpl.kt rename to Aos/data/src/main/java/com/avengers/data/repository/RestaurantRepositoryImpl.kt index 386ad33..038fd4c 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/data/repository/RestaurantRepositoryImpl.kt +++ b/Aos/data/src/main/java/com/avengers/data/repository/RestaurantRepositoryImpl.kt @@ -1,22 +1,22 @@ -package com.avengers.nibobnebob.data.repository - -import com.avengers.nibobnebob.data.model.response.MyRestaurantResponse.Companion.toDomainModel -import com.avengers.nibobnebob.data.model.response.RecommendRestaurantResponse.Companion.toDomainModel -import com.avengers.nibobnebob.data.model.response.RestaurantDetailResponse.Companion.toDomainModel -import com.avengers.nibobnebob.data.model.response.RestaurantIsWishResponse.Companion.toDomainModel -import com.avengers.nibobnebob.data.model.response.RestaurantItemResponse.Companion.toDomainModel -import com.avengers.nibobnebob.data.model.response.ReviewSortResponse.Companion.toDomainModel -import com.avengers.nibobnebob.data.model.response.SearchRestaurantResponse.Companion.toDomainModel -import com.avengers.nibobnebob.data.model.response.WishRestaurantResponse.Companion.toDomainModel -import com.avengers.nibobnebob.data.model.runRemote -import com.avengers.nibobnebob.data.remote.RestaurantApi +package com.avengers.data.repository + +import com.avengers.data.model.response.MyRestaurantResponse.Companion.toDomainModel +import com.avengers.data.model.response.RecommendRestaurantResponse.Companion.toDomainModel +import com.avengers.data.model.response.RestaurantDetailResponse.Companion.toDomainModel +import com.avengers.data.model.response.RestaurantIsWishResponse.Companion.toDomainModel +import com.avengers.data.model.response.RestaurantItemResponse.Companion.toDomainModel +import com.avengers.data.model.response.ReviewSortResponse.Companion.toDomainModel +import com.avengers.data.model.response.SearchRestaurantResponse.Companion.toDomainModel +import com.avengers.data.model.response.WishRestaurantResponse.Companion.toDomainModel +import com.avengers.data.model.runRemote +import com.avengers.data.remote.RestaurantApi import com.avengers.nibobnebob.domain.model.MyRestaurantData import com.avengers.nibobnebob.domain.model.RecommendRestaurantData import com.avengers.nibobnebob.domain.model.RestaurantDetailData import com.avengers.nibobnebob.domain.model.RestaurantIsWishData import com.avengers.nibobnebob.domain.model.RestaurantItemsData import com.avengers.nibobnebob.domain.model.ReviewSortData -import com.avengers.nibobnebob.domain.model.SearchRestaurantData +import com.avengers.domain.model.SearchRestaurantData import com.avengers.nibobnebob.domain.model.WishRestaurantData import com.avengers.nibobnebob.domain.model.base.BaseState import com.avengers.nibobnebob.domain.model.base.StatusCode diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/data/repository/ValidationRepositoryImpl.kt b/Aos/data/src/main/java/com/avengers/data/repository/ValidationRepositoryImpl.kt similarity index 86% rename from Aos/app/src/main/java/com/avengers/nibobnebob/data/repository/ValidationRepositoryImpl.kt rename to Aos/data/src/main/java/com/avengers/data/repository/ValidationRepositoryImpl.kt index 08dccaa..9bf307b 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/data/repository/ValidationRepositoryImpl.kt +++ b/Aos/data/src/main/java/com/avengers/data/repository/ValidationRepositoryImpl.kt @@ -1,8 +1,8 @@ -package com.avengers.nibobnebob.data.repository +package com.avengers.data.repository -import com.avengers.nibobnebob.data.model.response.ValidateResponse.Companion.toDomainModel -import com.avengers.nibobnebob.data.model.runRemote -import com.avengers.nibobnebob.data.remote.ValidationApi +import com.avengers.data.model.response.ValidateResponse.Companion.toDomainModel +import com.avengers.data.model.runRemote +import com.avengers.data.remote.ValidationApi import com.avengers.nibobnebob.domain.model.ValidateData import com.avengers.nibobnebob.domain.model.base.BaseState import com.avengers.nibobnebob.domain.model.base.StatusCode diff --git a/Aos/data/src/test/java/com/avengers/data/ExampleUnitTest.kt b/Aos/data/src/test/java/com/avengers/data/ExampleUnitTest.kt new file mode 100644 index 0000000..8dd4d6b --- /dev/null +++ b/Aos/data/src/test/java/com/avengers/data/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package com.avengers.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/Aos/domain/.gitignore b/Aos/domain/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/Aos/domain/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/Aos/domain/build.gradle.kts b/Aos/domain/build.gradle.kts new file mode 100644 index 0000000..906c246 --- /dev/null +++ b/Aos/domain/build.gradle.kts @@ -0,0 +1,21 @@ +plugins { + id("java-library") + id("org.jetbrains.kotlin.jvm") + id("kotlin-kapt") +} + +java { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 +} + +dependencies { + + implementation("javax.inject:javax.inject:1") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2") + // 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") +} \ No newline at end of file diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/model/FollowListData.kt b/Aos/domain/src/main/java/com/avengers/domain/model/FollowListData.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/domain/model/FollowListData.kt rename to Aos/domain/src/main/java/com/avengers/domain/model/FollowListData.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/model/LocationData.kt b/Aos/domain/src/main/java/com/avengers/domain/model/LocationData.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/domain/model/LocationData.kt rename to Aos/domain/src/main/java/com/avengers/domain/model/LocationData.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/model/LoginData.kt b/Aos/domain/src/main/java/com/avengers/domain/model/LoginData.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/domain/model/LoginData.kt rename to Aos/domain/src/main/java/com/avengers/domain/model/LoginData.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/model/MyDefaultInfoData.kt b/Aos/domain/src/main/java/com/avengers/domain/model/MyDefaultInfoData.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/domain/model/MyDefaultInfoData.kt rename to Aos/domain/src/main/java/com/avengers/domain/model/MyDefaultInfoData.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/model/MyInfoData.kt b/Aos/domain/src/main/java/com/avengers/domain/model/MyInfoData.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/domain/model/MyInfoData.kt rename to Aos/domain/src/main/java/com/avengers/domain/model/MyInfoData.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/model/MyRestaurantData.kt b/Aos/domain/src/main/java/com/avengers/domain/model/MyRestaurantData.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/domain/model/MyRestaurantData.kt rename to Aos/domain/src/main/java/com/avengers/domain/model/MyRestaurantData.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/model/RecommendFollowListData.kt b/Aos/domain/src/main/java/com/avengers/domain/model/RecommendFollowListData.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/domain/model/RecommendFollowListData.kt rename to Aos/domain/src/main/java/com/avengers/domain/model/RecommendFollowListData.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/model/RecommendRestaurantData.kt b/Aos/domain/src/main/java/com/avengers/domain/model/RecommendRestaurantData.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/domain/model/RecommendRestaurantData.kt rename to Aos/domain/src/main/java/com/avengers/domain/model/RecommendRestaurantData.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/model/RestaurantData.kt b/Aos/domain/src/main/java/com/avengers/domain/model/RestaurantData.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/domain/model/RestaurantData.kt rename to Aos/domain/src/main/java/com/avengers/domain/model/RestaurantData.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/model/RestaurantDetailData.kt b/Aos/domain/src/main/java/com/avengers/domain/model/RestaurantDetailData.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/domain/model/RestaurantDetailData.kt rename to Aos/domain/src/main/java/com/avengers/domain/model/RestaurantDetailData.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/model/RestaurantIsWishData.kt b/Aos/domain/src/main/java/com/avengers/domain/model/RestaurantIsWishData.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/domain/model/RestaurantIsWishData.kt rename to Aos/domain/src/main/java/com/avengers/domain/model/RestaurantIsWishData.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/model/SearchRestaurantData.kt b/Aos/domain/src/main/java/com/avengers/domain/model/SearchRestaurantData.kt similarity index 70% rename from Aos/app/src/main/java/com/avengers/nibobnebob/domain/model/SearchRestaurantData.kt rename to Aos/domain/src/main/java/com/avengers/domain/model/SearchRestaurantData.kt index 66c22a5..cddf9d5 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/model/SearchRestaurantData.kt +++ b/Aos/domain/src/main/java/com/avengers/domain/model/SearchRestaurantData.kt @@ -1,13 +1,14 @@ -package com.avengers.nibobnebob.domain.model +package com.avengers.domain.model -import com.avengers.nibobnebob.data.model.response.Location + +import com.avengers.nibobnebob.domain.model.LocationData import com.avengers.nibobnebob.domain.model.base.BaseDomainModel data class SearchRestaurantData( val id: Int, val name: String, - val location: Location, + val location: LocationData, val address: String, val phoneNumber: String, val reviewCnt: Int, diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/model/UserDetailData.kt b/Aos/domain/src/main/java/com/avengers/domain/model/UserDetailData.kt similarity index 81% rename from Aos/app/src/main/java/com/avengers/nibobnebob/domain/model/UserDetailData.kt rename to Aos/domain/src/main/java/com/avengers/domain/model/UserDetailData.kt index b2ebced..12f50c1 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/model/UserDetailData.kt +++ b/Aos/domain/src/main/java/com/avengers/domain/model/UserDetailData.kt @@ -1,8 +1,6 @@ package com.avengers.nibobnebob.domain.model -import com.avengers.nibobnebob.data.model.response.Location import com.avengers.nibobnebob.domain.model.base.BaseDomainModel -import com.google.gson.annotations.SerializedName data class UserDetailData( val nickName: String, @@ -18,7 +16,7 @@ data class UserDetailData( data class UserDetailRestaurantData( val id: Int, val name: String, - val location: Location, + val location: LocationData, val address: String, val phoneNumber: String, val reviewCnt: Int, diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/model/ValidateData.kt b/Aos/domain/src/main/java/com/avengers/domain/model/ValidateData.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/domain/model/ValidateData.kt rename to Aos/domain/src/main/java/com/avengers/domain/model/ValidateData.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/model/WishRestaurantData.kt b/Aos/domain/src/main/java/com/avengers/domain/model/WishRestaurantData.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/domain/model/WishRestaurantData.kt rename to Aos/domain/src/main/java/com/avengers/domain/model/WishRestaurantData.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/model/base/BaseDomainModel.kt b/Aos/domain/src/main/java/com/avengers/domain/model/base/BaseDomainModel.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/domain/model/base/BaseDomainModel.kt rename to Aos/domain/src/main/java/com/avengers/domain/model/base/BaseDomainModel.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/model/base/BaseState.kt b/Aos/domain/src/main/java/com/avengers/domain/model/base/BaseState.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/domain/model/base/BaseState.kt rename to Aos/domain/src/main/java/com/avengers/domain/model/base/BaseState.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/repository/FollowRepository.kt b/Aos/domain/src/main/java/com/avengers/domain/repository/FollowRepository.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/domain/repository/FollowRepository.kt rename to Aos/domain/src/main/java/com/avengers/domain/repository/FollowRepository.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/repository/IntroRepository.kt b/Aos/domain/src/main/java/com/avengers/domain/repository/IntroRepository.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/domain/repository/IntroRepository.kt rename to Aos/domain/src/main/java/com/avengers/domain/repository/IntroRepository.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/repository/MyPageRepository.kt b/Aos/domain/src/main/java/com/avengers/domain/repository/MyPageRepository.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/domain/repository/MyPageRepository.kt rename to Aos/domain/src/main/java/com/avengers/domain/repository/MyPageRepository.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/repository/RestaurantRepository.kt b/Aos/domain/src/main/java/com/avengers/domain/repository/RestaurantRepository.kt similarity index 97% rename from Aos/app/src/main/java/com/avengers/nibobnebob/domain/repository/RestaurantRepository.kt rename to Aos/domain/src/main/java/com/avengers/domain/repository/RestaurantRepository.kt index 5ecf683..f3c4b85 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/repository/RestaurantRepository.kt +++ b/Aos/domain/src/main/java/com/avengers/domain/repository/RestaurantRepository.kt @@ -6,7 +6,7 @@ import com.avengers.nibobnebob.domain.model.RestaurantDetailData import com.avengers.nibobnebob.domain.model.RestaurantIsWishData import com.avengers.nibobnebob.domain.model.RestaurantItemsData import com.avengers.nibobnebob.domain.model.ReviewSortData -import com.avengers.nibobnebob.domain.model.SearchRestaurantData +import com.avengers.domain.model.SearchRestaurantData import com.avengers.nibobnebob.domain.model.WishRestaurantData import com.avengers.nibobnebob.domain.model.base.BaseState import kotlinx.coroutines.flow.Flow diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/repository/ValidationRepository.kt b/Aos/domain/src/main/java/com/avengers/domain/repository/ValidationRepository.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/domain/repository/ValidationRepository.kt rename to Aos/domain/src/main/java/com/avengers/domain/repository/ValidationRepository.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/usecase/FollowFriendUseCase.kt b/Aos/domain/src/main/java/com/avengers/domain/usecase/FollowFriendUseCase.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/domain/usecase/FollowFriendUseCase.kt rename to Aos/domain/src/main/java/com/avengers/domain/usecase/FollowFriendUseCase.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/usecase/GetEmailValidationUseCase.kt b/Aos/domain/src/main/java/com/avengers/domain/usecase/GetEmailValidationUseCase.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/domain/usecase/GetEmailValidationUseCase.kt rename to Aos/domain/src/main/java/com/avengers/domain/usecase/GetEmailValidationUseCase.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/usecase/GetNickValidationUseCase.kt b/Aos/domain/src/main/java/com/avengers/domain/usecase/GetNickValidationUseCase.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/domain/usecase/GetNickValidationUseCase.kt rename to Aos/domain/src/main/java/com/avengers/domain/usecase/GetNickValidationUseCase.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/usecase/UnFollowFriendUseCase.kt b/Aos/domain/src/main/java/com/avengers/domain/usecase/UnFollowFriendUseCase.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/domain/usecase/UnFollowFriendUseCase.kt rename to Aos/domain/src/main/java/com/avengers/domain/usecase/UnFollowFriendUseCase.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/usecase/restaurant/AddRestaurantUseCase.kt b/Aos/domain/src/main/java/com/avengers/domain/usecase/restaurant/AddRestaurantUseCase.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/domain/usecase/restaurant/AddRestaurantUseCase.kt rename to Aos/domain/src/main/java/com/avengers/domain/usecase/restaurant/AddRestaurantUseCase.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/usecase/restaurant/AddWishRestaurantUseCase.kt b/Aos/domain/src/main/java/com/avengers/domain/usecase/restaurant/AddWishRestaurantUseCase.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/domain/usecase/restaurant/AddWishRestaurantUseCase.kt rename to Aos/domain/src/main/java/com/avengers/domain/usecase/restaurant/AddWishRestaurantUseCase.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/usecase/restaurant/DeleteMyWishRestaurantUseCase.kt b/Aos/domain/src/main/java/com/avengers/domain/usecase/restaurant/DeleteMyWishRestaurantUseCase.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/domain/usecase/restaurant/DeleteMyWishRestaurantUseCase.kt rename to Aos/domain/src/main/java/com/avengers/domain/usecase/restaurant/DeleteMyWishRestaurantUseCase.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/usecase/restaurant/DeleteRestaurantUseCase.kt b/Aos/domain/src/main/java/com/avengers/domain/usecase/restaurant/DeleteRestaurantUseCase.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/domain/usecase/restaurant/DeleteRestaurantUseCase.kt rename to Aos/domain/src/main/java/com/avengers/domain/usecase/restaurant/DeleteRestaurantUseCase.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/usecase/restaurant/GetMyRestaurantListUseCase.kt b/Aos/domain/src/main/java/com/avengers/domain/usecase/restaurant/GetMyRestaurantListUseCase.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/domain/usecase/restaurant/GetMyRestaurantListUseCase.kt rename to Aos/domain/src/main/java/com/avengers/domain/usecase/restaurant/GetMyRestaurantListUseCase.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/usecase/restaurant/GetMyWishListUseCase.kt b/Aos/domain/src/main/java/com/avengers/domain/usecase/restaurant/GetMyWishListUseCase.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/domain/usecase/restaurant/GetMyWishListUseCase.kt rename to Aos/domain/src/main/java/com/avengers/domain/usecase/restaurant/GetMyWishListUseCase.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/usecase/restaurant/GetRestaurantDetailUseCase.kt b/Aos/domain/src/main/java/com/avengers/domain/usecase/restaurant/GetRestaurantDetailUseCase.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/domain/usecase/restaurant/GetRestaurantDetailUseCase.kt rename to Aos/domain/src/main/java/com/avengers/domain/usecase/restaurant/GetRestaurantDetailUseCase.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/usecase/restaurant/GetRestaurantIsWishUseCase.kt b/Aos/domain/src/main/java/com/avengers/domain/usecase/restaurant/GetRestaurantIsWishUseCase.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/domain/usecase/restaurant/GetRestaurantIsWishUseCase.kt rename to Aos/domain/src/main/java/com/avengers/domain/usecase/restaurant/GetRestaurantIsWishUseCase.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/usecase/restaurant/GetSortedReviewUseCase.kt b/Aos/domain/src/main/java/com/avengers/domain/usecase/restaurant/GetSortedReviewUseCase.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/domain/usecase/restaurant/GetSortedReviewUseCase.kt rename to Aos/domain/src/main/java/com/avengers/domain/usecase/restaurant/GetSortedReviewUseCase.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/usecase/restaurant/PostLikeReviewUseCase.kt b/Aos/domain/src/main/java/com/avengers/domain/usecase/restaurant/PostLikeReviewUseCase.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/domain/usecase/restaurant/PostLikeReviewUseCase.kt rename to Aos/domain/src/main/java/com/avengers/domain/usecase/restaurant/PostLikeReviewUseCase.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/usecase/restaurant/PostUnlikeReviewUseCase.kt b/Aos/domain/src/main/java/com/avengers/domain/usecase/restaurant/PostUnlikeReviewUseCase.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/domain/usecase/restaurant/PostUnlikeReviewUseCase.kt rename to Aos/domain/src/main/java/com/avengers/domain/usecase/restaurant/PostUnlikeReviewUseCase.kt diff --git a/Aos/presentation/.gitignore b/Aos/presentation/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/Aos/presentation/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/Aos/presentation/build.gradle.kts b/Aos/presentation/build.gradle.kts new file mode 100644 index 0000000..a5c34f9 --- /dev/null +++ b/Aos/presentation/build.gradle.kts @@ -0,0 +1,68 @@ +plugins { + id("com.android.library") + id("org.jetbrains.kotlin.android") + id("kotlin-kapt") + id("androidx.navigation.safeargs.kotlin") +} + +android { + namespace = "com.avengers.presentation" + compileSdk = 34 + + defaultConfig { + minSdk = 24 + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles("consumer-rules.pro") + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + kotlinOptions { + jvmTarget = "17" + } + + buildFeatures { + dataBinding = true + } +} + +dependencies { + + implementation(project(":data")) + implementation(project(":domain")) + + implementation("androidx.core:core-ktx:1.9.0") + implementation("androidx.appcompat:appcompat:1.6.1") + implementation("com.google.android.material:material:1.11.0") + testImplementation("junit:junit:4.13.2") + androidTestImplementation("androidx.test.ext:junit:1.1.5") + androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") + + // glide + implementation("com.github.bumptech.glide:glide:4.16.0") + implementation("com.github.bumptech.glide:compose:1.0.0-beta01") + + // navigation + implementation("androidx.navigation:navigation-fragment-ktx:2.5.1") + implementation("androidx.navigation:navigation-ui-ktx:2.5.1") + + // naverMap + api("com.naver.maps:map-sdk:3.17.0") + api("com.google.android.gms:play-services-location:21.0.1") + + // naver Login + api ("com.navercorp.nid:oauth:5.8.0") + +} \ No newline at end of file diff --git a/Aos/presentation/consumer-rules.pro b/Aos/presentation/consumer-rules.pro new file mode 100644 index 0000000..e69de29 diff --git a/Aos/presentation/proguard-rules.pro b/Aos/presentation/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/Aos/presentation/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/Aos/presentation/src/androidTest/java/com/avengers/presentation/ExampleInstrumentedTest.kt b/Aos/presentation/src/androidTest/java/com/avengers/presentation/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..fcf0474 --- /dev/null +++ b/Aos/presentation/src/androidTest/java/com/avengers/presentation/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.avengers.presentation + +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.avengers.presentation.test", appContext.packageName) + } +} \ No newline at end of file diff --git a/Aos/presentation/src/main/AndroidManifest.xml b/Aos/presentation/src/main/AndroidManifest.xml new file mode 100644 index 0000000..48d92bb --- /dev/null +++ b/Aos/presentation/src/main/AndroidManifest.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/base/BaseActivity.kt b/Aos/presentation/src/main/java/com/avengers/presentation/base/BaseActivity.kt similarity index 96% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/base/BaseActivity.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/base/BaseActivity.kt index eb70cf4..2371aac 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/base/BaseActivity.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/base/BaseActivity.kt @@ -1,4 +1,4 @@ -package com.avengers.nibobnebob.presentation.base +package com.avengers.presentation.base import android.os.Bundle import android.view.LayoutInflater diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/base/BaseActivityViewModel.kt b/Aos/presentation/src/main/java/com/avengers/presentation/base/BaseActivityViewModel.kt similarity index 92% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/base/BaseActivityViewModel.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/base/BaseActivityViewModel.kt index 948ca77..48b644b 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/base/BaseActivityViewModel.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/base/BaseActivityViewModel.kt @@ -1,8 +1,8 @@ -package com.avengers.nibobnebob.presentation.base +package com.avengers.presentation.base import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.avengers.nibobnebob.app.NetworkManager +import com.avengers.data.config.NetworkManager import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/base/BaseFragment.kt b/Aos/presentation/src/main/java/com/avengers/presentation/base/BaseFragment.kt similarity index 96% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/base/BaseFragment.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/base/BaseFragment.kt index e39bc17..db44374 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/base/BaseFragment.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/base/BaseFragment.kt @@ -14,10 +14,12 @@ import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle -import com.avengers.nibobnebob.R import com.avengers.nibobnebob.presentation.customview.LoadingDialog import com.avengers.nibobnebob.presentation.customview.OneButtonTitleDialog import com.avengers.nibobnebob.presentation.customview.TwoButtonTitleDialog +import com.avengers.presentation.R +import com.avengers.presentation.base.BaseActivityViewModel +import com.avengers.presentation.base.NetWorkState import com.google.android.material.snackbar.Snackbar import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.collectLatest diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/customview/CalendarDatePicker.kt b/Aos/presentation/src/main/java/com/avengers/presentation/customview/CalendarDatePicker.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/customview/CalendarDatePicker.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/customview/CalendarDatePicker.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/customview/ImageDialog.kt b/Aos/presentation/src/main/java/com/avengers/presentation/customview/ImageDialog.kt similarity index 94% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/customview/ImageDialog.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/customview/ImageDialog.kt index 93d0fb4..2a61f26 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/customview/ImageDialog.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/customview/ImageDialog.kt @@ -6,7 +6,7 @@ import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.os.Bundle import android.view.LayoutInflater -import com.avengers.nibobnebob.databinding.DialogImageViewBinding +import com.avengers.presentation.databinding.DialogImageViewBinding import com.bumptech.glide.Glide import com.bumptech.glide.request.RequestOptions diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/customview/LoadingDialog.kt b/Aos/presentation/src/main/java/com/avengers/presentation/customview/LoadingDialog.kt similarity index 92% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/customview/LoadingDialog.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/customview/LoadingDialog.kt index c695e26..d526799 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/customview/LoadingDialog.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/customview/LoadingDialog.kt @@ -5,7 +5,7 @@ import android.content.Context import android.graphics.drawable.ColorDrawable import android.os.Bundle import android.view.Window -import com.avengers.nibobnebob.databinding.DialogLoadingBinding +import com.avengers.presentation.databinding.DialogLoadingBinding class LoadingDialog(context : Context) : Dialog(context) { diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/customview/OneButtonTitleDialog.kt b/Aos/presentation/src/main/java/com/avengers/presentation/customview/OneButtonTitleDialog.kt similarity index 92% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/customview/OneButtonTitleDialog.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/customview/OneButtonTitleDialog.kt index 5dc894d..545d6a6 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/customview/OneButtonTitleDialog.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/customview/OneButtonTitleDialog.kt @@ -5,7 +5,7 @@ import android.content.Context import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.os.Bundle -import com.avengers.nibobnebob.databinding.DialogOneButtonTitleBinding +import com.avengers.presentation.databinding.DialogOneButtonTitleBinding class OneButtonTitleDialog( context: Context, diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/customview/RecommendRestaurantDialog.kt b/Aos/presentation/src/main/java/com/avengers/presentation/customview/RecommendRestaurantDialog.kt similarity index 95% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/customview/RecommendRestaurantDialog.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/customview/RecommendRestaurantDialog.kt index 1ce128f..f5046bf 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/customview/RecommendRestaurantDialog.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/customview/RecommendRestaurantDialog.kt @@ -6,9 +6,9 @@ import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.os.Bundle import android.view.View -import com.avengers.nibobnebob.databinding.DialogRecommendRestaurantBinding import com.avengers.nibobnebob.presentation.ui.main.home.adapter.HomeRecommendAdapter import com.avengers.nibobnebob.presentation.ui.main.home.model.UiRecommendRestaurantData +import com.avengers.presentation.databinding.DialogRecommendRestaurantBinding class RecommendRestaurantDialog( context: Context, diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/customview/RestaurantBottomSheet.kt b/Aos/presentation/src/main/java/com/avengers/presentation/customview/RestaurantBottomSheet.kt similarity index 95% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/customview/RestaurantBottomSheet.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/customview/RestaurantBottomSheet.kt index cf2d324..0e88557 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/customview/RestaurantBottomSheet.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/customview/RestaurantBottomSheet.kt @@ -4,9 +4,9 @@ import android.content.Context import android.view.LayoutInflater import android.widget.Toast import androidx.lifecycle.lifecycleScope -import com.avengers.nibobnebob.R -import com.avengers.nibobnebob.databinding.BottomSheetRestaurantBinding import com.avengers.nibobnebob.presentation.ui.main.home.model.UiRestaurantData +import com.avengers.presentation.R +import com.avengers.presentation.databinding.BottomSheetRestaurantBinding import com.google.android.material.bottomsheet.BottomSheetDialog import kotlinx.coroutines.launch diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/customview/SelectRegionDialog.kt b/Aos/presentation/src/main/java/com/avengers/presentation/customview/SelectRegionDialog.kt similarity index 94% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/customview/SelectRegionDialog.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/customview/SelectRegionDialog.kt index fbce2ad..58a5cc4 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/customview/SelectRegionDialog.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/customview/SelectRegionDialog.kt @@ -7,8 +7,8 @@ import android.graphics.drawable.ColorDrawable import android.os.Bundle import android.view.View import android.view.WindowManager -import com.avengers.nibobnebob.R -import com.avengers.nibobnebob.databinding.DialogSelectRegionBinding +import com.avengers.presentation.R +import com.avengers.presentation.databinding.DialogSelectRegionBinding import com.google.android.material.chip.Chip class SelectRegionDialog( diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/customview/TwoButtonTitleDialog.kt b/Aos/presentation/src/main/java/com/avengers/presentation/customview/TwoButtonTitleDialog.kt similarity index 93% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/customview/TwoButtonTitleDialog.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/customview/TwoButtonTitleDialog.kt index e989984..4134762 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/customview/TwoButtonTitleDialog.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/customview/TwoButtonTitleDialog.kt @@ -5,7 +5,7 @@ import android.content.Context import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.os.Bundle -import com.avengers.nibobnebob.databinding.DialogTwoButtonTitleBinding +import com.avengers.presentation.databinding.DialogTwoButtonTitleBinding class TwoButtonTitleDialog( context: Context, diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/DataExtensions.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/DataExtensions.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/DataExtensions.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/DataExtensions.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/NavigationExtensions.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/NavigationExtensions.kt similarity index 91% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/NavigationExtensions.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/NavigationExtensions.kt index dd69d6e..570dc24 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/NavigationExtensions.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/NavigationExtensions.kt @@ -1,11 +1,9 @@ package com.avengers.nibobnebob.presentation.ui -import android.app.Activity import androidx.activity.OnBackPressedCallback import androidx.fragment.app.FragmentActivity import androidx.navigation.NavController -import androidx.navigation.fragment.findNavController -import com.avengers.nibobnebob.NavGraphDirections +import com.avengers.presentation.NavGraphDirections internal fun NavController.toRestaurantDetail(restaurantId: Int) { diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/UiExtensions.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/UiExtensions.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/UiExtensions.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/UiExtensions.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/bindingadapters/ButtonBindingAdapter.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/bindingadapters/ButtonBindingAdapter.kt similarity index 97% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/bindingadapters/ButtonBindingAdapter.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/bindingadapters/ButtonBindingAdapter.kt index 3fbd608..326379f 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/bindingadapters/ButtonBindingAdapter.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/bindingadapters/ButtonBindingAdapter.kt @@ -3,8 +3,9 @@ package com.avengers.nibobnebob.presentation.ui.bindingadapters import android.graphics.Color import androidx.appcompat.widget.AppCompatButton import androidx.databinding.BindingAdapter -import com.avengers.nibobnebob.R + import com.avengers.nibobnebob.presentation.ui.main.mypage.edit.EditProfileUiState +import com.avengers.presentation.R @BindingAdapter("setBtnEnable") diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/bindingadapters/ImageButtonBindingAdapter.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/bindingadapters/ImageButtonBindingAdapter.kt similarity index 93% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/bindingadapters/ImageButtonBindingAdapter.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/bindingadapters/ImageButtonBindingAdapter.kt index 9ac1e0d..5eb80b1 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/bindingadapters/ImageButtonBindingAdapter.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/bindingadapters/ImageButtonBindingAdapter.kt @@ -2,8 +2,8 @@ package com.avengers.nibobnebob.presentation.ui.bindingadapters import android.widget.ImageButton import androidx.databinding.BindingAdapter -import com.avengers.nibobnebob.R import com.avengers.nibobnebob.presentation.ui.main.home.TrackingState +import com.avengers.presentation.R @BindingAdapter("trackingBtnDrawable") fun bindTrackingBtnDrawable(btn: ImageButton, state: TrackingState) { diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/bindingadapters/ImageViewBindingAdapter.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/bindingadapters/ImageViewBindingAdapter.kt similarity index 98% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/bindingadapters/ImageViewBindingAdapter.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/bindingadapters/ImageViewBindingAdapter.kt index 4333d3d..a02a085 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/bindingadapters/ImageViewBindingAdapter.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/bindingadapters/ImageViewBindingAdapter.kt @@ -4,7 +4,7 @@ import android.view.View import android.widget.ImageView import androidx.core.net.toUri import androidx.databinding.BindingAdapter -import com.avengers.nibobnebob.R +import com.avengers.presentation.R import com.bumptech.glide.Glide import com.bumptech.glide.request.RequestOptions diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/bindingadapters/RecyclerViewBindingAdapter.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/bindingadapters/RecyclerViewBindingAdapter.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/bindingadapters/RecyclerViewBindingAdapter.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/bindingadapters/RecyclerViewBindingAdapter.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/bindingadapters/TextInputBindingAdapter.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/bindingadapters/TextInputBindingAdapter.kt similarity index 98% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/bindingadapters/TextInputBindingAdapter.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/bindingadapters/TextInputBindingAdapter.kt index 4c439b8..dd58672 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/bindingadapters/TextInputBindingAdapter.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/bindingadapters/TextInputBindingAdapter.kt @@ -1,10 +1,10 @@ package com.avengers.nibobnebob.presentation.ui.bindingadapters import androidx.databinding.BindingAdapter -import com.avengers.nibobnebob.R import com.avengers.nibobnebob.presentation.ui.intro.signup.InputState import com.avengers.nibobnebob.presentation.ui.main.mypage.Validation import com.avengers.nibobnebob.presentation.ui.main.mypage.edit.EditInputState +import com.avengers.presentation.R import com.google.android.material.textfield.TextInputLayout diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/bindingadapters/TextViewBindingAdapter.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/bindingadapters/TextViewBindingAdapter.kt similarity index 99% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/bindingadapters/TextViewBindingAdapter.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/bindingadapters/TextViewBindingAdapter.kt index 84e35f3..fc1764c 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/bindingadapters/TextViewBindingAdapter.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/bindingadapters/TextViewBindingAdapter.kt @@ -6,7 +6,6 @@ import android.view.View import android.widget.TextView import androidx.core.content.ContextCompat import androidx.databinding.BindingAdapter -import com.avengers.nibobnebob.R import com.avengers.nibobnebob.presentation.ui.intro.signup.InputState import com.avengers.nibobnebob.presentation.ui.main.global.restaurantadd.CommentState import com.avengers.nibobnebob.presentation.ui.main.mypage.Validation @@ -16,6 +15,7 @@ import com.avengers.nibobnebob.presentation.util.Constants.FILTER_NEW import com.avengers.nibobnebob.presentation.util.Constants.FILTER_OLD import com.avengers.nibobnebob.presentation.util.Constants.FILTER_WORST import com.avengers.nibobnebob.presentation.util.LoginType +import com.avengers.presentation.R // signup @BindingAdapter("helperMessage") diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/intro/IntroActivity.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/intro/IntroActivity.kt similarity index 95% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/intro/IntroActivity.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/intro/IntroActivity.kt index 540fd55..0c57d31 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/intro/IntroActivity.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/intro/IntroActivity.kt @@ -13,9 +13,8 @@ import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.viewModels import androidx.core.app.ActivityCompat import androidx.core.content.ContextCompat -import com.avengers.nibobnebob.databinding.ActivityIntroBinding -import com.avengers.nibobnebob.presentation.base.BaseActivity -import com.avengers.nibobnebob.presentation.ui.adjustKeyboard +import com.avengers.presentation.base.BaseActivity +import com.avengers.presentation.databinding.ActivityIntroBinding import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/intro/IntroViewModel.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/intro/IntroViewModel.kt similarity index 90% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/intro/IntroViewModel.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/intro/IntroViewModel.kt index bf66ba9..cadb233 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/intro/IntroViewModel.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/intro/IntroViewModel.kt @@ -2,8 +2,8 @@ package com.avengers.nibobnebob.presentation.ui.intro import androidx.lifecycle.viewModelScope -import com.avengers.nibobnebob.app.NetworkManager -import com.avengers.nibobnebob.presentation.base.BaseActivityViewModel +import com.avengers.data.config.NetworkManager +import com.avengers.presentation.base.BaseActivityViewModel import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableStateFlow diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/intro/login/LoginFragment.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/intro/login/LoginFragment.kt similarity index 97% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/intro/login/LoginFragment.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/intro/login/LoginFragment.kt index 10e22ea..0f272d3 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/intro/login/LoginFragment.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/intro/login/LoginFragment.kt @@ -6,11 +6,11 @@ import androidx.fragment.app.activityViewModels import androidx.fragment.app.viewModels import androidx.navigation.NavController import androidx.navigation.fragment.findNavController -import com.avengers.nibobnebob.R -import com.avengers.nibobnebob.databinding.FragmentLoginBinding import com.avengers.nibobnebob.presentation.base.BaseFragment import com.avengers.nibobnebob.presentation.ui.intro.IntroViewModel import com.avengers.nibobnebob.presentation.ui.main.MainActivity +import com.avengers.presentation.R +import com.avengers.presentation.databinding.FragmentLoginBinding import com.navercorp.nid.NaverIdLoginSDK import com.navercorp.nid.oauth.NidOAuthLogin import com.navercorp.nid.oauth.OAuthLoginCallback diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/intro/login/LoginViewModel.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/intro/login/LoginViewModel.kt similarity index 98% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/intro/login/LoginViewModel.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/intro/login/LoginViewModel.kt index 79a6505..3e12557 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/intro/login/LoginViewModel.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/intro/login/LoginViewModel.kt @@ -2,7 +2,7 @@ package com.avengers.nibobnebob.presentation.ui.intro.login import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.avengers.nibobnebob.app.DataStoreManager +import com.avengers.data.config.DataStoreManager import com.avengers.nibobnebob.domain.model.base.BaseState import com.avengers.nibobnebob.domain.model.base.StatusCode import com.avengers.nibobnebob.domain.repository.IntroRepository diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/intro/signup/BasicSignupFragment.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/intro/signup/BasicSignupFragment.kt similarity index 84% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/intro/signup/BasicSignupFragment.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/intro/signup/BasicSignupFragment.kt index 17c8069..74daca1 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/intro/signup/BasicSignupFragment.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/intro/signup/BasicSignupFragment.kt @@ -1,13 +1,15 @@ -package com.avengers.nibobnebob.presentation.ui.intro.signup +package com.avengers.presentation.ui.intro.signup import androidx.fragment.app.activityViewModels import androidx.fragment.app.viewModels import androidx.navigation.NavController import androidx.navigation.fragment.findNavController -import com.avengers.nibobnebob.R -import com.avengers.nibobnebob.databinding.FragmentBasicSignupBinding import com.avengers.nibobnebob.presentation.base.BaseFragment import com.avengers.nibobnebob.presentation.ui.intro.IntroViewModel +import com.avengers.nibobnebob.presentation.ui.intro.signup.BasicSignupEvents +import com.avengers.nibobnebob.presentation.ui.intro.signup.BasicSignupViewModel +import com.avengers.presentation.R +import com.avengers.presentation.databinding.FragmentBasicSignupBinding import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/intro/signup/BasicSignupViewModel.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/intro/signup/BasicSignupViewModel.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/intro/signup/BasicSignupViewModel.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/intro/signup/BasicSignupViewModel.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/intro/signup/DetailSignupFragment.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/intro/signup/DetailSignupFragment.kt similarity index 97% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/intro/signup/DetailSignupFragment.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/intro/signup/DetailSignupFragment.kt index 80d9c90..fe622ea 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/intro/signup/DetailSignupFragment.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/intro/signup/DetailSignupFragment.kt @@ -6,13 +6,13 @@ import androidx.fragment.app.activityViewModels import androidx.fragment.app.viewModels import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.navArgs -import com.avengers.nibobnebob.R -import com.avengers.nibobnebob.databinding.FragmentDetailSignupBinding import com.avengers.nibobnebob.presentation.base.BaseFragment import com.avengers.nibobnebob.presentation.customview.CalendarDatePicker import com.avengers.nibobnebob.presentation.ui.intro.IntroViewModel import com.avengers.nibobnebob.presentation.ui.main.MainActivity import com.avengers.nibobnebob.presentation.ui.toMultiPart +import com.avengers.presentation.R +import com.avengers.presentation.databinding.FragmentDetailSignupBinding import com.google.android.material.textfield.MaterialAutoCompleteTextView import dagger.hilt.android.AndroidEntryPoint diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/intro/signup/DetailSignupViewModel.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/intro/signup/DetailSignupViewModel.kt similarity index 99% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/intro/signup/DetailSignupViewModel.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/intro/signup/DetailSignupViewModel.kt index 37dab70..95b431f 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/intro/signup/DetailSignupViewModel.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/intro/signup/DetailSignupViewModel.kt @@ -1,9 +1,8 @@ package com.avengers.nibobnebob.presentation.ui.intro.signup -import android.util.Log import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.avengers.nibobnebob.app.DataStoreManager +import com.avengers.data.config.DataStoreManager import com.avengers.nibobnebob.domain.model.base.BaseState import com.avengers.nibobnebob.domain.repository.IntroRepository import com.avengers.nibobnebob.domain.usecase.GetNickValidationUseCase diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/intro/signup/SignupUiState.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/intro/signup/SignupUiState.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/intro/signup/SignupUiState.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/intro/signup/SignupUiState.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/intro/signup/model/UiSignupData.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/intro/signup/model/UiSignupData.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/intro/signup/model/UiSignupData.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/intro/signup/model/UiSignupData.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/MainActivity.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/MainActivity.kt similarity index 95% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/MainActivity.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/MainActivity.kt index 70de496..67e3cfb 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/MainActivity.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/MainActivity.kt @@ -10,7 +10,6 @@ import android.provider.MediaStore import android.view.MotionEvent import android.view.View import android.view.inputmethod.InputMethodManager -import androidx.activity.OnBackPressedCallback import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.viewModels import androidx.core.app.ActivityCompat @@ -18,10 +17,10 @@ import androidx.core.content.ContextCompat import androidx.navigation.NavController import androidx.navigation.fragment.NavHostFragment import androidx.navigation.ui.setupWithNavController -import com.avengers.nibobnebob.R -import com.avengers.nibobnebob.databinding.ActivityMainBinding -import com.avengers.nibobnebob.presentation.base.BaseActivity +import com.avengers.presentation.base.BaseActivity import com.avengers.nibobnebob.presentation.ui.intro.IntroActivity +import com.avengers.presentation.R +import com.avengers.presentation.databinding.ActivityMainBinding import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/MainViewModel.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/MainViewModel.kt similarity index 90% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/MainViewModel.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/MainViewModel.kt index dff2ce6..cd36eaf 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/MainViewModel.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/MainViewModel.kt @@ -1,9 +1,8 @@ package com.avengers.nibobnebob.presentation.ui.main import androidx.lifecycle.viewModelScope -import com.avengers.nibobnebob.app.NetworkManager -import com.avengers.nibobnebob.presentation.base.BaseActivityViewModel -import com.avengers.nibobnebob.presentation.ui.intro.IntroEvents +import com.avengers.data.config.NetworkManager +import com.avengers.presentation.base.BaseActivityViewModel import com.avengers.nibobnebob.presentation.ui.main.home.model.UiRestaurantData import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableSharedFlow diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/follow/FollowFragment.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/follow/FollowFragment.kt similarity index 96% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/follow/FollowFragment.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/follow/FollowFragment.kt index b1f2367..45acbe2 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/follow/FollowFragment.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/follow/FollowFragment.kt @@ -5,12 +5,12 @@ import androidx.fragment.app.activityViewModels import androidx.fragment.app.viewModels import androidx.navigation.NavController import androidx.navigation.fragment.findNavController -import com.avengers.nibobnebob.R -import com.avengers.nibobnebob.databinding.FragmentFollowBinding import com.avengers.nibobnebob.presentation.base.BaseFragment import com.avengers.nibobnebob.presentation.ui.main.MainViewModel import com.avengers.nibobnebob.presentation.ui.main.follow.adapter.FollowAdapter import com.avengers.nibobnebob.presentation.ui.toUserDetail +import com.avengers.presentation.R +import com.avengers.presentation.databinding.FragmentFollowBinding import com.google.android.material.tabs.TabLayout import dagger.hilt.android.AndroidEntryPoint diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/follow/FollowViewModel.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/follow/FollowViewModel.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/follow/FollowViewModel.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/follow/FollowViewModel.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/follow/adapter/FollowAdapter.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/follow/adapter/FollowAdapter.kt similarity index 93% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/follow/adapter/FollowAdapter.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/follow/adapter/FollowAdapter.kt index 4d17849..5402e4c 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/follow/adapter/FollowAdapter.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/follow/adapter/FollowAdapter.kt @@ -5,9 +5,8 @@ import android.view.ViewGroup import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView -import com.avengers.nibobnebob.databinding.ItemFollowerBinding import com.avengers.nibobnebob.presentation.ui.main.follow.model.UiFollowData -import com.avengers.nibobnebob.presentation.util.DefaultDiffUtil +import com.avengers.presentation.databinding.ItemFollowerBinding class FollowAdapter : ListAdapter(diffCallback) { diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/follow/adapter/FollowSearchAdapter.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/follow/adapter/FollowSearchAdapter.kt similarity index 95% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/follow/adapter/FollowSearchAdapter.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/follow/adapter/FollowSearchAdapter.kt index 2cd095c..9c11905 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/follow/adapter/FollowSearchAdapter.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/follow/adapter/FollowSearchAdapter.kt @@ -5,8 +5,8 @@ import android.view.ViewGroup import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView -import com.avengers.nibobnebob.databinding.ItemFollowSearchBinding import com.avengers.nibobnebob.presentation.ui.main.follow.model.UiFollowSearchData +import com.avengers.presentation.databinding.ItemFollowSearchBinding class FollowSearchAdapter() : ListAdapter(diffCallback) { diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/follow/mapper/UiFollowDatamapper.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/follow/mapper/UiFollowDatamapper.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/follow/mapper/UiFollowDatamapper.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/follow/mapper/UiFollowDatamapper.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/follow/mapper/UiFollowSearchDatamapper.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/follow/mapper/UiFollowSearchDatamapper.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/follow/mapper/UiFollowSearchDatamapper.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/follow/mapper/UiFollowSearchDatamapper.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/follow/model/UiFollowData.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/follow/model/UiFollowData.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/follow/model/UiFollowData.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/follow/model/UiFollowData.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/follow/model/UiFollowSearchData.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/follow/model/UiFollowSearchData.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/follow/model/UiFollowSearchData.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/follow/model/UiFollowSearchData.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/follow/search/FollowBindingAdapater.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/follow/search/FollowBindingAdapater.kt similarity index 96% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/follow/search/FollowBindingAdapater.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/follow/search/FollowBindingAdapater.kt index c6f691c..50499c6 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/follow/search/FollowBindingAdapater.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/follow/search/FollowBindingAdapater.kt @@ -1,7 +1,7 @@ package com.avengers.nibobnebob.presentation.ui.main.follow.search import androidx.databinding.BindingAdapter -import com.avengers.nibobnebob.R +import com.avengers.presentation.R import com.google.android.material.chip.Chip import com.google.android.material.chip.ChipGroup diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/follow/search/FollowSearchFragment.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/follow/search/FollowSearchFragment.kt similarity index 95% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/follow/search/FollowSearchFragment.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/follow/search/FollowSearchFragment.kt index 8813531..02615cd 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/follow/search/FollowSearchFragment.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/follow/search/FollowSearchFragment.kt @@ -3,8 +3,6 @@ package com.avengers.nibobnebob.presentation.ui.main.follow.search import androidx.fragment.app.activityViewModels import androidx.fragment.app.viewModels import androidx.navigation.fragment.findNavController -import com.avengers.nibobnebob.R -import com.avengers.nibobnebob.databinding.FragmentFollowSearchBinding import com.avengers.nibobnebob.presentation.base.BaseFragment import com.avengers.nibobnebob.presentation.customview.SelectRegionDialog import com.avengers.nibobnebob.presentation.ui.adjustKeyboard @@ -12,6 +10,8 @@ import com.avengers.nibobnebob.presentation.ui.customBack import com.avengers.nibobnebob.presentation.ui.main.MainViewModel import com.avengers.nibobnebob.presentation.ui.main.follow.adapter.FollowSearchAdapter import com.avengers.nibobnebob.presentation.ui.toUserDetail +import com.avengers.presentation.R +import com.avengers.presentation.databinding.FragmentFollowSearchBinding import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/follow/search/FollowSearchViewModel.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/follow/search/FollowSearchViewModel.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/follow/search/FollowSearchViewModel.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/follow/search/FollowSearchViewModel.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/global/mapper/UiRestaurantDetailDataMapper.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/global/mapper/UiRestaurantDetailDataMapper.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/global/mapper/UiRestaurantDetailDataMapper.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/global/mapper/UiRestaurantDetailDataMapper.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/global/mapper/UiRestaurantReviewDataMapper.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/global/mapper/UiRestaurantReviewDataMapper.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/global/mapper/UiRestaurantReviewDataMapper.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/global/mapper/UiRestaurantReviewDataMapper.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/global/mapper/UiUserDetailDataMapper.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/global/mapper/UiUserDetailDataMapper.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/global/mapper/UiUserDetailDataMapper.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/global/mapper/UiUserDetailDataMapper.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/global/model/UiRestaurantDetailData.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/global/model/UiRestaurantDetailData.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/global/model/UiRestaurantDetailData.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/global/model/UiRestaurantDetailData.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/global/model/UiReviewData.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/global/model/UiReviewData.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/global/model/UiReviewData.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/global/model/UiReviewData.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/global/model/UiUserDetailData.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/global/model/UiUserDetailData.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/global/model/UiUserDetailData.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/global/model/UiUserDetailData.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/global/restaurantadd/AddMyRestaurantFragment.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/global/restaurantadd/AddMyRestaurantFragment.kt similarity index 97% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/global/restaurantadd/AddMyRestaurantFragment.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/global/restaurantadd/AddMyRestaurantFragment.kt index e692017..3dbcb6a 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/global/restaurantadd/AddMyRestaurantFragment.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/global/restaurantadd/AddMyRestaurantFragment.kt @@ -4,13 +4,13 @@ import androidx.fragment.app.activityViewModels import androidx.fragment.app.viewModels import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.navArgs -import com.avengers.nibobnebob.R -import com.avengers.nibobnebob.databinding.FragmentAddMyRestaurantBinding import com.avengers.nibobnebob.presentation.base.BaseFragment import com.avengers.nibobnebob.presentation.ui.customBack import com.avengers.nibobnebob.presentation.ui.main.MainViewModel import com.avengers.nibobnebob.presentation.ui.toHome import com.avengers.nibobnebob.presentation.ui.toMultiPart +import com.avengers.presentation.R +import com.avengers.presentation.databinding.FragmentAddMyRestaurantBinding import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/global/restaurantadd/AddMyRestaurantViewModel.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/global/restaurantadd/AddMyRestaurantViewModel.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/global/restaurantadd/AddMyRestaurantViewModel.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/global/restaurantadd/AddMyRestaurantViewModel.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/global/restaurantdetail/RestaurantDetailFragment.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/global/restaurantdetail/RestaurantDetailFragment.kt similarity index 96% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/global/restaurantdetail/RestaurantDetailFragment.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/global/restaurantdetail/RestaurantDetailFragment.kt index df361e4..0337069 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/global/restaurantdetail/RestaurantDetailFragment.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/global/restaurantdetail/RestaurantDetailFragment.kt @@ -5,13 +5,13 @@ import androidx.fragment.app.viewModels import androidx.navigation.NavController import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.navArgs -import com.avengers.nibobnebob.R -import com.avengers.nibobnebob.databinding.FragmentRestaurantDetailBinding import com.avengers.nibobnebob.presentation.base.BaseFragment import com.avengers.nibobnebob.presentation.customview.TwoButtonTitleDialog import com.avengers.nibobnebob.presentation.ui.customBack import com.avengers.nibobnebob.presentation.ui.main.MainViewModel import com.avengers.nibobnebob.presentation.ui.main.global.restaurantdetail.adapter.RestaurantReviewAdapter +import com.avengers.presentation.R +import com.avengers.presentation.databinding.FragmentRestaurantDetailBinding import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/global/restaurantdetail/RestaurantDetailViewModel.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/global/restaurantdetail/RestaurantDetailViewModel.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/global/restaurantdetail/RestaurantDetailViewModel.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/global/restaurantdetail/RestaurantDetailViewModel.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/global/restaurantdetail/adapter/RestaurantReviewAdapter.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/global/restaurantdetail/adapter/RestaurantReviewAdapter.kt similarity index 95% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/global/restaurantdetail/adapter/RestaurantReviewAdapter.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/global/restaurantdetail/adapter/RestaurantReviewAdapter.kt index cd5d584..aaf664a 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/global/restaurantdetail/adapter/RestaurantReviewAdapter.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/global/restaurantdetail/adapter/RestaurantReviewAdapter.kt @@ -5,8 +5,8 @@ import android.view.ViewGroup import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView -import com.avengers.nibobnebob.databinding.ItemReviewListBinding import com.avengers.nibobnebob.presentation.ui.main.global.model.UiReviewData +import com.avengers.presentation.databinding.ItemReviewListBinding class RestaurantReviewAdapter : ListAdapter(diffCallback) { companion object { diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/global/restaurantreview/RestaurantReviewsFragment.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/global/restaurantreview/RestaurantReviewsFragment.kt similarity index 96% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/global/restaurantreview/RestaurantReviewsFragment.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/global/restaurantreview/RestaurantReviewsFragment.kt index b57d72f..0643e1d 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/global/restaurantreview/RestaurantReviewsFragment.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/global/restaurantreview/RestaurantReviewsFragment.kt @@ -6,13 +6,13 @@ import androidx.fragment.app.viewModels import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.navArgs import androidx.recyclerview.widget.RecyclerView -import com.avengers.nibobnebob.R -import com.avengers.nibobnebob.databinding.FragmentRestaurantReviewsBinding import com.avengers.nibobnebob.presentation.base.BaseFragment import com.avengers.nibobnebob.presentation.ui.customBack import com.avengers.nibobnebob.presentation.ui.main.MainViewModel import com.avengers.nibobnebob.presentation.ui.main.global.restaurantdetail.adapter.RestaurantReviewAdapter import com.avengers.nibobnebob.presentation.util.Constants +import com.avengers.presentation.R +import com.avengers.presentation.databinding.FragmentRestaurantReviewsBinding import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/global/restaurantreview/RestaurantReviewsViewModel.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/global/restaurantreview/RestaurantReviewsViewModel.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/global/restaurantreview/RestaurantReviewsViewModel.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/global/restaurantreview/RestaurantReviewsViewModel.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/global/userdetail/UserDetailFragment.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/global/userdetail/UserDetailFragment.kt similarity index 96% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/global/userdetail/UserDetailFragment.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/global/userdetail/UserDetailFragment.kt index 68e31bb..bad6718 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/global/userdetail/UserDetailFragment.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/global/userdetail/UserDetailFragment.kt @@ -7,13 +7,13 @@ import androidx.fragment.app.viewModels import androidx.navigation.NavController import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.navArgs -import com.avengers.nibobnebob.R -import com.avengers.nibobnebob.databinding.FragmentUserDetailBinding import com.avengers.nibobnebob.presentation.base.BaseFragment import com.avengers.nibobnebob.presentation.customview.ImageDialog import com.avengers.nibobnebob.presentation.ui.customBack import com.avengers.nibobnebob.presentation.ui.main.MainViewModel import com.avengers.nibobnebob.presentation.ui.main.global.userdetail.adapter.UserDetailRestaurantAdapter +import com.avengers.presentation.R +import com.avengers.presentation.databinding.FragmentUserDetailBinding import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/global/userdetail/UserDetailViewModel.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/global/userdetail/UserDetailViewModel.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/global/userdetail/UserDetailViewModel.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/global/userdetail/UserDetailViewModel.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/global/userdetail/adapter/UserDetailRestaurantAdapter.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/global/userdetail/adapter/UserDetailRestaurantAdapter.kt similarity index 94% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/global/userdetail/adapter/UserDetailRestaurantAdapter.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/global/userdetail/adapter/UserDetailRestaurantAdapter.kt index 39ed4ed..2c12ed2 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/global/userdetail/adapter/UserDetailRestaurantAdapter.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/global/userdetail/adapter/UserDetailRestaurantAdapter.kt @@ -4,9 +4,9 @@ import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView -import com.avengers.nibobnebob.databinding.ItemUserDetailRestaurantBinding import com.avengers.nibobnebob.presentation.ui.main.global.model.UiUserDetailRestaurantData import com.avengers.nibobnebob.presentation.util.DefaultDiffUtil +import com.avengers.presentation.databinding.ItemUserDetailRestaurantBinding class UserDetailRestaurantAdapter( private val restaurantClick: (Int) -> Unit diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/home/HomeFragment.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/home/HomeFragment.kt similarity index 99% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/home/HomeFragment.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/home/HomeFragment.kt index 62866fb..40f3f00 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/home/HomeFragment.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/home/HomeFragment.kt @@ -9,8 +9,6 @@ import androidx.lifecycle.lifecycleScope import androidx.navigation.NavController import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.navArgs -import com.avengers.nibobnebob.R -import com.avengers.nibobnebob.databinding.FragmentHomeBinding import com.avengers.nibobnebob.presentation.base.BaseFragment import com.avengers.nibobnebob.presentation.customview.RecommendRestaurantDialog import com.avengers.nibobnebob.presentation.customview.RestaurantBottomSheet @@ -22,6 +20,8 @@ import com.avengers.nibobnebob.presentation.ui.requestLocationPermission import com.avengers.nibobnebob.presentation.ui.toAddRestaurant import com.avengers.nibobnebob.presentation.ui.toRestaurantDetail import com.avengers.nibobnebob.presentation.util.Constants.NEAR_RESTAURANT +import com.avengers.presentation.R +import com.avengers.presentation.databinding.FragmentHomeBinding import com.naver.maps.geometry.LatLng import com.naver.maps.map.CameraAnimation import com.naver.maps.map.CameraPosition diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/home/HomeViewModel.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/home/HomeViewModel.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/home/HomeViewModel.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/home/HomeViewModel.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/home/adapter/HomeFilterAdapter.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/home/adapter/HomeFilterAdapter.kt similarity index 95% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/home/adapter/HomeFilterAdapter.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/home/adapter/HomeFilterAdapter.kt index f27e353..fa08e2d 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/home/adapter/HomeFilterAdapter.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/home/adapter/HomeFilterAdapter.kt @@ -5,8 +5,8 @@ import android.view.ViewGroup import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView -import com.avengers.nibobnebob.databinding.ItemHomeFilterBinding import com.avengers.nibobnebob.presentation.ui.main.home.model.UiFilterData +import com.avengers.presentation.databinding.ItemHomeFilterBinding class HomeFilterAdapter: ListAdapter(diffCallback) { diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/home/adapter/HomeRecommendRestaurantAdapter.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/home/adapter/HomeRecommendRestaurantAdapter.kt similarity index 96% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/home/adapter/HomeRecommendRestaurantAdapter.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/home/adapter/HomeRecommendRestaurantAdapter.kt index f1a73ce..a9411d3 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/home/adapter/HomeRecommendRestaurantAdapter.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/home/adapter/HomeRecommendRestaurantAdapter.kt @@ -5,8 +5,8 @@ import android.view.ViewGroup import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView -import com.avengers.nibobnebob.databinding.ItemRecommendRestaurantBinding import com.avengers.nibobnebob.presentation.ui.main.home.model.UiRecommendRestaurantData +import com.avengers.presentation.databinding.ItemRecommendRestaurantBinding import com.bumptech.glide.Glide class HomeRecommendAdapter( diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/home/adapter/HomeSearchAdapter.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/home/adapter/HomeSearchAdapter.kt similarity index 97% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/home/adapter/HomeSearchAdapter.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/home/adapter/HomeSearchAdapter.kt index ae985d9..01fa9c8 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/home/adapter/HomeSearchAdapter.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/home/adapter/HomeSearchAdapter.kt @@ -8,8 +8,8 @@ import android.text.style.ForegroundColorSpan import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.avengers.nibobnebob.databinding.ItemHomeSearchBinding import com.avengers.nibobnebob.presentation.ui.main.home.model.UiRestaurantData +import com.avengers.presentation.databinding.ItemHomeSearchBinding class HomeSearchAdapter( private val onClickSearchItem: (UiRestaurantData) -> Unit diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/home/mapper/UiRestaurantDataMapper.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/home/mapper/UiRestaurantDataMapper.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/home/mapper/UiRestaurantDataMapper.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/home/mapper/UiRestaurantDataMapper.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/home/mapper/UiSearchResultDataMapper.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/home/mapper/UiSearchResultDataMapper.kt similarity index 89% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/home/mapper/UiSearchResultDataMapper.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/home/mapper/UiSearchResultDataMapper.kt index 3b94b75..281020d 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/home/mapper/UiSearchResultDataMapper.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/home/mapper/UiSearchResultDataMapper.kt @@ -1,6 +1,6 @@ package com.avengers.nibobnebob.presentation.ui.main.home.mapper -import com.avengers.nibobnebob.domain.model.SearchRestaurantData +import com.avengers.domain.model.SearchRestaurantData import com.avengers.nibobnebob.presentation.ui.main.home.model.UiRestaurantData fun SearchRestaurantData.toUiRestaurantData(): UiRestaurantData = UiRestaurantData( diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/home/model/UiFilterData.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/home/model/UiFilterData.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/home/model/UiFilterData.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/home/model/UiFilterData.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/home/model/UiRecommendRestaurantData.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/home/model/UiRecommendRestaurantData.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/home/model/UiRecommendRestaurantData.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/home/model/UiRecommendRestaurantData.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/home/model/UiRestaurantData.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/home/model/UiRestaurantData.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/home/model/UiRestaurantData.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/home/model/UiRestaurantData.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/home/search/RestaurantSearchFragment.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/home/search/RestaurantSearchFragment.kt similarity index 96% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/home/search/RestaurantSearchFragment.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/home/search/RestaurantSearchFragment.kt index 3aefb1c..21bcf3c 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/home/search/RestaurantSearchFragment.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/home/search/RestaurantSearchFragment.kt @@ -3,11 +3,9 @@ package com.avengers.nibobnebob.presentation.ui.main.home.search import android.Manifest import android.annotation.SuppressLint import android.content.Context -import android.content.Intent import android.content.pm.PackageManager import android.location.Location import android.location.LocationManager -import android.provider.Settings import android.view.MotionEvent import android.view.View import androidx.core.app.ActivityCompat @@ -15,14 +13,14 @@ import androidx.fragment.app.activityViewModels import androidx.fragment.app.viewModels import androidx.navigation.NavController import androidx.navigation.fragment.findNavController -import com.avengers.nibobnebob.R -import com.avengers.nibobnebob.databinding.FragmentRestaurantSearchBinding import com.avengers.nibobnebob.presentation.base.BaseFragment import com.avengers.nibobnebob.presentation.ui.adjustKeyboard import com.avengers.nibobnebob.presentation.ui.customBack import com.avengers.nibobnebob.presentation.ui.main.MainActivity import com.avengers.nibobnebob.presentation.ui.main.MainViewModel import com.avengers.nibobnebob.presentation.ui.main.home.adapter.HomeSearchAdapter +import com.avengers.presentation.R +import com.avengers.presentation.databinding.FragmentRestaurantSearchBinding import com.google.android.gms.location.LocationServices import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.flow.collectLatest diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/home/search/RestaurantSearchMapFragment.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/home/search/RestaurantSearchMapFragment.kt similarity index 98% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/home/search/RestaurantSearchMapFragment.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/home/search/RestaurantSearchMapFragment.kt index f74ac70..7f4ad49 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/home/search/RestaurantSearchMapFragment.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/home/search/RestaurantSearchMapFragment.kt @@ -12,8 +12,6 @@ import androidx.fragment.app.viewModels import androidx.lifecycle.lifecycleScope import androidx.navigation.NavController import androidx.navigation.fragment.findNavController -import com.avengers.nibobnebob.R -import com.avengers.nibobnebob.databinding.FragmentRestaurantSearchMapBinding import com.avengers.nibobnebob.presentation.base.BaseFragment import com.avengers.nibobnebob.presentation.customview.RestaurantBottomSheet import com.avengers.nibobnebob.presentation.ui.customBack @@ -21,6 +19,8 @@ import com.avengers.nibobnebob.presentation.ui.main.MainViewModel import com.avengers.nibobnebob.presentation.ui.main.home.model.UiRestaurantData import com.avengers.nibobnebob.presentation.ui.toAddRestaurant import com.avengers.nibobnebob.presentation.ui.toHome +import com.avengers.presentation.R +import com.avengers.presentation.databinding.FragmentRestaurantSearchMapBinding import com.naver.maps.geometry.LatLng import com.naver.maps.map.CameraUpdate import com.naver.maps.map.MapFragment diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/home/search/RestaurantSearchMapViewModel.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/home/search/RestaurantSearchMapViewModel.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/home/search/RestaurantSearchMapViewModel.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/home/search/RestaurantSearchMapViewModel.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/home/search/RestaurantSearchViewModel.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/home/search/RestaurantSearchViewModel.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/home/search/RestaurantSearchViewModel.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/home/search/RestaurantSearchViewModel.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/MyPageFragment.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/MyPageFragment.kt similarity index 97% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/MyPageFragment.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/MyPageFragment.kt index 46897c8..892fa89 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/MyPageFragment.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/MyPageFragment.kt @@ -9,14 +9,14 @@ import androidx.fragment.app.activityViewModels import androidx.fragment.app.viewModels import androidx.navigation.NavController import androidx.navigation.fragment.findNavController -import com.avengers.nibobnebob.R -import com.avengers.nibobnebob.databinding.FragmentMyPageBinding import com.avengers.nibobnebob.presentation.base.BaseFragment import com.avengers.nibobnebob.presentation.customview.ImageDialog import com.avengers.nibobnebob.presentation.ui.intro.IntroActivity import com.avengers.nibobnebob.presentation.ui.main.MainViewModel import com.avengers.nibobnebob.presentation.ui.main.mypage.share.MyPageSharedUiEvent import com.avengers.nibobnebob.presentation.ui.main.mypage.share.MyPageSharedViewModel +import com.avengers.presentation.R +import com.avengers.presentation.databinding.FragmentMyPageBinding import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/MyPageViewModel.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/MyPageViewModel.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/MyPageViewModel.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/MyPageViewModel.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/Validation.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/Validation.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/Validation.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/Validation.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/edit/EditProfileFragment.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/edit/EditProfileFragment.kt similarity index 95% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/edit/EditProfileFragment.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/edit/EditProfileFragment.kt index ebfbf6c..edb7218 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/edit/EditProfileFragment.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/edit/EditProfileFragment.kt @@ -1,13 +1,10 @@ package com.avengers.nibobnebob.presentation.ui.main.mypage.edit -import androidx.activity.OnBackPressedCallback import androidx.fragment.app.activityViewModels import androidx.fragment.app.viewModels import androidx.navigation.NavController import androidx.navigation.Navigation import androidx.navigation.fragment.findNavController -import com.avengers.nibobnebob.R -import com.avengers.nibobnebob.databinding.FragmentEditProfileBinding import com.avengers.nibobnebob.presentation.base.BaseFragment import com.avengers.nibobnebob.presentation.customview.CalendarDatePicker import com.avengers.nibobnebob.presentation.ui.customBack @@ -15,6 +12,8 @@ import com.avengers.nibobnebob.presentation.ui.main.MainViewModel import com.avengers.nibobnebob.presentation.ui.main.mypage.share.MyPageSharedUiEvent import com.avengers.nibobnebob.presentation.ui.main.mypage.share.MyPageSharedViewModel import com.avengers.nibobnebob.presentation.ui.toMultiPart +import com.avengers.presentation.R +import com.avengers.presentation.databinding.FragmentEditProfileBinding import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/edit/EditProfileViewModel.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/edit/EditProfileViewModel.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/edit/EditProfileViewModel.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/edit/EditProfileViewModel.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/mapper/UiMyListDataMapper.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/mapper/UiMyListDataMapper.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/mapper/UiMyListDataMapper.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/mapper/UiMyListDataMapper.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/mapper/UiMyPageInfoDataMapper.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/mapper/UiMyPageInfoDataMapper.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/mapper/UiMyPageInfoDataMapper.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/mapper/UiMyPageInfoDataMapper.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/mapper/UiMyWishListDataMapper.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/mapper/UiMyWishListDataMapper.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/mapper/UiMyWishListDataMapper.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/mapper/UiMyWishListDataMapper.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/mapper/UiMypageEditInfoMapper.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/mapper/UiMypageEditInfoMapper.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/mapper/UiMypageEditInfoMapper.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/mapper/UiMypageEditInfoMapper.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/model/UiMyListData.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/model/UiMyListData.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/model/UiMyListData.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/model/UiMyListData.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/model/UiMyPageEditInfoData.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/model/UiMyPageEditInfoData.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/model/UiMyPageEditInfoData.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/model/UiMyPageEditInfoData.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/model/UiMyPageMainInfoData.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/model/UiMyPageMainInfoData.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/model/UiMyPageMainInfoData.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/model/UiMyPageMainInfoData.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/model/UiMyWishData.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/model/UiMyWishData.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/model/UiMyWishData.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/model/UiMyWishData.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/mylist/MyRestaurantAdapter.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/mylist/MyRestaurantAdapter.kt similarity index 96% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/mylist/MyRestaurantAdapter.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/mylist/MyRestaurantAdapter.kt index ed0725a..4840dd1 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/mylist/MyRestaurantAdapter.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/mylist/MyRestaurantAdapter.kt @@ -6,9 +6,9 @@ import androidx.appcompat.widget.PopupMenu import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView -import com.avengers.nibobnebob.R -import com.avengers.nibobnebob.databinding.ItemMyListBinding import com.avengers.nibobnebob.presentation.ui.main.mypage.model.UiMyListData +import com.avengers.presentation.R +import com.avengers.presentation.databinding.ItemMyListBinding class MyRestaurantAdapter( private val showDetail: (Int) -> Unit, diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/mylist/MyRestaurantListFragment.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/mylist/MyRestaurantListFragment.kt similarity index 97% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/mylist/MyRestaurantListFragment.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/mylist/MyRestaurantListFragment.kt index f62dcba..cdc5c88 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/mylist/MyRestaurantListFragment.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/mylist/MyRestaurantListFragment.kt @@ -6,14 +6,14 @@ import androidx.fragment.app.viewModels import androidx.navigation.NavController import androidx.navigation.fragment.findNavController import androidx.recyclerview.widget.RecyclerView -import com.avengers.nibobnebob.R -import com.avengers.nibobnebob.databinding.FragmentMyRestaurantListBinding import com.avengers.nibobnebob.presentation.base.BaseFragment import com.avengers.nibobnebob.presentation.ui.customBack import com.avengers.nibobnebob.presentation.ui.main.MainViewModel import com.avengers.nibobnebob.presentation.ui.main.mypage.share.MyPageSharedUiEvent import com.avengers.nibobnebob.presentation.ui.main.mypage.share.MyPageSharedViewModel import com.avengers.nibobnebob.presentation.ui.toMyPage +import com.avengers.presentation.R +import com.avengers.presentation.databinding.FragmentMyRestaurantListBinding import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/mylist/MyRestaurantListViewModel.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/mylist/MyRestaurantListViewModel.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/mylist/MyRestaurantListViewModel.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/mylist/MyRestaurantListViewModel.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/share/MyPageSharedViewModel.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/share/MyPageSharedViewModel.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/share/MyPageSharedViewModel.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/share/MyPageSharedViewModel.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/wishlist/MyWishAdapter.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/wishlist/MyWishAdapter.kt similarity index 96% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/wishlist/MyWishAdapter.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/wishlist/MyWishAdapter.kt index 0f561c4..312e6c7 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/wishlist/MyWishAdapter.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/wishlist/MyWishAdapter.kt @@ -6,9 +6,9 @@ import androidx.appcompat.widget.PopupMenu import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView -import com.avengers.nibobnebob.R -import com.avengers.nibobnebob.databinding.ItemWishListBinding import com.avengers.nibobnebob.presentation.ui.main.mypage.model.UiMyWishData +import com.avengers.presentation.R +import com.avengers.presentation.databinding.ItemWishListBinding class MyWishAdapter( private val deleteMyWish: (Int) -> Unit, diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/wishlist/MyWishListViewModel.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/wishlist/MyWishListViewModel.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/wishlist/MyWishListViewModel.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/wishlist/MyWishListViewModel.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/wishlist/WishRestaurantListFragment.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/wishlist/WishRestaurantListFragment.kt similarity index 97% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/wishlist/WishRestaurantListFragment.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/wishlist/WishRestaurantListFragment.kt index 9efd591..3e3d7c3 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/main/mypage/wishlist/WishRestaurantListFragment.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/main/mypage/wishlist/WishRestaurantListFragment.kt @@ -6,13 +6,13 @@ import androidx.fragment.app.viewModels import androidx.navigation.NavController import androidx.navigation.fragment.findNavController import androidx.recyclerview.widget.RecyclerView -import com.avengers.nibobnebob.R -import com.avengers.nibobnebob.databinding.FragmentWishRestaurantListBinding import com.avengers.nibobnebob.presentation.base.BaseFragment import com.avengers.nibobnebob.presentation.ui.customBack import com.avengers.nibobnebob.presentation.ui.main.MainViewModel import com.avengers.nibobnebob.presentation.ui.main.mypage.share.MyPageSharedUiEvent import com.avengers.nibobnebob.presentation.ui.main.mypage.share.MyPageSharedViewModel +import com.avengers.presentation.R +import com.avengers.presentation.databinding.FragmentWishRestaurantListBinding import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/splash/SplashActivity.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/splash/SplashActivity.kt similarity index 87% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/splash/SplashActivity.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/splash/SplashActivity.kt index bf5a641..fb38f26 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/splash/SplashActivity.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/splash/SplashActivity.kt @@ -1,12 +1,12 @@ -package com.avengers.nibobnebob.presentation.ui.splash +package com.avengers.presentation.ui.splash import android.annotation.SuppressLint import android.content.Intent import androidx.activity.viewModels -import com.avengers.nibobnebob.databinding.ActivitySplashBinding -import com.avengers.nibobnebob.presentation.base.BaseActivity +import com.avengers.presentation.base.BaseActivity import com.avengers.nibobnebob.presentation.ui.intro.IntroActivity import com.avengers.nibobnebob.presentation.ui.main.MainActivity +import com.avengers.presentation.databinding.ActivitySplashBinding import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.delay diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/splash/SplashViewModel.kt b/Aos/presentation/src/main/java/com/avengers/presentation/ui/splash/SplashViewModel.kt similarity index 84% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/splash/SplashViewModel.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/ui/splash/SplashViewModel.kt index 11ddf45..9ab29c1 100644 --- a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/splash/SplashViewModel.kt +++ b/Aos/presentation/src/main/java/com/avengers/presentation/ui/splash/SplashViewModel.kt @@ -1,9 +1,9 @@ -package com.avengers.nibobnebob.presentation.ui.splash +package com.avengers.presentation.ui.splash import androidx.lifecycle.viewModelScope -import com.avengers.nibobnebob.app.DataStoreManager -import com.avengers.nibobnebob.app.NetworkManager -import com.avengers.nibobnebob.presentation.base.BaseActivityViewModel +import com.avengers.data.config.DataStoreManager +import com.avengers.data.config.NetworkManager +import com.avengers.presentation.base.BaseActivityViewModel import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/util/Constants.kt b/Aos/presentation/src/main/java/com/avengers/presentation/util/Constants.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/util/Constants.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/util/Constants.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/util/DefaultDiffUtil.kt b/Aos/presentation/src/main/java/com/avengers/presentation/util/DefaultDiffUtil.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/util/DefaultDiffUtil.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/util/DefaultDiffUtil.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/util/LocationArray.kt b/Aos/presentation/src/main/java/com/avengers/presentation/util/LocationArray.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/util/LocationArray.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/util/LocationArray.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/util/LoginType.kt b/Aos/presentation/src/main/java/com/avengers/presentation/util/LoginType.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/util/LoginType.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/util/LoginType.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/util/TimeUtil.kt b/Aos/presentation/src/main/java/com/avengers/presentation/util/TimeUtil.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/util/TimeUtil.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/util/TimeUtil.kt diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/util/ValidationUtil.kt b/Aos/presentation/src/main/java/com/avengers/presentation/util/ValidationUtil.kt similarity index 100% rename from Aos/app/src/main/java/com/avengers/nibobnebob/presentation/util/ValidationUtil.kt rename to Aos/presentation/src/main/java/com/avengers/presentation/util/ValidationUtil.kt diff --git a/Aos/app/src/main/res/color/selector_filter_background.xml b/Aos/presentation/src/main/res/color/selector_filter_background.xml similarity index 100% rename from Aos/app/src/main/res/color/selector_filter_background.xml rename to Aos/presentation/src/main/res/color/selector_filter_background.xml diff --git a/Aos/app/src/main/res/color/selector_filter_chip_text.xml b/Aos/presentation/src/main/res/color/selector_filter_chip_text.xml similarity index 100% rename from Aos/app/src/main/res/color/selector_filter_chip_text.xml rename to Aos/presentation/src/main/res/color/selector_filter_chip_text.xml diff --git a/Aos/app/src/main/res/color/selector_next_btn_text.xml b/Aos/presentation/src/main/res/color/selector_next_btn_text.xml similarity index 100% rename from Aos/app/src/main/res/color/selector_next_btn_text.xml rename to Aos/presentation/src/main/res/color/selector_next_btn_text.xml diff --git a/Aos/app/src/main/res/color/selector_nick_check_text.xml b/Aos/presentation/src/main/res/color/selector_nick_check_text.xml similarity index 100% rename from Aos/app/src/main/res/color/selector_nick_check_text.xml rename to Aos/presentation/src/main/res/color/selector_nick_check_text.xml diff --git a/Aos/app/src/main/res/drawable/ic_add_photo.xml b/Aos/presentation/src/main/res/drawable/ic_add_photo.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_add_photo.xml rename to Aos/presentation/src/main/res/drawable/ic_add_photo.xml diff --git a/Aos/app/src/main/res/drawable/ic_add_review_photo.xml b/Aos/presentation/src/main/res/drawable/ic_add_review_photo.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_add_review_photo.xml rename to Aos/presentation/src/main/res/drawable/ic_add_review_photo.xml diff --git a/Aos/app/src/main/res/drawable/ic_app_logo.xml b/Aos/presentation/src/main/res/drawable/ic_app_logo.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_app_logo.xml rename to Aos/presentation/src/main/res/drawable/ic_app_logo.xml diff --git a/Aos/app/src/main/res/drawable/ic_app_logo_foreground.xml b/Aos/presentation/src/main/res/drawable/ic_app_logo_foreground.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_app_logo_foreground.xml rename to Aos/presentation/src/main/res/drawable/ic_app_logo_foreground.xml diff --git a/Aos/app/src/main/res/drawable/ic_back.xml b/Aos/presentation/src/main/res/drawable/ic_back.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_back.xml rename to Aos/presentation/src/main/res/drawable/ic_back.xml diff --git a/Aos/app/src/main/res/drawable/ic_calendar.xml b/Aos/presentation/src/main/res/drawable/ic_calendar.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_calendar.xml rename to Aos/presentation/src/main/res/drawable/ic_calendar.xml diff --git a/Aos/app/src/main/res/drawable/ic_check.xml b/Aos/presentation/src/main/res/drawable/ic_check.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_check.xml rename to Aos/presentation/src/main/res/drawable/ic_check.xml diff --git a/Aos/app/src/main/res/drawable/ic_close.xml b/Aos/presentation/src/main/res/drawable/ic_close.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_close.xml rename to Aos/presentation/src/main/res/drawable/ic_close.xml diff --git a/Aos/app/src/main/res/drawable/ic_delete.xml b/Aos/presentation/src/main/res/drawable/ic_delete.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_delete.xml rename to Aos/presentation/src/main/res/drawable/ic_delete.xml diff --git a/Aos/app/src/main/res/drawable/ic_drop_down.xml b/Aos/presentation/src/main/res/drawable/ic_drop_down.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_drop_down.xml rename to Aos/presentation/src/main/res/drawable/ic_drop_down.xml diff --git a/Aos/app/src/main/res/drawable/ic_edit.xml b/Aos/presentation/src/main/res/drawable/ic_edit.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_edit.xml rename to Aos/presentation/src/main/res/drawable/ic_edit.xml diff --git a/Aos/app/src/main/res/drawable/ic_enter.xml b/Aos/presentation/src/main/res/drawable/ic_enter.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_enter.xml rename to Aos/presentation/src/main/res/drawable/ic_enter.xml diff --git a/Aos/app/src/main/res/drawable/ic_filter.xml b/Aos/presentation/src/main/res/drawable/ic_filter.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_filter.xml rename to Aos/presentation/src/main/res/drawable/ic_filter.xml diff --git a/Aos/app/src/main/res/drawable/ic_following.xml b/Aos/presentation/src/main/res/drawable/ic_following.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_following.xml rename to Aos/presentation/src/main/res/drawable/ic_following.xml diff --git a/Aos/app/src/main/res/drawable/ic_home.xml b/Aos/presentation/src/main/res/drawable/ic_home.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_home.xml rename to Aos/presentation/src/main/res/drawable/ic_home.xml diff --git a/Aos/app/src/main/res/drawable/ic_launcher_background.xml b/Aos/presentation/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_launcher_background.xml rename to Aos/presentation/src/main/res/drawable/ic_launcher_background.xml diff --git a/Aos/app/src/main/res/drawable/ic_launcher_foreground.xml b/Aos/presentation/src/main/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_launcher_foreground.xml rename to Aos/presentation/src/main/res/drawable/ic_launcher_foreground.xml diff --git a/Aos/app/src/main/res/drawable/ic_loading.xml b/Aos/presentation/src/main/res/drawable/ic_loading.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_loading.xml rename to Aos/presentation/src/main/res/drawable/ic_loading.xml diff --git a/Aos/app/src/main/res/drawable/ic_location_circle.xml b/Aos/presentation/src/main/res/drawable/ic_location_circle.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_location_circle.xml rename to Aos/presentation/src/main/res/drawable/ic_location_circle.xml diff --git a/Aos/app/src/main/res/drawable/ic_location_off.xml b/Aos/presentation/src/main/res/drawable/ic_location_off.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_location_off.xml rename to Aos/presentation/src/main/res/drawable/ic_location_off.xml diff --git a/Aos/app/src/main/res/drawable/ic_location_on.xml b/Aos/presentation/src/main/res/drawable/ic_location_on.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_location_on.xml rename to Aos/presentation/src/main/res/drawable/ic_location_on.xml diff --git a/Aos/app/src/main/res/drawable/ic_logo.xml b/Aos/presentation/src/main/res/drawable/ic_logo.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_logo.xml rename to Aos/presentation/src/main/res/drawable/ic_logo.xml diff --git a/Aos/app/src/main/res/drawable/ic_logo_big.xml b/Aos/presentation/src/main/res/drawable/ic_logo_big.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_logo_big.xml rename to Aos/presentation/src/main/res/drawable/ic_logo_big.xml diff --git a/Aos/app/src/main/res/drawable/ic_logo_home.xml b/Aos/presentation/src/main/res/drawable/ic_logo_home.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_logo_home.xml rename to Aos/presentation/src/main/res/drawable/ic_logo_home.xml diff --git a/Aos/app/src/main/res/drawable/ic_marker.xml b/Aos/presentation/src/main/res/drawable/ic_marker.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_marker.xml rename to Aos/presentation/src/main/res/drawable/ic_marker.xml diff --git a/Aos/app/src/main/res/drawable/ic_marker_near.xml b/Aos/presentation/src/main/res/drawable/ic_marker_near.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_marker_near.xml rename to Aos/presentation/src/main/res/drawable/ic_marker_near.xml diff --git a/Aos/app/src/main/res/drawable/ic_menu.xml b/Aos/presentation/src/main/res/drawable/ic_menu.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_menu.xml rename to Aos/presentation/src/main/res/drawable/ic_menu.xml diff --git a/Aos/app/src/main/res/drawable/ic_more.xml b/Aos/presentation/src/main/res/drawable/ic_more.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_more.xml rename to Aos/presentation/src/main/res/drawable/ic_more.xml diff --git a/Aos/app/src/main/res/drawable/ic_mypage.xml b/Aos/presentation/src/main/res/drawable/ic_mypage.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_mypage.xml rename to Aos/presentation/src/main/res/drawable/ic_mypage.xml diff --git a/Aos/app/src/main/res/drawable/ic_naver.xml b/Aos/presentation/src/main/res/drawable/ic_naver.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_naver.xml rename to Aos/presentation/src/main/res/drawable/ic_naver.xml diff --git a/Aos/app/src/main/res/drawable/ic_plus.xml b/Aos/presentation/src/main/res/drawable/ic_plus.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_plus.xml rename to Aos/presentation/src/main/res/drawable/ic_plus.xml diff --git a/Aos/app/src/main/res/drawable/ic_refresh.xml b/Aos/presentation/src/main/res/drawable/ic_refresh.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_refresh.xml rename to Aos/presentation/src/main/res/drawable/ic_refresh.xml diff --git a/Aos/app/src/main/res/drawable/ic_search.xml b/Aos/presentation/src/main/res/drawable/ic_search.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_search.xml rename to Aos/presentation/src/main/res/drawable/ic_search.xml diff --git a/Aos/app/src/main/res/drawable/ic_star_border.xml b/Aos/presentation/src/main/res/drawable/ic_star_border.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_star_border.xml rename to Aos/presentation/src/main/res/drawable/ic_star_border.xml diff --git a/Aos/app/src/main/res/drawable/ic_star_full.xml b/Aos/presentation/src/main/res/drawable/ic_star_full.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_star_full.xml rename to Aos/presentation/src/main/res/drawable/ic_star_full.xml diff --git a/Aos/app/src/main/res/drawable/ic_test.jpeg b/Aos/presentation/src/main/res/drawable/ic_test.jpeg similarity index 100% rename from Aos/app/src/main/res/drawable/ic_test.jpeg rename to Aos/presentation/src/main/res/drawable/ic_test.jpeg diff --git a/Aos/app/src/main/res/drawable/ic_thumbs_down_blank.xml b/Aos/presentation/src/main/res/drawable/ic_thumbs_down_blank.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_thumbs_down_blank.xml rename to Aos/presentation/src/main/res/drawable/ic_thumbs_down_blank.xml diff --git a/Aos/app/src/main/res/drawable/ic_thumbs_down_fill.xml b/Aos/presentation/src/main/res/drawable/ic_thumbs_down_fill.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_thumbs_down_fill.xml rename to Aos/presentation/src/main/res/drawable/ic_thumbs_down_fill.xml diff --git a/Aos/app/src/main/res/drawable/ic_thumbs_up_blank.xml b/Aos/presentation/src/main/res/drawable/ic_thumbs_up_blank.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_thumbs_up_blank.xml rename to Aos/presentation/src/main/res/drawable/ic_thumbs_up_blank.xml diff --git a/Aos/app/src/main/res/drawable/ic_thumbs_up_fill.xml b/Aos/presentation/src/main/res/drawable/ic_thumbs_up_fill.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_thumbs_up_fill.xml rename to Aos/presentation/src/main/res/drawable/ic_thumbs_up_fill.xml diff --git a/Aos/app/src/main/res/drawable/ic_x.xml b/Aos/presentation/src/main/res/drawable/ic_x.xml similarity index 100% rename from Aos/app/src/main/res/drawable/ic_x.xml rename to Aos/presentation/src/main/res/drawable/ic_x.xml diff --git a/Aos/app/src/main/res/drawable/menu_selector_style.xml b/Aos/presentation/src/main/res/drawable/menu_selector_style.xml similarity index 100% rename from Aos/app/src/main/res/drawable/menu_selector_style.xml rename to Aos/presentation/src/main/res/drawable/menu_selector_style.xml diff --git a/Aos/app/src/main/res/drawable/oval_primary1fill_nostroke.xml b/Aos/presentation/src/main/res/drawable/oval_primary1fill_nostroke.xml similarity index 100% rename from Aos/app/src/main/res/drawable/oval_primary1fill_nostroke.xml rename to Aos/presentation/src/main/res/drawable/oval_primary1fill_nostroke.xml diff --git a/Aos/app/src/main/res/drawable/oval_primary2fill_nostroke.xml b/Aos/presentation/src/main/res/drawable/oval_primary2fill_nostroke.xml similarity index 100% rename from Aos/app/src/main/res/drawable/oval_primary2fill_nostroke.xml rename to Aos/presentation/src/main/res/drawable/oval_primary2fill_nostroke.xml diff --git a/Aos/app/src/main/res/drawable/oval_primary3fill_nostroke.xml b/Aos/presentation/src/main/res/drawable/oval_primary3fill_nostroke.xml similarity index 100% rename from Aos/app/src/main/res/drawable/oval_primary3fill_nostroke.xml rename to Aos/presentation/src/main/res/drawable/oval_primary3fill_nostroke.xml diff --git a/Aos/app/src/main/res/drawable/oval_primary4fill_nostroke.xml b/Aos/presentation/src/main/res/drawable/oval_primary4fill_nostroke.xml similarity index 100% rename from Aos/app/src/main/res/drawable/oval_primary4fill_nostroke.xml rename to Aos/presentation/src/main/res/drawable/oval_primary4fill_nostroke.xml diff --git a/Aos/app/src/main/res/drawable/oval_primary5fill_nostroke.xml b/Aos/presentation/src/main/res/drawable/oval_primary5fill_nostroke.xml similarity index 100% rename from Aos/app/src/main/res/drawable/oval_primary5fill_nostroke.xml rename to Aos/presentation/src/main/res/drawable/oval_primary5fill_nostroke.xml diff --git a/Aos/app/src/main/res/drawable/rect_dark1fill_nostroke_8radius.xml b/Aos/presentation/src/main/res/drawable/rect_dark1fill_nostroke_8radius.xml similarity index 100% rename from Aos/app/src/main/res/drawable/rect_dark1fill_nostroke_8radius.xml rename to Aos/presentation/src/main/res/drawable/rect_dark1fill_nostroke_8radius.xml diff --git a/Aos/app/src/main/res/drawable/rect_dark6fill_nostroke_20radius.xml b/Aos/presentation/src/main/res/drawable/rect_dark6fill_nostroke_20radius.xml similarity index 100% rename from Aos/app/src/main/res/drawable/rect_dark6fill_nostroke_20radius.xml rename to Aos/presentation/src/main/res/drawable/rect_dark6fill_nostroke_20radius.xml diff --git a/Aos/app/src/main/res/drawable/rect_dark7fill_nostroke_10radius.xml b/Aos/presentation/src/main/res/drawable/rect_dark7fill_nostroke_10radius.xml similarity index 100% rename from Aos/app/src/main/res/drawable/rect_dark7fill_nostroke_10radius.xml rename to Aos/presentation/src/main/res/drawable/rect_dark7fill_nostroke_10radius.xml diff --git a/Aos/app/src/main/res/drawable/rect_naverfill_nostroke_12radius.xml b/Aos/presentation/src/main/res/drawable/rect_naverfill_nostroke_12radius.xml similarity index 100% rename from Aos/app/src/main/res/drawable/rect_naverfill_nostroke_12radius.xml rename to Aos/presentation/src/main/res/drawable/rect_naverfill_nostroke_12radius.xml diff --git a/Aos/app/src/main/res/drawable/rect_primary1_nostroke_radius30.xml b/Aos/presentation/src/main/res/drawable/rect_primary1_nostroke_radius30.xml similarity index 100% rename from Aos/app/src/main/res/drawable/rect_primary1_nostroke_radius30.xml rename to Aos/presentation/src/main/res/drawable/rect_primary1_nostroke_radius30.xml diff --git a/Aos/app/src/main/res/drawable/rect_primary1_nostroke_top_radius20.xml b/Aos/presentation/src/main/res/drawable/rect_primary1_nostroke_top_radius20.xml similarity index 100% rename from Aos/app/src/main/res/drawable/rect_primary1_nostroke_top_radius20.xml rename to Aos/presentation/src/main/res/drawable/rect_primary1_nostroke_top_radius20.xml diff --git a/Aos/app/src/main/res/drawable/rect_primary2fill_nostroke_28radius.xml b/Aos/presentation/src/main/res/drawable/rect_primary2fill_nostroke_28radius.xml similarity index 100% rename from Aos/app/src/main/res/drawable/rect_primary2fill_nostroke_28radius.xml rename to Aos/presentation/src/main/res/drawable/rect_primary2fill_nostroke_28radius.xml diff --git a/Aos/app/src/main/res/drawable/rect_primary3fill_nostroke_30radius.xml b/Aos/presentation/src/main/res/drawable/rect_primary3fill_nostroke_30radius.xml similarity index 100% rename from Aos/app/src/main/res/drawable/rect_primary3fill_nostroke_30radius.xml rename to Aos/presentation/src/main/res/drawable/rect_primary3fill_nostroke_30radius.xml diff --git a/Aos/app/src/main/res/drawable/rect_primary3fill_nostroke_radius10.xml b/Aos/presentation/src/main/res/drawable/rect_primary3fill_nostroke_radius10.xml similarity index 100% rename from Aos/app/src/main/res/drawable/rect_primary3fill_nostroke_radius10.xml rename to Aos/presentation/src/main/res/drawable/rect_primary3fill_nostroke_radius10.xml diff --git a/Aos/app/src/main/res/drawable/rect_primary4fill_nostroke_20radius.xml b/Aos/presentation/src/main/res/drawable/rect_primary4fill_nostroke_20radius.xml similarity index 100% rename from Aos/app/src/main/res/drawable/rect_primary4fill_nostroke_20radius.xml rename to Aos/presentation/src/main/res/drawable/rect_primary4fill_nostroke_20radius.xml diff --git a/Aos/app/src/main/res/drawable/rect_primary6fill_nostroke_30radius.xml b/Aos/presentation/src/main/res/drawable/rect_primary6fill_nostroke_30radius.xml similarity index 100% rename from Aos/app/src/main/res/drawable/rect_primary6fill_nostroke_30radius.xml rename to Aos/presentation/src/main/res/drawable/rect_primary6fill_nostroke_30radius.xml diff --git a/Aos/app/src/main/res/drawable/rect_primary6fill_nostroke_8radius.xml b/Aos/presentation/src/main/res/drawable/rect_primary6fill_nostroke_8radius.xml similarity index 100% rename from Aos/app/src/main/res/drawable/rect_primary6fill_nostroke_8radius.xml rename to Aos/presentation/src/main/res/drawable/rect_primary6fill_nostroke_8radius.xml diff --git a/Aos/app/src/main/res/drawable/rect_primary_light4fill_nostroke_8radius.xml b/Aos/presentation/src/main/res/drawable/rect_primary_light4fill_nostroke_8radius.xml similarity index 100% rename from Aos/app/src/main/res/drawable/rect_primary_light4fill_nostroke_8radius.xml rename to Aos/presentation/src/main/res/drawable/rect_primary_light4fill_nostroke_8radius.xml diff --git a/Aos/app/src/main/res/drawable/rect_primarylight3fill_12radius.xml b/Aos/presentation/src/main/res/drawable/rect_primarylight3fill_12radius.xml similarity index 100% rename from Aos/app/src/main/res/drawable/rect_primarylight3fill_12radius.xml rename to Aos/presentation/src/main/res/drawable/rect_primarylight3fill_12radius.xml diff --git a/Aos/app/src/main/res/drawable/rect_primarylight3fill_nostroke_10radius.xml b/Aos/presentation/src/main/res/drawable/rect_primarylight3fill_nostroke_10radius.xml similarity index 100% rename from Aos/app/src/main/res/drawable/rect_primarylight3fill_nostroke_10radius.xml rename to Aos/presentation/src/main/res/drawable/rect_primarylight3fill_nostroke_10radius.xml diff --git a/Aos/app/src/main/res/drawable/rect_primarylight3fill_nostroke_8radius.xml b/Aos/presentation/src/main/res/drawable/rect_primarylight3fill_nostroke_8radius.xml similarity index 100% rename from Aos/app/src/main/res/drawable/rect_primarylight3fill_nostroke_8radius.xml rename to Aos/presentation/src/main/res/drawable/rect_primarylight3fill_nostroke_8radius.xml diff --git a/Aos/app/src/main/res/drawable/rect_wishlistcolorfill_12radius.xml b/Aos/presentation/src/main/res/drawable/rect_wishlistcolorfill_12radius.xml similarity index 100% rename from Aos/app/src/main/res/drawable/rect_wishlistcolorfill_12radius.xml rename to Aos/presentation/src/main/res/drawable/rect_wishlistcolorfill_12radius.xml diff --git a/Aos/app/src/main/res/drawable/selector_location_drop_down.xml b/Aos/presentation/src/main/res/drawable/selector_location_drop_down.xml similarity index 100% rename from Aos/app/src/main/res/drawable/selector_location_drop_down.xml rename to Aos/presentation/src/main/res/drawable/selector_location_drop_down.xml diff --git a/Aos/app/src/main/res/drawable/selector_next_btn.xml b/Aos/presentation/src/main/res/drawable/selector_next_btn.xml similarity index 100% rename from Aos/app/src/main/res/drawable/selector_next_btn.xml rename to Aos/presentation/src/main/res/drawable/selector_next_btn.xml diff --git a/Aos/app/src/main/res/layout/activity_intro.xml b/Aos/presentation/src/main/res/layout/activity_intro.xml similarity index 100% rename from Aos/app/src/main/res/layout/activity_intro.xml rename to Aos/presentation/src/main/res/layout/activity_intro.xml diff --git a/Aos/app/src/main/res/layout/activity_main.xml b/Aos/presentation/src/main/res/layout/activity_main.xml similarity index 100% rename from Aos/app/src/main/res/layout/activity_main.xml rename to Aos/presentation/src/main/res/layout/activity_main.xml diff --git a/Aos/app/src/main/res/layout/activity_splash.xml b/Aos/presentation/src/main/res/layout/activity_splash.xml similarity index 94% rename from Aos/app/src/main/res/layout/activity_splash.xml rename to Aos/presentation/src/main/res/layout/activity_splash.xml index f12cda8..68b5780 100644 --- a/Aos/app/src/main/res/layout/activity_splash.xml +++ b/Aos/presentation/src/main/res/layout/activity_splash.xml @@ -6,7 +6,7 @@ + type="com.avengers.presentation.ui.splash.SplashViewModel" />