MIN-49] feat: story 중첩 리사이클러뷰 구현(#23)

app/src/main/java/com/najudoryeong/mineme/MainActivity.kt

@@ -3,13 +3,10 @@ package com.najudoryeong.mineme
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.view.View
-import android.view.WindowManager
 import androidx.activity.viewModels
 import androidx.databinding.DataBindingUtil
-import androidx.fragment.app.Fragment
 import androidx.navigation.NavController
 import androidx.navigation.fragment.NavHostFragment
-import androidx.navigation.fragment.findNavController
 import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.NavigationUI
 import androidx.navigation.ui.setupWithNavController

app/src/main/java/com/najudoryeong/mineme/MainViewModel.kt

@@ -1,7 +1,5 @@
 package com.najudoryeong.mineme
 
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 
 

app/src/main/java/com/najudoryeong/mineme/MineMeApplication.kt

@@ -2,7 +2,7 @@ package com.najudoryeong.mineme
 
 import android.app.Application
 import android.util.Log
-import com.example.common.util.NATIVE_APP_KEY
+import com.najudoryeong.mineme.common.util.NATIVE_APP_KEY
 import com.kakao.sdk.common.KakaoSdk
 import com.kakao.sdk.common.util.Utility
 import dagger.hilt.android.HiltAndroidApp
@@ -12,7 +12,7 @@ class MineMeApplication : Application() {
     override fun onCreate() {
         super.onCreate()
         KakaoSdk.init(this, NATIVE_APP_KEY)
-        //printAppKeyHash()
+        printAppKeyHash()
     }
 
     private fun printAppKeyHash() {

common-ui/src/main/java/com/najudoryeong/mineme/common_ui/MainActivityUtil.kt

@@ -1,7 +1,5 @@
 package com.najudoryeong.mineme.common_ui
 
-import androidx.fragment.app.Fragment
-
 interface MainActivityUtil{
     fun setToolbarTitle(newTitle: String)
     fun setVisibilityBottomAppbar(visibilityMode : Int)

common-ui/src/main/java/com/najudoryeong/mineme/common_ui/RecyclerViewBindingAdapter.kt

@@ -10,4 +10,5 @@ fun bindRecyclerView(view: RecyclerView, adapter: RecyclerView.Adapter<*>, submi
         stateRestorationPolicy = RecyclerView.Adapter.StateRestorationPolicy.PREVENT_WHEN_EMPTY
         (this as ListAdapter<Any, *>).submitList(submitList?.toMutableList())
     }
-}
+}
+

common/build.gradle

@@ -32,6 +32,9 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    buildFeatures {
+        dataBinding true
+    }
 }
 
 dependencies {

common/src/androidTest/java/com/example/common/ExampleInstrumentedTest.kt → common/src/androidTest/java/com/najudoryeong/common/ExampleInstrumentedTest.kt

@@ -1,4 +1,4 @@
-package com.example.common
+package com.najudoryeong.common
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4

common/src/main/java/com/example/common/data/dto/CodeRequest.kt → common/src/main/java/com/najudoryeong/mineme/common/data/dto/CodeRequest.kt

@@ -1,4 +1,4 @@
-package com.example.common.data.dto
+package com.najudoryeong.mineme.common.data.dto
 
 data class CodeRequest(
     val code : String

common/src/main/java/com/najudoryeong/mineme/common/data/dto/CommonResponse.kt

@@ -0,0 +1,6 @@
+package com.najudoryeong.mineme.common.data.dto
+
+data class CommonResponse<T>(
+    val data: T,
+    val success: Boolean
+)

common/src/main/java/com/example/common/data/dto/LoginRequest.kt → common/src/main/java/com/najudoryeong/mineme/common/data/dto/LoginRequest.kt

@@ -1,4 +1,4 @@
-package com.example.common.data.dto
+package com.najudoryeong.mineme.common.data.dto
 
 data class LoginRequest(
     val accessToken: String,

common/src/main/java/com/najudoryeong/mineme/common/data/dto/LoginResponse.kt

@@ -0,0 +1,8 @@
+package com.najudoryeong.mineme.common.data.dto
+
+import com.najudoryeong.mineme.common.data.entity.LoginData
+
+data class LoginResponse(
+    val success: Boolean,
+    val data: LoginData
+)

common/src/main/java/com/example/common/data/dto/NullResponse.kt → common/src/main/java/com/najudoryeong/mineme/common/data/dto/NullResponse.kt

@@ -1,4 +1,4 @@
-package com.example.common.data.dto
+package com.najudoryeong.mineme.common.data.dto
 
 data class NullResponse(
     val success: Boolean,

common/src/main/java/com/example/common/data/dto/UserInfoRequest.kt → common/src/main/java/com/najudoryeong/mineme/common/data/dto/UserInfoRequest.kt

@@ -1,4 +1,4 @@
-package com.example.common.data.dto
+package com.najudoryeong.mineme.common.data.dto
 
 data class UserInfoRequest(
     val nickname: String,

common/src/main/java/com/example/common/data/entity/LoginData.kt → common/src/main/java/com/najudoryeong/mineme/common/data/entity/LoginData.kt

@@ -1,4 +1,4 @@
-package com.example.common.data.entity
+package com.najudoryeong.mineme.common.data.entity
 
 data class LoginData(
     val jwt: String,

common/src/main/java/com/example/common/data/entity/ProviderName.kt → common/src/main/java/com/najudoryeong/mineme/common/data/entity/ProviderName.kt

@@ -1,4 +1,4 @@
-package com.example.common.data.entity
+package com.najudoryeong.mineme.common.data.entity
 
 enum class ProviderType(providerType: String) {
     KAKAO("KAKAO")

common/src/main/java/com/example/common/data/source/AuthService.kt → common/src/main/java/com/najudoryeong/mineme/common/data/source/AuthService.kt

@@ -1,7 +1,7 @@
-package com.example.common.data.source
+package com.najudoryeong.mineme.common.data.source
 
-import com.example.common.data.dto.LoginRequest
-import com.example.common.data.dto.LoginResponse
+import com.najudoryeong.mineme.common.data.dto.LoginRequest
+import com.najudoryeong.mineme.common.data.dto.LoginResponse
 import retrofit2.http.Body
 import retrofit2.http.POST
 

common/src/main/java/com/example/common/data/source/UserService.kt → common/src/main/java/com/najudoryeong/mineme/common/data/source/UserService.kt

@@ -1,11 +1,9 @@
-package com.example.common.data.source
+package com.najudoryeong.mineme.common.data.source
 
-import com.example.common.data.dto.CodeRequest
-import com.example.common.data.dto.HomeResponse
-import com.example.common.data.dto.UserInfoRequest
-import com.example.common.data.dto.NullResponse
+import com.najudoryeong.mineme.common.data.dto.CodeRequest
+import com.najudoryeong.mineme.common.data.dto.UserInfoRequest
+import com.najudoryeong.mineme.common.data.dto.NullResponse
 import retrofit2.http.Body
-import retrofit2.http.GET
 import retrofit2.http.Header
 import retrofit2.http.POST
 
@@ -24,11 +22,4 @@ interface UserService {
         @Body userCodeRequest: CodeRequest
     ): NullResponse
 
-
-    @GET("api/test/main/info")
-    suspend fun getHomeInfo(
-        @Header("Authorization") token: String,
-    ): HomeResponse
-
-
 }

common/src/main/java/com/example/common/di/DataStoreModule.kt → common/src/main/java/com/najudoryeong/mineme/common/di/DataStoreModule.kt

@@ -1,10 +1,10 @@
-package com.example.common.di
+package com.najudoryeong.mineme.common.di
 
 import android.content.Context
 import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.preferencesDataStore
-import com.example.common.domain.usecase.DataStoreUseCase
+import com.najudoryeong.mineme.common.domain.usecase.DataStoreUseCase
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn

common/src/main/java/com/example/common/di/NetworkModule.kt → common/src/main/java/com/najudoryeong/mineme/common/di/NetworkModule.kt

@@ -1,14 +1,12 @@
-package com.example.common.di
+package com.najudoryeong.mineme.common.di
 
-import com.example.common.data.source.AuthService
-import com.example.common.data.source.StoryService
-import com.example.common.data.source.UserService
+import com.najudoryeong.mineme.common.data.source.AuthService
+import com.najudoryeong.mineme.common.data.source.UserService
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import retrofit2.Retrofit
-import retrofit2.create
 import javax.inject.Singleton
 
 @Module
@@ -27,11 +25,4 @@ class NetworkModule {
         return retrofit.create(UserService::class.java)
     }
 
-
-    @Singleton
-    @Provides
-    fun provideStoryService(retrofit: Retrofit): StoryService {
-        return retrofit.create(StoryService::class.java)
-    }
-
 }

story/src/main/java/com/najudoryeong/mineme/story/StoryModel.kt → common/src/main/java/com/najudoryeong/mineme/common/domain/entity/Story.kt

@@ -1,6 +1,6 @@
-package com.najudoryeong.mineme.story
+package com.najudoryeong.mineme.common.domain.entity
 
-data class StoryModel(
+data class Story(
     val date: String,
     val postId: Int,
     val region: String,

common/src/main/java/com/example/common/domain/usecase/DataStoreUseCase.kt → common/src/main/java/com/najudoryeong/mineme/common/domain/usecase/DataStoreUseCase.kt

@@ -1,5 +1,6 @@
-package com.example.common.domain.usecase
+package com.najudoryeong.mineme.common.domain.usecase
 
+import android.util.Log
 import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.intPreferencesKey
@@ -30,6 +31,7 @@ class DataStoreUseCase @Inject constructor(
 
     suspend fun editJsonWebToken(jwt: String) {
         dataStore.edit {
+            Log.d("test", "edijwt")
             it[jsonWebToken_key] = jwt
         }
     }

common/src/main/java/com/example/common/domain/usecase/UserUseCase.kt → common/src/main/java/com/najudoryeong/mineme/common/domain/usecase/UserUseCase.kt

@@ -1,8 +1,6 @@
-package com.example.common.domain.usecase
+package com.najudoryeong.mineme.common.domain.usecase
 
-import com.example.common.data.dto.HomeResponse
-import com.example.common.data.source.UserService
-import kotlinx.coroutines.launch
+import com.najudoryeong.mineme.common.data.source.UserService
 import javax.inject.Inject
 import javax.inject.Singleton
 

common/src/main/java/com/example/common/util/Constant.kt → common/src/main/java/com/najudoryeong/mineme/common/util/Constant.kt

@@ -1,3 +1,3 @@
-package com.example.common.util
+package com.najudoryeong.mineme.common.util
 
 const val NATIVE_APP_KEY = "5162225c94277a85e12566f227145303"

common/src/test/java/com/example/common/ExampleUnitTest.kt → common/src/test/java/com/najudoryeong/common/ExampleUnitTest.kt

@@ -1,4 +1,4 @@
-package com.example.common
+package com.najudoryeong.common
 
 import org.junit.Test
 

foundation/src/androidTest/java/com/example/foundation/ExampleInstrumentedTest.kt → foundation/src/androidTest/java/com/najudoryeong/foundation/ExampleInstrumentedTest.kt

@@ -1,4 +1,4 @@
-package com.example.foundation
+package com.najudoryeong.foundation
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4

foundation/src/main/java/com/example/foundation/di/NetworkModule.kt → foundation/src/main/java/com/najudoryeong/mineme/foundation/di/NetworkModule.kt

@@ -1,6 +1,6 @@
-package com.example.foundation.di
+package com.najudoryeong.mineme.foundation.di
 
-import com.example.foundation.util.BASE_URL
+import com.najudoryeong.mineme.foundation.util.BASE_URL
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn

foundation/src/main/java/com/example/foundation/util/Constant.kt → foundation/src/main/java/com/najudoryeong/mineme/foundation/util/Constant.kt

@@ -1,4 +1,4 @@
-package com.example.foundation.util
+package com.najudoryeong.mineme.foundation.util
 
 const val BASE_URL = "http://13.125.67.47:18080/"
 

foundation/src/test/java/com/example/foundation/ExampleUnitTest.kt → foundation/src/test/java/com/najudoryeong/foundation/ExampleUnitTest.kt

@@ -1,4 +1,4 @@
-package com.example.foundation
+package com.najudoryeong.foundation
 
 import org.junit.Test
 

home/build.gradle

@@ -40,12 +40,10 @@ dependencies {
     api project(path: ':common-ui')
     api project(path: ':common')
 
-
     // Hilt
     implementation "com.google.dagger:hilt-android:$rootProject.hiltVersion"
     kapt "com.google.dagger:hilt-android-compiler:$rootProject.hiltVersion"
 
-    api project(path: ':common-ui')
 
     implementation 'androidx.core:core-ktx:1.9.0'
     implementation 'androidx.appcompat:appcompat:1.6.0'

home/src/main/java/com/najudoryeong/mineme/home/data/HomeService.kt

@@ -0,0 +1,16 @@
+package com.najudoryeong.mineme.home.data
+
+import com.najudoryeong.mineme.common.data.dto.CommonResponse
+import com.najudoryeong.mineme.home.domain.entity.HomeData
+import retrofit2.http.GET
+import retrofit2.http.Header
+
+interface HomeService {
+
+    @GET("api/test/main/info")
+    suspend fun readHomeInfo(
+        @Header("Authorization") token: String,
+    ): CommonResponse<HomeData>
+
+
+}

home/src/main/java/com/najudoryeong/mineme/home/di/NetworkModule.kt

@@ -0,0 +1,21 @@
+package com.najudoryeong.mineme.home.di
+
+import com.najudoryeong.mineme.home.data.HomeService
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import retrofit2.Retrofit
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+class NetworkModule {
+
+    @Singleton
+    @Provides
+    fun provideHomeService(retrofit: Retrofit): HomeService {
+        return retrofit.create(HomeService::class.java)
+    }
+
+}