Improve styling

Author: epou

assets/img/bg_consent.webp

@@ -41,7 +41,7 @@ void main() {
         await tester.ensureVisible(acceptPrivacyPolicy);
         await tester.tap(acceptPrivacyPolicy);
 
-        final continueButton = find.byKey(ValueKey("style.button"));
+        final continueButton = find.byKey(ValueKey("acceptTermsButton"));
         await waitForWidget(tester, continueButton);
         await tester.ensureVisible(continueButton);
         await tester.tap(continueButton);

integration_test/background_tracking_easily_disabled_test.dart

@@ -132,36 +132,6 @@ class Style {
     );
   }
 
-  static Widget outlinedButton(
-    text,
-    onPressed, {
-    color,
-    textColor,
-    borderColor,
-    elevation,
-    Key? key,
-  }) {
-    return OutlinedButton(
-      key: key,
-      onPressed: onPressed,
-      style: OutlinedButton.styleFrom(
-        tapTargetSize: MaterialTapTargetSize.shrinkWrap,
-        padding: const EdgeInsets.symmetric(vertical: 14),
-        foregroundColor: color ?? colorPrimary,
-        side: BorderSide(color: borderColor ?? color ?? colorPrimary),
-        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(25)),
-      ),
-      child: Text(
-        text,
-        style: TextStyle(
-          color: textColor ?? color ?? colorPrimary,
-          fontSize: 14,
-          fontWeight: FontWeight.w500,
-        ),
-      ),
-    );
-  }
-
   //TextFields
   static Widget textField(
     hint,
@@ -246,6 +216,4 @@ class Style {
       alignLabelWithHint: true,
     );
   }
-
-  static Widget get bottomOffset => SizedBox(height: 75);
 }

lib/core/utils/style.dart

@@ -24,19 +24,21 @@ class LocationConsentPage extends StatelessWidget {
         child: Padding(
           padding: const EdgeInsets.all(16),
           child: Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            spacing: 16,
             children: [
               Expanded(
-                child: Style.outlinedButton(
-                  MyLocalizations.of(context, "no_show_info"),
-                  () async => await onCompleted?.call(),
+                flex: 1,
+                child: OutlinedButton(
+                  child: Text(MyLocalizations.of(context, "no_show_info")),
+                  onPressed: () async => await onCompleted?.call(),
                   key: const Key("rejectBackgroundTrackingBtn"),
                 ),
               ),
-              const SizedBox(width: 16),
               Expanded(
-                child: Style.button(
-                  MyLocalizations.of(context, 'continue_txt'),
-                  () {
+                flex: 2,
+                child: FilledButton(
+                  onPressed: () {
                     Navigator.push(
                       context,
                       MaterialPageRoute(
@@ -45,6 +47,7 @@ class LocationConsentPage extends StatelessWidget {
                       ),
                     );
                   },
+                  child: Text(MyLocalizations.of(context, 'continue_txt')),
                 ),
               ),
             ],

lib/features/onboarding/presentation/pages/location_consent_page.dart

@@ -51,6 +51,17 @@ class _LocationInfoConsentPageState extends State<LocationInfoConsentPage> {
               fontSize: 16,
             ),
           ),
+          bottomNavigationBar: SafeArea(
+            child: Padding(
+              padding: const EdgeInsets.all(16),
+              child: FilledButton(
+                child: Text(
+                  MyLocalizations.of(context, 'turn_on_location_button'),
+                ),
+                onPressed: _isLoading ? null : _handleButtonPressed,
+              ),
+            ),
+          ),
           body: SafeArea(
             child: Padding(
               padding: const EdgeInsets.all(16),
@@ -64,19 +75,6 @@ class _LocationInfoConsentPageState extends State<LocationInfoConsentPage> {
                       color: theme.textTheme.bodyMedium?.color,
                     ),
                   ),
-                  SizedBox(
-                    width: double.infinity,
-                    child: ElevatedButton(
-                      style: ElevatedButton.styleFrom(
-                        backgroundColor: theme.primaryColorDark,
-                        foregroundColor: Colors.white,
-                      ),
-                      child: Text(
-                        MyLocalizations.of(context, 'turn_on_location_button'),
-                      ),
-                      onPressed: _isLoading ? null : _handleButtonPressed,
-                    ),
-                  ),
                 ],
               ),
             ),