Skip to content
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.

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

chore: Change the onboarding for the AppStore + fix #6003

Merged
merged 1 commit into from
Dec 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,14 @@ class ConsentAnalyticsPage extends StatelessWidget {
),
),
OnboardingBottomBar(
rightButton: _buildButton(
leftButton: _buildButton(
context,
appLocalizations.refuse_button_label,
false,
const Color(0xFFA08D84),
Colors.white,
),
leftButton: _buildButton(
rightButton: _buildButton(
context,
appLocalizations.authorize_button_label,
true,
Expand Down
4 changes: 2 additions & 2 deletions packages/smooth_app/lib/pages/onboarding/next_button.dart
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class NextButton extends StatelessWidget {
OnboardingFlowNavigator(userPreferences);
final OnboardingPage previousPage = currentPage.getPrevPage();
return OnboardingBottomBar(
rightButton: previousPage.isOnboardingNotStarted()
leftButton: previousPage.isOnboardingNotStarted()
? null
: OnboardingBottomIcon(
onPressed: () async => navigator.navigateToPage(
Expand All @@ -50,7 +50,7 @@ class NextButton extends StatelessWidget {
? const EdgeInsetsDirectional.only(end: 2.0)
: EdgeInsets.zero,
),
leftButton: OnboardingBottomButton(
rightButton: OnboardingBottomButton(
onPressed: () async {
await OnboardingLoader(localDatabase)
.runAtNextTime(currentPage, context);
Expand Down
20 changes: 10 additions & 10 deletions packages/smooth_app/lib/pages/onboarding/onboarding_bottom_bar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ import 'package:smooth_app/generic_lib/design_constants.dart';
/// Bottom Bar during onboarding. Typical use case: previous/next buttons.
class OnboardingBottomBar extends StatelessWidget {
const OnboardingBottomBar({
required this.leftButton,
required this.rightButton,
required this.backgroundColor,
this.rightButton,
required this.leftButton,
this.semanticsHorizontalOrder = true,
});

final Widget leftButton;
final Widget? rightButton;
final Widget? leftButton;
final Widget rightButton;

/// If [true], the [leftButton] will be said first by the screen reader.
final bool semanticsHorizontalOrder;
Expand All @@ -27,7 +27,7 @@ class OnboardingBottomBar extends StatelessWidget {
final Size screenSize = MediaQuery.sizeOf(context);
// Side padding is 8% of total width.
final double sidePadding = screenSize.width * .08;
final bool hasPrevious = rightButton != null;
final bool hasPrevious = leftButton != null;
return Column(
children: <Widget>[
Container(
Expand All @@ -48,14 +48,14 @@ class OnboardingBottomBar extends StatelessWidget {
: MainAxisAlignment.end,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
if (rightButton != null)
if (leftButton != null)
Semantics(
sortKey: OrdinalSortKey(semanticsHorizontalOrder ? 1.0 : 2.0),
child: rightButton,
sortKey: OrdinalSortKey(semanticsHorizontalOrder ? 2.0 : 1.0),
child: leftButton,
),
Semantics(
sortKey: OrdinalSortKey(semanticsHorizontalOrder ? 2.0 : 1.0),
child: leftButton,
sortKey: OrdinalSortKey(semanticsHorizontalOrder ? 1.0 : 2.0),
child: rightButton,
),
],
),
Expand Down
14 changes: 9 additions & 5 deletions packages/smooth_app/lib/pages/onboarding/permissions_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,12 @@ class _PermissionsPageState extends State<PermissionsPage> {
),
)),
OnboardingBottomBar(
rightButton: _IgnoreButton(
onPermissionIgnored: () => _moveToNextScreen(context),
),
leftButton: _AskPermissionButton(
leftButton: !Platform.isIOS
? _IgnoreButton(
onPermissionIgnored: () => _moveToNextScreen(context),
)
: null,
rightButton: _AskPermissionButton(
onPermissionIgnored: () => _moveToNextScreen(context),
),
backgroundColor: widget.backgroundColor,
Expand Down Expand Up @@ -153,7 +155,9 @@ class _AskPermissionButton extends StatelessWidget {
},
backgroundColor: Colors.white,
foregroundColor: Colors.black,
label: appLocalizations.authorize_button_label,
label: Platform.isIOS
? appLocalizations.onboarding_continue_button
: appLocalizations.authorize_button_label,
);
}
}
Expand Down
Loading