[FEAT/#76] 정보입력뷰 api 연결

app/src/main/AndroidManifest.xml

@@ -16,6 +16,7 @@
         android:theme="@style/Theme.Cherrish" >
         <activity
             android:name=".presentation.main.MainActivity"
+            android:windowSoftInputMode="adjustResize"
             android:exported="true"
             android:label="@string/app_name"
             android:theme="@style/Theme.Cherrish" >
@@ -27,4 +28,4 @@
         </activity>
     </application>
 
-</manifest>
+</manifest>

app/src/main/java/com/cherrish/android/core/common/extension/ModifierExt.kt

@@ -4,8 +4,14 @@ import android.graphics.BlurMaskFilter
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.consumeWindowInsets
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.composed
 import androidx.compose.ui.draw.drawBehind
@@ -17,6 +23,9 @@ import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.graphics.drawOutline
 import androidx.compose.ui.graphics.drawscope.drawIntoCanvas
 import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.layout.findRootCoordinates
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.layout.positionInWindow
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
@@ -86,3 +95,19 @@ fun Modifier.dropShadow(
         }
     }
 }
+
+fun Modifier.advancedImePadding() = composed {
+    var consumePadding by remember { mutableStateOf(0) }
+    onGloballyPositioned { coordinates ->
+        consumePadding = (
+            coordinates.findRootCoordinates().size.height -
+                (coordinates.positionInWindow().y + coordinates.size.height).toInt()
+            ).coerceAtLeast(
+            0
+        )
+    }
+        .consumeWindowInsets(
+            PaddingValues(bottom = with(LocalDensity.current) { consumePadding.toDp() })
+        )
+        .imePadding()
+}

app/src/main/java/com/cherrish/android/data/di/DataSourceModule.kt

@@ -1,7 +1,9 @@
 package com.cherrish.android.data.di
 
 import com.cherrish.android.data.remote.datasource.CalendarDataSource
+import com.cherrish.android.data.remote.datasource.OnboardingProfileDataSource
 import com.cherrish.android.data.remote.datasourceimpl.CalendarDataSourceImpl
+import com.cherrish.android.data.remote.datasourceimpl.OnboardingProfileDataSourceImpl
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -16,4 +18,10 @@ abstract class DataSourceModule {
     abstract fun bindCalendarDataSource(
         calendarDataSourceImpl: CalendarDataSourceImpl
     ): CalendarDataSource
+
+    @Binds
+    @Singleton
+    abstract fun bindOnboardingProfileDataSource(
+        onboardingProfileDataSourceImpl: OnboardingProfileDataSourceImpl
+    ): OnboardingProfileDataSource
 }

app/src/main/java/com/cherrish/android/data/di/RepositoryModule.kt

@@ -1,7 +1,9 @@
 package com.cherrish.android.data.di
 
 import com.cherrish.android.data.repository.CalendarRepository
+import com.cherrish.android.data.repository.OnboardingProfileRepository
 import com.cherrish.android.data.repositoryimpl.CalendarRepositoryImpl
+import com.cherrish.android.data.repositoryimpl.OnboardingProfileRepositoryImpl
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -16,4 +18,10 @@ abstract class RepositoryModule {
     abstract fun bindCalendarRepository(
         calendarRepositoryImpl: CalendarRepositoryImpl
     ): CalendarRepository
+
+    @Binds
+    @Singleton
+    abstract fun bindOnboardingProfileRepository(
+        onboardingProfileRepositoryImpl: OnboardingProfileRepositoryImpl
+    ): OnboardingProfileRepository
 }

app/src/main/java/com/cherrish/android/data/di/ServiceModule.kt

@@ -1,6 +1,7 @@
 package com.cherrish.android.data.di
 
 import com.cherrish.android.data.remote.service.CalendarService
+import com.cherrish.android.data.remote.service.OnboardingProfileService
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -16,4 +17,10 @@ object ServiceModule {
     fun provideCalendarService(
         retrofit: Retrofit
     ): CalendarService = retrofit.create(CalendarService::class.java)
+
+    @Provides
+    @Singleton
+    fun provideOnboardingProfileService(
+        retrofit: Retrofit
+    ): OnboardingProfileService = retrofit.create(OnboardingProfileService::class.java)
 }

app/src/main/java/com/cherrish/android/data/model/OnboardingProfileRequestModel.kt

@@ -0,0 +1,13 @@
+package com.cherrish.android.data.model
+
+import com.cherrish.android.data.remote.dto.request.OnboardingProfileRequestDto
+
+data class OnboardingProfileRequestModel(
+    val name: String,
+    val age: Int
+)
+
+fun OnboardingProfileRequestModel.toDto() = OnboardingProfileRequestDto(
+    name = this.name,
+    age = this.age
+)

app/src/main/java/com/cherrish/android/data/model/OnboardingProfileResponseModel.kt

@@ -0,0 +1,15 @@
+package com.cherrish.android.data.model
+
+import com.cherrish.android.data.remote.dto.response.OnboardingProfileResponseDto
+
+data class OnboardingProfileResponseModel(
+    val id: Long,
+    val name: String,
+    val date: String
+)
+
+fun OnboardingProfileResponseDto.toModel() = OnboardingProfileResponseModel(
+    id = this.id,
+    name = this.name,
+    date = this.date
+)

app/src/main/java/com/cherrish/android/data/remote/datasource/OnboardingProfileDataSource.kt

@@ -0,0 +1,11 @@
+package com.cherrish.android.data.remote.datasource
+
+import com.cherrish.android.core.network.BaseResponse
+import com.cherrish.android.data.remote.dto.request.OnboardingProfileRequestDto
+import com.cherrish.android.data.remote.dto.response.OnboardingProfileResponseDto
+
+interface OnboardingProfileDataSource {
+    suspend fun postOnboardingProfile(
+        request: OnboardingProfileRequestDto
+    ): BaseResponse<OnboardingProfileResponseDto>
+}

app/src/main/java/com/cherrish/android/data/remote/datasourceimpl/OnboardingProfileDataSourceImpl.kt

@@ -0,0 +1,18 @@
+package com.cherrish.android.data.remote.datasourceimpl
+
+import com.cherrish.android.core.network.BaseResponse
+import com.cherrish.android.data.remote.datasource.OnboardingProfileDataSource
+import com.cherrish.android.data.remote.dto.request.OnboardingProfileRequestDto
+import com.cherrish.android.data.remote.dto.response.OnboardingProfileResponseDto
+import com.cherrish.android.data.remote.service.OnboardingProfileService
+import javax.inject.Inject
+
+class OnboardingProfileDataSourceImpl @Inject constructor(
+    private val onboardingProfileService: OnboardingProfileService
+) : OnboardingProfileDataSource {
+    override suspend fun postOnboardingProfile(
+        request: OnboardingProfileRequestDto
+    ): BaseResponse<OnboardingProfileResponseDto> {
+        return onboardingProfileService.postOnboardingProfile(request)
+    }
+}

app/src/main/java/com/cherrish/android/data/remote/dto/request/OnboardingProfileRequestDto.kt

@@ -0,0 +1,12 @@
+package com.cherrish.android.data.remote.dto.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class OnboardingProfileRequestDto(
+    @SerialName("name")
+    val name: String,
+    @SerialName("age")
+    val age: Int
+)

app/src/main/java/com/cherrish/android/data/remote/dto/response/OnboardingProfileResponseDto.kt

@@ -0,0 +1,14 @@
+package com.cherrish.android.data.remote.dto.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class OnboardingProfileResponseDto(
+    @SerialName("id")
+    val id: Long,
+    @SerialName("name")
+    val name: String,
+    @SerialName("date")
+    val date: String
+)

app/src/main/java/com/cherrish/android/data/remote/service/OnboardingProfileService.kt

@@ -0,0 +1,14 @@
+package com.cherrish.android.data.remote.service
+
+import com.cherrish.android.core.network.BaseResponse
+import com.cherrish.android.data.remote.dto.request.OnboardingProfileRequestDto
+import com.cherrish.android.data.remote.dto.response.OnboardingProfileResponseDto
+import retrofit2.http.Body
+import retrofit2.http.POST
+
+interface OnboardingProfileService {
+    @POST("api/onboarding/profiles")
+    suspend fun postOnboardingProfile(
+        @Body request: OnboardingProfileRequestDto
+    ): BaseResponse<OnboardingProfileResponseDto>
+}

app/src/main/java/com/cherrish/android/data/repository/OnboardingProfileRepository.kt

@@ -0,0 +1,10 @@
+package com.cherrish.android.data.repository
+
+import com.cherrish.android.data.model.OnboardingProfileRequestModel
+import com.cherrish.android.data.model.OnboardingProfileResponseModel
+
+interface OnboardingProfileRepository {
+    suspend fun postOnboardingProfile(
+        request: OnboardingProfileRequestModel
+    ): Result<OnboardingProfileResponseModel>
+}

app/src/main/java/com/cherrish/android/data/repositoryimpl/OnboardingProfileRepositoryImpl.kt

@@ -0,0 +1,23 @@
+package com.cherrish.android.data.repositoryimpl
+
+import com.cherrish.android.core.util.suspendRunCatching
+import com.cherrish.android.data.model.OnboardingProfileRequestModel
+import com.cherrish.android.data.model.OnboardingProfileResponseModel
+import com.cherrish.android.data.model.toDto
+import com.cherrish.android.data.model.toModel
+import com.cherrish.android.data.remote.datasource.OnboardingProfileDataSource
+import com.cherrish.android.data.repository.OnboardingProfileRepository
+import javax.inject.Inject
+
+class OnboardingProfileRepositoryImpl @Inject constructor(
+    private val onboardingProfileDataSource: OnboardingProfileDataSource
+) : OnboardingProfileRepository {
+    override suspend fun postOnboardingProfile(
+        request: OnboardingProfileRequestModel
+    ): Result<OnboardingProfileResponseModel> =
+        suspendRunCatching {
+            onboardingProfileDataSource.postOnboardingProfile(
+                request = request.toDto()
+            ).data!!.toModel()
+        }
+}

app/src/main/java/com/cherrish/android/presentation/main/MainActivity.kt

@@ -1,5 +1,6 @@
 package com.cherrish.android.presentation.main
 
+import android.content.pm.ActivityInfo
 import android.graphics.Color
 import android.os.Bundle
 import androidx.activity.ComponentActivity
@@ -13,11 +14,11 @@ import dagger.hilt.android.AndroidEntryPoint
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
         enableEdgeToEdge(
             statusBarStyle = SystemBarStyle.dark(Color.TRANSPARENT),
             navigationBarStyle = SystemBarStyle.dark(Color.TRANSPARENT)
         )
+        requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
         setContent {
             CherrishTheme {
                 val appState = rememberMainAppState()

app/src/main/java/com/cherrish/android/presentation/main/MainAppState.kt

@@ -6,13 +6,16 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.navigation.NavDestination.Companion.hasRoute
 import androidx.navigation.NavHostController
+import androidx.navigation.NavOptions
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.navOptions
 import com.cherrish.android.presentation.calendar.navigation.navigateToCalendar
 import com.cherrish.android.presentation.calendar.navigation.navigateToProcedure
 import com.cherrish.android.presentation.challenge.navigation.navigateToChallenge
 import com.cherrish.android.presentation.home.navigation.navigateToHome
 import com.cherrish.android.presentation.mypage.navigation.navigateToMyPage
+import com.cherrish.android.presentation.onboarding.navigation.navigateToOnboarding
+import com.cherrish.android.presentation.onboarding.navigation.navigateToOnboardingInformation
 import com.cherrish.android.presentation.splash.navigation.Splash
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.SharingStarted
@@ -27,6 +30,17 @@ class MainAppState(
 ) {
     val startDestination = Splash
 
+    private val clearStackNavOptions = navOptions {
+        popUpTo(0) { inclusive = true }
+        launchSingleTop = true
+        restoreState = false
+    }
+
+    private val keepStackNavOptions = navOptions {
+        launchSingleTop = true
+        restoreState = true
+    }
+
     private val currentDestination = navController.currentBackStackEntryFlow
         .map { it.destination }
         .stateIn(
@@ -79,6 +93,18 @@ class MainAppState(
         }
     }
 
+    fun navigateToOnboarding(navOptions: NavOptions? = clearStackNavOptions) {
+        navController.navigateToOnboarding(navOptions)
+    }
+
+    fun navigateToOnboardingInformation(navOptions: NavOptions? = clearStackNavOptions) {
+        navController.navigateToOnboardingInformation(navOptions)
+    }
+
+    fun navigateToHome(navOptions: NavOptions? = clearStackNavOptions) {
+        navController.navigateToHome(navOptions)
+    }
+
     fun navigateUp() {
         navController.navigateUp()
     }

app/src/main/java/com/cherrish/android/presentation/main/MainScreen.kt

@@ -12,6 +12,8 @@ import com.cherrish.android.presentation.challenge.navigation.challengeNavGraph
 import com.cherrish.android.presentation.home.navigation.homeNavGraph
 import com.cherrish.android.presentation.main.component.MainBottomBar
 import com.cherrish.android.presentation.mypage.navigation.myPageNavGraph
+import com.cherrish.android.presentation.onboarding.navigation.onboardingInformationNavGraph
+import com.cherrish.android.presentation.onboarding.navigation.onboardingNavGraph
 import com.cherrish.android.presentation.splash.navigation.splashNavGraph
 import kotlinx.collections.immutable.toPersistentList
 
@@ -41,10 +43,20 @@ fun MainScreen(
             startDestination = appState.startDestination
         ) {
             splashNavGraph(
-                navigateToOnboarding = {}, // TODO: 로직 넣어서 바꿀 예정
+                navigateToOnboarding = appState::navigateToOnboarding,
                 paddingValues = innerPadding
             )
 
+            onboardingNavGraph(
+                paddingValues = innerPadding,
+                navigateToOnboardingInformation = appState::navigateToOnboardingInformation
+            )
+
+            onboardingInformationNavGraph(
+                paddingValues = innerPadding,
+                navigateToHome = appState::navigateToHome
+            )
+
             homeNavGraph(paddingValues = innerPadding)
 
             calendarNavGraph(