mirror of
https://github.com/permissionlesstech/bitchat-android.git
synced 2026-07-25 11:05:20 +00:00
Redesign: Permissions screen, battery optimization, location sheet (#415)
* update permissions screen design * battery optimization screen * remove init screen * skip init screen on load * skip on load only * location sheet design wip * denser location sheet * location sheet layout fix
This commit is contained in:
@@ -25,6 +25,7 @@ import com.bitchat.android.onboarding.BluetoothCheckScreen
|
||||
import com.bitchat.android.onboarding.BluetoothStatus
|
||||
import com.bitchat.android.onboarding.BluetoothStatusManager
|
||||
import com.bitchat.android.onboarding.BatteryOptimizationManager
|
||||
import com.bitchat.android.onboarding.BatteryOptimizationPreferenceManager
|
||||
import com.bitchat.android.onboarding.BatteryOptimizationScreen
|
||||
import com.bitchat.android.onboarding.BatteryOptimizationStatus
|
||||
import com.bitchat.android.onboarding.InitializationErrorScreen
|
||||
@@ -163,7 +164,7 @@ class MainActivity : ComponentActivity() {
|
||||
}
|
||||
|
||||
when (onboardingState) {
|
||||
OnboardingState.CHECKING -> {
|
||||
OnboardingState.PERMISSION_REQUESTING -> {
|
||||
InitializingScreen(modifier)
|
||||
}
|
||||
|
||||
@@ -226,16 +227,8 @@ class MainActivity : ComponentActivity() {
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
OnboardingState.PERMISSION_REQUESTING -> {
|
||||
InitializingScreen(modifier)
|
||||
}
|
||||
|
||||
OnboardingState.INITIALIZING -> {
|
||||
InitializingScreen(modifier)
|
||||
}
|
||||
|
||||
OnboardingState.COMPLETE -> {
|
||||
|
||||
OnboardingState.CHECKING, OnboardingState.INITIALIZING, OnboardingState.COMPLETE -> {
|
||||
// Set up back navigation handling for the chat screen
|
||||
val backCallback = object : OnBackPressedCallback(true) {
|
||||
override fun handleOnBackPressed() {
|
||||
@@ -533,6 +526,13 @@ class MainActivity : ComponentActivity() {
|
||||
return
|
||||
}
|
||||
|
||||
// Check if user has previously skipped battery optimization
|
||||
if (BatteryOptimizationPreferenceManager.isSkipped(this)) {
|
||||
android.util.Log.d("MainActivity", "User previously skipped battery optimization, proceeding to permissions")
|
||||
proceedWithPermissionCheck()
|
||||
return
|
||||
}
|
||||
|
||||
// For existing users, check battery optimization status
|
||||
batteryOptimizationManager.logBatteryOptimizationStatus()
|
||||
val currentBatteryOptimizationStatus = when {
|
||||
|
||||
Reference in New Issue
Block a user