Auto stash before merge of "master" and "origin/master"

Author: Codel1417

lib/Frontend/pages/intro.dart

@@ -57,6 +57,7 @@ class OnBoardingPageState extends ConsumerState<OnBoardingPage> {
     );
   }
 
+  int page = 0;
   @override
   Widget build(BuildContext context) {
     setupSystemColor(context);
@@ -77,6 +78,7 @@ 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) {
@@ -251,12 +253,16 @@ 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,
-        size: 24,
-        key: Key('previousPage'),
-      ),
-      next: const Icon(
+      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'),

lib/Frontend/translation_string_definitions.dart

@@ -382,6 +382,7 @@ String onboardingBluetoothEnableButtonLabel() =>
     Intl.message("Open Settings to turn On Bluetooth", name: 'onboardingBluetoothEnableButtonLabel', desc: 'Label for the button to open bluetooth settings on the onboarding screen');
 
 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 onboardingCompletedTitle() => Intl.message("Happy Wagging!", name: 'onboardingCompletedTitle', desc: 'Title of the final page of the onboarding screen');
 

web/index.html

@@ -110,7 +110,6 @@
       <source srcset="splash/img/dark-1x.png 1x, splash/img/dark-2x.png 2x, splash/img/dark-3x.png 3x, splash/img/dark-4x.png 4x" media="(prefers-color-scheme: dark)">
       <img class="center" aria-hidden="true" src="splash/img/light-1x.png" alt="">
   </picture>
-  
   <script src="https://cdn.jsdelivr.net/npm/[email protected]/build/pdf.min.mjs" type="module"></script>
   <script type="module">
   var { pdfjsLib } = globalThis;