Skip to content

Commit ba8248e

Browse files
dadachiclaude
andauthored
Drop NFC-removal leftovers and tighten a few obvious patterns (#41)
- 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>
1 parent 97c2814 commit ba8248e

4 files changed

Lines changed: 5 additions & 39 deletions

File tree

app/src/main/kotlin/com/nativeapptemplate/nativeapptemplatefree/MainActivityViewModel.kt

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@ import androidx.lifecycle.viewModelScope
66
import com.nativeapptemplate.nativeapptemplatefree.MainActivityUiState.Loading
77
import com.nativeapptemplate.nativeapptemplatefree.MainActivityUiState.Success
88
import com.nativeapptemplate.nativeapptemplatefree.data.login.LoginRepository
9-
import com.nativeapptemplate.nativeapptemplatefree.model.Permissions
109
import com.nativeapptemplate.nativeapptemplatefree.model.UserData
1110
import dagger.hilt.android.lifecycle.HiltViewModel
12-
import kotlinx.coroutines.flow.Flow
1311
import kotlinx.coroutines.flow.SharingStarted
1412
import kotlinx.coroutines.flow.StateFlow
1513
import kotlinx.coroutines.flow.catch
@@ -43,19 +41,15 @@ class MainActivityViewModel @Inject constructor(
4341
val isLoggedIn = loginRepository.isLoggedIn().first()
4442

4543
if (isLoggedIn) {
46-
val permissionsFlow: Flow<Permissions> = loginRepository.getPermissions()
47-
48-
permissionsFlow
44+
loginRepository.getPermissions()
4945
.catch { exception ->
5046
Log.e("MainActivityViewModel", "Failed to update permissions", exception)
5147

52-
val booleanFlow = loginRepository.logout()
53-
booleanFlow
48+
loginRepository.logout()
5449
.catch { logoutException ->
5550
Log.e("MainActivityViewModel", "Logout error", logoutException)
5651
}
57-
.collect {
58-
}
52+
.collect { }
5953
}
6054
.collect { permissions ->
6155
loginRepository.setPermissions(permissions)

app/src/main/kotlin/com/nativeapptemplate/nativeapptemplatefree/NatConstants.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,10 @@ object NatConstants {
1717
const val PLACEHOLDER_EMAIL: String = "you@example.com"
1818
const val PLACEHOLDER_PASSWORD: String = "password"
1919

20-
fun baseUrlString(): String {
21-
val result = if (BuildConfig.PORT.isEmpty()) {
20+
fun baseUrlString(): String =
21+
if (BuildConfig.PORT.isEmpty()) {
2222
"${BuildConfig.SCHEME}://${BuildConfig.DOMAIN}"
2323
} else {
2424
"${BuildConfig.SCHEME}://${BuildConfig.DOMAIN}:${BuildConfig.PORT}"
2525
}
26-
27-
return result
28-
}
2926
}

app/src/main/kotlin/com/nativeapptemplate/nativeapptemplatefree/ui/common/tags/CustomerScannedTag.kt

Lines changed: 0 additions & 23 deletions
This file was deleted.

app/src/main/kotlin/com/nativeapptemplate/nativeapptemplatefree/ui/shop_detail/ShopDetailCardView.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ fun ShopDetailCardView(
3737
.padding(end = 8.dp),
3838
)
3939

40-
// TODO: removed in Phase 2A-2 — scanState/customerReadAt column dropped with ItemTag schema v2
41-
4240
Column(
4341
horizontalAlignment = Alignment.End,
4442
) {

0 commit comments

Comments
 (0)