fix: Material theme deprecations

2025-08-06 13:51:20 +08:00 · 2024-06-28 11:56:52 +05:30
parent 806a72de4b
commit 21ab2b449e
30 changed files with 88 additions and 95 deletions
--- a/lib/consts.dart
+++ b/lib/consts.dart
@ -26,7 +26,7 @@ final kIsAndroid = !kIsWeb && Platform.isAndroid;
 final kIsMobile = !kIsWeb && (Platform.isIOS || Platform.isAndroid);

 final kColorTransparentState =
-    MaterialStateProperty.all<Color>(Colors.transparent);
+    WidgetStateProperty.all<Color>(Colors.transparent);
 const kColorTransparent = Colors.transparent;
 const kColorWhite = Colors.white;
 const kColorBlack = Colors.black;
--- a/lib/screens/common_widgets/editor_title_actions.dart
+++ b/lib/screens/common_widgets/editor_title_actions.dart
@ -70,8 +70,8 @@ class EditorTitleActions extends StatelessWidget {
      message: tooltip,
      child: IconButton(
        style: ButtonStyle(
-          padding: MaterialStateProperty.all(const EdgeInsets.all(0) + padding),
-          shape: MaterialStateProperty.all(const ContinuousRectangleBorder()),
+          padding: WidgetStateProperty.all(const EdgeInsets.all(0) + padding),
+          shape: WidgetStateProperty.all(const ContinuousRectangleBorder()),
        ),
        onPressed: onPressed,
        icon: Icon(
--- a/lib/screens/common_widgets/envfield_cell.dart
+++ b/lib/screens/common_widgets/envfield_cell.dart
@ -44,7 +44,7 @@ class EnvCellField extends StatelessWidget {
        ),
        enabledBorder: UnderlineInputBorder(
          borderSide: BorderSide(
-            color: clrScheme.surfaceVariant,
+            color: clrScheme.surfaceContainerHighest,
          ),
        ),
      ),
--- a/lib/screens/common_widgets/sidebar_filter.dart
+++ b/lib/screens/common_widgets/sidebar_filter.dart
@ -19,7 +19,7 @@ class SidebarFilter extends StatelessWidget {
      decoration: BoxDecoration(
        borderRadius: kBorderRadius8,
        border: Border.all(
-          color: Theme.of(context).colorScheme.surfaceVariant,
+          color: Theme.of(context).colorScheme.surfaceContainerHighest,
        ),
      ),
      child: Row(
--- a/lib/screens/dashboard.dart
+++ b/lib/screens/dashboard.dart
@ -88,7 +88,7 @@ class Dashboard extends ConsumerWidget {
            VerticalDivider(
              thickness: 1,
              width: 1,
-              color: Theme.of(context).colorScheme.surfaceVariant,
+              color: Theme.of(context).colorScheme.surfaceContainerHighest,
            ),
            Expanded(
              child: IndexedStack(
--- a/lib/screens/envvar/editor_pane/secrets_pane.dart
+++ b/lib/screens/envvar/editor_pane/secrets_pane.dart
@ -177,7 +177,7 @@ class EditEnvironmentSecretsState
      children: [
        Container(
          decoration: BoxDecoration(
-            color: Theme.of(context).colorScheme.background,
+            color: Theme.of(context).colorScheme.surface,
            borderRadius: kBorderRadius12,
          ),
          margin: kP10,
--- a/lib/screens/envvar/editor_pane/variables_pane.dart
+++ b/lib/screens/envvar/editor_pane/variables_pane.dart
@ -178,7 +178,7 @@ class EditEnvironmentVariablesState
      children: [
        Container(
          decoration: BoxDecoration(
-            color: Theme.of(context).colorScheme.background,
+            color: Theme.of(context).colorScheme.surface,
            borderRadius: kBorderRadius12,
          ),
          margin: kP10,
--- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_body.dart
+++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_body.dart
@ -17,59 +17,54 @@ class EditRequestBody extends ConsumerWidget {
    final contentType = ref.watch(selectedRequestModelProvider
        .select((value) => value?.httpRequestModel?.bodyContentType));

-    return Container(
-      decoration: BoxDecoration(
-        color: Theme.of(context).colorScheme.background,
-      ),
-      child: Column(
-        children: [
-          const SizedBox(
-            height: kHeaderHeight,
-            child: Row(
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: [
-                Text(
-                  "Select Content Type:",
-                ),
-                DropdownButtonBodyContentType(),
-              ],
-            ),
+    return Column(
+      children: [
+        const SizedBox(
+          height: kHeaderHeight,
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              Text(
+                "Select Content Type:",
+              ),
+              DropdownButtonBodyContentType(),
+            ],
          ),
-          Expanded(
-            child: switch (contentType) {
-              ContentType.formdata =>
-                const Padding(padding: kPh4, child: FormDataWidget()),
-              // TODO: Fix JsonTextFieldEditor & plug it here
-              ContentType.json => Padding(
-                  padding: kPt5o10,
-                  child: TextFieldEditor(
-                    key: Key("$selectedId-json-body"),
-                    fieldKey: "$selectedId-json-body-editor",
-                    initialValue: requestModel?.httpRequestModel?.body,
-                    onChanged: (String value) {
-                      ref
-                          .read(collectionStateNotifierProvider.notifier)
-                          .update(selectedId, body: value);
-                    },
-                  ),
+        ),
+        Expanded(
+          child: switch (contentType) {
+            ContentType.formdata =>
+              const Padding(padding: kPh4, child: FormDataWidget()),
+            // TODO: Fix JsonTextFieldEditor & plug it here
+            ContentType.json => Padding(
+                padding: kPt5o10,
+                child: TextFieldEditor(
+                  key: Key("$selectedId-json-body"),
+                  fieldKey: "$selectedId-json-body-editor",
+                  initialValue: requestModel?.httpRequestModel?.body,
+                  onChanged: (String value) {
+                    ref
+                        .read(collectionStateNotifierProvider.notifier)
+                        .update(selectedId, body: value);
+                  },
                ),
-              _ => Padding(
-                  padding: kPt5o10,
-                  child: TextFieldEditor(
-                    key: Key("$selectedId-body"),
-                    fieldKey: "$selectedId-body-editor",
-                    initialValue: requestModel?.httpRequestModel?.body,
-                    onChanged: (String value) {
-                      ref
-                          .read(collectionStateNotifierProvider.notifier)
-                          .update(selectedId, body: value);
-                    },
-                  ),
+              ),
+            _ => Padding(
+                padding: kPt5o10,
+                child: TextFieldEditor(
+                  key: Key("$selectedId-body"),
+                  fieldKey: "$selectedId-body-editor",
+                  initialValue: requestModel?.httpRequestModel?.body,
+                  onChanged: (String value) {
+                    ref
+                        .read(collectionStateNotifierProvider.notifier)
+                        .update(selectedId, body: value);
+                  },
                ),
-            },
-          )
-        ],
-      ),
+              ),
+          },
+        )
+      ],
    );
  }
 }
--- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart
+++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart
@ -201,10 +201,6 @@ class _FormDataBodyState extends ConsumerState<FormDataWidget> {
    return Stack(
      children: [
        Container(
-          decoration: BoxDecoration(
-            color: Theme.of(context).colorScheme.background,
-            borderRadius: kBorderRadius12,
-          ),
          margin: kP10,
          child: Column(
            children: [
--- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart
+++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart
@ -179,10 +179,6 @@ class EditRequestHeadersState extends ConsumerState<EditRequestHeaders> {
    return Stack(
      children: [
        Container(
-          decoration: BoxDecoration(
-            color: Theme.of(context).colorScheme.background,
-            borderRadius: kBorderRadius12,
-          ),
          margin: kP10,
          child: Column(
            children: [
--- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart
+++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart
@ -179,10 +179,6 @@ class EditRequestURLParamsState extends ConsumerState<EditRequestURLParams> {
    return Stack(
      children: [
        Container(
-          decoration: BoxDecoration(
-            color: Theme.of(context).colorScheme.background,
-            borderRadius: kBorderRadius12,
-          ),
          margin: kP10,
          child: Column(
            crossAxisAlignment: CrossAxisAlignment.stretch,
--- a/lib/screens/home_page/editor_pane/url_card.dart
+++ b/lib/screens/home_page/editor_pane/url_card.dart
@ -12,10 +12,12 @@ class EditorPaneRequestURLCard extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    return Card(
+      color: kColorTransparent,
+      surfaceTintColor: kColorTransparent,
      elevation: 0,
      shape: RoundedRectangleBorder(
        side: BorderSide(
-          color: Theme.of(context).colorScheme.surfaceVariant,
+          color: Theme.of(context).colorScheme.surfaceContainerHighest,
        ),
        borderRadius: kBorderRadius12,
      ),
@ -32,7 +34,6 @@ class EditorPaneRequestURLCard extends StatelessWidget {
                  Expanded(
                    child: URLTextField(),
                  ),
-                  SizedBox.shrink(),
                ],
              )
            : const Row(
--- a/lib/screens/mobile/widgets/page_base.dart
+++ b/lib/screens/mobile/widgets/page_base.dart
@ -21,9 +21,9 @@ class PageBase extends ConsumerWidget {
    final isDarkMode =
        ref.watch(settingsProvider.select((value) => value.isDark));
    final scaffold = Scaffold(
-      backgroundColor: Theme.of(context).colorScheme.background,
+      backgroundColor: Theme.of(context).colorScheme.surface,
      appBar: AppBar(
-        backgroundColor: Theme.of(context).colorScheme.background,
+        backgroundColor: Theme.of(context).colorScheme.surface,
        primary: true,
        title: Text(title),
        centerTitle: true,
--- a/lib/widgets/card_request_details.dart
+++ b/lib/widgets/card_request_details.dart
@ -9,9 +9,11 @@ class RequestDetailsCard extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    return Card(
+      color: kColorTransparent,
+      surfaceTintColor: kColorTransparent,
      shape: RoundedRectangleBorder(
        side: BorderSide(
-          color: Theme.of(context).colorScheme.surfaceVariant,
+          color: Theme.of(context).colorScheme.surfaceContainerHighest,
        ),
        borderRadius: kBorderRadius12,
      ),
--- a/lib/widgets/card_sidebar_environment.dart
+++ b/lib/widgets/card_sidebar_environment.dart
@ -42,7 +42,8 @@ class SidebarEnvironmentCard extends StatelessWidget {
    final colorScheme = Theme.of(context).colorScheme;
    final Color color =
        isGlobal ? colorScheme.secondaryContainer : colorScheme.surface;
-    final Color colorVariant = colorScheme.surfaceVariant.withOpacity(0.5);
+    final Color colorVariant =
+        colorScheme.surfaceContainerHighest.withOpacity(0.5);
    final Color surfaceTint = colorScheme.primary;
    bool isSelected = selectedId == id;
    bool inEditMode = editRequestId == id;
--- a/lib/widgets/card_sidebar_request.dart
+++ b/lib/widgets/card_sidebar_request.dart
@ -42,7 +42,7 @@ class SidebarRequestCard extends StatelessWidget {
  Widget build(BuildContext context) {
    final Color color = Theme.of(context).colorScheme.surface;
    final Color colorVariant =
-        Theme.of(context).colorScheme.surfaceVariant.withOpacity(0.5);
+        Theme.of(context).colorScheme.surfaceContainerHighest.withOpacity(0.5);
    final Color surfaceTint = Theme.of(context).colorScheme.primary;
    bool isSelected = selectedId == id;
    bool inEditMode = editRequestId == id;
--- a/lib/widgets/checkbox.dart
+++ b/lib/widgets/checkbox.dart
@ -22,16 +22,16 @@ class CheckBox extends StatelessWidget {
          borderRadius: BorderRadius.circular(3),
        ),
        side: BorderSide(
-          color: colorScheme.surfaceVariant,
+          color: colorScheme.surfaceContainerHighest,
          width: 1.5,
        ),
        splashRadius: 0,
        value: value,
        onChanged: onChanged,
        checkColor: colorScheme.onPrimary,
-        fillColor: MaterialStateProperty.resolveWith<Color?>(
-          (Set<MaterialState> states) {
-            if (states.contains(MaterialState.selected)) {
+        fillColor: WidgetStateProperty.resolveWith<Color?>(
+          (Set<WidgetState> states) {
+            if (states.contains(WidgetState.selected)) {
              return colorScheme.primary;
            }
            return null;
--- a/lib/widgets/codegen_previewer.dart
+++ b/lib/widgets/codegen_previewer.dart
@ -121,7 +121,8 @@ class ViewCodePane extends StatelessWidget {
                  : Theme.of(context).colorScheme.primaryContainer)
              .withOpacity(kForegroundOpacity),
          Theme.of(context).colorScheme.surface),
-      border: Border.all(color: Theme.of(context).colorScheme.surfaceVariant),
+      border: Border.all(
+          color: Theme.of(context).colorScheme.surfaceContainerHighest),
      borderRadius: kBorderRadius8,
    );

--- a/lib/widgets/editor.dart
+++ b/lib/widgets/editor.dart
@ -93,7 +93,7 @@ class _TextFieldEditorState extends State<TextFieldEditor> {
          enabledBorder: OutlineInputBorder(
            borderRadius: kBorderRadius8,
            borderSide: BorderSide(
-              color: Theme.of(context).colorScheme.surfaceVariant,
+              color: Theme.of(context).colorScheme.surfaceContainerHighest,
            ),
          ),
          filled: true,
--- a/lib/widgets/editor_json.dart
+++ b/lib/widgets/editor_json.dart
@ -110,7 +110,7 @@ class _JsonTextFieldEditorState extends State<JsonTextFieldEditor> {
          enabledBorder: OutlineInputBorder(
            borderRadius: kBorderRadius8,
            borderSide: BorderSide(
-              color: Theme.of(context).colorScheme.surfaceVariant,
+              color: Theme.of(context).colorScheme.surfaceContainerHighest,
            ),
          ),
          filled: true,
--- a/lib/widgets/field_cell.dart
+++ b/lib/widgets/field_cell.dart
@ -43,7 +43,7 @@ class CellField extends StatelessWidget {
        ),
        enabledBorder: UnderlineInputBorder(
          borderSide: BorderSide(
-            color: clrScheme.surfaceVariant,
+            color: clrScheme.surfaceContainerHighest,
          ),
        ),
      ),
--- a/lib/widgets/field_cell_obscurable.dart
+++ b/lib/widgets/field_cell_obscurable.dart
@ -57,7 +57,7 @@ class ObscurableCellField extends HookWidget {
        ),
        enabledBorder: UnderlineInputBorder(
          borderSide: BorderSide(
-            color: clrScheme.surfaceVariant,
+            color: clrScheme.surfaceContainerHighest,
          ),
        ),
      ),
--- a/lib/widgets/field_header.dart
+++ b/lib/widgets/field_header.dart
@ -93,7 +93,7 @@ class _HeaderFieldState extends State<HeaderField> {
          ),
          enabledBorder: UnderlineInputBorder(
            borderSide: BorderSide(
-              color: colorScheme.surfaceVariant,
+              color: colorScheme.surfaceContainerHighest,
            ),
          ),
        ),
--- a/lib/widgets/field_raw.dart
+++ b/lib/widgets/field_raw.dart
@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:apidash/consts.dart';

 class RawTextField extends StatelessWidget {
  const RawTextField({
@ -24,6 +25,7 @@ class RawTextField extends StatelessWidget {
        isDense: true,
        border: InputBorder.none,
        hintText: hintText,
+        contentPadding: kPv8,
      ),
      onTapOutside: (PointerDownEvent event) {
        FocusManager.instance.primaryFocus?.unfocus();
--- a/lib/widgets/json_previewer.dart
+++ b/lib/widgets/json_previewer.dart
@ -246,9 +246,11 @@ class _JsonPreviewerState extends State<JsonPreviewer> {
                  ),
                  Container(
                    decoration: BoxDecoration(
-                      color: Theme.of(context).colorScheme.background,
+                      color: Theme.of(context).colorScheme.surface,
                      border: Border.all(
-                          color: Theme.of(context).colorScheme.surfaceVariant),
+                          color: Theme.of(context)
+                              .colorScheme
+                              .surfaceContainerHighest),
                      borderRadius: kBorderRadius8,
                    ),
                    child: Row(
--- a/lib/widgets/response_widgets.dart
+++ b/lib/widgets/response_widgets.dart
@ -405,7 +405,8 @@ class _BodySuccessState extends State<BodySuccess> {
                  : Theme.of(context).colorScheme.primaryContainer)
              .withOpacity(kForegroundOpacity),
          Theme.of(context).colorScheme.surface),
-      border: Border.all(color: Theme.of(context).colorScheme.surfaceVariant),
+      border: Border.all(
+          color: Theme.of(context).colorScheme.surfaceContainerHighest),
      borderRadius: kBorderRadius8,
    );

@ -425,7 +426,7 @@ class _BodySuccessState extends State<BodySuccess> {
                      ? const SizedBox()
                      : SegmentedButton<ResponseBodyView>(
                          style: const ButtonStyle(
-                            padding: MaterialStatePropertyAll(
+                            padding: WidgetStatePropertyAll(
                              EdgeInsets.symmetric(
                                horizontal: 8,
                              ),
--- a/lib/widgets/splitview_dashboard.dart
+++ b/lib/widgets/splitview_dashboard.dart
@ -35,7 +35,7 @@ class DashboardSplitViewState extends State<DashboardSplitView> {
      data: MultiSplitViewThemeData(
        dividerThickness: 3,
        dividerPainter: DividerPainters.background(
-          color: Theme.of(context).colorScheme.surfaceVariant,
+          color: Theme.of(context).colorScheme.surfaceContainerHighest,
          highlightedColor: Theme.of(context).colorScheme.outline.withOpacity(
                kHintOpacity,
              ),
--- a/lib/widgets/splitview_drawer.dart
+++ b/lib/widgets/splitview_drawer.dart
@ -60,7 +60,7 @@ class DrawerSplitView extends StatelessWidget {
                      child: IconButton(
                        icon: Icon(
                          rightDrawerIcon ?? Icons.arrow_forward,
-                          color: Theme.of(context).colorScheme.onBackground,
+                          color: Theme.of(context).colorScheme.onSurface,
                        ),
                        onPressed: () {
                          scaffoldKey.currentState!.openEndDrawer();
--- a/lib/widgets/splitview_equal.dart
+++ b/lib/widgets/splitview_equal.dart
@ -30,7 +30,7 @@ class _EqualSplitViewState extends State<EqualSplitView> {
      data: MultiSplitViewThemeData(
        dividerThickness: 3,
        dividerPainter: DividerPainters.background(
-          color: Theme.of(context).colorScheme.surfaceVariant,
+          color: Theme.of(context).colorScheme.surfaceContainerHighest,
          highlightedColor: Theme.of(context).colorScheme.outline.withOpacity(
                kHintOpacity,
              ),
--- a/lib/widgets/tables.dart
+++ b/lib/widgets/tables.dart
@ -18,7 +18,7 @@ class MapTable extends StatelessWidget {
    return Table(
      border: TableBorder(
        horizontalInside: BorderSide(
-          color: Theme.of(context).colorScheme.surfaceVariant,
+          color: Theme.of(context).colorScheme.surfaceContainerHighest,
        ),
      ),
      columnWidths: const <int, TableColumnWidth>{