Improve visibility of onboarding forward/back buttons

Author: Codel1417

lib/Frontend/Widgets/scan_for_new_device.dart

@@ -253,7 +253,8 @@ class _ScanGearListState extends ConsumerState<ScanGearList> {
                       Padding(
                         padding: const EdgeInsets.all(16.0),
                         child: Text(
-                          convertToUwU(scanDevicesScanMessage()),
+                          //Show a different message during onboarding
+                          convertToUwU(widget.popOnConnect ? scanDevicesScanMessage() : scanDevicesOnboardingScanMessage()),
                           textAlign: TextAlign.center,
                         ),
                       ),

lib/Frontend/pages/intro.dart

@@ -1,3 +1,4 @@
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
@@ -57,7 +58,6 @@ class OnBoardingPageState extends ConsumerState<OnBoardingPage> {
     );
   }
 
-  int page = 0;
   @override
   Widget build(BuildContext context) {
     setupSystemColor(context);
@@ -78,7 +78,6 @@ class OnBoardingPageState extends ConsumerState<OnBoardingPage> {
     return IntroductionScreen(
       key: introKey,
       canProgress: (page) {
-        this.page = page;
         if (page == 2 && !bluetoothAccepted) {
           return false;
         } else if (page == 1 && !privacyAccepted) {
@@ -88,6 +87,8 @@ class OnBoardingPageState extends ConsumerState<OnBoardingPage> {
       },
       globalBackgroundColor: Theme.of(context).canvasColor,
       allowImplicitScrolling: true,
+      showBackButton: true,
+      showSkipButton: kDebugMode,
       globalHeader: Align(
         alignment: Alignment.topRight,
         child: SafeArea(
@@ -253,20 +254,32 @@ class OnBoardingPageState extends ConsumerState<OnBoardingPage> {
       onSkip: () => _onIntroEnd(context),
       // You can override onSkip callback
       //rtl: true, // Display as right-to-left
-      back: const Icon(Icons.arrow_back),
-      overrideNext: page == 3
-          ? FilledButton(
-              onPressed: () {
-                _onIntroEnd(context);
-              },
-              child: Text(convertToUwU(onboardingContinueLabel()), style: const TextStyle(fontWeight: FontWeight.w600)),
-            )
-          : null,
-      next: Icon(
-        Icons.arrow_forward,
-        size: 24,
-        key: Key('nextPage'),
+      overrideNext: Row(
+        mainAxisSize: MainAxisSize.min,
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: [
+          FilledButton(
+            onPressed: () {
+              introKey.currentState?.next();
+            },
+            child: Row(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                Text(convertToUwU(onboardingContinueLabel()), style: const TextStyle(fontWeight: FontWeight.w600)),
+                const Icon(
+                  Icons.arrow_forward,
+                  key: Key('nextPage'),
+                ),
+              ],
+            ),
+          )
+        ],
+      ),
+
+      skip: const Icon(
+        Icons.skip_next,
       ),
+      back: const Icon(Icons.arrow_back),
       done: FilledButton(
         onPressed: () {
           _onIntroEnd(context);
@@ -276,7 +289,7 @@ class OnBoardingPageState extends ConsumerState<OnBoardingPage> {
       dotsFlex: 1,
       controlsPadding: const EdgeInsets.symmetric(vertical: 32),
       dotsDecorator: DotsDecorator(
-        size: const Size.square(10.0),
+        size: const Size.square(12.0),
         activeSize: const Size(40.0, 10.0),
         activeColor: Theme.of(context).colorScheme.primary,
         color: Theme.of(context).colorScheme.tertiary,

lib/Frontend/translation_string_definitions.dart

@@ -29,7 +29,8 @@ String aboutPage() => Intl.message('About', name: 'aboutPage', desc: 'The label
 String settingsPage() => Intl.message('Settings', name: 'settingsPage', desc: 'The label and title of the settings page');
 String moreExperimentalTitle() => Intl.message('Experimental', name: 'moreExperimentalTitle', desc: 'The label for the experimental features on the More page');
 String moreCoshubPromoTitle() => Intl.message('CosHub', name: 'moreCoshubPromoTitle', desc: 'The title for the coshub link on the More page');
-String moreCoshubPromoDescription() => Intl.message('Our latest app to help you plan, share and create your cosplay is here', name: 'moreCoshubPromoDescription', desc: 'The description for the coshub link on the More page');
+String moreCoshubPromoDescription() =>
+    Intl.message('Our latest app to help you plan, share and create your cosplay is here', name: 'moreCoshubPromoDescription', desc: 'The description for the coshub link on the More page');
 
 String settingsDescription() => Intl.message('Change app color, configure Haptics, and more', name: 'settingsDescription', desc: 'The description of the settings page on the more page');
 
@@ -219,6 +220,8 @@ String scanDevicesFoundTitle() => Intl.message('Found Gear. Tap the gear name to
 
 String scanDevicesScanMessage() => Intl.message('Scanning for gear. Please make sure your gear is powered on and nearby',
     name: 'scanDevicesScanMessage', desc: 'scan for devices scan in progress message when scanning for a device');
+String scanDevicesOnboardingScanMessage() => Intl.message('Scanning for gear. Please make sure your gear is powered on and nearby. You can always connect your gear later.',
+    name: 'scanDevicesOnboardingScanMessage', desc: 'additional scan for devices scan in progress message when scanning for a device during onboarding');
 
 //Triggers
 String triggerWalkingTitle() => Intl.message('Walking', name: 'triggerWalkingTitle', desc: 'Walking/Step trigger title');
@@ -383,6 +386,7 @@ String onboardingBluetoothEnableButtonLabel() =>
 
 String onboardingDoneButtonLabel() => Intl.message("Done", name: 'onboardingDoneButtonLabel', desc: 'Label for the button to close the onboarding screen');
 String onboardingContinueLabel() => Intl.message("Continue", name: 'onboardingContinueLabel', desc: 'Label for the button to continue past the scan for gear screen');
+String onboardingBackButtonLabel() => Intl.message("Back", name: 'onboardingBackButtonLabel', desc: 'Label for the button to go back on the onboarding screen');
 
 String onboardingCompletedTitle() => Intl.message("Happy Wagging!", name: 'onboardingCompletedTitle', desc: 'Title of the final page of the onboarding screen');
 

lib/main.dart

@@ -243,8 +243,6 @@ class TailApp extends ConsumerWidget {
       HiveProxy
         ..put(settings, showDebugging, true)
         ..put(settings, allowAnalytics, false)
-        ..put(settings, allowErrorReporting, true)
-        ..put(settings, hasCompletedOnboarding, hasCompletedOnboardingVersionToAgree)
         ..put(settings, showDemoGear, true);
     }