[Feature] 앱 초기 튜토리얼 화면

.github/workflows/android-pull-request-ci.yml

@@ -44,10 +44,10 @@ jobs:
           echo "TEMP_TOKEN=\"TEMP_TOKEN\"" >> local.properties
 
       - name: Access Kakao KAKAO_NATIVE_APP_KEY
-          env:
-            KAKAO_NATIVE_APP_KEY: ${{ secrets.KAKAO_NATIVE_APP_KEY }}
-          run: |
-            echo "KAKAO_NATIVE_APP_KEY=\"$KAKAO_NATIVE_APP_KEY\"" >> local.properties
+        env:
+          KAKAO_NATIVE_APP_KEY: ${{ secrets.KAKAO_NATIVE_APP_KEY }}
+        run: |
+          echo "KAKAO_NATIVE_APP_KEY=\"$KAKAO_NATIVE_APP_KEY\"" >> local.properties
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew

Near/app/build.gradle.kts

@@ -7,6 +7,7 @@ plugins {
     alias(libs.plugins.hilt.application)
     alias(libs.plugins.kotlin.kapt)
     alias(libs.plugins.kotlin.serialization)
+    alias(libs.plugins.kotlin.parcelize)
 }
 
 android {
@@ -98,6 +99,9 @@ dependencies {
 
     // Kakao Module
     implementation(libs.v2.all)
+
+    // Splash Screen API
+    implementation(libs.androidx.core.splashscreen)
 }
 
 fun getProperty(propertyKey: String): String = gradleLocalProperties(rootDir, providers).getProperty(propertyKey)

Near/app/src/main/AndroidManifest.xml

@@ -9,7 +9,7 @@
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@mipmap/ic_launcher_round"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
@@ -20,25 +20,28 @@
         <meta-data
             android:name="com.kakao.sdk.AppKey"
             android:value="${kakaoAppKey}" />
-            
+
         <!-- 카카오톡 로그인 콜백을 위한 Activity -->
         <activity
             android:name="com.kakao.sdk.auth.AuthCodeHandlerActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <data android:host="oauth"
-                      android:scheme="kakao${kakaoAppKey}" />
+
+                <data
+                    android:host="oauth"
+                    android:scheme="kakao${kakaoAppKey}" />
             </intent-filter>
         </activity>
-        
+
         <activity
             android:name=".presentation.feature.main.MainActivity"
             android:exported="true"
             android:label="@string/app_name"
-            android:theme="@style/Theme.Near">
+            android:theme="@style/Theme.Near.Splash">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

Near/app/src/main/java/com/alarmy/near/data/di/DataStoreModule.kt

@@ -9,17 +9,35 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
+import javax.inject.Qualifier
 import javax.inject.Singleton
 
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class AuthDataStore
+
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class OnboardingDataStore
+
 // DataStore 확장 프로퍼티
-private val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = "auth_preferences")
+private val Context.authDataStore: DataStore<Preferences> by preferencesDataStore(name = "auth_preferences")
+private val Context.onboardingDataStore: DataStore<Preferences> by preferencesDataStore(name = "onboarding_preferences")
 
 @Module
 @InstallIn(SingletonComponent::class)
 object DataStoreModule {
     @Provides
     @Singleton
-    fun provideDataStore(
+    @AuthDataStore
+    fun provideAuthDataStore(
+        @ApplicationContext context: Context,
+    ): DataStore<Preferences> = context.authDataStore
+
+    @Provides
+    @Singleton
+    @OnboardingDataStore
+    fun provideOnboardingDataStore(
         @ApplicationContext context: Context,
-    ): DataStore<Preferences> = context.dataStore
+    ): DataStore<Preferences> = context.onboardingDataStore
 }

Near/app/src/main/java/com/alarmy/near/data/di/RepositoryModule.kt

@@ -6,6 +6,8 @@ import com.alarmy.near.data.repository.DefaultFriendRepository
 import com.alarmy.near.data.repository.ExampleRepository
 import com.alarmy.near.data.repository.ExampleRepositoryImpl
 import com.alarmy.near.data.repository.FriendRepository
+import com.alarmy.near.data.repository.OnBoardingRepository
+import com.alarmy.near.data.repository.OnBoardingRepositoryImpl
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -26,4 +28,8 @@ interface RepositoryModule {
     @Binds
     @Singleton
     abstract fun bindAuthRepository(authRepositoryImpl: AuthRepositoryImpl): AuthRepository
+
+    @Binds
+    @Singleton
+    abstract fun bindOnBoardingRepository(onBoardingRepositoryImpl: OnBoardingRepositoryImpl): OnBoardingRepository
 }

Near/app/src/main/java/com/alarmy/near/data/local/datastore/OnboardingPreferences.kt

@@ -0,0 +1,48 @@
+package com.alarmy.near.data.local.datastore
+
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.booleanPreferencesKey
+import androidx.datastore.preferences.core.edit
+import com.alarmy.near.data.di.OnboardingDataStore
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * 온보딩 완료 상태를 관리하는 DataStore
+ * 최초 접속 여부를 확인하여 온보딩 화면 표시 여부를 결정
+ */
+@Singleton
+class OnboardingPreferences @Inject constructor(
+    @OnboardingDataStore private val dataStore: DataStore<Preferences>,
+) {
+    companion object {
+        private val ONBOARDING_COMPLETED_KEY = booleanPreferencesKey("onboarding_completed")
+    }
+
+    /**
+     * 온보딩 완료 여부를 확인하는 Flow
+     * true: 온보딩 완료됨, false: 온보딩 미완료
+     */
+    val isOnboardingCompleted: Flow<Boolean> = dataStore.data.map { preferences ->
+        preferences[ONBOARDING_COMPLETED_KEY] ?: false
+    }
+
+    /**
+     * 온보딩 완료 상태를 저장
+     */
+    suspend fun setOnboardingCompleted(completed: Boolean) {
+        dataStore.edit { preferences ->
+            preferences[ONBOARDING_COMPLETED_KEY] = completed
+        }
+    }
+
+    /**
+     * 온보딩 완료 상태를 true로 설정
+     */
+    suspend fun markOnboardingAsCompleted() {
+        setOnboardingCompleted(true)
+    }
+}

Near/app/src/main/java/com/alarmy/near/data/local/datastore/TokenPreferences.kt

@@ -5,9 +5,9 @@ import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.longPreferencesKey
 import androidx.datastore.preferences.core.stringPreferencesKey
+import com.alarmy.near.data.di.AuthDataStore
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
-
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -16,11 +16,9 @@ import javax.inject.Singleton
  * 액세스 토큰과 리프레시 토큰의 저장, 조회, 삭제를 담당
  */
 @Singleton
-class TokenPreferences
-    @Inject
-    constructor(
-        private val dataStore: DataStore<Preferences>,
-    ) {
+class TokenPreferences @Inject constructor(
+    @AuthDataStore private val dataStore: DataStore<Preferences>,
+) {
         private val accessTokenKey = stringPreferencesKey("access_token")
         private val refreshTokenKey = stringPreferencesKey("refresh_token")
         private val expiresAtKey = longPreferencesKey("expires_at")

Near/app/src/main/java/com/alarmy/near/data/mapper/FriendMapper.kt

@@ -1,21 +1,65 @@
 package com.alarmy.near.data.mapper
 
+import com.alarmy.near.model.Anniversary
 import com.alarmy.near.model.ContactFrequency
-import com.alarmy.near.model.FriendSummary
+import com.alarmy.near.model.DayOfWeek
+import com.alarmy.near.model.Friend
+import com.alarmy.near.model.Relation
+import com.alarmy.near.model.ReminderInterval
+import com.alarmy.near.network.request.AnniversaryRequest
+import com.alarmy.near.network.request.ContactFrequencyRequest
+import com.alarmy.near.network.request.FriendRequest
+import com.alarmy.near.network.response.AnniversaryEntity
+import com.alarmy.near.network.response.ContactFrequencyEntity
 import com.alarmy.near.network.response.FriendEntity
 
-fun FriendEntity.toModel(): FriendSummary =
-    FriendSummary(
-        id = friendId,
+fun FriendEntity.toModel(): Friend =
+    Friend(
+        friendId = friendId,
+        imageUrl = imageUrl,
+        relation = Relation.valueOf(relation),
         name = name,
-        profileImageUrl = imageUrl,
-        lastContactedAt = lastContactAt,
-        isContacted = true,
-        contactFrequency =
-            when (checkRate) {
-                in 0..29 -> ContactFrequency.LOW
-                in 30..69 -> ContactFrequency.MIDDLE
-                in 70..100 -> ContactFrequency.HIGH
-                else -> ContactFrequency.LOW
-        },
-            )
+        contactFrequency = contactFrequency.toModel(),
+        birthday = birthday,
+        anniversaryList = anniversaryList.map { it.toModel() },
+        memo = memo,
+        phone = phone,
+        lastContactAt = lastContactAt,
+    )
+
+fun ContactFrequencyEntity.toModel(): ContactFrequency =
+    ContactFrequency(
+        reminderInterval = ReminderInterval.valueOf(contactWeek),
+        dayOfWeek = DayOfWeek.valueOf(dayOfWeek),
+    )
+
+fun AnniversaryEntity.toModel(): Anniversary =
+    Anniversary(
+        id = id,
+        title = title,
+        date = date,
+    )
+
+fun Friend.toRequest(): FriendRequest =
+    FriendRequest(
+        name = name,
+        relation = relation.toString(),
+        contactFrequency = contactFrequency.toRequest(),
+        birthday = birthday,
+        anniversaryList = anniversaryList.map { it.toRequest() },
+        memo = memo,
+        phone = phone,
+    )
+
+fun ContactFrequency.toRequest(): ContactFrequencyRequest =
+    ContactFrequencyRequest(
+        contactWeek = reminderInterval.toString(),
+        dayOfWeek = dayOfWeek.toString(),
+    )
+
+fun Anniversary.toRequest(): AnniversaryRequest =
+    AnniversaryRequest(
+        id = id,
+        title = title,
+        date = date,
+    )

Near/app/src/main/java/com/alarmy/near/data/mapper/FriendRecordMapper.kt

@@ -0,0 +1,20 @@
+package com.alarmy.near.data.mapper
+
+import com.alarmy.near.model.FriendRecord
+import com.alarmy.near.network.response.FriendRecordEntity
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
+
+fun FriendRecordEntity.toModel(): FriendRecord =
+    FriendRecord(
+        isChecked = isChecked,
+        createdAt = createdAt.toShortDate(),
+    )
+
+private fun String.toShortDate(): String {
+    val inputFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
+    val outputFormatter = DateTimeFormatter.ofPattern("yy.MM.dd")
+
+    val dateTime = LocalDateTime.parse(this, inputFormatter)
+    return dateTime.format(outputFormatter)
+}

Near/app/src/main/java/com/alarmy/near/data/mapper/FriendSummaryMapper.kt

@@ -0,0 +1,25 @@
+package com.alarmy.near.data.mapper
+
+import com.alarmy.near.model.friendsummary.ContactFrequencyLevel
+import com.alarmy.near.model.friendsummary.FriendSummary
+import com.alarmy.near.network.response.FriendSummaryEntity
+
+private val CONTACT_FREQUENCY_LOW_RANGE = 0..29
+private val CONTACT_FREQUENCY_MIDDLE_RANGE = 30..69
+private val CONTACT_FREQUENCY_HIGH_RANGE = 70..100
+
+fun FriendSummaryEntity.toModel(): FriendSummary =
+    FriendSummary(
+        id = friendId,
+        name = name,
+        profileImageUrl = imageUrl,
+        lastContactedAt = lastContactAt,
+        isContacted = true,
+        contactFrequencyLevel =
+            when (checkRate) {
+                in CONTACT_FREQUENCY_LOW_RANGE -> ContactFrequencyLevel.LOW
+                in CONTACT_FREQUENCY_MIDDLE_RANGE -> ContactFrequencyLevel.MIDDLE
+                in CONTACT_FREQUENCY_HIGH_RANGE -> ContactFrequencyLevel.HIGH
+                else -> ContactFrequencyLevel.LOW
+            },
+    )

Near/app/src/main/java/com/alarmy/near/data/repository/DefaultFriendRepository.kt

@@ -1,7 +1,10 @@
 package com.alarmy.near.data.repository
 
 import com.alarmy.near.data.mapper.toModel
-import com.alarmy.near.model.FriendSummary
+import com.alarmy.near.data.mapper.toRequest
+import com.alarmy.near.model.Friend
+import com.alarmy.near.model.FriendRecord
+import com.alarmy.near.model.friendsummary.FriendSummary
 import com.alarmy.near.model.monthly.MonthlyFriend
 import com.alarmy.near.network.service.FriendService
 import kotlinx.coroutines.flow.Flow
@@ -30,4 +33,34 @@ class DefaultFriendRepository
                     },
                 )
             }
+
+        override fun fetchFriendById(friendId: String): Flow<Friend> =
+            flow {
+                emit(friendService.fetchFriendById(friendId).toModel())
+            }
+
+        override fun updateFriend(
+            friendId: String,
+            friend: Friend,
+        ): Flow<Friend> =
+            flow {
+                emit(friendService.updateFriend(friendId, friend.toRequest()).toModel())
+            }
+
+        override fun deleteFriend(friendId: String): Flow<Unit> =
+            flow {
+                friendService.deleteFriend(friendId)
+                emit(Unit)
+            }
+
+        override fun fetchFriendRecord(friendId: String): Flow<List<FriendRecord>> =
+            flow {
+                emit(friendService.fetchFriendRecord(friendId).map { it.toModel() })
+            }
+
+        override fun recordContact(friendId: String): Flow<String> =
+            flow {
+                val response = friendService.recordContact(friendId)
+                emit(response.message) // CommonMessageEntity.message 라고 가정
+            }
     }