More material 3 updates

2025-04-19 21:39:16 +00:00 · 2023-01-25 19:55:34 +01:00 · 2023-01-25 19:55:34 +01:00 · 386af8e809
commit 386af8e809
parent ad51937d01
17 changed files with 304 additions and 279 deletions
--- a/lib/config/theme.dart
+++ b/lib/config/theme.dart
@ -73,6 +73,9 @@ ThemeData lightTheme(ColorScheme? dynamicColorScheme) => ThemeData(
      dynamicColorScheme != null ? dynamicColorScheme.primary : adguardGreenColor
    ),
  ),
+  iconTheme: IconThemeData(
+    color: dynamicColorScheme != null ? dynamicColorScheme.onSurfaceVariant : const Color.fromRGBO(117, 117, 117, 1),
+  ),
  androidOverscrollIndicator: AndroidOverscrollIndicator.stretch,
 );

@ -117,14 +120,6 @@ ThemeData darkTheme(ColorScheme? dynamicColorScheme) => ThemeData(
    ),
  ),
  brightness: Brightness.dark,
-  textTheme: const TextTheme(
-    bodyText1: TextStyle(
-      color: Colors.white70
-    ),
-    bodyText2: TextStyle(
-      color: Colors.white
-    ),
-  ),
  dividerColor: Colors.white12,
  listTileTheme: ListTileThemeData(
    tileColor: Colors.transparent,
@ -154,6 +149,9 @@ ThemeData darkTheme(ColorScheme? dynamicColorScheme) => ThemeData(
      dynamicColorScheme != null ? dynamicColorScheme.primary : adguardGreenColor
    ),
  ),
+  iconTheme: IconThemeData(
+    color: dynamicColorScheme != null ? dynamicColorScheme.onSurfaceVariant : const Color.fromRGBO(187, 187, 187, 1),
+  ),
  androidOverscrollIndicator: AndroidOverscrollIndicator.stretch
 );

--- a/lib/screens/clients/fab.dart
+++ b/lib/screens/clients/fab.dart
@ -69,11 +69,7 @@ class ClientsFab extends StatelessWidget {

    return FloatingActionButton(
      onPressed: () => openAddClient(),
-      backgroundColor: Theme.of(context).floatingActionButtonTheme.backgroundColor,
-      child: Icon(
-        Icons.add,
-        color: Theme.of(context).floatingActionButtonTheme.foregroundColor,
-      ),
+      child: const Icon(Icons.add),
    );
  }
 }
--- a/lib/screens/connect/fab.dart
+++ b/lib/screens/connect/fab.dart
@ -17,11 +17,7 @@ class FabConnect extends StatelessWidget {

    return FloatingActionButton(
      onPressed: openAddServerModal,
-      backgroundColor: Theme.of(context).floatingActionButtonTheme.backgroundColor,
-      child: Icon(
-        Icons.add_rounded,
-        color: Theme.of(context).floatingActionButtonTheme.foregroundColor,
-      ),
+      child: const Icon(Icons.add_rounded),
    );
  }
 }
--- a/lib/screens/filters/add_custom_rule.dart
+++ b/lib/screens/filters/add_custom_rule.dart
@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:provider/provider.dart';
-import 'package:material_segmented_control/material_segmented_control.dart';
 import 'package:flutter_web_browser/flutter_web_browser.dart';

 import 'package:adguard_home_manager/constants/urls.dart';
@ -19,11 +18,13 @@ class AddCustomRule extends StatefulWidget {
  State<AddCustomRule> createState() => _AddCustomRuleState();
 }

+enum BlockingPresets { block, unblock, custom }
+
 class _AddCustomRuleState extends State<AddCustomRule> {
  final TextEditingController domainController = TextEditingController();
  String? domainError;

-  int preset = 0;
+  BlockingPresets preset = BlockingPresets.block;

  bool addImportant = false;

@ -55,10 +56,10 @@ class _AddCustomRuleState extends State<AddCustomRule> {

    String fieldValue = value ?? domainController.text;
    
-    if (preset == 0) {
+    if (preset == BlockingPresets.block) {
      rule = "||${fieldValue.trim()}^";
    }
-    else if (preset == 1) {
+    else if (preset == BlockingPresets.unblock) {
      rule = "@@||${fieldValue.trim()}^";
    }
    else {
@ -196,13 +197,26 @@ class _AddCustomRuleState extends State<AddCustomRule> {
            ),
          ),
          const SizedBox(height: 30),
-          MaterialSegmentedControl(
-            children: presets,
-            selectionIndex: preset,
-            onSegmentChosen: (value) => setState(() => preset = value),
-            selectedColor: Theme.of(context).floatingActionButtonTheme.backgroundColor!,
-            unselectedColor: Colors.transparent,
-            borderColor: Theme.of(context).colorScheme.onSurface,
+          Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 24),
+            child: SegmentedButton(
+              segments: [
+                ButtonSegment(
+                  value: BlockingPresets.block,
+                  label: Text(AppLocalizations.of(context)!.block)
+                ),
+                ButtonSegment(
+                  value: BlockingPresets.unblock,
+                  label: Text(AppLocalizations.of(context)!.unblock)
+                ),
+                ButtonSegment(
+                  value: BlockingPresets.custom,
+                  label: Text(AppLocalizations.of(context)!.custom)
+                ),
+              ], 
+              selected: <BlockingPresets>{preset},
+              onSelectionChanged: (value) => setState(() => preset = value.first),
+            ),
          ),
          const SizedBox(height: 20),
          Material(
--- a/lib/screens/filters/fab.dart
+++ b/lib/screens/filters/fab.dart
@ -169,11 +169,7 @@ class FiltersFab extends StatelessWidget {
      onPressed: type == 'blacklist' || type == 'whitelist'
        ? () => openAddWhitelistBlacklist()
        : () => openAddCustomRule(),
-      backgroundColor: Theme.of(context).floatingActionButtonTheme.backgroundColor,
-      child: Icon(
-        Icons.add,
-        color: Theme.of(context).floatingActionButtonTheme.foregroundColor,
-      ),
+      child: const Icon(Icons.add),
    );
  }
 }
--- a/lib/screens/filters/filters.dart
+++ b/lib/screens/filters/filters.dart
@ -366,7 +366,7 @@ class _FiltersWidgetState extends State<FiltersWidget> with TickerProviderStateM
                  ] : [],
                  bottom: TabBar(
                    controller: tabController,
-                    isScrollable: true,
+                    isScrollable: false,
                    unselectedLabelColor: Theme.of(context).colorScheme.onSurfaceVariant,
                    tabs: [
                      Tab(
@ -388,16 +388,7 @@ class _FiltersWidgetState extends State<FiltersWidget> with TickerProviderStateM
            )
          ];
        }), 
-        body: Container(
-          decoration: BoxDecoration(
-            color: Theme.of(context).scaffoldBackgroundColor,
-            border: Border(
-              top: BorderSide(
-                color: Theme.of(context).colorScheme.onSurface.withOpacity(0.1)
-              )
-            )
-          ),
-          child: TabBarView(
+        body: TabBarView(
          controller: tabController,
          children: [
            RefreshIndicator(
@ -434,7 +425,6 @@ class _FiltersWidgetState extends State<FiltersWidget> with TickerProviderStateM
            ),
          ]
        )
-        ),
      )
    );
  }
--- a/lib/screens/filters/list_details_screen.dart
+++ b/lib/screens/filters/list_details_screen.dart
@ -306,12 +306,10 @@ class _ListDetailsScreenState extends State<ListDetailsScreen> {
            right: 20,
            child: FloatingActionButton(
              onPressed: () => enableDisableList(widget.list, !enabled),
-              backgroundColor: Theme.of(context).floatingActionButtonTheme.backgroundColor,
              child: Icon(
                enabled == true
                  ? Icons.gpp_bad_rounded
                  : Icons.verified_user_rounded,
-                color: Theme.of(context).floatingActionButtonTheme.foregroundColor,
              ),
            ),
          )
--- a/lib/screens/home/fab.dart
+++ b/lib/screens/home/fab.dart
@ -24,11 +24,7 @@ class HomeFab extends StatelessWidget {
    return serversProvider.serverStatus.loadStatus == 1
      ? FloatingActionButton(
          onPressed: openManagementBottomSheet,
-          backgroundColor: Theme.of(context).floatingActionButtonTheme.backgroundColor,
-          child: Icon(
-            Icons.shield_rounded,
-            color: Theme.of(context).floatingActionButtonTheme.foregroundColor,
-          ),
+          child: const Icon(Icons.shield_rounded),
        )
      : const SizedBox();
  }
--- a/lib/screens/logs/log_list_tile.dart
+++ b/lib/screens/logs/log_list_tile.dart
@ -29,7 +29,6 @@ class LogListTile extends StatelessWidget {
                Icon(
                  icon,
                  size: 24,
-                  color: Theme.of(context).listTileTheme.iconColor,
                ),
                const SizedBox(width: 16),
                Flexible(
@ -38,9 +37,10 @@ class LogListTile extends StatelessWidget {
                    children: [
                      Text(
                        title,
-                        style: const TextStyle(
+                        style: TextStyle(
                          fontSize: 16,
-                          fontWeight: FontWeight.w400
+                          fontWeight: FontWeight.w400,
+                          color: Theme.of(context).colorScheme.onSurface
                        ),
                      ),
                      const SizedBox(height: 3),
--- a/lib/screens/servers/servers.dart
+++ b/lib/screens/servers/servers.dart
@ -88,11 +88,7 @@ class _ServersState extends State<Servers> {
            right: 20,
            child: FloatingActionButton(
              onPressed: openAddServerModal,
-              backgroundColor: Theme.of(context).floatingActionButtonTheme.backgroundColor,
-              child: Icon(
-                Icons.add,
-                color: Theme.of(context).floatingActionButtonTheme.foregroundColor,
-              ),
+              child: const Icon(Icons.add),
            ),
          ),
        ],
--- a/lib/screens/settings/access_settings/clients_list.dart
+++ b/lib/screens/settings/access_settings/clients_list.dart
@ -321,7 +321,6 @@ class _ClientsListState extends State<ClientsList> {
                : -70,
              right: 20,
              child: FloatingActionButton(
-                backgroundColor: Theme.of(context).floatingActionButtonTheme.backgroundColor,
                onPressed: () {
                  showModalBottomSheet(
                    context: context, 
@ -333,10 +332,7 @@ class _ClientsListState extends State<ClientsList> {
                    isScrollControlled: true
                  );
                },
-                child: Icon(
-                  Icons.add,
-                  color: Theme.of(context).floatingActionButtonTheme.foregroundColor,
-                ),
+                child: const Icon(Icons.add),
              ),
            )
          ]
--- a/lib/screens/settings/dhcp/dhcp_leases.dart
+++ b/lib/screens/settings/dhcp/dhcp_leases.dart
@ -184,11 +184,7 @@ class DhcpLeases extends StatelessWidget {
      floatingActionButton: staticLeases == true
        ? FloatingActionButton(
            onPressed: openAddStaticLease,
-            backgroundColor: Theme.of(context).floatingActionButtonTheme.backgroundColor,
-            child: Icon(
-              Icons.add,
-              color: Theme.of(context).floatingActionButtonTheme.foregroundColor,
-            ),
+            child: const Icon(Icons.add),
          )
        : null,
    );
--- a/lib/screens/settings/dns_rewrites/dns_rewrites.dart
+++ b/lib/screens/settings/dns_rewrites/dns_rewrites.dart
@ -286,7 +286,6 @@ class _DnsRewritesWidgetState extends State<DnsRewritesWidget> {
      ),
      body: generateBody(),
      floatingActionButton: FloatingActionButton(
-        backgroundColor: Theme.of(context).floatingActionButtonTheme.backgroundColor,
        onPressed: () => {
          showModalBottomSheet(
            context: context, 
@ -297,10 +296,7 @@ class _DnsRewritesWidgetState extends State<DnsRewritesWidget> {
            isScrollControlled: true
          )
        },
-        child: Icon(
-          Icons.add,
-          color: Theme.of(context).floatingActionButtonTheme.foregroundColor,
-        ),
+        child: const Icon(Icons.add),
      ),
    );
  }
--- a/lib/widgets/add_server_modal.dart
+++ b/lib/widgets/add_server_modal.dart
@ -3,7 +3,6 @@
 import 'package:provider/provider.dart';
 import 'package:flutter/material.dart';
 import 'package:uuid/uuid.dart';
-import 'package:material_segmented_control/material_segmented_control.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';

 import 'package:adguard_home_manager/providers/app_config_provider.dart';
@ -13,6 +12,8 @@ import 'package:adguard_home_manager/models/app_log.dart';
 import 'package:adguard_home_manager/providers/servers_provider.dart';
 import 'package:adguard_home_manager/models/server.dart';

+enum ConnectionType { http, https}
+
 class AddServerModal extends StatefulWidget {
  final Server? server;

@ -31,7 +32,7 @@ class _AddServerModalState extends State<AddServerModal> {
  final TextEditingController nameController = TextEditingController();
  String? nameError;

-  String connectionType = "http";
+  ConnectionType connectionType = ConnectionType.http;

  final TextEditingController ipDomainController = TextEditingController();
  String? ipDomainError;
@ -227,7 +228,7 @@ class _AddServerModalState extends State<AddServerModal> {
  void initState() {
    if (widget.server != null) {
      nameController.text = widget.server!.name;
-      connectionType = widget.server!.connectionMethod;
+      connectionType = widget.server!.connectionMethod == 'https' ? ConnectionType.https : ConnectionType.http;
      ipDomainController.text = widget.server!.domain;
      pathController.text = widget.server!.path ?? '';
      portController.text = widget.server!.port != null ? widget.server!.port.toString() : "";
@ -247,38 +248,11 @@ class _AddServerModalState extends State<AddServerModal> {

    final mediaQuery = MediaQuery.of(context);

-    Map<int, Widget> connectionTypes = {
-      0: Text(
-        'HTTP',
-        style: TextStyle(
-          color: appConfigProvider.useDynamicColor == true
-            ? Theme.of(context).floatingActionButtonTheme.foregroundColor!
-            : connectionType == 'http'
-              ? Colors.white
-              : Theme.of(context).primaryColor,
-          fontSize: 14,
-          fontWeight: FontWeight.w500
-        ),
-      ),
-      1: Text(
-        'HTTPS',
-        style: TextStyle(
-          color: appConfigProvider.useDynamicColor == true
-            ? Theme.of(context).floatingActionButtonTheme.foregroundColor!
-            : connectionType == 'https'
-              ? Colors.white
-              : Theme.of(context).primaryColor,
-          fontSize: 14,
-          fontWeight: FontWeight.w500
-        ),
-      )
-    };
-
    void connect() async {
      Server serverObj = Server(
        id: uuid.v4(),
        name: nameController.text, 
-        connectionMethod: connectionType, 
+        connectionMethod: connectionType.name, 
        domain: ipDomainController.text, 
        port: portController.text != '' ? int.parse(portController.text) : null,
        user: userController.text, 
@ -389,7 +363,7 @@ class _AddServerModalState extends State<AddServerModal> {
      final Server serverObj = Server(
        id: widget.server!.id,
        name: nameController.text, 
-        connectionMethod: connectionType, 
+        connectionMethod: connectionType.name, 
        domain: ipDomainController.text, 
        port: portController.text != '' ? int.parse(portController.text) : null,
        user: userController.text, 
@ -527,7 +501,7 @@ class _AddServerModalState extends State<AddServerModal> {
                  )
                ),
                child: Text(
-                  "$connectionType://${ipDomainController.text}${portController.text != '' ? ':${portController.text}' : ""}${pathController.text}",
+                  "${connectionType.name}://${ipDomainController.text}${portController.text != '' ? ':${portController.text}' : ""}${pathController.text}",
                  textAlign: TextAlign.center,
                  style: TextStyle(
                    color: Theme.of(context).primaryColor,
@ -553,21 +527,20 @@ class _AddServerModalState extends State<AddServerModal> {
              ),
              sectionLabel(AppLocalizations.of(context)!.connection),
              Padding(
-                padding: const EdgeInsets.symmetric(horizontal: 10),
-                child: MaterialSegmentedControl(
-                  children: connectionTypes,
-                  selectionIndex: connectionType == 'http' ? 0 : 1,
-                  onSegmentChosen: (value) => setState(() {
-                    if (value == 0) {
-                      connectionType = 'http';
-                    }
-                    else if (value == 1) {
-                      connectionType = 'https';
-                    }
-                  }),
-                  selectedColor: Theme.of(context).floatingActionButtonTheme.backgroundColor!,
-                  unselectedColor: Colors.transparent,
-                  borderColor: Theme.of(context).colorScheme.onSurface,
+                padding: const EdgeInsets.symmetric(horizontal: 24),
+                child: SegmentedButton<ConnectionType>(
+                  segments: const [
+                    ButtonSegment(
+                      value: ConnectionType.http,
+                      label: Text("HTTP")
+                    ),
+                    ButtonSegment(
+                      value: ConnectionType.https,
+                      label: Text("HTTPS")
+                    ),
+                  ], 
+                  selected: <ConnectionType>{connectionType},
+                  onSelectionChanged: (value) => setState(() => connectionType = value.first),
                ),
              ),
              const SizedBox(height: 30),
--- a/lib/widgets/servers_list/servers_list.dart
+++ b/lib/widgets/servers_list/servers_list.dart
@ -274,7 +274,7 @@ class _ServersListState extends State<ServersList> with SingleTickerProviderStat
            mainAxisAlignment: MainAxisAlignment.spaceBetween,
            children: [
              PopupMenuButton(
-                color: Theme.of(context).dialogBackgroundColor,
+                // color: Theme.of(context).dialogBackgroundColor,
                itemBuilder: (context) => [
                  PopupMenuItem(
                    enabled: server.defaultServer == false 
--- a/pubspec.lock
+++ b/pubspec.lock
@ -5,196 +5,232 @@ packages:
    dependency: "direct main"
    description:
      name: animations
-      url: "https://pub.dartlang.org"
+      sha256: fe8a6bdca435f718bb1dc8a11661b2c22504c6da40ef934cee8327ed77934164
+      url: "https://pub.dev"
    source: hosted
-    version: "2.0.5"
+    version: "2.0.7"
  archive:
    dependency: transitive
    description:
      name: archive
-      url: "https://pub.dartlang.org"
+      sha256: ed7cc591a948744994714375caf9a2ce89e1d82e8243997c8a2994d57181c212
+      url: "https://pub.dev"
    source: hosted
-    version: "3.3.1"
+    version: "3.3.5"
  args:
    dependency: transitive
    description:
      name: args
-      url: "https://pub.dartlang.org"
+      sha256: "139d809800a412ebb26a3892da228b2d0ba36f0ef5d9a82166e5e52ec8d61611"
+      url: "https://pub.dev"
    source: hosted
-    version: "2.3.1"
+    version: "2.3.2"
  async:
    dependency: transitive
    description:
      name: async
-      url: "https://pub.dartlang.org"
+      sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
+      url: "https://pub.dev"
    source: hosted
-    version: "2.9.0"
+    version: "2.10.0"
  boolean_selector:
    dependency: transitive
    description:
      name: boolean_selector
-      url: "https://pub.dartlang.org"
+      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
+      url: "https://pub.dev"
    source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
  bottom_inset_observer:
    dependency: transitive
    description:
      name: bottom_inset_observer
-      url: "https://pub.dartlang.org"
+      sha256: cbfb01e0e07cc4922052701786d5e607765a6f54e1844f41061abf8744519a7d
+      url: "https://pub.dev"
    source: hosted
    version: "3.1.0"
  bottom_sheet:
    dependency: "direct main"
    description:
      name: bottom_sheet
-      url: "https://pub.dartlang.org"
+      sha256: "7a3d4a1515eba91a7d9e1359e49416147de339889170fc879a8b905d27958c94"
+      url: "https://pub.dev"
    source: hosted
    version: "3.1.2"
  characters:
    dependency: transitive
    description:
      name: characters
-      url: "https://pub.dartlang.org"
+      sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
+      url: "https://pub.dev"
    source: hosted
    version: "1.2.1"
  checked_yaml:
    dependency: transitive
    description:
      name: checked_yaml
-      url: "https://pub.dartlang.org"
+      sha256: "3d1505d91afa809d177efd4eed5bb0eb65805097a1463abdd2add076effae311"
+      url: "https://pub.dev"
    source: hosted
-    version: "2.0.1"
+    version: "2.0.2"
  cli_util:
    dependency: transitive
    description:
      name: cli_util
-      url: "https://pub.dartlang.org"
+      sha256: "66f86e916d285c1a93d3b79587d94bd71984a66aac4ff74e524cfa7877f1395c"
+      url: "https://pub.dev"
    source: hosted
    version: "0.3.5"
  clock:
    dependency: transitive
    description:
      name: clock
-      url: "https://pub.dartlang.org"
+      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      url: "https://pub.dev"
    source: hosted
    version: "1.1.1"
  collection:
    dependency: transitive
    description:
      name: collection
-      url: "https://pub.dartlang.org"
+      sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
+      url: "https://pub.dev"
    source: hosted
-    version: "1.16.0"
+    version: "1.17.0"
+  convert:
+    dependency: transitive
+    description:
+      name: convert
+      sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.1"
  crypto:
    dependency: transitive
    description:
      name: crypto
-      url: "https://pub.dartlang.org"
+      sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67
+      url: "https://pub.dev"
    source: hosted
    version: "3.0.2"
  csslib:
    dependency: transitive
    description:
      name: csslib
-      url: "https://pub.dartlang.org"
+      sha256: b36c7f7e24c0bdf1bf9a3da461c837d1de64b9f8beb190c9011d8c72a3dfd745
+      url: "https://pub.dev"
    source: hosted
    version: "0.17.2"
  cupertino_icons:
    dependency: "direct main"
    description:
      name: cupertino_icons
-      url: "https://pub.dartlang.org"
+      sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be
+      url: "https://pub.dev"
    source: hosted
    version: "1.0.5"
  device_info_plus:
    dependency: "direct main"
    description:
      name: device_info_plus
-      url: "https://pub.dartlang.org"
+      sha256: b809c4ed5f7fcdb325ccc70b80ad934677dc4e2aa414bf46859a42bfdfafcbb6
+      url: "https://pub.dev"
    source: hosted
-    version: "4.1.2"
+    version: "4.1.3"
  device_info_plus_linux:
    dependency: transitive
    description:
      name: device_info_plus_linux
-      url: "https://pub.dartlang.org"
+      sha256: "77a8b3c4af06bc46507f89304d9f49dfc64b4ae004b994532ed23b34adeae4b3"
+      url: "https://pub.dev"
    source: hosted
    version: "3.0.0"
  device_info_plus_macos:
    dependency: transitive
    description:
      name: device_info_plus_macos
-      url: "https://pub.dartlang.org"
+      sha256: "37961762fbd46d3620c7b69ca606671014db55fc1b7a11e696fd90ed2e8fe03d"
+      url: "https://pub.dev"
    source: hosted
    version: "3.0.0"
  device_info_plus_platform_interface:
    dependency: transitive
    description:
      name: device_info_plus_platform_interface
-      url: "https://pub.dartlang.org"
+      sha256: "83fdba24fcf6846d3b10f10dfdc8b6c6d7ada5f8ed21d62ea2909c2dfa043773"
+      url: "https://pub.dev"
    source: hosted
    version: "3.0.0"
  device_info_plus_web:
    dependency: transitive
    description:
      name: device_info_plus_web
-      url: "https://pub.dartlang.org"
+      sha256: "5890f6094df108181c7a29720bc23d0fd6159f17d82787fac093d1fefcaf6325"
+      url: "https://pub.dev"
    source: hosted
    version: "3.0.0"
  device_info_plus_windows:
    dependency: transitive
    description:
      name: device_info_plus_windows
-      url: "https://pub.dartlang.org"
+      sha256: "23a2874af0e23ee6e3a2a0ebcecec3a9da13241f2cb93a93a44c8764df123dd7"
+      url: "https://pub.dev"
    source: hosted
    version: "4.1.0"
  dynamic_color:
    dependency: "direct main"
    description:
      name: dynamic_color
-      url: "https://pub.dartlang.org"
+      sha256: "37a15576f5a0bfd5555b613cf20ea3bd379607cf88d457374a16032f4e942174"
+      url: "https://pub.dev"
    source: hosted
    version: "1.5.4"
  equatable:
    dependency: transitive
    description:
      name: equatable
-      url: "https://pub.dartlang.org"
+      sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2
+      url: "https://pub.dev"
    source: hosted
    version: "2.0.5"
  expandable:
    dependency: "direct main"
    description:
      name: expandable
-      url: "https://pub.dartlang.org"
+      sha256: "9604d612d4d1146dafa96c6d8eec9c2ff0994658d6d09fed720ab788c7f5afc2"
+      url: "https://pub.dev"
    source: hosted
    version: "5.0.1"
  fake_async:
    dependency: transitive
    description:
      name: fake_async
-      url: "https://pub.dartlang.org"
+      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+      url: "https://pub.dev"
    source: hosted
    version: "1.3.1"
  ffi:
    dependency: transitive
    description:
      name: ffi
-      url: "https://pub.dartlang.org"
+      sha256: a38574032c5f1dd06c4aee541789906c12ccaab8ba01446e800d9c5b79c4a978
+      url: "https://pub.dev"
    source: hosted
    version: "2.0.1"
  file:
    dependency: transitive
    description:
      name: file
-      url: "https://pub.dartlang.org"
+      sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d"
+      url: "https://pub.dev"
    source: hosted
    version: "6.1.4"
  fl_chart:
    dependency: "direct main"
    description:
      name: fl_chart
-      url: "https://pub.dartlang.org"
+      sha256: "749b3342ea3e95cbf61a0fec31a62606e837377b8b6d0caa7367a7ef80f38b7d"
+      url: "https://pub.dev"
    source: hosted
    version: "0.55.2"
  flutter:
@ -206,21 +242,24 @@ packages:
    dependency: "direct main"
    description:
      name: flutter_displaymode
-      url: "https://pub.dartlang.org"
+      sha256: fdeaceb35d84ed000625ae0666bbec5b015407d1f90135cdd1bbfdb4ca73de1a
+      url: "https://pub.dev"
    source: hosted
-    version: "0.4.0"
+    version: "0.4.1"
  flutter_launcher_icons:
    dependency: "direct dev"
    description:
      name: flutter_launcher_icons
-      url: "https://pub.dartlang.org"
+      sha256: a9de6706cd844668beac27c0aed5910fa0534832b3c2cad61a5fd977fce82a5d
+      url: "https://pub.dev"
    source: hosted
    version: "0.10.0"
  flutter_lints:
    dependency: "direct dev"
    description:
      name: flutter_lints
-      url: "https://pub.dartlang.org"
+      sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c
+      url: "https://pub.dev"
    source: hosted
    version: "2.0.1"
  flutter_localizations:
@ -232,16 +271,18 @@ packages:
    dependency: "direct dev"
    description:
      name: flutter_native_splash
-      url: "https://pub.dartlang.org"
+      sha256: "6777a3abb974021a39b5fdd2d46a03ca390e03903b6351f21d10e7ecc969f12d"
+      url: "https://pub.dev"
    source: hosted
-    version: "2.2.10+1"
+    version: "2.2.16"
  flutter_svg:
    dependency: "direct main"
    description:
      name: flutter_svg
-      url: "https://pub.dartlang.org"
+      sha256: "6ff9fa12892ae074092de2fa6a9938fb21dbabfdaa2ff57dc697ff912fc8d4b2"
+      url: "https://pub.dev"
    source: hosted
-    version: "1.1.5"
+    version: "1.1.6"
  flutter_test:
    dependency: "direct dev"
    description: flutter
@ -251,7 +292,8 @@ packages:
    dependency: "direct main"
    description:
      name: flutter_web_browser
-      url: "https://pub.dartlang.org"
+      sha256: a5564b736253f745e147b8c4eff86de436324d081974cc1f16bff881134a400f
+      url: "https://pub.dev"
    source: hosted
    version: "0.17.1"
  flutter_web_plugins:
@ -263,184 +305,210 @@ packages:
    dependency: transitive
    description:
      name: html
-      url: "https://pub.dartlang.org"
+      sha256: d9793e10dbe0e6c364f4c59bf3e01fb33a9b2a674bc7a1081693dba0614b6269
+      url: "https://pub.dev"
    source: hosted
-    version: "0.15.0"
+    version: "0.15.1"
  http:
    dependency: transitive
    description:
      name: http
-      url: "https://pub.dartlang.org"
+      sha256: "6aa2946395183537c8b880962d935877325d6a09a2867c3970c05c0fed6ac482"
+      url: "https://pub.dev"
    source: hosted
    version: "0.13.5"
  http_parser:
    dependency: transitive
    description:
      name: http_parser
-      url: "https://pub.dartlang.org"
+      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
+      url: "https://pub.dev"
    source: hosted
-    version: "4.0.1"
+    version: "4.0.2"
  image:
    dependency: transitive
    description:
      name: image
-      url: "https://pub.dartlang.org"
+      sha256: "8e9d133755c3e84c73288363e6343157c383a0c6c56fc51afcc5d4d7180306d6"
+      url: "https://pub.dev"
    source: hosted
-    version: "3.2.0"
+    version: "3.3.0"
  intl:
    dependency: "direct main"
    description:
      name: intl
-      url: "https://pub.dartlang.org"
+      sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91"
+      url: "https://pub.dev"
    source: hosted
    version: "0.17.0"
  js:
    dependency: transitive
    description:
      name: js
-      url: "https://pub.dartlang.org"
+      sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
+      url: "https://pub.dev"
    source: hosted
-    version: "0.6.4"
+    version: "0.6.5"
  json_annotation:
    dependency: transitive
    description:
      name: json_annotation
-      url: "https://pub.dartlang.org"
+      sha256: c33da08e136c3df0190bd5bbe51ae1df4a7d96e7954d1d7249fea2968a72d317
+      url: "https://pub.dev"
    source: hosted
-    version: "4.7.0"
+    version: "4.8.0"
  lints:
    dependency: transitive
    description:
      name: lints
-      url: "https://pub.dartlang.org"
+      sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593"
+      url: "https://pub.dev"
    source: hosted
-    version: "2.0.0"
+    version: "2.0.1"
  matcher:
    dependency: transitive
    description:
      name: matcher
-      url: "https://pub.dartlang.org"
+      sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
+      url: "https://pub.dev"
    source: hosted
-    version: "0.12.12"
+    version: "0.12.13"
  material_color_utilities:
    dependency: transitive
    description:
      name: material_color_utilities
-      url: "https://pub.dartlang.org"
+      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+      url: "https://pub.dev"
    source: hosted
-    version: "0.1.5"
-  material_segmented_control:
-    dependency: "direct main"
-    description:
-      name: material_segmented_control
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "4.0.0"
+    version: "0.2.0"
  meta:
    dependency: transitive
    description:
      name: meta
-      url: "https://pub.dartlang.org"
+      sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
+      url: "https://pub.dev"
    source: hosted
    version: "1.8.0"
  nested:
    dependency: transitive
    description:
      name: nested
-      url: "https://pub.dartlang.org"
+      sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
+      url: "https://pub.dev"
    source: hosted
    version: "1.0.0"
  package_info_plus:
    dependency: "direct main"
    description:
      name: package_info_plus
-      url: "https://pub.dartlang.org"
+      sha256: f62d7253edc197fe3c88d7c2ddab82d68f555e778d55390ccc3537eca8e8d637
+      url: "https://pub.dev"
    source: hosted
    version: "1.4.3+1"
  package_info_plus_linux:
    dependency: transitive
    description:
      name: package_info_plus_linux
-      url: "https://pub.dartlang.org"
+      sha256: "04b575f44233d30edbb80a94e57cad9107aada334fc02aabb42b6becd13c43fc"
+      url: "https://pub.dev"
    source: hosted
    version: "1.0.5"
  package_info_plus_macos:
    dependency: transitive
    description:
      name: package_info_plus_macos
-      url: "https://pub.dartlang.org"
+      sha256: a2ad8b4acf4cd479d4a0afa5a74ea3f5b1c7563b77e52cc32b3ee6956d5482a6
+      url: "https://pub.dev"
    source: hosted
    version: "1.3.0"
  package_info_plus_platform_interface:
    dependency: transitive
    description:
      name: package_info_plus_platform_interface
-      url: "https://pub.dartlang.org"
+      sha256: f7a0c8f1e7e981bc65f8b64137a53fd3c195b18d429fba960babc59a5a1c7ae8
+      url: "https://pub.dev"
    source: hosted
    version: "1.0.2"
  package_info_plus_web:
    dependency: transitive
    description:
      name: package_info_plus_web
-      url: "https://pub.dartlang.org"
+      sha256: f0829327eb534789e0a16ccac8936a80beed4e2401c4d3a74f3f39094a822d3b
+      url: "https://pub.dev"
    source: hosted
-    version: "1.0.5"
+    version: "1.0.6"
  package_info_plus_windows:
    dependency: transitive
    description:
      name: package_info_plus_windows
-      url: "https://pub.dartlang.org"
+      sha256: "79524f11c42dd9078b96d797b3cf79c0a2883a50c4920dc43da8562c115089bc"
+      url: "https://pub.dev"
    source: hosted
    version: "2.1.0"
  path:
    dependency: transitive
    description:
      name: path
-      url: "https://pub.dartlang.org"
+      sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
+      url: "https://pub.dev"
    source: hosted
    version: "1.8.2"
  path_drawing:
    dependency: transitive
    description:
      name: path_drawing
-      url: "https://pub.dartlang.org"
+      sha256: bbb1934c0cbb03091af082a6389ca2080345291ef07a5fa6d6e078ba8682f977
+      url: "https://pub.dev"
    source: hosted
    version: "1.0.1"
  path_parsing:
    dependency: transitive
    description:
      name: path_parsing
-      url: "https://pub.dartlang.org"
+      sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf
+      url: "https://pub.dev"
    source: hosted
    version: "1.0.1"
  percent_indicator:
    dependency: "direct main"
    description:
      name: percent_indicator
-      url: "https://pub.dartlang.org"
+      sha256: cec41f67181fbd5322aa68b355621d1a4eea827426b8eeb613f6cbe195ff7b4a
+      url: "https://pub.dev"
    source: hosted
    version: "4.2.2"
  petitparser:
    dependency: transitive
    description:
      name: petitparser
-      url: "https://pub.dartlang.org"
+      sha256: "49392a45ced973e8d94a85fdb21293fbb40ba805fc49f2965101ae748a3683b4"
+      url: "https://pub.dev"
    source: hosted
-    version: "5.0.0"
+    version: "5.1.0"
  plugin_platform_interface:
    dependency: transitive
    description:
      name: plugin_platform_interface
-      url: "https://pub.dartlang.org"
+      sha256: dbf0f707c78beedc9200146ad3cb0ab4d5da13c246336987be6940f026500d3a
+      url: "https://pub.dev"
    source: hosted
    version: "2.1.3"
+  pointycastle:
+    dependency: transitive
+    description:
+      name: pointycastle
+      sha256: db7306cf0249f838d1a24af52b5a5887c5bf7f31d8bb4e827d071dc0939ad346
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.6.2"
  provider:
    dependency: "direct main"
    description:
      name: provider
-      url: "https://pub.dartlang.org"
+      sha256: cdbe7530b12ecd9eb455bdaa2fcb8d4dad22e80b8afb4798b41479d5ce26847f
+      url: "https://pub.dev"
    source: hosted
-    version: "6.0.3"
+    version: "6.0.5"
  sky_engine:
    dependency: transitive
    description: flutter
@ -450,121 +518,138 @@ packages:
    dependency: transitive
    description:
      name: source_span
-      url: "https://pub.dartlang.org"
+      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
+      url: "https://pub.dev"
    source: hosted
-    version: "1.9.0"
+    version: "1.9.1"
  sqflite:
    dependency: "direct main"
    description:
      name: sqflite
-      url: "https://pub.dartlang.org"
+      sha256: "067ab48dbc66bae05e18073a604443baa35957101bd3905b94f65e764c6d0688"
+      url: "https://pub.dev"
    source: hosted
-    version: "2.1.0"
+    version: "2.2.3"
  sqflite_common:
    dependency: transitive
    description:
      name: sqflite_common
-      url: "https://pub.dartlang.org"
+      sha256: b2ed22d1d62c944ec0dac5cc687ae99cb3331c3ebe146d726ed24704634b5ccd
+      url: "https://pub.dev"
    source: hosted
-    version: "2.3.0"
+    version: "2.4.1"
  stack_trace:
    dependency: transitive
    description:
      name: stack_trace
-      url: "https://pub.dartlang.org"
+      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      url: "https://pub.dev"
    source: hosted
-    version: "1.10.0"
+    version: "1.11.0"
  store_checker:
    dependency: "direct main"
    description:
      name: store_checker
-      url: "https://pub.dartlang.org"
+      sha256: "0bb9b67fe3c9b0545918ca8621983ab830a1b242eef12ac19b17abac56d452b8"
+      url: "https://pub.dev"
    source: hosted
    version: "1.1.0"
  stream_channel:
    dependency: transitive
    description:
      name: stream_channel
-      url: "https://pub.dartlang.org"
+      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      url: "https://pub.dev"
    source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
  string_scanner:
    dependency: transitive
    description:
      name: string_scanner
-      url: "https://pub.dartlang.org"
+      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      url: "https://pub.dev"
    source: hosted
-    version: "1.1.1"
+    version: "1.2.0"
  synchronized:
    dependency: transitive
    description:
      name: synchronized
-      url: "https://pub.dartlang.org"
+      sha256: "33b31b6beb98100bf9add464a36a8dd03eb10c7a8cf15aeec535e9b054aaf04b"
+      url: "https://pub.dev"
    source: hosted
-    version: "3.0.0+3"
+    version: "3.0.1"
  term_glyph:
    dependency: transitive
    description:
      name: term_glyph
-      url: "https://pub.dartlang.org"
+      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
+      url: "https://pub.dev"
    source: hosted
    version: "1.2.1"
  test_api:
    dependency: transitive
    description:
      name: test_api
-      url: "https://pub.dartlang.org"
+      sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
+      url: "https://pub.dev"
    source: hosted
-    version: "0.4.12"
+    version: "0.4.16"
  typed_data:
    dependency: transitive
    description:
      name: typed_data
-      url: "https://pub.dartlang.org"
+      sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5"
+      url: "https://pub.dev"
    source: hosted
    version: "1.3.1"
  universal_io:
    dependency: transitive
    description:
      name: universal_io
-      url: "https://pub.dartlang.org"
+      sha256: "79f78ddad839ee3aae3ec7c01eb4575faf0d5c860f8e5223bc9f9c17f7f03cef"
+      url: "https://pub.dev"
    source: hosted
    version: "2.0.4"
  uuid:
    dependency: "direct main"
    description:
      name: uuid
-      url: "https://pub.dartlang.org"
+      sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313"
+      url: "https://pub.dev"
    source: hosted
-    version: "3.0.6"
+    version: "3.0.7"
  vector_math:
    dependency: transitive
    description:
      name: vector_math
-      url: "https://pub.dartlang.org"
+      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      url: "https://pub.dev"
    source: hosted
-    version: "2.1.2"
+    version: "2.1.4"
  win32:
    dependency: transitive
    description:
      name: win32
-      url: "https://pub.dartlang.org"
+      sha256: c9ebe7ee4ab0c2194e65d3a07d8c54c5d00bb001b76081c4a04cdb8448b59e46
+      url: "https://pub.dev"
    source: hosted
-    version: "3.0.0"
+    version: "3.1.3"
  xml:
    dependency: transitive
    description:
      name: xml
-      url: "https://pub.dartlang.org"
+      sha256: "979ee37d622dec6365e2efa4d906c37470995871fe9ae080d967e192d88286b5"
+      url: "https://pub.dev"
    source: hosted
-    version: "6.1.0"
+    version: "6.2.2"
  yaml:
    dependency: transitive
    description:
      name: yaml
-      url: "https://pub.dartlang.org"
+      sha256: "23812a9b125b48d4007117254bca50abb6c712352927eece9e155207b1db2370"
+      url: "https://pub.dev"
    source: hosted
    version: "3.1.1"
 sdks:
-  dart: ">=2.18.1 <3.0.0"
+  dart: ">=2.18.1 <4.0.0"
  flutter: ">=3.3.0"
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -50,7 +50,6 @@ dependencies:
  bottom_sheet: ^3.1.2
  percent_indicator: ^4.2.2
  store_checker: ^1.1.0
-  material_segmented_control: ^4.0.0

 dev_dependencies:
  flutter_test: