feat - 홈화면 작업

app/build.gradle.kts

@@ -52,6 +52,9 @@ android {
         buildConfig = true
         compose = true
     }
+    androidResources {
+        noCompress += "mp4"
+    }
 }
 
 dependencies {

app/src/main/AndroidManifest.xml

@@ -30,16 +30,21 @@
         </service>
 
         <activity
-            android:name=".MainActivity"
+            android:name=".SplashActivity"
             android:exported="true"
             android:label="@string/app_name"
-            android:theme="@style/Theme.JapKor">
+            android:theme="@style/Theme.JapKor.Splash">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".MainActivity"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:theme="@style/Theme.JapKor" />
         <activity
             android:name="com.apptive.japkor.LoginCallbackActivity"
             android:exported="true">

app/src/main/java/com/apptive/japkor/LoginCallbackActivity.kt

@@ -81,9 +81,9 @@ class LoginCallbackActivity : ComponentActivity() {
 
         val startRoute = when (userStatus) {
             UserStatus.INCOMPLETE_PROFILE -> Screen.RequiredInfo.route
+            UserStatus.CONNECTING -> Screen.Home.route
             UserStatus.PENDING_APPROVAL,
             UserStatus.APPROVED,
-            UserStatus.CONNECTING,
             UserStatus.CONNECTED,
             UserStatus.BLACKLISTED -> Screen.RequiredInfoComplete.route
             null -> when (needsProfileCompletion) {

app/src/main/java/com/apptive/japkor/SplashActivity.kt

@@ -0,0 +1,48 @@
+package com.apptive.japkor
+
+import android.content.Intent
+import android.media.MediaPlayer
+import android.net.Uri
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import com.apptive.japkor.widget.FullscreenVideoView
+
+class SplashActivity : ComponentActivity() {
+    private var hasNavigated = false
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_splash)
+
+        val videoView = findViewById<FullscreenVideoView>(R.id.splashVideo)
+        val videoUri = Uri.parse("android.resource://${packageName}/${R.raw.n_splash}")
+        videoView.setVideoURI(videoUri)
+        videoView.setOnPreparedListener { mediaPlayer ->
+            videoView.updateVideoSize(mediaPlayer.videoWidth, mediaPlayer.videoHeight)
+            mediaPlayer.isLooping = false
+            mediaPlayer.setVideoScalingMode(
+                MediaPlayer.VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING
+            )
+            videoView.start()
+        }
+        videoView.setOnCompletionListener {
+            videoView.stopPlayback()
+            navigateToMain()
+        }
+        videoView.setOnErrorListener { _, _, _ ->
+            navigateToMain()
+            true
+        }
+    }
+
+    private fun navigateToMain() {
+        if (hasNavigated) return
+        hasNavigated = true
+        val intent = Intent(this, MainActivity::class.java)
+        intent.putExtras(this.intent)
+        intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION)
+        startActivity(intent)
+        overridePendingTransition(0, 0)
+        finish()
+    }
+}

app/src/main/java/com/apptive/japkor/data/api/MatchingService.kt

@@ -0,0 +1,15 @@
+package com.apptive.japkor.data.api
+
+import com.apptive.japkor.data.model.MatchingResponse
+import retrofit2.Call
+import retrofit2.http.GET
+import retrofit2.http.POST
+import retrofit2.http.Path
+
+interface MatchingService {
+    @GET("members/matchings/female")
+    fun getFemaleMatchings(): Call<List<MatchingResponse>>
+
+    @POST("members/matchings/{matchingId}/select")
+    fun selectMatching(@Path("matchingId") matchingId: Long): Call<Void>
+}

app/src/main/java/com/apptive/japkor/data/api/ServiceFactory.kt

@@ -8,4 +8,8 @@ object ServiceFactory {
     val requiredInfoApiService: RequiredInfoApiService by lazy {
         ApiClient.retrofit.create(RequiredInfoApiService::class.java)
     }
-}
+
+    val matchingService: MatchingService by lazy {
+        ApiClient.retrofit.create(MatchingService::class.java)
+    }
+}

app/src/main/java/com/apptive/japkor/data/local/DataStoreManager.kt

@@ -73,6 +73,15 @@ class DataStoreManager(private val context: Context) {
         }
     }
 
+    suspend fun clearUserInfo() {
+        context.dataStore.edit { prefs ->
+            prefs.remove(KEY_MEMBER_ID)
+            prefs.remove(KEY_NAME)
+            prefs.remove(KEY_TOKEN)
+            prefs.remove(KEY_STATUS)
+        }
+    }
+
     suspend fun clear() {
         context.dataStore.edit { it.clear() }
     }

app/src/main/java/com/apptive/japkor/data/model/Matching.kt

@@ -0,0 +1,13 @@
+package com.apptive.japkor.data.model
+
+data class MatchingResponse(
+    val matchingId: Long,
+    val maleMemberId: Long,
+    val maleName: String,
+    val maleEmail: String,
+    val height: Int?,
+    val weight: Int?,
+    val residenceArea: String?,
+    val matchingOrder: Int,
+    val status: String
+)

app/src/main/java/com/apptive/japkor/navigation/AppNavHost.kt

@@ -4,6 +4,7 @@ import androidx.compose.runtime.Composable
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
+import com.apptive.japkor.ui.main.MainRouteScreen
 import com.apptive.japkor.ui.language.LanguageScreen
 import com.apptive.japkor.ui.login.LoginScreen
 import com.apptive.japkor.ui.requiredinfo.RequiredInfoCompleteScreen
@@ -15,6 +16,8 @@ sealed class Screen(val route: String) {
 
     object Language : Screen("language")
 
+    object Home : Screen("home")
+
     object RequiredInfo : Screen("requiredinfo")
 
     object RequiredInfoComplete : Screen("requiredinfo_complete")
@@ -38,6 +41,9 @@ fun AppNavHost(
         composable(Screen.Login.route) {
             LoginScreen(navController)
         }
+        composable(Screen.Home.route) {
+            MainRouteScreen(navController)
+        }
         composable(Screen.RequiredInfo.route) {
             RequiredInfoScreen(navController)
         }

app/src/main/java/com/apptive/japkor/ui/localization/Localization.kt

@@ -33,6 +33,9 @@ object AppLocalizer {
         "로그인 성공! 환영합니다." to "ログイン成功！ようこそ。",
         "로그인 실패! 이메일과 비밀번호를 확인해주세요." to "ログイン失敗。メールアドレスとパスワードを確認してください。",
         "로그인" to "ログイン",
+        "로그아웃" to "ログアウト",
+        "정말 로그아웃 하시겠어요?" to "本当にログアウトしますか？",
+        "취소" to "キャンセル",
         "아이디 찾기" to "IDを探す",
         "비밀번호 찾기" to "パスワードを探す",
         "회원가입" to "会員登録",

app/src/main/java/com/apptive/japkor/ui/login/LoginScreen.kt

@@ -214,9 +214,11 @@ fun LoginScreen(navController: NavController,viewModel: LoginScreenViewModel = v
                                         UserStatus.INCOMPLETE_PROFILE -> {
                                             navController.navigate(Screen.RequiredInfo.route)
                                         }
+                                        UserStatus.CONNECTING -> {
+                                            navController.navigate(Screen.Home.route)
+                                        }
                                         UserStatus.PENDING_APPROVAL,
                                         UserStatus.APPROVED,
-                                        UserStatus.CONNECTING,
                                         UserStatus.CONNECTED,
                                         UserStatus.BLACKLISTED -> {
                                             navController.navigate(Screen.RequiredInfoComplete.route)