Merge pull request #90 from LanPet-dev/develop

Develop

Author: sejun2

.idea/deploymentTargetSelector.xml

@@ -0,0 +1,4 @@
+kotlin version: 2.0.21
+error message: The daemon has terminated unexpectedly on startup attempt #1 with error code: 0. The daemon process output:
+    1. Kotlin compile daemon is ready
+

.idea/gradle.xml

@@ -28,6 +28,7 @@ android {
 }
 
 dependencies {
+//    implementation(libs.androidx.core.splashscreen)
     implementation(libs.androidx.browser)
     implementation(libs.androidx.appcompat)
     implementation(libs.material)
@@ -51,13 +52,14 @@ dependencies {
     implementation(projects.feature.free)
     implementation(projects.feature.myprofile)
     implementation(projects.feature.wiki)
+    implementation(projects.feature.splash)
     implementation(projects.feature.myposts)
     implementation(projects.feature.settings)
     implementation(projects.core.designsystem)
     implementation(projects.domain.model)
+    implementation(projects.domain.repository)
 
     implementation(libs.hilt.android)
-    implementation(project(":domain:repository"))
     ksp(libs.hilt.android.compiler)
 
     implementation(libs.androidx.core.ktx)

.idea/kotlinc.xml

@@ -5,7 +5,9 @@
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.CAMERA" />
 
-    <uses-feature android:name="android.hardware.camera" android:required="false" />
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
 
     <application
         android:name=".LanPetApplication"

.kotlin/errors/errors-1740914001561.log

@@ -5,19 +5,14 @@ import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.compose.runtime.CompositionLocalProvider
+import androidx.navigation.compose.rememberNavController
 import com.lanpet.core.auth.AuthManager
 import com.lanpet.core.auth.LocalAuthManager
 import com.lanpet.core.designsystem.theme.LanPetAppTheme
 import com.lanpet.core.manager.CoilManager
 import com.lanpet.core.manager.LocalCoilManager
 import com.lanpet.core.navigation.AppNavigation
-import com.lanpet.domain.model.SocialAuthToken
-import com.lanpet.domain.repository.AuthRepository
-import com.lanpet.domain.repository.LandingRepository
-import com.lanpet.feature.auth.navigation.Login
-import com.lanpet.feature.landing.navigation.Landing
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.runBlocking
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -29,55 +24,30 @@ class MainActivity : ComponentActivity() {
     @Inject
     lateinit var coilManager: CoilManager
 
-    @Inject
-    lateinit var landingRepository: LandingRepository
-
-    @Inject
-    lateinit var authRepository: AuthRepository
-
     override fun onCreate(savedInstanceState: Bundle?) {
+        Timber.e("MainActivity onCreate")
+        // 사용자가 설정한 SplashScreen 스타일을 기본으로 사용
+//        val splashScreen = installSplashScreen()
+
         super.onCreate(savedInstanceState)
 
         enableEdgeToEdge()
         setContent {
-            // Start destination
-            val startDestination =
-                runBlocking {
-                    return@runBlocking if (landingRepository.getShouldShowLanding()) {
-                        Landing
-                    } else {
-                        Login
-                    }
-                }
-
-            // Auto login
-            runBlocking {
-                val token = authRepository.getAuthTokenFromDataStore()
-
-                Timber.i("token: $token")
-
-                if (token != null) {
-                    authManager.handleAuthentication(
-                        SocialAuthToken(
-                            socialAuthType = token.socialAuthType,
-                            accessToken = token.accessToken,
-                            refreshToken = token.refreshToken,
-                            expiresIn = token.expiresIn,
-                            expireDateTime = token.expireDateTime,
-                        ),
-                    )
-                }
-            }
-
+            val navController = rememberNavController()
             CompositionLocalProvider(LocalAuthManager provides authManager) {
                 CompositionLocalProvider(LocalCoilManager provides coilManager) {
                     LanPetAppTheme {
                         AppNavigation(
-                            startDestination = startDestination,
+                            navController = navController,
                         )
                     }
                 }
             }
         }
     }
+
+    override fun onDestroy() {
+        Timber.e("MainActivity onDestroy")
+        super.onDestroy()
+    }
 }

README.md

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_logo_background"/>
+    <foreground android:drawable="@drawable/ic_logo"/>
+</adaptive-icon>

app/build.gradle.kts

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_logo_background"/>
+    <foreground android:drawable="@drawable/ic_logo"/>
+</adaptive-icon>