Skip to content

Drop NFC-removal leftovers and tighten a few obvious patterns #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dadachi merged 1 commit into from
Apr 29, 2026
Merged

Drop NFC-removal leftovers and tighten a few obvious patterns #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions app/src/main/kotlin/com/nativeapptemplate/nativeapptemplatefree/MainActivityViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
7 changes: 2 additions & 5 deletions app/src/main/kotlin/com/nativeapptemplate/nativeapptemplatefree/NatConstants.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
23 changes: 0 additions & 23 deletions ...n/kotlin/com/nativeapptemplate/nativeapptemplatefree/ui/common/tags/CustomerScannedTag.kt
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions ...n/kotlin/com/nativeapptemplate/nativeapptemplatefree/ui/shop_detail/ShopDetailCardView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
) {
Expand Down
Loading