From 532244f72ec367e7a0cede1bf00921f1f189d5e2 Mon Sep 17 00:00:00 2001 From: jung0115 Date: Wed, 30 Oct 2024 14:55:11 +0900 Subject: [PATCH] =?UTF-8?q?KKUMI-108=20[FEAT]=20#90=20-=20=20=ED=8F=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=9E=91=EC=84=B1=20=EC=A4=91=20=EC=9D=B4?= =?UTF-8?q?=EB=AF=B8=EC=A7=80=20=EC=97=86=EC=9D=84=20=EB=95=8C=20:=20?= =?UTF-8?q?=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=84=A0=ED=83=9D=EC=B0=BD?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EB=93=A4=EC=96=B4=EA=B0=94=EB=8B=A4?= =?UTF-8?q?=EA=B0=80=20=EC=84=A0=ED=83=9D=20=EC=95=88=20=ED=95=98=EA=B3=A0?= =?UTF-8?q?=20=EB=8F=8C=EC=95=84=EC=99=94=EC=9D=84=20=EB=95=8C=20=EC=9D=B4?= =?UTF-8?q?=EB=AF=B8=EC=A7=80=20=EC=B6=94=EA=B0=80=ED=95=98=EA=B8=B0=20?= =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EA=B7=B8=EB=8C=80=EB=A1=9C=20=EB=B3=B4?= =?UTF-8?q?=EC=97=AC=EC=A3=BC=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/marastro/mykkumi/android/MyKkumiApplication.kt | 2 +- .../main/java/com/marastro/mykkumi/data/di/NetworkModule.kt | 2 +- .../mykkumi/data/repository/PreSignedUrlRepositoryImpl.kt | 2 +- .../marastro/mykkumi/data/{util => utils}/FormDataUtil.kt | 2 +- .../mykkumi/data/{util => utils}/KakaoInitializer.kt | 2 +- .../com/marastro/mykkumi/feature/post/PostEditFragment.kt | 5 ++++- 6 files changed, 9 insertions(+), 6 deletions(-) rename core/data/src/main/java/com/marastro/mykkumi/data/{util => utils}/FormDataUtil.kt (98%) rename core/data/src/main/java/com/marastro/mykkumi/data/{util => utils}/KakaoInitializer.kt (91%) diff --git a/app/src/main/java/com/marastro/mykkumi/android/MyKkumiApplication.kt b/app/src/main/java/com/marastro/mykkumi/android/MyKkumiApplication.kt index cc8720a..6ae3f8c 100644 --- a/app/src/main/java/com/marastro/mykkumi/android/MyKkumiApplication.kt +++ b/app/src/main/java/com/marastro/mykkumi/android/MyKkumiApplication.kt @@ -2,7 +2,7 @@ package com.marastro.mykkumi.android import android.app.Application import com.google.firebase.analytics.FirebaseAnalytics -import com.marastro.mykkumi.data.util.KakaoInitializer +import com.marastro.mykkumi.data.utils.KakaoInitializer import com.marastro.mykkumi.domain.datastore.AuthTokenDataStore import dagger.hilt.android.HiltAndroidApp import javax.inject.Inject diff --git a/core/data/src/main/java/com/marastro/mykkumi/data/di/NetworkModule.kt b/core/data/src/main/java/com/marastro/mykkumi/data/di/NetworkModule.kt index c293ecf..5bfcd54 100644 --- a/core/data/src/main/java/com/marastro/mykkumi/data/di/NetworkModule.kt +++ b/core/data/src/main/java/com/marastro/mykkumi/data/di/NetworkModule.kt @@ -22,7 +22,7 @@ import com.marastro.mykkumi.data.datasource.ReportDataSource import com.marastro.mykkumi.data.datasource.UserInfoDataSource import com.marastro.mykkumi.data.interceptor.TokenAuthenticator import com.marastro.mykkumi.data.interceptor.TokenInterceptor -import com.marastro.mykkumi.data.util.KakaoInitializer +import com.marastro.mykkumi.data.utils.KakaoInitializer import com.marastro.mykkumi.domain.datastore.AuthTokenDataStore import com.marastro.mykkumi.domain.repository.ReAccessTokenRepository import dagger.hilt.android.qualifiers.ApplicationContext diff --git a/core/data/src/main/java/com/marastro/mykkumi/data/repository/PreSignedUrlRepositoryImpl.kt b/core/data/src/main/java/com/marastro/mykkumi/data/repository/PreSignedUrlRepositoryImpl.kt index 850c050..316442f 100644 --- a/core/data/src/main/java/com/marastro/mykkumi/data/repository/PreSignedUrlRepositoryImpl.kt +++ b/core/data/src/main/java/com/marastro/mykkumi/data/repository/PreSignedUrlRepositoryImpl.kt @@ -4,7 +4,7 @@ import android.content.Context import android.widget.Toast import com.marastro.mykkumi.data.datasource.PreSignedUrlDataSource import com.marastro.mykkumi.data.datasource.PutImageS3DataSource -import com.marastro.mykkumi.data.util.FormDataUtil +import com.marastro.mykkumi.data.utils.FormDataUtil import com.marastro.mykkumi.domain.repository.PreSignedUrlRepository import dagger.hilt.android.qualifiers.ApplicationContext import javax.inject.Inject diff --git a/core/data/src/main/java/com/marastro/mykkumi/data/util/FormDataUtil.kt b/core/data/src/main/java/com/marastro/mykkumi/data/utils/FormDataUtil.kt similarity index 98% rename from core/data/src/main/java/com/marastro/mykkumi/data/util/FormDataUtil.kt rename to core/data/src/main/java/com/marastro/mykkumi/data/utils/FormDataUtil.kt index 29e8522..9ce4d8a 100644 --- a/core/data/src/main/java/com/marastro/mykkumi/data/util/FormDataUtil.kt +++ b/core/data/src/main/java/com/marastro/mykkumi/data/utils/FormDataUtil.kt @@ -1,4 +1,4 @@ -package com.marastro.mykkumi.data.util +package com.marastro.mykkumi.data.utils import android.content.ContentResolver import android.content.Context diff --git a/core/data/src/main/java/com/marastro/mykkumi/data/util/KakaoInitializer.kt b/core/data/src/main/java/com/marastro/mykkumi/data/utils/KakaoInitializer.kt similarity index 91% rename from core/data/src/main/java/com/marastro/mykkumi/data/util/KakaoInitializer.kt rename to core/data/src/main/java/com/marastro/mykkumi/data/utils/KakaoInitializer.kt index ff9469f..0dc563f 100644 --- a/core/data/src/main/java/com/marastro/mykkumi/data/util/KakaoInitializer.kt +++ b/core/data/src/main/java/com/marastro/mykkumi/data/utils/KakaoInitializer.kt @@ -1,4 +1,4 @@ -package com.marastro.mykkumi.data.util +package com.marastro.mykkumi.data.utils import android.content.Context import com.kakao.sdk.common.KakaoSdk diff --git a/feature/post/src/main/java/com/marastro/mykkumi/feature/post/PostEditFragment.kt b/feature/post/src/main/java/com/marastro/mykkumi/feature/post/PostEditFragment.kt index 63d2226..61cfd21 100644 --- a/feature/post/src/main/java/com/marastro/mykkumi/feature/post/PostEditFragment.kt +++ b/feature/post/src/main/java/com/marastro/mykkumi/feature/post/PostEditFragment.kt @@ -85,6 +85,7 @@ class PostEditFragment : BaseFragment(R.layout.fragment if(navController?.currentDestination?.id == R.id.postEditFragment && !isStartPosting) { navController?.popBackStack() } + // 상태 복원 완료 isRestoringState = false } @@ -97,7 +98,9 @@ class PostEditFragment : BaseFragment(R.layout.fragment navController = view.findNavController() - binding.relativeEmptyImage.visibility = View.GONE + if(!viewModel.postEditUiState.value.isNullOrEmpty()) binding.relativeEmptyImage.visibility = View.GONE + else binding.relativeEmptyImage.visibility = View.VISIBLE + binding.textBtnUploadPost.setBackgroundResource(com.marastro.mykkumi.common_ui.R.drawable.shape_btn_round12_neutral50) binding.textBtnUploadPost.setTextColor(ContextCompat.getColor(requireContext(), com.marastro.mykkumi.common_ui.R.color.neutral_700)) binding.textCountContent.visibility = View.GONE