From 8857c6fba9a166c25575f2c4da2f184bd44dbaf2 Mon Sep 17 00:00:00 2001 From: leeeha Date: Thu, 29 Feb 2024 22:06:25 +0900 Subject: [PATCH 1/8] =?UTF-8?q?[mod]=20#258=20=ED=91=B8=EC=8B=9C=20?= =?UTF-8?q?=EC=95=8C=EB=A6=BC=EC=97=90=EC=84=9C=20=EB=A0=88=EB=B2=A8?= =?UTF-8?q?=EC=97=85=20=EA=B0=80=EC=9D=B4=EB=93=9C=20=ED=99=94=EB=A9=B4=20?= =?UTF-8?q?=EB=8C=80=EC=8B=A0=EC=97=90=20=EB=AA=A9=ED=91=9C=EC=97=AC?= =?UTF-8?q?=EC=A0=95=20=EB=B7=B0=EB=A1=9C=20=EC=A0=84=ED=99=98=ED=95=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../winey/presentation/main/MainActivity.kt | 19 ++++++++------- .../main/notification/NotificationActivity.kt | 21 +++++++++-------- .../main/notification/NotificationAdapter.kt | 23 +++++++++++-------- .../presentation/splash/SplashActivity.kt | 8 ++++++- 4 files changed, 41 insertions(+), 30 deletions(-) diff --git a/app/src/main/java/org/go/sopt/winey/presentation/main/MainActivity.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/MainActivity.kt index 35367e5d4..3ce0ae31a 100644 --- a/app/src/main/java/org/go/sopt/winey/presentation/main/MainActivity.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/MainActivity.kt @@ -23,6 +23,7 @@ import org.go.sopt.winey.presentation.main.feed.WineyFeedFragment import org.go.sopt.winey.presentation.main.feed.detail.DetailActivity import org.go.sopt.winey.presentation.main.mypage.MyPageFragment import org.go.sopt.winey.presentation.main.mypage.MypageHelpActivity +import org.go.sopt.winey.presentation.main.mypage.goal.GoalPathActivity import org.go.sopt.winey.presentation.main.recommend.RecommendFragment import org.go.sopt.winey.presentation.model.NotificationType import org.go.sopt.winey.presentation.onboarding.login.LoginActivity @@ -105,16 +106,16 @@ class MainActivity : BindingActivity(R.layout.activity_main true ) - NotificationType.LIKE_NOTIFICATION, NotificationType.COMMENT_NOTIFICATION - -> navigateToDetail(feedId?.toInt()) + NotificationType.LIKE_NOTIFICATION, NotificationType.COMMENT_NOTIFICATION -> + navigateToDetail(feedId?.toInt()) - NotificationType.HOW_TO_LEVEL_UP -> navigateToLevelupHelp() + NotificationType.HOW_TO_LEVEL_UP -> navigateToGoalPath() else -> {} } } private fun initFragment() { - if (intent.getBooleanExtra(KEY_TO_MYPAGE, false)) { + if (intent.getBooleanExtra(KEY_TO_MY_PAGE, false)) { navigateToMyPageWithBundle(KEY_FROM_NOTI, true) } else { if (prevScreenName == VAL_MY_FEED_SCREEN) { @@ -220,22 +221,20 @@ class MainActivity : BindingActivity(R.layout.activity_main startActivity(intent) } - private fun navigateToLevelupHelp() { - val intent = Intent(this, MypageHelpActivity::class.java) + private fun navigateToGoalPath() { + val intent = Intent(this, GoalPathActivity::class.java) startActivity(intent) } companion object { + const val KEY_FEED_ID = "feedId" + const val KEY_TO_MY_PAGE = "navigateMyPage" private const val KEY_FEED_UPLOAD = "upload" private const val KEY_FEED_DELETE = "delete" - - private const val KEY_FEED_ID = "feedId" private const val KEY_NOTI_TYPE = "notiType" private const val KEY_PREV_SCREEN = "PREV_SCREEN_NAME" private const val KEY_FROM_NOTI = "fromNoti" private const val KEY_TO_MYFEED = "toMyFeed" - private const val KEY_TO_MYPAGE = "navigateMypage" - private const val VAL_MY_FEED_SCREEN = "MyFeedFragment" } } diff --git a/app/src/main/java/org/go/sopt/winey/presentation/main/notification/NotificationActivity.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/notification/NotificationActivity.kt index a2d033eaf..f8389a9b6 100644 --- a/app/src/main/java/org/go/sopt/winey/presentation/main/notification/NotificationActivity.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/notification/NotificationActivity.kt @@ -12,7 +12,7 @@ import org.go.sopt.winey.R import org.go.sopt.winey.databinding.ActivityNotificationBinding import org.go.sopt.winey.presentation.main.MainActivity import org.go.sopt.winey.presentation.main.feed.detail.DetailActivity -import org.go.sopt.winey.presentation.main.mypage.MypageHelpActivity +import org.go.sopt.winey.presentation.main.mypage.goal.GoalPathActivity import org.go.sopt.winey.util.binding.BindingActivity import org.go.sopt.winey.util.context.snackBar import org.go.sopt.winey.util.view.UiState @@ -22,6 +22,7 @@ class NotificationActivity : BindingActivity(R.layout.activity_notification) { private val viewModel by viewModels() private lateinit var notificationAdapter: NotificationAdapter + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) initNotificationAdapter() @@ -34,8 +35,8 @@ class NotificationActivity : private fun initNotificationAdapter() { notificationAdapter = NotificationAdapter( navigateFeedDetail = { feedId -> navigateToDetail(feedId) }, - navigateLevelupHelp = { navigateToLevelupHelp() }, - navigateMypage = { navigateToMypage() } + navigateGoalPath = { navigateToGoalPath() }, + navigateMyPage = { navigateToMyPage() } ) binding.rvNotificationPost.adapter = notificationAdapter } @@ -75,19 +76,19 @@ class NotificationActivity : private fun navigateToDetail(feedId: Int?) { val intent = Intent(this, DetailActivity::class.java) - intent.putExtra("feedId", feedId) + intent.putExtra(MainActivity.KEY_FEED_ID, feedId) startActivity(intent) } - private fun navigateToMypage() { - val intent = Intent(this, MainActivity::class.java) - intent.putExtra("navigateMypage", true) + private fun navigateToGoalPath() { + val intent = Intent(this, GoalPathActivity::class.java) startActivity(intent) - this.finish() } - private fun navigateToLevelupHelp() { - val intent = Intent(this, MypageHelpActivity::class.java) + private fun navigateToMyPage() { + val intent = Intent(this, MainActivity::class.java) + intent.putExtra(MainActivity.KEY_TO_MY_PAGE, true) startActivity(intent) + this.finish() } } diff --git a/app/src/main/java/org/go/sopt/winey/presentation/main/notification/NotificationAdapter.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/notification/NotificationAdapter.kt index fc64b61a2..a17dc6e1c 100644 --- a/app/src/main/java/org/go/sopt/winey/presentation/main/notification/NotificationAdapter.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/notification/NotificationAdapter.kt @@ -6,12 +6,13 @@ import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView import org.go.sopt.winey.databinding.ItemNotificationPostBinding import org.go.sopt.winey.domain.entity.Notification +import org.go.sopt.winey.presentation.model.NotificationType import org.go.sopt.winey.util.view.ItemDiffCallback class NotificationAdapter( private val navigateFeedDetail: (feedId: Int?) -> Unit, - private val navigateMypage: () -> Unit, - private val navigateLevelupHelp: () -> Unit + private val navigateMyPage: () -> Unit, + private val navigateGoalPath: () -> Unit ) : ListAdapter(DiffUtil) { @@ -26,11 +27,12 @@ class NotificationAdapter( data.notiReceiver == data.notiMessage.substring(0, data.notiReceiver.length) } } + class NotificationViewHolder( private val binding: ItemNotificationPostBinding, private val navigateFeedDetail: (feedId: Int?) -> Unit, - private val navigateMypage: () -> Unit, - private val navigateLevelupHelp: () -> Unit + private val navigateMyPage: () -> Unit, + private val navigateGoalPath: () -> Unit ) : RecyclerView.ViewHolder(binding.root) { fun onBind(data: Notification?) { @@ -39,13 +41,16 @@ class NotificationAdapter( if (data == null) { return } + binding.root.setOnClickListener { - when (data?.notiType) { - "HOWTOLEVELUP" -> navigateLevelupHelp.invoke() - "LIKENOTI", "COMMENTNOTI" -> navigateFeedDetail(data.linkId) - else -> navigateMypage.invoke() + when (data.notiType) { + NotificationType.LIKE_NOTIFICATION.key, + NotificationType.COMMENT_NOTIFICATION.key -> navigateFeedDetail(data.linkId) + NotificationType.HOW_TO_LEVEL_UP.key -> navigateGoalPath.invoke() + else -> navigateMyPage.invoke() } } + executePendingBindings() } } @@ -54,7 +59,7 @@ class NotificationAdapter( override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): NotificationViewHolder { val binding = ItemNotificationPostBinding.inflate(LayoutInflater.from(parent.context), parent, false) - return NotificationViewHolder(binding, navigateFeedDetail, navigateMypage, navigateLevelupHelp) + return NotificationViewHolder(binding, navigateFeedDetail, navigateMyPage, navigateGoalPath) } override fun onBindViewHolder(holder: NotificationViewHolder, position: Int) { diff --git a/app/src/main/java/org/go/sopt/winey/presentation/splash/SplashActivity.kt b/app/src/main/java/org/go/sopt/winey/presentation/splash/SplashActivity.kt index e0d37cb16..5f7bb4c85 100644 --- a/app/src/main/java/org/go/sopt/winey/presentation/splash/SplashActivity.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/splash/SplashActivity.kt @@ -19,6 +19,7 @@ import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.delay import kotlinx.coroutines.flow.firstOrNull import kotlinx.coroutines.launch +import org.go.sopt.winey.BuildConfig import org.go.sopt.winey.R import org.go.sopt.winey.databinding.ActivitySplashBinding import org.go.sopt.winey.domain.repository.DataStoreRepository @@ -101,7 +102,12 @@ class SplashActivity : BindingActivity(R.layout.activity_ private fun showLottieAnimation() { lifecycleScope.launch { delay(DELAY_TIME) - checkAppUpdateInfo() + + if (BuildConfig.DEBUG) { + checkAutoLogin() + } else { + checkAppUpdateInfo() + } } } From d9c4cf3a7c45bbbab5146368c80b125f9047eb33 Mon Sep 17 00:00:00 2001 From: leeeha Date: Thu, 29 Feb 2024 22:13:51 +0900 Subject: [PATCH 2/8] =?UTF-8?q?[chore]=20#258=20=ED=95=A8=EC=88=98=20?= =?UTF-8?q?=EC=9D=B4=EB=A6=84=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/go/sopt/winey/presentation/main/MainActivity.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/go/sopt/winey/presentation/main/MainActivity.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/MainActivity.kt index bb40235e2..ac18f4c13 100644 --- a/app/src/main/java/org/go/sopt/winey/presentation/main/MainActivity.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/MainActivity.kt @@ -107,9 +107,9 @@ class MainActivity : BindingActivity(R.layout.activity_main } NotificationType.LIKE_NOTIFICATION, NotificationType.COMMENT_NOTIFICATION -> - navigateToDetail(feedId?.toInt()) + navigateToDetailScreen(feedId?.toInt()) - NotificationType.HOW_TO_LEVEL_UP -> navigateToGoalPath() + NotificationType.HOW_TO_LEVEL_UP -> navigateToGoalPathScreen() else -> {} } } @@ -227,7 +227,7 @@ class MainActivity : BindingActivity(R.layout.activity_main startActivity(intent) } - private fun navigateToGoalPath() { + private fun navigateToGoalPathScreen() { val intent = Intent(this, GoalPathActivity::class.java) startActivity(intent) } From 050bf679f23a1be3a924a361cf91fa5a7cecd1e7 Mon Sep 17 00:00:00 2001 From: leeeha Date: Thu, 29 Feb 2024 22:22:37 +0900 Subject: [PATCH 3/8] =?UTF-8?q?[del]=20#258=20=EC=82=AC=EC=9A=A9=ED=95=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EC=BD=94=EB=93=9C=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../go/sopt/winey/presentation/splash/SplashActivity.kt | 7 ------- 1 file changed, 7 deletions(-) diff --git a/app/src/main/java/org/go/sopt/winey/presentation/splash/SplashActivity.kt b/app/src/main/java/org/go/sopt/winey/presentation/splash/SplashActivity.kt index 5f7bb4c85..d980ee126 100644 --- a/app/src/main/java/org/go/sopt/winey/presentation/splash/SplashActivity.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/splash/SplashActivity.kt @@ -111,13 +111,6 @@ class SplashActivity : BindingActivity(R.layout.activity_ } } - private inline fun navigateTo() { - Intent(this, T::class.java).apply { - addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK) - startActivity(this) - } - } - private fun checkAppUpdateInfo() { appUpdateManager.appUpdateInfo.addOnSuccessListener { appUpdateInfo -> if (appUpdateInfo.updateAvailability() == UpdateAvailability.UPDATE_AVAILABLE && From d5ef5e0ba05cdb62eae5a954ec8f82aa19b8f642 Mon Sep 17 00:00:00 2001 From: leeeha Date: Thu, 29 Feb 2024 22:31:09 +0900 Subject: [PATCH 4/8] =?UTF-8?q?[fix]=20#258=20=EC=9D=B8=EC=95=B1=20?= =?UTF-8?q?=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8=20=EC=98=88=EC=99=B8=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../go/sopt/winey/presentation/splash/SplashActivity.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/go/sopt/winey/presentation/splash/SplashActivity.kt b/app/src/main/java/org/go/sopt/winey/presentation/splash/SplashActivity.kt index d980ee126..74425f695 100644 --- a/app/src/main/java/org/go/sopt/winey/presentation/splash/SplashActivity.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/splash/SplashActivity.kt @@ -27,6 +27,7 @@ import org.go.sopt.winey.presentation.main.MainActivity import org.go.sopt.winey.presentation.onboarding.guide.GuideActivity import org.go.sopt.winey.util.binding.BindingActivity import org.go.sopt.winey.util.context.colorOf +import org.go.sopt.winey.util.context.snackBar import timber.log.Timber import javax.inject.Inject @@ -112,7 +113,9 @@ class SplashActivity : BindingActivity(R.layout.activity_ } private fun checkAppUpdateInfo() { - appUpdateManager.appUpdateInfo.addOnSuccessListener { appUpdateInfo -> + val appUpdateInfoTask = appUpdateManager.appUpdateInfo + + appUpdateInfoTask.addOnSuccessListener { appUpdateInfo -> if (appUpdateInfo.updateAvailability() == UpdateAvailability.UPDATE_AVAILABLE && appUpdateInfo.isUpdateTypeAllowed(AppUpdateType.IMMEDIATE) ) { @@ -122,6 +125,10 @@ class SplashActivity : BindingActivity(R.layout.activity_ checkAutoLogin() } } + + appUpdateInfoTask.addOnFailureListener { t -> + snackBar(binding.root) { t.message.toString() } + } } private fun requestImmediateUpdate(appUpdateInfo: AppUpdateInfo) { From 67181613c6d36f11fe16f1f9be98c4220e5643e2 Mon Sep 17 00:00:00 2001 From: leeeha Date: Thu, 29 Feb 2024 23:02:02 +0900 Subject: [PATCH 5/8] =?UTF-8?q?[chore]=20#258=20=EB=82=B4=EB=B6=80=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=EB=A5=BC=20=EC=9C=84=ED=95=B4=20?= =?UTF-8?q?=EB=B2=84=EC=A0=84=20=EC=BD=94=EB=93=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/release/output-metadata.json | 2 +- buildSrc/src/main/java/DefaultConfig.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 567a07d18..45e9584e1 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -11,7 +11,7 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 23, + "versionCode": 25, "versionName": "1.1.0", "outputFile": "app-release.apk" } diff --git a/buildSrc/src/main/java/DefaultConfig.kt b/buildSrc/src/main/java/DefaultConfig.kt index fac79e571..72f60c4b6 100644 --- a/buildSrc/src/main/java/DefaultConfig.kt +++ b/buildSrc/src/main/java/DefaultConfig.kt @@ -3,6 +3,6 @@ object DefaultConfig { const val compileSdk = 33 const val minSdk = 28 const val targetSdk = 33 - const val versionCode = 23 + const val versionCode = 25 const val versionName = "1.1.0" } From 4788e5827fe4b2b00d5f83a966f035515cc5736f Mon Sep 17 00:00:00 2001 From: leeeha Date: Thu, 29 Feb 2024 23:27:17 +0900 Subject: [PATCH 6/8] =?UTF-8?q?[del]=20#258=20=EB=AF=B8=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=20=EC=9E=84=ED=8F=AC=ED=8A=B8=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/go/sopt/winey/presentation/splash/SplashActivity.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/org/go/sopt/winey/presentation/splash/SplashActivity.kt b/app/src/main/java/org/go/sopt/winey/presentation/splash/SplashActivity.kt index 74425f695..0d0fae9ed 100644 --- a/app/src/main/java/org/go/sopt/winey/presentation/splash/SplashActivity.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/splash/SplashActivity.kt @@ -1,6 +1,5 @@ package org.go.sopt.winey.presentation.splash -import android.app.Activity import android.content.Intent import android.os.Build import android.os.Bundle From efb72c1c423bfe40790dbfc568f4e4c1394c94a5 Mon Sep 17 00:00:00 2001 From: leeeha Date: Sat, 2 Mar 2024 20:43:52 +0900 Subject: [PATCH 7/8] =?UTF-8?q?[merge]=20#258=20=EB=94=94=EB=B2=A8?= =?UTF-8?q?=EB=A1=AD=20=EB=B8=8C=EB=9E=9C=EC=B9=98=EC=99=80=EC=9D=98=20?= =?UTF-8?q?=EB=A8=B8=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/go/sopt/winey/presentation/main/MainActivity.kt | 2 ++ .../go/sopt/winey/presentation/splash/SplashActivity.kt | 7 ------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/org/go/sopt/winey/presentation/main/MainActivity.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/MainActivity.kt index d8ee7250d..9e9c3f2e9 100644 --- a/app/src/main/java/org/go/sopt/winey/presentation/main/MainActivity.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/MainActivity.kt @@ -9,7 +9,9 @@ import android.provider.Settings import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.viewModels import androidx.core.content.ContextCompat +import androidx.fragment.app.Fragment import androidx.fragment.app.commit +import androidx.fragment.app.replace import androidx.lifecycle.flowWithLifecycle import androidx.lifecycle.lifecycleScope import dagger.hilt.android.AndroidEntryPoint diff --git a/app/src/main/java/org/go/sopt/winey/presentation/splash/SplashActivity.kt b/app/src/main/java/org/go/sopt/winey/presentation/splash/SplashActivity.kt index 96a2bd625..0d0fae9ed 100644 --- a/app/src/main/java/org/go/sopt/winey/presentation/splash/SplashActivity.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/splash/SplashActivity.kt @@ -111,13 +111,6 @@ class SplashActivity : BindingActivity(R.layout.activity_ } } - private inline fun navigateTo() { - Intent(this, T::class.java).apply { - addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK) - startActivity(this) - } - } - private fun checkAppUpdateInfo() { val appUpdateInfoTask = appUpdateManager.appUpdateInfo From ad9108c35a8e160c322e7df3f6c4bbed7328a570 Mon Sep 17 00:00:00 2001 From: leeeha Date: Sat, 2 Mar 2024 20:46:18 +0900 Subject: [PATCH 8/8] =?UTF-8?q?[refactor]=20#258=20=EC=96=B4=EB=8C=91?= =?UTF-8?q?=ED=84=B0=EC=99=80=20=EC=9D=B4=EB=84=98=20=ED=81=B4=EB=9E=98?= =?UTF-8?q?=EC=8A=A4=EC=9D=98=20=ED=8C=A8=ED=82=A4=EC=A7=80=20=EC=9C=84?= =?UTF-8?q?=EC=B9=98=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sopt/winey/presentation/main/feed/WineyFeedFragment.kt | 5 +++++ .../presentation/main/feed/{ => adapter}/WineyFeedAdapter.kt | 2 +- .../main/feed/{ => adapter}/WineyFeedGoalAdapter.kt | 2 +- .../main/feed/{ => adapter}/WineyFeedHeaderAdapter.kt | 2 +- .../main/feed/{ => adapter}/WineyFeedLoadAdapter.kt | 2 +- .../winey/presentation/main/feed/upload/UploadActivity.kt | 2 +- .../winey/presentation/main/feed/upload/UploadViewModel.kt | 2 +- .../winey/presentation/main/mypage/myfeed/MyFeedActivity.kt | 2 +- .../winey/presentation/{main/feed => model}/WineyFeedType.kt | 2 +- .../java/org/go/sopt/winey/util/binding/BindingAdapter.kt | 2 +- 10 files changed, 14 insertions(+), 9 deletions(-) rename app/src/main/java/org/go/sopt/winey/presentation/main/feed/{ => adapter}/WineyFeedAdapter.kt (98%) rename app/src/main/java/org/go/sopt/winey/presentation/main/feed/{ => adapter}/WineyFeedGoalAdapter.kt (97%) rename app/src/main/java/org/go/sopt/winey/presentation/main/feed/{ => adapter}/WineyFeedHeaderAdapter.kt (98%) rename app/src/main/java/org/go/sopt/winey/presentation/main/feed/{ => adapter}/WineyFeedLoadAdapter.kt (95%) rename app/src/main/java/org/go/sopt/winey/presentation/{main/feed => model}/WineyFeedType.kt (51%) diff --git a/app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedFragment.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedFragment.kt index dd04f690c..1263dc410 100644 --- a/app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedFragment.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedFragment.kt @@ -24,11 +24,16 @@ import org.go.sopt.winey.domain.entity.UserV2 import org.go.sopt.winey.domain.entity.WineyFeed import org.go.sopt.winey.domain.repository.DataStoreRepository import org.go.sopt.winey.presentation.main.MainViewModel +import org.go.sopt.winey.presentation.main.feed.adapter.WineyFeedAdapter +import org.go.sopt.winey.presentation.main.feed.adapter.WineyFeedGoalAdapter +import org.go.sopt.winey.presentation.main.feed.adapter.WineyFeedHeaderAdapter +import org.go.sopt.winey.presentation.main.feed.adapter.WineyFeedLoadAdapter import org.go.sopt.winey.presentation.main.feed.detail.DetailActivity import org.go.sopt.winey.presentation.main.feed.upload.UploadActivity import org.go.sopt.winey.presentation.main.mypage.goal.GoalPathActivity import org.go.sopt.winey.presentation.main.notification.NotificationActivity import org.go.sopt.winey.presentation.model.WineyDialogLabel +import org.go.sopt.winey.presentation.model.WineyFeedType import org.go.sopt.winey.util.activity.showReportGoogleForm import org.go.sopt.winey.util.amplitude.AmplitudeUtils import org.go.sopt.winey.util.amplitude.type.EventType diff --git a/app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedAdapter.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/adapter/WineyFeedAdapter.kt similarity index 98% rename from app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedAdapter.kt rename to app/src/main/java/org/go/sopt/winey/presentation/main/feed/adapter/WineyFeedAdapter.kt index 449493557..194fe699c 100644 --- a/app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedAdapter.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/adapter/WineyFeedAdapter.kt @@ -1,4 +1,4 @@ -package org.go.sopt.winey.presentation.main.feed +package org.go.sopt.winey.presentation.main.feed.adapter import android.view.LayoutInflater import android.view.View diff --git a/app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedGoalAdapter.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/adapter/WineyFeedGoalAdapter.kt similarity index 97% rename from app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedGoalAdapter.kt rename to app/src/main/java/org/go/sopt/winey/presentation/main/feed/adapter/WineyFeedGoalAdapter.kt index 06369ebeb..9c7e5cc90 100644 --- a/app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedGoalAdapter.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/adapter/WineyFeedGoalAdapter.kt @@ -1,4 +1,4 @@ -package org.go.sopt.winey.presentation.main.feed +package org.go.sopt.winey.presentation.main.feed.adapter import android.content.Context import android.view.LayoutInflater diff --git a/app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedHeaderAdapter.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/adapter/WineyFeedHeaderAdapter.kt similarity index 98% rename from app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedHeaderAdapter.kt rename to app/src/main/java/org/go/sopt/winey/presentation/main/feed/adapter/WineyFeedHeaderAdapter.kt index 3f33de6ae..e40c4212d 100644 --- a/app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedHeaderAdapter.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/adapter/WineyFeedHeaderAdapter.kt @@ -1,4 +1,4 @@ -package org.go.sopt.winey.presentation.main.feed +package org.go.sopt.winey.presentation.main.feed.adapter import android.view.LayoutInflater import android.view.ViewGroup diff --git a/app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedLoadAdapter.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/adapter/WineyFeedLoadAdapter.kt similarity index 95% rename from app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedLoadAdapter.kt rename to app/src/main/java/org/go/sopt/winey/presentation/main/feed/adapter/WineyFeedLoadAdapter.kt index 193809774..af3c368cc 100644 --- a/app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedLoadAdapter.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/adapter/WineyFeedLoadAdapter.kt @@ -1,4 +1,4 @@ -package org.go.sopt.winey.presentation.main.feed +package org.go.sopt.winey.presentation.main.feed.adapter import android.view.LayoutInflater import android.view.ViewGroup diff --git a/app/src/main/java/org/go/sopt/winey/presentation/main/feed/upload/UploadActivity.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/upload/UploadActivity.kt index b001de3f2..70ac11a26 100644 --- a/app/src/main/java/org/go/sopt/winey/presentation/main/feed/upload/UploadActivity.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/upload/UploadActivity.kt @@ -7,7 +7,7 @@ import dagger.hilt.android.AndroidEntryPoint import org.go.sopt.winey.R import org.go.sopt.winey.databinding.ActivityUploadBinding import org.go.sopt.winey.presentation.main.feed.WineyFeedFragment -import org.go.sopt.winey.presentation.main.feed.WineyFeedType +import org.go.sopt.winey.presentation.model.WineyFeedType import org.go.sopt.winey.util.binding.BindingActivity import org.go.sopt.winey.util.intent.getCompatibleSerializable diff --git a/app/src/main/java/org/go/sopt/winey/presentation/main/feed/upload/UploadViewModel.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/upload/UploadViewModel.kt index 61e625d6b..9ca3f51d6 100644 --- a/app/src/main/java/org/go/sopt/winey/presentation/main/feed/upload/UploadViewModel.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/upload/UploadViewModel.kt @@ -17,7 +17,7 @@ import okhttp3.RequestBody import okhttp3.RequestBody.Companion.toRequestBody import org.go.sopt.winey.data.model.remote.response.ResponsePostWineyFeedDto import org.go.sopt.winey.domain.repository.FeedRepository -import org.go.sopt.winey.presentation.main.feed.WineyFeedType +import org.go.sopt.winey.presentation.model.WineyFeedType import org.go.sopt.winey.util.code.ErrorCode import org.go.sopt.winey.util.multipart.UriToRequestBody import org.go.sopt.winey.util.view.InputUiState diff --git a/app/src/main/java/org/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedActivity.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedActivity.kt index bd35eece1..dd279619d 100644 --- a/app/src/main/java/org/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedActivity.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedActivity.kt @@ -17,7 +17,7 @@ import kotlinx.coroutines.launch import org.go.sopt.winey.R import org.go.sopt.winey.databinding.FragmentMyfeedBinding import org.go.sopt.winey.domain.entity.WineyFeed -import org.go.sopt.winey.presentation.main.feed.WineyFeedLoadAdapter +import org.go.sopt.winey.presentation.main.feed.adapter.WineyFeedLoadAdapter import org.go.sopt.winey.presentation.main.feed.detail.DetailActivity import org.go.sopt.winey.presentation.model.WineyDialogLabel import org.go.sopt.winey.util.binding.BindingActivity diff --git a/app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedType.kt b/app/src/main/java/org/go/sopt/winey/presentation/model/WineyFeedType.kt similarity index 51% rename from app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedType.kt rename to app/src/main/java/org/go/sopt/winey/presentation/model/WineyFeedType.kt index db6f85534..8545ebb1a 100644 --- a/app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedType.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/model/WineyFeedType.kt @@ -1,4 +1,4 @@ -package org.go.sopt.winey.presentation.main.feed +package org.go.sopt.winey.presentation.model enum class WineyFeedType { SAVE, diff --git a/app/src/main/java/org/go/sopt/winey/util/binding/BindingAdapter.kt b/app/src/main/java/org/go/sopt/winey/util/binding/BindingAdapter.kt index cd79992f1..38b68742c 100644 --- a/app/src/main/java/org/go/sopt/winey/util/binding/BindingAdapter.kt +++ b/app/src/main/java/org/go/sopt/winey/util/binding/BindingAdapter.kt @@ -19,7 +19,7 @@ import coil.load import coil.transform.RoundedCornersTransformation import de.hdodenhof.circleimageview.CircleImageView import org.go.sopt.winey.R -import org.go.sopt.winey.presentation.main.feed.WineyFeedType +import org.go.sopt.winey.presentation.model.WineyFeedType import org.go.sopt.winey.presentation.model.UserLevel import org.go.sopt.winey.presentation.nickname.NicknameActivity.Companion.MY_PAGE_SCREEN import org.go.sopt.winey.presentation.nickname.NicknameActivity.Companion.STORY_SCREEN