diff --git a/presentation/src/main/ic_launcher-playstore.png b/presentation/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..478abc4 Binary files /dev/null and b/presentation/src/main/ic_launcher-playstore.png differ diff --git a/presentation/src/main/java/com/d83t/bpm/presentation/ui/sign_up/SignUpActivity.kt b/presentation/src/main/java/com/d83t/bpm/presentation/ui/sign_up/SignUpActivity.kt index 51a6c7f..829b8a5 100644 --- a/presentation/src/main/java/com/d83t/bpm/presentation/ui/sign_up/SignUpActivity.kt +++ b/presentation/src/main/java/com/d83t/bpm/presentation/ui/sign_up/SignUpActivity.kt @@ -79,10 +79,9 @@ class SignUpActivity : BaseComponentActivity() { } override fun initUi() { + nicknameTextState.value = viewModel.kakaoUserInfo.second setContent { BPMTheme { - nicknameTextState.value = viewModel.kakaoUserInfo.second - SignUpActivityContent( imageState = imageState, nicknameTextState = nicknameTextState, diff --git a/presentation/src/main/java/com/d83t/bpm/presentation/ui/splash/SplashActivity.kt b/presentation/src/main/java/com/d83t/bpm/presentation/ui/splash/SplashActivity.kt index 4c8a64a..c55e5c6 100644 --- a/presentation/src/main/java/com/d83t/bpm/presentation/ui/splash/SplashActivity.kt +++ b/presentation/src/main/java/com/d83t/bpm/presentation/ui/splash/SplashActivity.kt @@ -107,14 +107,14 @@ class SplashActivity : BaseComponentActivity() { kakaoLoginInstance.loginWithKakaoTalk(this) { loginInfo, error -> if (error != null) { // 로그인 실패 - showDebugToast("login failed! cause : ${error.message}") +// showDebugToast("login failed! cause : ${error.message}") showToast("로그인에 실패하였습니다. 다시 시도해 주세요.") } else if (loginInfo != null) { // 로그인 성공 kakaoLoginInstance.me { user, error -> viewModel.setKakaoUserId(user?.id ?: 0L, user?.kakaoAccount?.profile?.nickname ?: "") // user?.id?.let { viewModel.setKakaoUserId(it) } - showDebugToast("login succeed. user token : ${user?.id}") +// showDebugToast("login succeed. user token : ${user?.id}") } } } diff --git a/presentation/src/main/res/layout/fragment_home.xml b/presentation/src/main/res/layout/fragment_home.xml index bf6f177..e05900f 100644 --- a/presentation/src/main/res/layout/fragment_home.xml +++ b/presentation/src/main/res/layout/fragment_home.xml @@ -54,8 +54,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:onClick="@{() -> vm.clickSchedule()}" android:foreground="?android:attr/selectableItemBackground" + android:onClick="@{() -> vm.clickSchedule()}" app:cardBackgroundColor="@color/gray_02" app:cardCornerRadius="12dp" app:cardElevation="0dp" @@ -262,8 +262,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" - android:layout_marginEnd="100dp" - app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintEnd_toStartOf="@id/guide_tab" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:tabIndicatorColor="@color/black" @@ -286,9 +285,9 @@ android:layout_width="0dp" android:layout_height="1dp" android:background="@color/gray_10" - app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toBottomOf="@id/tab"/> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/tab" /> + + diff --git a/presentation/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/presentation/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index eca70cf..036d09b 100644 --- a/presentation/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/presentation/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/presentation/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/presentation/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index eca70cf..036d09b 100644 --- a/presentation/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/presentation/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/presentation/src/main/res/mipmap-anydpi-v33/ic_launcher.xml b/presentation/src/main/res/mipmap-anydpi-v33/ic_launcher.xml deleted file mode 100644 index 6f3b755..0000000 --- a/presentation/src/main/res/mipmap-anydpi-v33/ic_launcher.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/mipmap-hdpi/ic_launcher.png b/presentation/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..f6bd353 Binary files /dev/null and b/presentation/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/presentation/src/main/res/mipmap-hdpi/ic_launcher.webp b/presentation/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78..0000000 Binary files a/presentation/src/main/res/mipmap-hdpi/ic_launcher.webp and /dev/null differ diff --git a/presentation/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/presentation/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..50fe0c5 Binary files /dev/null and b/presentation/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/presentation/src/main/res/mipmap-hdpi/ic_launcher_round.png b/presentation/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..05561fa Binary files /dev/null and b/presentation/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/presentation/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/presentation/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d..0000000 Binary files a/presentation/src/main/res/mipmap-hdpi/ic_launcher_round.webp and /dev/null differ diff --git a/presentation/src/main/res/mipmap-mdpi/ic_launcher.png b/presentation/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..d2b041f Binary files /dev/null and b/presentation/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/presentation/src/main/res/mipmap-mdpi/ic_launcher.webp b/presentation/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d6..0000000 Binary files a/presentation/src/main/res/mipmap-mdpi/ic_launcher.webp and /dev/null differ diff --git a/presentation/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/presentation/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..d070a88 Binary files /dev/null and b/presentation/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/presentation/src/main/res/mipmap-mdpi/ic_launcher_round.png b/presentation/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..499e72a Binary files /dev/null and b/presentation/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/presentation/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/presentation/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611d..0000000 Binary files a/presentation/src/main/res/mipmap-mdpi/ic_launcher_round.webp and /dev/null differ diff --git a/presentation/src/main/res/mipmap-xhdpi/ic_launcher.png b/presentation/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..f5df1e7 Binary files /dev/null and b/presentation/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/presentation/src/main/res/mipmap-xhdpi/ic_launcher.webp b/presentation/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a307..0000000 Binary files a/presentation/src/main/res/mipmap-xhdpi/ic_launcher.webp and /dev/null differ diff --git a/presentation/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/presentation/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..e97ea4c Binary files /dev/null and b/presentation/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/presentation/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/presentation/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..d3c0f1c Binary files /dev/null and b/presentation/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/presentation/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/presentation/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a695..0000000 Binary files a/presentation/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/presentation/src/main/res/mipmap-xxhdpi/ic_launcher.png b/presentation/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..51579da Binary files /dev/null and b/presentation/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/presentation/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/presentation/src/main/res/mipmap-xxhdpi/ic_launcher.webp deleted file mode 100644 index 28d4b77..0000000 Binary files a/presentation/src/main/res/mipmap-xxhdpi/ic_launcher.webp and /dev/null differ diff --git a/presentation/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/presentation/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..34d5fac Binary files /dev/null and b/presentation/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/presentation/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/presentation/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..b3b598c Binary files /dev/null and b/presentation/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/presentation/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/presentation/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9287f50..0000000 Binary files a/presentation/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..a427d79 Binary files /dev/null and b/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher.webp deleted file mode 100644 index aa7d642..0000000 Binary files a/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and /dev/null differ diff --git a/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..a6c0e8c Binary files /dev/null and b/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..9403def Binary files /dev/null and b/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9126ae3..0000000 Binary files a/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/presentation/src/main/res/values/ic_launcher_background.xml b/presentation/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 0000000..c5d5899 --- /dev/null +++ b/presentation/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + \ No newline at end of file