Skip to content

Commit e892a9d

Browse files
sejun2sejun2
committed
add: Splash 화면이 추가됩니다
1 parent 54b3fb4 commit e892a9d

27 files changed

Lines changed: 165 additions & 52 deletions

‎app/src/main/AndroidManifest.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
66
<uses-permission android:name="android.permission.CAMERA" />
77

8-
<uses-feature android:name="android.hardware.camera" android:required="false" />
8+
<uses-feature
9+
android:name="android.hardware.camera"
10+
android:required="false" />
911

1012
<application
1113
android:name=".LanPetApplication"

‎app/src/main/ic_logo-playstore.png‎

16 KB
Loading

‎app/src/main/java/com/lanpet/app/MainActivity.kt‎

Lines changed: 1 addition & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,7 @@ import com.lanpet.core.designsystem.theme.LanPetAppTheme
1111
import com.lanpet.core.manager.CoilManager
1212
import com.lanpet.core.manager.LocalCoilManager
1313
import com.lanpet.core.navigation.AppNavigation
14-
import com.lanpet.domain.model.SocialAuthToken
15-
import com.lanpet.domain.repository.AuthRepository
16-
import com.lanpet.domain.repository.LandingRepository
17-
import com.lanpet.feature.auth.navigation.Login
18-
import com.lanpet.feature.landing.navigation.Landing
1914
import dagger.hilt.android.AndroidEntryPoint
20-
import kotlinx.coroutines.runBlocking
21-
import timber.log.Timber
2215
import javax.inject.Inject
2316

2417
@AndroidEntryPoint
@@ -29,52 +22,15 @@ class MainActivity : ComponentActivity() {
2922
@Inject
3023
lateinit var coilManager: CoilManager
3124

32-
@Inject
33-
lateinit var landingRepository: LandingRepository
34-
35-
@Inject
36-
lateinit var authRepository: AuthRepository
37-
3825
override fun onCreate(savedInstanceState: Bundle?) {
3926
super.onCreate(savedInstanceState)
4027

4128
enableEdgeToEdge()
4229
setContent {
43-
// Start destination
44-
val startDestination =
45-
runBlocking {
46-
return@runBlocking if (landingRepository.getShouldShowLanding()) {
47-
Landing
48-
} else {
49-
Login
50-
}
51-
}
52-
53-
// Auto login
54-
runBlocking {
55-
val token = authRepository.getAuthTokenFromDataStore()
56-
57-
Timber.i("token: $token")
58-
59-
if (token != null) {
60-
authManager.handleAuthentication(
61-
SocialAuthToken(
62-
socialAuthType = token.socialAuthType,
63-
accessToken = token.accessToken,
64-
refreshToken = token.refreshToken,
65-
expiresIn = token.expiresIn,
66-
expireDateTime = token.expireDateTime,
67-
),
68-
)
69-
}
70-
}
71-
7230
CompositionLocalProvider(LocalAuthManager provides authManager) {
7331
CompositionLocalProvider(LocalCoilManager provides coilManager) {
7432
LanPetAppTheme {
75-
AppNavigation(
76-
startDestination = startDestination,
77-
)
33+
AppNavigation()
7834
}
7935
}
8036
}

‎app/src/main/res/drawable/ic_logo_foreground.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="108dp"
3+
android:height="108dp"
4+
android:viewportWidth="68"
5+
android:viewportHeight="33">
6+
<group android:scaleX="0.5304673"
7+
android:scaleY="0.25743267"
8+
android:translateX="16.131111"
9+
android:translateY="12.171317">
10+
<path
11+
android:pathData="M24.762,22.58V15.134H22.858V22.104C22.858,23.77 21.566,25.028 19.9,25.028C18.302,25.028 16.976,23.77 16.976,22.104V3.812C16.976,2.18 18.302,0.888 19.9,0.888C21.566,0.888 22.858,2.18 22.858,3.812V10.442H24.762V3.676C24.762,2.01 26.088,0.718 27.72,0.718C29.386,0.718 30.712,2.01 30.712,3.676V22.58C30.712,24.28 29.386,25.538 27.72,25.538C26.088,25.538 24.762,24.28 24.762,22.58ZM4.566,20.744H2.798C1.506,20.744 0.52,19.826 0.52,18.534V11.088C0.52,9.796 1.506,8.912 2.798,8.912H8.68V6.124H2.628C1.336,6.124 0.35,5.138 0.35,3.846C0.35,2.554 1.336,1.568 2.628,1.568H12.318C13.61,1.568 14.596,2.554 14.596,3.846V11.054C14.596,12.38 13.61,13.264 12.284,13.264H6.436V16.222C8.442,16.222 10.958,16.052 13.1,15.44C13.338,15.372 13.61,15.338 13.848,15.338C15.14,15.338 16.126,16.29 16.126,17.582C16.126,18.704 15.378,19.52 14.358,19.792C11.298,20.608 7.898,20.744 4.566,20.744ZM1.948,29.754V25.028C1.948,23.328 3.308,22.308 5.008,22.308C6.708,22.308 8.068,23.328 8.068,25.028V27.884H29.012C30.338,27.884 31.392,28.938 31.392,30.264C31.392,31.59 30.338,32.644 29.012,32.644H4.838C3.342,32.644 1.948,31.522 1.948,29.754Z"
12+
android:fillColor="#ffffff"/>
13+
<path
14+
android:pathData="M37.988,30.128C37.988,28.802 38.974,27.612 40.368,27.612C45.91,27.612 49.684,25.844 49.684,23.6V23.43C49.684,22.07 51.044,21.118 52.744,21.118C54.444,21.118 55.804,22.07 55.804,23.43V23.668C55.872,25.878 59.612,27.612 65.12,27.612C66.514,27.612 67.5,28.802 67.5,30.128C67.5,31.454 66.514,32.644 65.12,32.644C58.966,32.644 54.852,31.012 52.744,28.462C50.602,31.012 46.488,32.644 40.368,32.644C38.974,32.644 37.988,31.454 37.988,30.128ZM50.5,19.588H37.886C36.594,19.588 35.88,18.534 35.88,17.242C35.88,15.95 36.594,14.896 37.886,14.896H38.294L38.022,9.32C37.92,7.586 39.008,6.94 40.742,6.94C42.476,6.94 43.428,7.586 43.462,9.32L43.564,14.896H44.788L44.924,9.32C44.958,7.586 45.91,6.94 47.644,6.94C49.378,6.94 50.466,7.586 50.364,9.32L50.058,14.896H50.5C51.792,14.896 52.506,15.95 52.506,17.242C52.506,18.534 51.792,19.588 50.5,19.588ZM60.938,19.962V3.574C60.938,1.908 62.196,0.718 63.828,0.718C65.494,0.718 66.752,1.908 66.752,3.574V19.962C66.752,21.662 65.494,22.818 63.828,22.818C62.196,22.818 60.938,21.662 60.938,19.962ZM53.934,18.126V13.23H52.88C51.554,13.23 51.01,12.176 51.01,10.85C51.01,9.524 51.554,8.47 52.88,8.47H53.934V3.71C53.934,2.078 55.192,0.888 56.79,0.888C58.456,0.888 59.68,2.078 59.68,3.71V18.126C59.68,19.792 58.456,20.948 56.79,20.948C55.192,20.948 53.934,19.792 53.934,18.126ZM50.16,6.26H38.226C36.934,6.26 36.22,5.206 36.22,3.914C36.22,2.622 36.934,1.568 38.226,1.568H50.16C51.452,1.568 52.166,2.622 52.166,3.914C52.166,5.206 51.452,6.26 50.16,6.26Z"
15+
android:fillColor="#ffffff"/>
16+
</group>
17+
</vector>

‎app/src/main/res/mipmap-anydpi-v26/ic_logo.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3+
<background android:drawable="@color/ic_logo_background"/>
4+
<foreground android:drawable="@drawable/ic_logo_foreground"/>
5+
</adaptive-icon>

‎app/src/main/res/mipmap-anydpi-v26/ic_logo_round.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3+
<background android:drawable="@color/ic_logo_background"/>
4+
<foreground android:drawable="@drawable/ic_logo_foreground"/>
5+
</adaptive-icon>

‎app/src/main/res/mipmap-hdpi/ic_logo.webp‎

1.49 KB
Loading

‎app/src/main/res/mipmap-hdpi/ic_logo_foreground.webp‎

1.13 KB
Loading

‎app/src/main/res/mipmap-hdpi/ic_logo_round.webp‎

3.19 KB
Loading

‎app/src/main/res/mipmap-mdpi/ic_logo.webp‎

950 Bytes
Loading

0 commit comments

Comments
 (0)