From efbe5d4069547b46e6c39f87ef8ad8d1e7356edd Mon Sep 17 00:00:00 2001
From: dadachi <maurois@mac.com>
Date: Wed, 29 Apr 2026 17:33:45 +0900
Subject: [PATCH] Drop NFC-removal leftovers and tighten a few obvious patterns

- Delete CustomerScannedTag composable (dead since NFC/scan removal).
- Remove stale TODO marker in ShopDetailCardView left over from the
  schema-v2 drop of scanState/customerReadAt.
- Collapse NatConstants.baseUrlString into an expression-bodied
  function.
- Drop the redundant intermediate Flow vals (and now-unused imports)
  inside MainActivityViewModel.updatePermissions.

Mirrors NativeAppTemplate-Android#54.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../MainActivityViewModel.kt                  | 12 +++-------
 .../nativeapptemplatefree/NatConstants.kt     |  7 ++----
 .../ui/common/tags/CustomerScannedTag.kt      | 23 -------------------
 .../ui/shop_detail/ShopDetailCardView.kt      |  2 --
 4 files changed, 5 insertions(+), 39 deletions(-)
 delete mode 100644 app/src/main/kotlin/com/nativeapptemplate/nativeapptemplatefree/ui/common/tags/CustomerScannedTag.kt

diff --git a/app/src/main/kotlin/com/nativeapptemplate/nativeapptemplatefree/MainActivityViewModel.kt b/app/src/main/kotlin/com/nativeapptemplate/nativeapptemplatefree/MainActivityViewModel.kt
index 6d7e097..6c5c0e9 100644
--- a/app/src/main/kotlin/com/nativeapptemplate/nativeapptemplatefree/MainActivityViewModel.kt
+++ b/app/src/main/kotlin/com/nativeapptemplate/nativeapptemplatefree/MainActivityViewModel.kt
@@ -6,10 +6,8 @@ import androidx.lifecycle.viewModelScope
 import com.nativeapptemplate.nativeapptemplatefree.MainActivityUiState.Loading
 import com.nativeapptemplate.nativeapptemplatefree.MainActivityUiState.Success
 import com.nativeapptemplate.nativeapptemplatefree.data.login.LoginRepository
-import com.nativeapptemplate.nativeapptemplatefree.model.Permissions
 import com.nativeapptemplate.nativeapptemplatefree.model.UserData
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.catch
@@ -43,19 +41,15 @@ class MainActivityViewModel @Inject constructor(
       val isLoggedIn = loginRepository.isLoggedIn().first()
 
       if (isLoggedIn) {
-        val permissionsFlow: Flow<Permissions> = loginRepository.getPermissions()
-
-        permissionsFlow
+        loginRepository.getPermissions()
           .catch { exception ->
             Log.e("MainActivityViewModel", "Failed to update permissions", exception)
 
-            val booleanFlow = loginRepository.logout()
-            booleanFlow
+            loginRepository.logout()
               .catch { logoutException ->
                 Log.e("MainActivityViewModel", "Logout error", logoutException)
               }
-              .collect {
-              }
+              .collect { }
           }
           .collect { permissions ->
             loginRepository.setPermissions(permissions)
diff --git a/app/src/main/kotlin/com/nativeapptemplate/nativeapptemplatefree/NatConstants.kt b/app/src/main/kotlin/com/nativeapptemplate/nativeapptemplatefree/NatConstants.kt
index faa4cf3..0b88648 100644
--- a/app/src/main/kotlin/com/nativeapptemplate/nativeapptemplatefree/NatConstants.kt
+++ b/app/src/main/kotlin/com/nativeapptemplate/nativeapptemplatefree/NatConstants.kt
@@ -17,13 +17,10 @@ object NatConstants {
   const val PLACEHOLDER_EMAIL: String = "you@example.com"
   const val PLACEHOLDER_PASSWORD: String = "password"
 
-  fun baseUrlString(): String {
-    val result = if (BuildConfig.PORT.isEmpty()) {
+  fun baseUrlString(): String =
+    if (BuildConfig.PORT.isEmpty()) {
       "${BuildConfig.SCHEME}://${BuildConfig.DOMAIN}"
     } else {
       "${BuildConfig.SCHEME}://${BuildConfig.DOMAIN}:${BuildConfig.PORT}"
     }
-
-    return result
-  }
 }
diff --git a/app/src/main/kotlin/com/nativeapptemplate/nativeapptemplatefree/ui/common/tags/CustomerScannedTag.kt b/app/src/main/kotlin/com/nativeapptemplate/nativeapptemplatefree/ui/common/tags/CustomerScannedTag.kt
deleted file mode 100644
index 62516f6..0000000
--- a/app/src/main/kotlin/com/nativeapptemplate/nativeapptemplatefree/ui/common/tags/CustomerScannedTag.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.nativeapptemplate.nativeapptemplatefree.ui.common.tags
-
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.tooling.preview.Preview
-import com.nativeapptemplate.nativeapptemplatefree.designsystem.theme.NatTheme
-
-@Composable
-fun CustomerScannedTag() {
-  TagView(
-    text = "CUSTOMER SCANNED",
-    textColor = MaterialTheme.colorScheme.onError,
-    backgroundColor = MaterialTheme.colorScheme.error,
-  )
-}
-
-@Preview
-@Composable
-private fun CustomerScannedTagPreview() {
-  NatTheme {
-    CustomerScannedTag()
-  }
-}
diff --git a/app/src/main/kotlin/com/nativeapptemplate/nativeapptemplatefree/ui/shop_detail/ShopDetailCardView.kt b/app/src/main/kotlin/com/nativeapptemplate/nativeapptemplatefree/ui/shop_detail/ShopDetailCardView.kt
index d39fce9..950afa9 100644
--- a/app/src/main/kotlin/com/nativeapptemplate/nativeapptemplatefree/ui/shop_detail/ShopDetailCardView.kt
+++ b/app/src/main/kotlin/com/nativeapptemplate/nativeapptemplatefree/ui/shop_detail/ShopDetailCardView.kt
@@ -37,8 +37,6 @@ fun ShopDetailCardView(
         .padding(end = 8.dp),
     )
 
-    // TODO: removed in Phase 2A-2 — scanState/customerReadAt column dropped with ItemTag schema v2
-
     Column(
       horizontalAlignment = Alignment.End,
     ) {