merge material 3

lib/pages/widgets/defalut_delivery_address.dart

@@ -15,7 +15,11 @@ class DefaultDeliveryAddress extends StatelessWidget {
   final IconData? iconData;
 
   const DefaultDeliveryAddress(
-      {Key? key, this.deliveryAddress, this.onTap, this.labelKey, this.iconData})
+      {Key? key,
+      this.deliveryAddress,
+      this.onTap,
+      this.labelKey,
+      this.iconData})
       : super(key: key);
 
   @override
@@ -38,6 +42,9 @@ class DefaultDeliveryAddress extends StatelessWidget {
                 : GestureDetector(
                     onTap: () => onTap!(),
                     child: Chip(
+                        shape: const StadiumBorder(
+                            side: BorderSide(color: Colors.transparent)),
+                        backgroundColor: Colors.grey.withOpacity(0.3),
                         label: LocalText(
                             context, "delivery_address.change_address",
                             color: primaryColor)),

lib/pages/widgets/length_picker.dart

@@ -1,8 +1,6 @@
 import 'package:fcs/helpers/theme.dart';
 import 'package:fcs/pages/widgets/local_text.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 
 import 'input_text.dart';
 
@@ -268,6 +266,7 @@ class _LengthPickerDialogState extends State<LengthPickerDialog> {
                     ),
                   ),
                   Slider(
+                    inactiveColor: Colors.grey.shade200,
                     activeColor: primaryColor,
                     value: _valueFeet.toDouble() > MAX_FEET
                         ? 0
@@ -296,6 +295,7 @@ class _LengthPickerDialogState extends State<LengthPickerDialog> {
               ),
             ),
             Slider(
+              inactiveColor: Colors.grey.shade200,
               activeColor: primaryColor,
               value: _valueInc.toDouble() > (widget.displayFeet! ? 11 : MAX_INC)
                   ? 0

lib/pages/widgets/local_app_bar.dart

@@ -1,7 +1,6 @@
 import 'package:fcs/helpers/theme.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-
 import 'local_text.dart';
 
 class LocalAppBar extends StatelessWidget implements PreferredSizeWidget {
@@ -12,6 +11,7 @@ class LocalAppBar extends StatelessWidget implements PreferredSizeWidget {
   final List<Widget>? actions;
   final Widget? titleWidget;
   final Function()? onBack;
+  final bool centerTitle;
 
   const LocalAppBar(
       {Key? key,
@@ -21,7 +21,8 @@ class LocalAppBar extends StatelessWidget implements PreferredSizeWidget {
       this.arrowColor = Colors.white,
       this.actions,
       this.titleWidget,
-      this.onBack})
+      this.onBack,
+      this.centerTitle = true})
       : super(key: key);
 
   @override
@@ -31,21 +32,23 @@ class LocalAppBar extends StatelessWidget implements PreferredSizeWidget {
   Widget build(BuildContext context) {
     return AppBar(
       elevation: 0,
-      centerTitle: true,
+      centerTitle: centerTitle,
       leading: IconButton(
           icon: Icon(CupertinoIcons.back, color: arrowColor, size: 25),
-          onPressed: onBack),
+          onPressed: () {
+            if (onBack != null) {
+              onBack!();
+            } else {
+              Navigator.of(context).pop();
+            }
+          }),
       shadowColor: Colors.transparent,
       backgroundColor: backgroundColor,
       surfaceTintColor: backgroundColor,
       title: titleWidget ??
           (labelKey != null
-              ? LocalText(
-                  context,
-                  labelKey!,
-                  color: Colors.white,
-                  fontSize: 20,
-                )
+              ? LocalText(context, labelKey!,
+                  color: labelColor ?? Colors.white, fontSize: 20)
               : const SizedBox()),
       actions: actions,
     );

lib/pages/widgets/status_tree.dart

@@ -19,6 +19,7 @@ class StatusTree extends StatelessWidget {
   Widget build(BuildContext context) {
     return ExpansionTile(
       initiallyExpanded: true,
+      shape: Border.symmetric(horizontal: BorderSide(color: Colors.grey.shade300)),
       title: Text(
         'Status',
         style: TextStyle(color: primaryColor, fontWeight: FontWeight.bold),