Skip to content

Commit 7836ab2

Browse files
committed
goto onboarding with background tag reading when not signed in
1 parent b622341 commit 7836ab2

3 files changed

Lines changed: 16 additions & 8 deletions

File tree

app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ android {
1818
applicationId = "com.nativeapptemplate.nativeapptemplatefree"
1919
targetSdk = 35
2020
minSdk = 26
21-
versionCode = 2
22-
versionName = "2.0.0"
21+
versionCode = 3
22+
versionName = "2.0.1"
2323

2424
vectorDrawables {
2525
useSupportLibrary = true

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,12 @@ class MainActivity : ComponentActivity() {
4747
lateinit var loginRepository: LoginRepository
4848

4949
private val viewModel: MainActivityViewModel by viewModels()
50+
var uiState: MainActivityUiState by mutableStateOf(Loading)
5051

5152
override fun onCreate(savedInstanceState: Bundle?) {
5253
val splashScreen = installSplashScreen()
5354
super.onCreate(savedInstanceState)
5455

55-
var uiState: MainActivityUiState by mutableStateOf(Loading)
56-
5756
viewModel.updateShouldNavigateToScanView(false)
5857
viewModel.updateShouldFetchItemTagForShowTagInfoScan(false)
5958
viewModel.updateShouldCompleteItemTagForCompleteScan(false)
@@ -67,9 +66,9 @@ class MainActivity : ComponentActivity() {
6766
// Update the uiState
6867
lifecycleScope.launch {
6968
lifecycle.repeatOnLifecycle(Lifecycle.State.STARTED) {
70-
viewModel.uiState
71-
.onEach { uiState = it }
72-
.collect()
69+
viewModel.uiState.collect {
70+
uiState = it
71+
}
7372
}
7473
}
7574

@@ -121,6 +120,8 @@ class MainActivity : ComponentActivity() {
121120
}
122121
}
123122

123+
if (!uiState.isLoggedIn) return
124+
124125
val intent = intent
125126
if (NfcAdapter.ACTION_NDEF_DISCOVERED == intent.action) {
126127
viewModel.updateShouldNavigateToScanView(false)
@@ -153,6 +154,9 @@ class MainActivity : ComponentActivity() {
153154

154155
override fun onNewIntent(intent: Intent) {
155156
super.onNewIntent(intent)
157+
158+
if (!uiState.isLoggedIn) return
159+
156160
if (NfcAdapter.ACTION_NDEF_DISCOVERED == intent.action) {
157161
viewModel.updateShouldNavigateToScanView(false)
158162

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,5 +145,9 @@ class MainActivityViewModel @Inject constructor(
145145

146146
sealed interface MainActivityUiState {
147147
data object Loading : MainActivityUiState
148-
data class Success(val userData: UserData) : MainActivityUiState
148+
data class Success(val userData: UserData) : MainActivityUiState {
149+
override val isLoggedIn = userData.isLoggedIn
150+
}
151+
152+
val isLoggedIn: Boolean get() = false
149153
}

0 commit comments

Comments
 (0)