Skip to content

Commit 311fdfe

Browse files
committed
feat: Setup updates
1 parent 405e9ee commit 311fdfe

3 files changed

Lines changed: 14 additions & 7 deletions

File tree

app/src/main/java/com/sameerasw/airsync/presentation/ui/components/dialogs/PermissionDialog.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.sameerasw.airsync.presentation.ui.components.dialogs
22

3+
import androidx.compose.foundation.background
34
import androidx.compose.foundation.layout.Arrangement
45
import androidx.compose.foundation.layout.Column
56
import androidx.compose.foundation.layout.Row
@@ -69,7 +70,7 @@ fun PermissionExplanationDialog(
6970
) {
7071
Column(
7172
modifier = Modifier
72-
.fillMaxWidth()
73+
.fillMaxWidth().background(MaterialTheme.colorScheme.surfaceContainerHigh)
7374
.padding(18.dp)
7475
.verticalScroll(rememberScrollState()),
7576
verticalArrangement = Arrangement.spacedBy(16.dp)
@@ -117,12 +118,10 @@ fun PermissionExplanationDialog(
117118
style = MaterialTheme.typography.titleMedium.copy(
118119
fontWeight = FontWeight.SemiBold
119120
),
120-
color = MaterialTheme.colorScheme.onPrimaryContainer
121121
)
122122
Text(
123123
text = permissionInfo.whyNeeded,
124124
style = MaterialTheme.typography.bodyMedium,
125-
color = MaterialTheme.colorScheme.onPrimaryContainer
126125
)
127126
}
128127
}

app/src/main/java/com/sameerasw/airsync/presentation/ui/composables/WelcomeScreen.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ fun WelcomeScreen(
139139
},
140140
onNext = {
141141
HapticUtil.performClick(haptics)
142+
viewModel.setOnboardingCompleted(true)
142143
currentStep = OnboardingStep.FEATURE_INTRODUCTION
143144
}
144145
)
@@ -678,7 +679,7 @@ fun PreferencesStepContent(
678679
Column(
679680
modifier = Modifier
680681
.fillMaxSize()
681-
.padding(horizontal = 24.dp)
682+
.padding(horizontal = 16.dp)
682683
.padding(bottom = 16.dp),
683684
horizontalAlignment = Alignment.CenterHorizontally
684685
) {
@@ -789,8 +790,7 @@ fun PreferencesStepContent(
789790
Row(
790791
modifier = Modifier
791792
.fillMaxWidth()
792-
.navigationBarsPadding()
793-
.padding(16.dp),
793+
.navigationBarsPadding(),
794794
verticalAlignment = Alignment.CenterVertically,
795795
horizontalArrangement = Arrangement.spacedBy(12.dp)
796796
) {

app/src/main/java/com/sameerasw/airsync/presentation/ui/screens/AirSyncMainScreen.kt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ import androidx.compose.runtime.mutableStateOf
7373
import androidx.compose.runtime.remember
7474
import androidx.compose.runtime.rememberCoroutineScope
7575
import androidx.compose.runtime.rememberUpdatedState
76+
import androidx.compose.runtime.saveable.rememberSaveable
7677
import androidx.compose.runtime.setValue
7778
import androidx.compose.runtime.snapshotFlow
7879
import androidx.compose.ui.Alignment
@@ -158,6 +159,12 @@ fun AirSyncMainScreen(
158159
val settingsScrollState = rememberScrollState()
159160
var hasProcessedQrDialog by remember { mutableStateOf(false) }
160161
var hasAppliedInitialTab by remember { mutableStateOf(false) }
162+
var isWelcomeDismissed by rememberSaveable { mutableStateOf(false) }
163+
var hasSeenWelcomeThisSession by rememberSaveable { mutableStateOf(false) }
164+
165+
if (!uiState.isOnboardingCompleted) {
166+
hasSeenWelcomeThisSession = true
167+
}
161168

162169
// Volume & Media state
163170
var volume by remember { mutableFloatStateOf(50f) }
@@ -1208,14 +1215,15 @@ fun AirSyncMainScreen(
12081215

12091216
// Welcome Screen Overlay
12101217
AnimatedVisibility(
1211-
visible = !uiState.isOnboardingCompleted,
1218+
visible = (!uiState.isOnboardingCompleted || hasSeenWelcomeThisSession) && !isWelcomeDismissed,
12121219
enter = fadeIn() + expandVertically(),
12131220
exit = fadeOut() + shrinkVertically(),
12141221
modifier = Modifier.zIndex(100f)
12151222
) {
12161223
WelcomeScreen(
12171224
viewModel = viewModel,
12181225
onBeginClick = {
1226+
isWelcomeDismissed = true
12191227
viewModel.setOnboardingCompleted(true)
12201228
}
12211229
)

0 commit comments

Comments
 (0)