permissionlesstech/bitchat-android
1
0
Fork 0
mirror of https://github.com/permissionlesstech/bitchat-android.git synced 2026-07-25 18:05:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: Introduce MainViewModel for onboarding state management

Browse Source 
This commit introduces a `MainViewModel` to manage the UI state for the onboarding flow. This change centralizes the onboarding state (including Bluetooth status, location status, error messages, and loading indicators) within the ViewModel, allowing it to survive configuration changes and simplifying state management within `MainActivity`.

Key changes:
- Created `MainViewModel.kt` to hold and manage onboarding-related UI state.
- Moved onboarding state variables (e.g., `onboardingState`, `bluetoothStatus`, `locationStatus`) from `MainActivity` to `MainViewModel`.
- Updated `MainActivity` to observe and update onboarding state through the `MainViewModel`.
- Created `OnboardingState.kt` to define the possible states of the onboarding process.
- Ensured that the onboarding process is not restarted on configuration changes by checking `mainViewModel.onboardingState` before initiating.
This commit is contained in:
Mohamad Hamade
2025-07-15 02:24:41 +03:00
parent 013f0c00cf
commit 245181d736
3 changed files with 153 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/bitchat/android/MainActivity.kt
+88 -100
View File
@@ -1,27 +1,30 @@
package com.bitchat.android package com.bitchat.android
import android.Manifest
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
import androidx.activity.ComponentActivity import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.activity.result.contract.ActivityResultContracts
import androidx.activity.viewModels
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Surface
import androidx.compose.runtime.*
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.ViewModelProvider
import androidx.activity.OnBackPressedCallback import androidx.activity.OnBackPressedCallback
import androidx.activity.addCallback import androidx.activity.compose.setContent
import androidx.activity.viewModels
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.lifecycleScope
import com.bitchat.android.mesh.BluetoothMeshService import com.bitchat.android.mesh.BluetoothMeshService
import com.bitchat.android.onboarding.* import com.bitchat.android.onboarding.BluetoothCheckScreen
import com.bitchat.android.onboarding.BluetoothStatus
import com.bitchat.android.onboarding.BluetoothStatusManager
import com.bitchat.android.onboarding.InitializationErrorScreen
import com.bitchat.android.onboarding.InitializingScreen
import com.bitchat.android.onboarding.LocationCheckScreen
import com.bitchat.android.onboarding.LocationStatus
import com.bitchat.android.onboarding.LocationStatusManager
import com.bitchat.android.onboarding.OnboardingCoordinator
import com.bitchat.android.onboarding.PermissionExplanationScreen
import com.bitchat.android.onboarding.PermissionManager
import com.bitchat.android.ui.ChatScreen import com.bitchat.android.ui.ChatScreen
import com.bitchat.android.ui.ChatViewModel import com.bitchat.android.ui.ChatViewModel
import com.bitchat.android.ui.theme.BitchatTheme import com.bitchat.android.ui.theme.BitchatTheme
@@ -37,6 +40,7 @@ class MainActivity : ComponentActivity() {
// Core mesh service - managed at app level // Core mesh service - managed at app level
private lateinit var meshService: BluetoothMeshService private lateinit var meshService: BluetoothMeshService
private val mainViewModel: MainViewModel by viewModels()
private val chatViewModel: ChatViewModel by viewModels { private val chatViewModel: ChatViewModel by viewModels {
object : ViewModelProvider.Factory { object : ViewModelProvider.Factory {
override fun <T : androidx.lifecycle.ViewModel> create(modelClass: Class<T>): T { override fun <T : androidx.lifecycle.ViewModel> create(modelClass: Class<T>): T {
@@ -46,25 +50,6 @@ class MainActivity : ComponentActivity() {
} }
} }
// UI state for onboarding flow
private var onboardingState by mutableStateOf(OnboardingState.CHECKING)
private var bluetoothStatus by mutableStateOf(BluetoothStatus.ENABLED)
private var locationStatus by mutableStateOf(LocationStatus.ENABLED)
private var errorMessage by mutableStateOf("")
private var isBluetoothLoading by mutableStateOf(false)
private var isLocationLoading by mutableStateOf(false)
enum class OnboardingState {
CHECKING,
BLUETOOTH_CHECK,
LOCATION_CHECK,
PERMISSION_EXPLANATION,
PERMISSION_REQUESTING,
INITIALIZING,
COMPLETE,
ERROR
}
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
@@ -103,42 +88,45 @@ class MainActivity : ComponentActivity() {
} }
} }
// Start the onboarding process // Only start onboarding process if we're in the initial CHECKING state
// This prevents restarting onboarding on configuration changes
if (mainViewModel.onboardingState == OnboardingState.CHECKING) {
checkOnboardingStatus() checkOnboardingStatus()
} }
}
@Composable @Composable
private fun OnboardingFlowScreen() { private fun OnboardingFlowScreen() {
when (onboardingState) { when (mainViewModel.onboardingState) {
OnboardingState.CHECKING -> { OnboardingState.CHECKING -> {
InitializingScreen() InitializingScreen()
} }
OnboardingState.BLUETOOTH_CHECK -> { OnboardingState.BLUETOOTH_CHECK -> {
BluetoothCheckScreen( BluetoothCheckScreen(
status = bluetoothStatus, status = mainViewModel.bluetoothStatus,
onEnableBluetooth = { onEnableBluetooth = {
isBluetoothLoading = true mainViewModel.updateBluetoothLoading(true)
bluetoothStatusManager.requestEnableBluetooth() bluetoothStatusManager.requestEnableBluetooth()
}, },
onRetry = { onRetry = {
checkBluetoothAndProceed() checkBluetoothAndProceed()
}, },
isLoading = isBluetoothLoading isLoading = mainViewModel.isBluetoothLoading
) )
} }
OnboardingState.LOCATION_CHECK -> { OnboardingState.LOCATION_CHECK -> {
LocationCheckScreen( LocationCheckScreen(
status = locationStatus, status = mainViewModel.locationStatus,
onEnableLocation = { onEnableLocation = {
isLocationLoading = true mainViewModel.updateLocationLoading(true)
locationStatusManager.requestEnableLocation() locationStatusManager.requestEnableLocation()
}, },
onRetry = { onRetry = {
checkLocationAndProceed() checkLocationAndProceed()
}, },
isLoading = isLocationLoading isLoading = mainViewModel.isLocationLoading
) )
} }
@@ -146,7 +134,7 @@ class MainActivity : ComponentActivity() {
PermissionExplanationScreen( PermissionExplanationScreen(
permissionCategories = permissionManager.getCategorizedPermissions(), permissionCategories = permissionManager.getCategorizedPermissions(),
onContinue = { onContinue = {
onboardingState = OnboardingState.PERMISSION_REQUESTING mainViewModel.updateOnboardingState(OnboardingState.PERMISSION_REQUESTING)
onboardingCoordinator.requestPermissions() onboardingCoordinator.requestPermissions()
} }
) )
@@ -184,9 +172,9 @@ class MainActivity : ComponentActivity() {
OnboardingState.ERROR -> { OnboardingState.ERROR -> {
InitializationErrorScreen( InitializationErrorScreen(
errorMessage = errorMessage, errorMessage = mainViewModel.errorMessage,
onRetry = { onRetry = {
onboardingState = OnboardingState.CHECKING mainViewModel.updateOnboardingState(OnboardingState.CHECKING)
checkOnboardingStatus() checkOnboardingStatus()
}, },
onOpenSettings = { onOpenSettings = {
@@ -225,9 +213,9 @@ class MainActivity : ComponentActivity() {
// For existing users, check Bluetooth status first // For existing users, check Bluetooth status first
bluetoothStatusManager.logBluetoothStatus() bluetoothStatusManager.logBluetoothStatus()
bluetoothStatus = bluetoothStatusManager.checkBluetoothStatus() mainViewModel.updateBluetoothStatus(bluetoothStatusManager.checkBluetoothStatus())
when (bluetoothStatus) { when (mainViewModel.bluetoothStatus) {
BluetoothStatus.ENABLED -> { BluetoothStatus.ENABLED -> {
// Bluetooth is enabled, check location services next // Bluetooth is enabled, check location services next
checkLocationAndProceed() checkLocationAndProceed()
@@ -235,14 +223,14 @@ class MainActivity : ComponentActivity() {
BluetoothStatus.DISABLED -> { BluetoothStatus.DISABLED -> {
// Show Bluetooth enable screen (should have permissions as existing user) // Show Bluetooth enable screen (should have permissions as existing user)
android.util.Log.d("MainActivity", "Bluetooth disabled, showing enable screen") android.util.Log.d("MainActivity", "Bluetooth disabled, showing enable screen")
onboardingState = OnboardingState.BLUETOOTH_CHECK mainViewModel.updateOnboardingState(OnboardingState.BLUETOOTH_CHECK)
isBluetoothLoading = false mainViewModel.updateBluetoothLoading(false)
} }
BluetoothStatus.NOT_SUPPORTED -> { BluetoothStatus.NOT_SUPPORTED -> {
// Device doesn't support Bluetooth // Device doesn't support Bluetooth
android.util.Log.e("MainActivity", "Bluetooth not supported") android.util.Log.e("MainActivity", "Bluetooth not supported")
onboardingState = OnboardingState.BLUETOOTH_CHECK mainViewModel.updateOnboardingState(OnboardingState.BLUETOOTH_CHECK)
isBluetoothLoading = false mainViewModel.updateBluetoothLoading(false)
} }
} }
} }
@@ -258,14 +246,14 @@ class MainActivity : ComponentActivity() {
if (permissionManager.isFirstTimeLaunch()) { if (permissionManager.isFirstTimeLaunch()) {
android.util.Log.d("MainActivity", "First time launch, showing permission explanation") android.util.Log.d("MainActivity", "First time launch, showing permission explanation")
onboardingState = OnboardingState.PERMISSION_EXPLANATION mainViewModel.updateOnboardingState(OnboardingState.PERMISSION_EXPLANATION)
} else if (permissionManager.areAllPermissionsGranted()) { } else if (permissionManager.areAllPermissionsGranted()) {
android.util.Log.d("MainActivity", "Existing user with permissions, initializing app") android.util.Log.d("MainActivity", "Existing user with permissions, initializing app")
onboardingState = OnboardingState.INITIALIZING mainViewModel.updateOnboardingState(OnboardingState.INITIALIZING)
initializeApp() initializeApp()
} else { } else {
android.util.Log.d("MainActivity", "Existing user missing permissions, showing explanation") android.util.Log.d("MainActivity", "Existing user missing permissions, showing explanation")
onboardingState = OnboardingState.PERMISSION_EXPLANATION mainViewModel.updateOnboardingState(OnboardingState.PERMISSION_EXPLANATION)
} }
} }
} }
@@ -275,8 +263,8 @@ class MainActivity : ComponentActivity() {
*/ */
private fun handleBluetoothEnabled() { private fun handleBluetoothEnabled() {
android.util.Log.d("MainActivity", "Bluetooth enabled by user") android.util.Log.d("MainActivity", "Bluetooth enabled by user")
isBluetoothLoading = false mainViewModel.updateBluetoothLoading(false)
bluetoothStatus = BluetoothStatus.ENABLED mainViewModel.updateBluetoothStatus(BluetoothStatus.ENABLED)
checkLocationAndProceed() checkLocationAndProceed()
} }
@@ -296,9 +284,9 @@ class MainActivity : ComponentActivity() {
// For existing users, check location status // For existing users, check location status
locationStatusManager.logLocationStatus() locationStatusManager.logLocationStatus()
locationStatus = locationStatusManager.checkLocationStatus() mainViewModel.updateLocationStatus(locationStatusManager.checkLocationStatus())
when (locationStatus) { when (mainViewModel.locationStatus) {
LocationStatus.ENABLED -> { LocationStatus.ENABLED -> {
// Location services enabled, proceed with permission/onboarding check // Location services enabled, proceed with permission/onboarding check
proceedWithPermissionCheck() proceedWithPermissionCheck()
@@ -306,14 +294,14 @@ class MainActivity : ComponentActivity() {
LocationStatus.DISABLED -> { LocationStatus.DISABLED -> {
// Show location enable screen (should have permissions as existing user) // Show location enable screen (should have permissions as existing user)
android.util.Log.d("MainActivity", "Location services disabled, showing enable screen") android.util.Log.d("MainActivity", "Location services disabled, showing enable screen")
onboardingState = OnboardingState.LOCATION_CHECK mainViewModel.updateOnboardingState(OnboardingState.LOCATION_CHECK)
isLocationLoading = false mainViewModel.updateLocationLoading(false)
} }
LocationStatus.NOT_AVAILABLE -> { LocationStatus.NOT_AVAILABLE -> {
// Device doesn't support location services (very unusual) // Device doesn't support location services (very unusual)
android.util.Log.e("MainActivity", "Location services not available") android.util.Log.e("MainActivity", "Location services not available")
onboardingState = OnboardingState.LOCATION_CHECK mainViewModel.updateOnboardingState(OnboardingState.LOCATION_CHECK)
isLocationLoading = false mainViewModel.updateLocationLoading(false)
} }
} }
} }
@@ -323,8 +311,8 @@ class MainActivity : ComponentActivity() {
*/ */
private fun handleLocationEnabled() { private fun handleLocationEnabled() {
android.util.Log.d("MainActivity", "Location services enabled by user") android.util.Log.d("MainActivity", "Location services enabled by user")
isLocationLoading = false mainViewModel.updateLocationLoading(false)
locationStatus = LocationStatus.ENABLED mainViewModel.updateLocationStatus(LocationStatus.ENABLED)
proceedWithPermissionCheck() proceedWithPermissionCheck()
} }
@@ -333,18 +321,18 @@ class MainActivity : ComponentActivity() {
*/ */
private fun handleLocationDisabled(message: String) { private fun handleLocationDisabled(message: String) {
android.util.Log.w("MainActivity", "Location services disabled or failed: $message") android.util.Log.w("MainActivity", "Location services disabled or failed: $message")
isLocationLoading = false mainViewModel.updateLocationLoading(false)
locationStatus = locationStatusManager.checkLocationStatus() mainViewModel.updateLocationStatus(locationStatusManager.checkLocationStatus())
when { when {
locationStatus == LocationStatus.NOT_AVAILABLE -> { mainViewModel.locationStatus == LocationStatus.NOT_AVAILABLE -> {
// Show permanent error for devices without location services // Show permanent error for devices without location services
errorMessage = message mainViewModel.updateErrorMessage(message)
onboardingState = OnboardingState.ERROR mainViewModel.updateOnboardingState(OnboardingState.ERROR)
} }
else -> { else -> {
// Stay on location check screen for retry // Stay on location check screen for retry
onboardingState = OnboardingState.LOCATION_CHECK mainViewModel.updateOnboardingState(OnboardingState.LOCATION_CHECK)
} }
} }
} }
@@ -354,14 +342,14 @@ class MainActivity : ComponentActivity() {
*/ */
private fun handleBluetoothDisabled(message: String) { private fun handleBluetoothDisabled(message: String) {
android.util.Log.w("MainActivity", "Bluetooth disabled or failed: $message") android.util.Log.w("MainActivity", "Bluetooth disabled or failed: $message")
isBluetoothLoading = false mainViewModel.updateBluetoothLoading(false)
bluetoothStatus = bluetoothStatusManager.checkBluetoothStatus() mainViewModel.updateBluetoothStatus(bluetoothStatusManager.checkBluetoothStatus())
when { when {
bluetoothStatus == BluetoothStatus.NOT_SUPPORTED -> { mainViewModel.bluetoothStatus == BluetoothStatus.NOT_SUPPORTED -> {
// Show permanent error for unsupported devices // Show permanent error for unsupported devices
errorMessage = message mainViewModel.updateErrorMessage(message)
onboardingState = OnboardingState.ERROR mainViewModel.updateOnboardingState(OnboardingState.ERROR)
} }
message.contains("Permission") && permissionManager.isFirstTimeLaunch() -> { message.contains("Permission") && permissionManager.isFirstTimeLaunch() -> {
// During first-time onboarding, if Bluetooth enable fails due to permissions, // During first-time onboarding, if Bluetooth enable fails due to permissions,
@@ -372,11 +360,11 @@ class MainActivity : ComponentActivity() {
message.contains("Permission") -> { message.contains("Permission") -> {
// For existing users, redirect to permission explanation to grant missing permissions // For existing users, redirect to permission explanation to grant missing permissions
android.util.Log.d("MainActivity", "Bluetooth enable requires permissions, showing permission explanation") android.util.Log.d("MainActivity", "Bluetooth enable requires permissions, showing permission explanation")
onboardingState = OnboardingState.PERMISSION_EXPLANATION mainViewModel.updateOnboardingState(OnboardingState.PERMISSION_EXPLANATION)
} }
else -> { else -> {
// Stay on Bluetooth check screen for retry // Stay on Bluetooth check screen for retry
onboardingState = OnboardingState.BLUETOOTH_CHECK mainViewModel.updateOnboardingState(OnboardingState.BLUETOOTH_CHECK)
} }
} }
} }
@@ -392,21 +380,21 @@ class MainActivity : ComponentActivity() {
currentBluetoothStatus != BluetoothStatus.ENABLED -> { currentBluetoothStatus != BluetoothStatus.ENABLED -> {
// Bluetooth still disabled, but now we have permissions to enable it // Bluetooth still disabled, but now we have permissions to enable it
android.util.Log.d("MainActivity", "Permissions granted, but Bluetooth still disabled. Showing Bluetooth enable screen.") android.util.Log.d("MainActivity", "Permissions granted, but Bluetooth still disabled. Showing Bluetooth enable screen.")
bluetoothStatus = currentBluetoothStatus mainViewModel.updateBluetoothStatus(currentBluetoothStatus)
onboardingState = OnboardingState.BLUETOOTH_CHECK mainViewModel.updateOnboardingState(OnboardingState.BLUETOOTH_CHECK)
isBluetoothLoading = false mainViewModel.updateBluetoothLoading(false)
} }
currentLocationStatus != LocationStatus.ENABLED -> { currentLocationStatus != LocationStatus.ENABLED -> {
// Location services still disabled, but now we have permissions to enable it // Location services still disabled, but now we have permissions to enable it
android.util.Log.d("MainActivity", "Permissions granted, but Location services still disabled. Showing Location enable screen.") android.util.Log.d("MainActivity", "Permissions granted, but Location services still disabled. Showing Location enable screen.")
locationStatus = currentLocationStatus mainViewModel.updateLocationStatus(currentLocationStatus)
onboardingState = OnboardingState.LOCATION_CHECK mainViewModel.updateOnboardingState(OnboardingState.LOCATION_CHECK)
isLocationLoading = false mainViewModel.updateLocationLoading(false)
} }
else -> { else -> {
// Both are enabled, proceed to app initialization // Both are enabled, proceed to app initialization
android.util.Log.d("MainActivity", "Both Bluetooth and Location services are enabled, proceeding to initialization") android.util.Log.d("MainActivity", "Both Bluetooth and Location services are enabled, proceeding to initialization")
onboardingState = OnboardingState.INITIALIZING mainViewModel.updateOnboardingState(OnboardingState.INITIALIZING)
initializeApp() initializeApp()
} }
} }
@@ -414,8 +402,8 @@ class MainActivity : ComponentActivity() {
private fun handleOnboardingFailed(message: String) { private fun handleOnboardingFailed(message: String) {
android.util.Log.e("MainActivity", "Onboarding failed: $message") android.util.Log.e("MainActivity", "Onboarding failed: $message")
errorMessage = message mainViewModel.updateErrorMessage(message)
onboardingState = OnboardingState.ERROR mainViewModel.updateOnboardingState(OnboardingState.ERROR)
} }
private fun initializeApp() { private fun initializeApp() {
@@ -450,7 +438,7 @@ class MainActivity : ComponentActivity() {
delay(500) delay(500)
android.util.Log.d("MainActivity", "App initialization complete") android.util.Log.d("MainActivity", "App initialization complete")
onboardingState = OnboardingState.COMPLETE mainViewModel.updateOnboardingState(OnboardingState.COMPLETE)
} catch (e: Exception) { } catch (e: Exception) {
android.util.Log.e("MainActivity", "Failed to initialize app", e) android.util.Log.e("MainActivity", "Failed to initialize app", e)
@@ -462,7 +450,7 @@ class MainActivity : ComponentActivity() {
override fun onNewIntent(intent: Intent) { override fun onNewIntent(intent: Intent) {
super.onNewIntent(intent) super.onNewIntent(intent)
// Handle notification intents when app is already running // Handle notification intents when app is already running
if (onboardingState == OnboardingState.COMPLETE) { if (mainViewModel.onboardingState == OnboardingState.COMPLETE) {
handleNotificationIntent(intent) handleNotificationIntent(intent)
} }
} }
@@ -470,7 +458,7 @@ class MainActivity : ComponentActivity() {
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
// Check Bluetooth and Location status on resume and handle accordingly // Check Bluetooth and Location status on resume and handle accordingly
if (onboardingState == OnboardingState.COMPLETE) { if (mainViewModel.onboardingState == OnboardingState.COMPLETE) {
// Set app foreground state // Set app foreground state
meshService.connectionManager.setAppBackgroundState(false) meshService.connectionManager.setAppBackgroundState(false)
chatViewModel.setAppBackgroundState(false) chatViewModel.setAppBackgroundState(false)
@@ -479,9 +467,9 @@ class MainActivity : ComponentActivity() {
val currentBluetoothStatus = bluetoothStatusManager.checkBluetoothStatus() val currentBluetoothStatus = bluetoothStatusManager.checkBluetoothStatus()
if (currentBluetoothStatus != BluetoothStatus.ENABLED) { if (currentBluetoothStatus != BluetoothStatus.ENABLED) {
android.util.Log.w("MainActivity", "Bluetooth disabled while app was backgrounded") android.util.Log.w("MainActivity", "Bluetooth disabled while app was backgrounded")
bluetoothStatus = currentBluetoothStatus mainViewModel.updateBluetoothStatus(currentBluetoothStatus)
onboardingState = OnboardingState.BLUETOOTH_CHECK mainViewModel.updateOnboardingState(OnboardingState.BLUETOOTH_CHECK)
isBluetoothLoading = false mainViewModel.updateBluetoothLoading(false)
return return
} }
@@ -489,9 +477,9 @@ class MainActivity : ComponentActivity() {
val currentLocationStatus = locationStatusManager.checkLocationStatus() val currentLocationStatus = locationStatusManager.checkLocationStatus()
if (currentLocationStatus != LocationStatus.ENABLED) { if (currentLocationStatus != LocationStatus.ENABLED) {
android.util.Log.w("MainActivity", "Location services disabled while app was backgrounded") android.util.Log.w("MainActivity", "Location services disabled while app was backgrounded")
locationStatus = currentLocationStatus mainViewModel.updateLocationStatus(currentLocationStatus)
onboardingState = OnboardingState.LOCATION_CHECK mainViewModel.updateOnboardingState(OnboardingState.LOCATION_CHECK)
isLocationLoading = false mainViewModel.updateLocationLoading(false)
} }
} }
} }
@@ -499,7 +487,7 @@ class MainActivity : ComponentActivity() {
override fun onPause() { override fun onPause() {
super.onPause() super.onPause()
// Only set background state if app is fully initialized // Only set background state if app is fully initialized
if (onboardingState == OnboardingState.COMPLETE) { if (mainViewModel.onboardingState == OnboardingState.COMPLETE) {
// Set app background state // Set app background state
meshService.connectionManager.setAppBackgroundState(true) meshService.connectionManager.setAppBackgroundState(true)
chatViewModel.setAppBackgroundState(true) chatViewModel.setAppBackgroundState(true)
@@ -535,7 +523,7 @@ class MainActivity : ComponentActivity() {
* Restart mesh services (for debugging/troubleshooting) * Restart mesh services (for debugging/troubleshooting)
*/ */
fun restartMeshServices() { fun restartMeshServices() {
if (onboardingState == OnboardingState.COMPLETE) { if (mainViewModel.onboardingState == OnboardingState.COMPLETE) {
lifecycleScope.launch { lifecycleScope.launch {
try { try {
android.util.Log.d("MainActivity", "Restarting mesh services") android.util.Log.d("MainActivity", "Restarting mesh services")
@@ -562,7 +550,7 @@ class MainActivity : ComponentActivity() {
} }
// Stop mesh services if app was fully initialized // Stop mesh services if app was fully initialized
if (onboardingState == OnboardingState.COMPLETE) { if (mainViewModel.onboardingState == OnboardingState.COMPLETE) {
try { try {
meshService.stopServices() meshService.stopServices()
android.util.Log.d("MainActivity", "Mesh services stopped successfully") android.util.Log.d("MainActivity", "Mesh services stopped successfully")
app/src/main/java/com/bitchat/android/MainViewModel.kt
+52
View File
@@ -0,0 +1,52 @@
package com.bitchat.android
import androidx.compose.runtime.*
import androidx.lifecycle.ViewModel
import com.bitchat.android.onboarding.BluetoothStatus
import com.bitchat.android.onboarding.LocationStatus
class MainViewModel : ViewModel() {
private var _onboardingState by mutableStateOf(OnboardingState.CHECKING)
val onboardingState: OnboardingState get() = _onboardingState
private var _bluetoothStatus by mutableStateOf(BluetoothStatus.ENABLED)
val bluetoothStatus: BluetoothStatus get() = _bluetoothStatus
private var _locationStatus by mutableStateOf(LocationStatus.ENABLED)
val locationStatus: LocationStatus get() = _locationStatus
private var _errorMessage by mutableStateOf("")
val errorMessage: String get() = _errorMessage
private var _isBluetoothLoading by mutableStateOf(false)
val isBluetoothLoading: Boolean get() = _isBluetoothLoading
private var _isLocationLoading by mutableStateOf(false)
val isLocationLoading: Boolean get() = _isLocationLoading
// Public update functions for MainActivity
fun updateOnboardingState(state: OnboardingState) {
_onboardingState = state
}
fun updateBluetoothStatus(status: BluetoothStatus) {
_bluetoothStatus = status
}
fun updateLocationStatus(status: LocationStatus) {
_locationStatus = status
}
fun updateErrorMessage(message: String) {
_errorMessage = message
}
fun updateBluetoothLoading(loading: Boolean) {
_isBluetoothLoading = loading
}
fun updateLocationLoading(loading: Boolean) {
_isLocationLoading = loading
}
}
app/src/main/java/com/bitchat/android/OnboardingState.kt
+12
View File
@@ -0,0 +1,12 @@
package com.bitchat.android
enum class OnboardingState {
CHECKING,
BLUETOOTH_CHECK,
LOCATION_CHECK,
PERMISSION_EXPLANATION,
PERMISSION_REQUESTING,
INITIALIZING,
COMPLETE,
ERROR
}