Update v3.6.1

build.gradle.kts

@@ -7,8 +7,8 @@ buildscript {
     }
 
     extra.apply {
-        set("versionName", "3.5.4")
-        set("versionCode", 30504)
+        set("versionName", "3.6.1")
+        set("versionCode", 30601)
     }
 
     dependencies {

data/src/main/java/in/koreatech/koin/data/repository/UserRepositoryImpl.kt

@@ -55,6 +55,8 @@ class UserRepositoryImpl @Inject constructor(
     override suspend fun deleteUser() {
         try {
             userRemoteDataSource.deleteUser()
+            userLocalDataSource.updateUserInfo(User.Anonymous)
+            userLocalDataSource.updateIsLogin(false)
             tokenLocalDataSource.removeAccessToken()
             tokenLocalDataSource.removeRefreshToken()
         } catch (e: HttpException) {

domain/src/main/java/in/koreatech/koin/domain/usecase/user/UserLogoutUseCase.kt

@@ -7,14 +7,14 @@ import `in`.koreatech.koin.domain.repository.UserRepository
 import javax.inject.Inject
 
 class UserLogoutUseCase @Inject constructor(
-    private val tokenRepository: TokenRepository,
     private val userRepository: UserRepository,
-    private val tokenErrorHandler: TokenErrorHandler
+    private val tokenErrorHandler: TokenErrorHandler,
+    private val deleteUserRefreshTokenUseCase: DeleteUserRefreshTokenUseCase
 ){
     suspend operator fun invoke() : Pair<Unit, ErrorHandler?> {
         return try {
             userRepository.deleteDeviceToken()
-            tokenRepository.removeToken()
+            deleteUserRefreshTokenUseCase()
             Unit to null
         } catch (t: Throwable) {
             Unit to tokenErrorHandler.handleLogoutError(t)

domain/src/main/java/in/koreatech/koin/domain/util/TimeUtil.kt

@@ -2,6 +2,8 @@ package `in`.koreatech.koin.domain.util
 
 import java.text.ParseException
 import java.text.SimpleDateFormat
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
 import java.util.*
 
 object TimeUtil {
@@ -10,6 +12,12 @@ object TimeUtil {
         return Calendar.getInstance().time
     }
 
+    fun isWeekend(dateString: String): Boolean {
+        val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd")
+        val date = LocalDate.parse(dateString, formatter)
+        return date.dayOfWeek.value == 6 || date.dayOfWeek.value == 7
+    }
+
     fun getNextDayDate(date: Date): Date {
         val calendar = Calendar.getInstance()
         calendar.time = date

gradle/libs.versions.toml

@@ -2,6 +2,7 @@
 activityComposeVersion = "1.8.2"
 activityKtxVersion = "1.5.0"
 cardviewVersion = "1.0.0"
+featureDeliveryKtxVersion = "2.1.0"
 firebaseBomVersion = "30.1.0"
 fragmentKtxVersion = "1.5.0"
 jetbrainsAnnotationsVersion = "23.0.0"
@@ -74,6 +75,7 @@ androidx-runner = { module = "androidx.test:runner", version.ref = "runnerVersio
 androidx-security-crypto = { module = "androidx.security:security-crypto", version.ref = "securityCryptoVersion" }
 activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityComposeVersion" }
 
+feature-delivery-ktx = { module = "com.google.android.play:feature-delivery-ktx", version.ref = "featureDeliveryKtxVersion" }
 napier = {module = "io.github.aakira:napier", version.ref="napier"}
 
 jetbrains-annotations = { module = "org.jetbrains:annotations", version.ref = "jetbrainsAnnotationsVersion" }

koin/build.gradle.kts

@@ -107,4 +107,6 @@ dependencies {
     implementation(libs.nav.fragment.ktx)
     implementation(libs.nav.ui.ktx)
     implementation(libs.nav.dynamic.features.fragment)
+
+    implementation(libs.feature.delivery.ktx)
 }

koin/src/main/java/in/koreatech/koin/ui/article/ArticleKeywordFragment.kt

@@ -129,6 +129,11 @@ class ArticleKeywordFragment : Fragment() {
                                 viewModel::deleteKeyword
                             )
                         )
+                    binding.chipGroupSuggestionKeywords.children.forEach { chip ->
+                        if ((chip as Chip).text == keyword) {
+                            chipGroupSuggestionKeywords.removeView(chip)
+                        }
+                    }
                 }
             }
         }
@@ -152,6 +157,7 @@ class ArticleKeywordFragment : Fragment() {
         viewLifecycleOwner.lifecycleScope.launch {
             repeatOnLifecycle(Lifecycle.State.STARTED) {
                 viewModel.suggestedKeywords.collect { suggests ->
+                    binding.chipGroupSuggestionKeywords.removeAllViews()
                     suggests.forEach { keyword ->
                         binding.run {
                             if (chipGroupSuggestionKeywords.childCount >= ArticleKeywordViewModel.MAX_SUGGEST_KEYWORD_COUNT)
@@ -306,13 +312,11 @@ class ArticleKeywordFragment : Fragment() {
 
     private fun initKeywordNotification() {
         notificationViewModel.getPermissionInfo()
-        if (requireContext().checkNotificationPermission().not()) {
-            binding.notificationKeyword.disableAll()
-        }
 
         binding.notificationKeyword.setOnSwitchClickListener { isChecked ->
             if (requireContext().checkNotificationPermission().not()) {
                 ToastUtil.getInstance().makeShort(R.string.request_notification_permission)
+                binding.notificationKeyword.isChecked = false
                 return@setOnSwitchClickListener
             }
 

koin/src/main/java/in/koreatech/koin/ui/article/viewmodel/ArticleSearchViewModel.kt

@@ -59,7 +59,6 @@ class ArticleSearchViewModel @Inject constructor(
     }
 
     fun search() {
-        _isLoading.value = true
         val trimmedQuery = query.value.trim()
         if (trimmedQuery.isEmpty()) {
             _searchResultUiState.tryEmit(SearchUiState.RequireInput)
@@ -68,6 +67,7 @@ class ArticleSearchViewModel @Inject constructor(
 
         articleRepository.fetchSearchedArticles(trimmedQuery, 4, 1, 20)
             .onStart {
+                _isLoading.value = true
                 _searchResultUiState.tryEmit(SearchUiState.Loading)
             }.onEach {
                 if (it.articleHeaders.isEmpty()) {

koin/src/main/java/in/koreatech/koin/ui/dining/DiningActivity.kt

@@ -8,6 +8,9 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.viewpager.widget.ViewPager
+import androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback
+import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
 import dagger.hilt.android.AndroidEntryPoint
 import `in`.koreatech.koin.R
@@ -46,6 +49,12 @@ class DiningActivity : KoinNavigationDrawerActivity() {
     private val diningOnBoardingBottomSheet by lazy {
         DiningNotificationOnBoardingFragment()
     }
+    private val diningPageChangeListener = object: OnPageChangeCallback() {
+        override fun onPageScrollStateChanged(state: Int) {
+            super.onPageScrollStateChanged(state)
+            binding.swipeRefreshLayoutDining.setEnabled(state == ViewPager.SCROLL_STATE_IDLE);
+        }
+    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -148,6 +157,7 @@ class DiningActivity : KoinNavigationDrawerActivity() {
                         tabsDiningTime.getTabAt(it)?.text.toString()
                     )
                 }
+                registerOnPageChangeCallback(diningPageChangeListener)
             }
             TabLayoutMediator(tabsDiningTime, diningViewPager) { tab, position ->
                 tab.text = when (position) {
@@ -229,4 +239,9 @@ class DiningActivity : KoinNavigationDrawerActivity() {
         onActionView()
         selectInitialPositions()
     }
+
+    override fun onPause() {
+        super.onPause()
+        binding.diningViewPager.unregisterOnPageChangeCallback(diningPageChangeListener)
+    }
 }

koin/src/main/java/in/koreatech/koin/ui/dining/adapter/DiningAdapter.kt

@@ -28,6 +28,7 @@ import `in`.koreatech.koin.domain.model.dining.Dining
 import `in`.koreatech.koin.domain.model.dining.LikeActionType
 import `in`.koreatech.koin.domain.model.dining.DiningPlace
 import `in`.koreatech.koin.domain.util.DiningUtil
+import `in`.koreatech.koin.domain.util.TimeUtil
 import `in`.koreatech.koin.ui.dining.DiningActivity
 import `in`.koreatech.koin.ui.login.LoginActivity
 import `in`.koreatech.koin.util.ext.toStringWithComma
@@ -68,6 +69,7 @@ class DiningAdapter(
                     textViewNoPhoto.visibility = View.INVISIBLE
                     imageViewNoPhoto.visibility = View.INVISIBLE
                     imageViewDining.visibility = View.VISIBLE
+
                     Glide.with(context)
                         .load(dining.imageUrl)
                         .listener(object : RequestListener<Drawable> {
@@ -87,6 +89,7 @@ class DiningAdapter(
                                 dataSource: DataSource?,
                                 isFirstResource: Boolean
                             ): Boolean {
+                                binding.lottieImageLoading.pauseAnimation()
                                 binding.lottieImageLoading.visibility = View.GONE
                                 return false
                             }
@@ -106,6 +109,10 @@ class DiningAdapter(
                 } else {
                     cardViewDining.strokeWidth =
                         TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 1f, context.resources.displayMetrics).toInt()
+                    textViewNoPhoto.text = if(TimeUtil.isWeekend(dining.date)) context.getString(
+                        R.string.photo_not_provided_on_weekend
+                    ) else context.getString(R.string.no_photo)
+
                     textViewNoPhoto.visibility = View.VISIBLE
                     imageViewNoPhoto.visibility = View.VISIBLE
                     imageViewDining.visibility = View.INVISIBLE

koin/src/main/java/in/koreatech/koin/ui/navigation/KoinNavigationDrawerActivity.kt

@@ -326,14 +326,6 @@ abstract class KoinNavigationDrawerActivity : ActivityBase(),
         lifecycleScope.launch {
             repeatOnLifecycle(Lifecycle.State.STARTED) {
                 userInfoFlow.collect { user ->
-                    when (menuState) {
-                        MenuState.Main, MenuState.Notification -> {
-                            if (!checkMainPermission()) requestMainPermissionLauncher.launch(MAIN_REQUIRED_PERMISSION)
-                            koinNavigationDrawerViewModel.updateDeviceToken()
-                        }
-
-                        else -> Unit
-                    }
                     when (user) {
                         User.Anonymous -> {
                             nameTextView.visibility = View.GONE
@@ -346,6 +338,15 @@ abstract class KoinNavigationDrawerActivity : ActivityBase(),
                             nameTextView.visibility = View.VISIBLE
                             helloMessageTextView.text = getString(R.string.navigation_hello_message)
                             loginOrLogoutTextView.text = getString(R.string.navigation_item_logout)
+
+                            when (menuState) {
+                                MenuState.Main, MenuState.Notification -> {
+                                    if (!checkMainPermission()) requestMainPermissionLauncher.launch(MAIN_REQUIRED_PERMISSION)
+                                    koinNavigationDrawerViewModel.updateDeviceToken()
+                                }
+
+                                else -> Unit
+                            }
                         }
                     }
                 }

koin/src/main/java/in/koreatech/koin/ui/navigation/viewmodel/KoinNavigationDrawerViewModel.kt

@@ -4,8 +4,6 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.viewModelScope
 import com.google.firebase.messaging.FirebaseMessaging
 import dagger.hilt.android.lifecycle.HiltViewModel
-import `in`.koreatech.koin.core.analytics.EventLogger
-import `in`.koreatech.koin.core.constant.AnalyticsConstant
 import `in`.koreatech.koin.core.viewmodel.BaseViewModel
 import `in`.koreatech.koin.core.viewmodel.SingleLiveEvent
 import `in`.koreatech.koin.domain.model.user.User