diff --git a/lib/core/router/app_router.dart b/lib/core/router/app_router.dart index 298f445b..530ef3f5 100644 --- a/lib/core/router/app_router.dart +++ b/lib/core/router/app_router.dart @@ -32,7 +32,7 @@ GoRouter router(RouterRef ref) { } int getCurrentIndex(BuildContext context) { - final String location = GoRouterState.of(context).location; + final String location = GoRouterState.of(context).uri.path; if (location == const HomeRoute().location) return 0; if (location.startsWith(const ProxiesRoute().location)) return 1; if (location.startsWith(const LogsRoute().location)) return 2; diff --git a/lib/features/wrapper/view/mobile_wrapper.dart b/lib/features/wrapper/view/mobile_wrapper.dart index 810ad6f4..4f414b01 100644 --- a/lib/features/wrapper/view/mobile_wrapper.dart +++ b/lib/features/wrapper/view/mobile_wrapper.dart @@ -18,7 +18,7 @@ class MobileWrapper extends HookConsumerWidget { final t = ref.watch(translationsProvider); final currentIndex = getCurrentIndex(context); - final location = GoRouterState.of(context).location; + final location = GoRouterState.of(context).uri.path; return Scaffold( key: RootScaffold.stateKey, diff --git a/pubspec.lock b/pubspec.lock index 8624afcb..90191bb5 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -10,7 +10,7 @@ packages: source: hosted version: "60.0.0" analyzer: - dependency: transitive + dependency: "direct overridden" description: name: analyzer sha256: "1952250bd005bacb895a01bf1b4dc00e3ba1c526cf47dca54dfe24979c65f5b3" @@ -253,26 +253,26 @@ packages: dependency: "direct dev" description: name: custom_lint - sha256: "3ce36c04d30c60cde295588c6185b3f9800e6c18f6670a7ffdb3d5eab39bb942" + sha256: ae3cf0f83a155bdfc50315d4a11c7b358ea1e201a57ab0bb2b397f1a9a2a9b80 url: "https://pub.dev" source: hosted - version: "0.4.0" + version: "0.5.2" custom_lint_builder: dependency: transitive description: name: custom_lint_builder - sha256: "73d09c9848e9f6d5c3e0a1809eac841a8d7ea123d0849feefa040e1ad60b6d06" + sha256: fe5ba0dabc29d71d52fa372012fabada14af50e4cdf75e4928b1db400cf6afe1 url: "https://pub.dev" source: hosted - version: "0.4.0" + version: "0.5.2" custom_lint_core: dependency: transitive description: name: custom_lint_core - sha256: "9170d9db2daf774aa2251a3bc98e4ba903c7702ab07aa438bc83bd3c9a0de57f" + sha256: a420aa57121a22b2a42e7e1dbbcaf7b91ef73b90adce07149419c16cf67d6fcc url: "https://pub.dev" source: hosted - version: "0.4.0" + version: "0.5.2" dart_style: dependency: transitive description: @@ -301,26 +301,26 @@ packages: dependency: "direct main" description: name: dio - sha256: "3866d67f93523161b643187af65f5ac08bc991a5bcdaf41a2d587fe4ccb49993" + sha256: ce75a1b40947fea0a0e16ce73337122a86762e38b982e1ccb909daa3b9bc4197 url: "https://pub.dev" source: hosted - version: "5.3.0" + version: "5.3.2" drift: dependency: "direct main" description: name: drift - sha256: "01e7237766b3404f08489ed0dc531a2fa5f5a42d7fa7787da6cc0a10e8d2632f" + sha256: a255df2476431d3179f5aba7a7435a3678542642fba43de98c330ae0e0393c2e url: "https://pub.dev" source: hosted - version: "2.10.0" + version: "2.11.0" drift_dev: dependency: "direct dev" description: name: drift_dev - sha256: "407eb1f149332238c567f06cc89b6aaee848de00d9031c76dc372dc16d993bca" + sha256: "5f63cbc64f9e2346a1fd22bf43c5df8a35369e62cc1f7519ea95410cd5ff8ce5" url: "https://pub.dev" source: hosted - version: "2.10.0" + version: "2.11.0" duration: dependency: "direct main" description: @@ -349,10 +349,10 @@ packages: dependency: "direct main" description: name: ffi - sha256: ed5337a5660c506388a9f012be0288fb38b49020ce2b45fe1f8b8323fe429f99 + sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878" url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.1.0" ffigen: dependency: "direct dev" description: @@ -373,10 +373,10 @@ packages: dependency: "direct main" description: name: file_picker - sha256: b1729fc96627dd44012d0a901558177418818d6bd428df59dcfeb594e5f66432 + sha256: "21145c9c268d54b1f771d8380c195d2d6f655e0567dc1ca2f9c134c02c819e0a" url: "https://pub.dev" source: hosted - version: "5.3.2" + version: "5.3.3" fixnum: dependency: transitive description: @@ -426,10 +426,10 @@ packages: dependency: "direct main" description: name: flutter_animate - sha256: be54662837a6e66cc53ee88549e808c625275e0faf5a43e11cf3182cb0bd1b02 + sha256: "62f346340a96192070e31e3f2a1bd30a28530f1fe8be978821e06cd56b74d6d2" url: "https://pub.dev" source: hosted - version: "4.2.0" + version: "4.2.0+1" flutter_gen_core: dependency: transitive description: @@ -450,10 +450,10 @@ packages: dependency: "direct main" description: name: flutter_hooks - sha256: "6a126f703b89499818d73305e4ce1e3de33b4ae1c5512e3b8eab4b986f46774c" + sha256: "9eab8fd7aa752c3c1c0a364f9825851d410eb935243411682f4b1b0a4c569d71" url: "https://pub.dev" source: hosted - version: "0.18.6" + version: "0.20.0" flutter_local_notifications: dependency: "direct main" description: @@ -503,10 +503,10 @@ packages: dependency: "direct main" description: name: flutter_native_splash - sha256: ba45d8cfbd778478a74696b012f33ffb6b1760c9bc531b21e2964444a4870dae + sha256: ecff62b3b893f2f665de7e4ad3de89f738941fcfcaaba8ee601e749efafa4698 url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.3.2" flutter_plugin_android_lifecycle: dependency: transitive description: @@ -519,10 +519,10 @@ packages: dependency: transitive description: name: flutter_riverpod - sha256: b83ac5827baadefd331ea1d85110f34645827ea234ccabf53a655f41901a9bf4 + sha256: b6cb0041c6c11cefb2dcb97ef436eba43c6d41287ac6d8ca93e02a497f53a4f3 url: "https://pub.dev" source: hosted - version: "2.3.6" + version: "2.3.7" flutter_svg: dependency: "direct main" description: @@ -561,10 +561,10 @@ packages: dependency: "direct dev" description: name: freezed - sha256: "2df89855fe181baae3b6d714dc3c4317acf4fccd495a6f36e5e00f24144c6c3b" + sha256: "83462cfc33dc9680533a7f3a4a6ab60aa94f287db5f4ee6511248c22833c497f" url: "https://pub.dev" source: hosted - version: "2.4.1" + version: "2.4.2" freezed_annotation: dependency: "direct main" description: @@ -601,18 +601,18 @@ packages: dependency: "direct main" description: name: go_router - sha256: edbceb4c06758652fc9d12e58edb371cd977011b032e298dae0eb357167baad2 + sha256: "2aa884667eeda3a1c461f31e72af1f77984ab0f29450d8fb12ec1f7bc53eea14" url: "https://pub.dev" source: hosted - version: "9.1.1" + version: "10.1.0" go_router_builder: dependency: "direct dev" description: name: go_router_builder - sha256: "61c57a1d536e66441f08de9750f376407f66a97b47b0a784cd89ac134767e257" + sha256: "3e7e0ca431abd9089ff82113d8c8790ba2114ff8e3690d40c4fd38394374474d" url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.3.0" graphs: dependency: transitive description: @@ -625,10 +625,10 @@ packages: dependency: "direct main" description: name: hooks_riverpod - sha256: be68cf7653fcab798500f9047ac58c3f109287a1595012412f4a0d654a9bb9c5 + sha256: "2bb8ae6a729e1334f71f1ef68dd5f0400dca8f01de8cbdcde062584a68017b18" url: "https://pub.dev" source: hosted - version: "2.3.6" + version: "2.3.8" hotreloader: dependency: transitive description: @@ -641,10 +641,10 @@ packages: dependency: transitive description: name: html - sha256: "58e3491f7bf0b6a4ea5110c0c688877460d1a6366731155c4a4580e7ded773e8" + sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a" url: "https://pub.dev" source: hosted - version: "0.15.3" + version: "0.15.4" http: dependency: transitive description: @@ -801,10 +801,10 @@ packages: dependency: "direct main" description: name: mobile_scanner - sha256: "54dd914e1bb5758b3db7aa02e56d65d80285ba0705e0e5fa5cfbb11e27344c4b" + sha256: "2fbc3914fe625e196c64ea8ffc4084cd36781d2be276d4d5923b11af3b5d44ff" url: "https://pub.dev" source: hosted - version: "3.3.0" + version: "3.4.1" package_config: dependency: transitive description: @@ -817,10 +817,10 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: ceb027f6bc6a60674a233b4a90a7658af1aebdea833da0b5b53c1e9821a78c7b + sha256: "6ff267fcd9d48cb61c8df74a82680e8b82e940231bb5f68356672fde0397334a" url: "https://pub.dev" source: hosted - version: "4.0.2" + version: "4.1.0" package_info_plus_platform_interface: dependency: transitive description: @@ -849,50 +849,50 @@ packages: dependency: "direct main" description: name: path_provider - sha256: "3087813781ab814e4157b172f1a11c46be20179fcc9bea043e0fba36bc0acaa2" + sha256: "909b84830485dbcd0308edf6f7368bc8fd76afa26a270420f34cabea2a6467a0" url: "https://pub.dev" source: hosted - version: "2.0.15" + version: "2.1.0" path_provider_android: dependency: transitive description: name: path_provider_android - sha256: "2cec049d282c7f13c594b4a73976b0b4f2d7a1838a6dd5aaf7bd9719196bee86" + sha256: "5d44fc3314d969b84816b569070d7ace0f1dea04bd94a83f74c4829615d22ad8" url: "https://pub.dev" source: hosted - version: "2.0.27" + version: "2.1.0" path_provider_foundation: dependency: transitive description: name: path_provider_foundation - sha256: "1995d88ec2948dac43edf8fe58eb434d35d22a2940ecee1a9fefcd62beee6eb3" + sha256: "1b744d3d774e5a879bb76d6cd1ecee2ba2c6960c03b1020cd35212f6aa267ac5" url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.3.0" path_provider_linux: dependency: transitive description: name: path_provider_linux - sha256: "2ae08f2216225427e64ad224a24354221c2c7907e448e6e0e8b57b1eb9f10ad1" + sha256: ba2b77f0c52a33db09fc8caf85b12df691bf28d983e84cf87ff6d693cfa007b3 url: "https://pub.dev" source: hosted - version: "2.1.10" + version: "2.2.0" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface - sha256: "57585299a729335f1298b43245842678cb9f43a6310351b18fb577d6e33165ec" + sha256: bced5679c7df11190e1ddc35f3222c858f328fff85c3942e46e7f5589bf9eb84 url: "https://pub.dev" source: hosted - version: "2.0.6" + version: "2.1.0" path_provider_windows: dependency: transitive description: name: path_provider_windows - sha256: "1cb68ba4cd3a795033de62ba1b7b4564dace301f952de6bfb3cd91b202b6ee96" + sha256: ee0e0d164516b90ae1f970bdf29f726f1aa730d7cfc449ecc74c495378b705da url: "https://pub.dev" source: hosted - version: "2.1.7" + version: "2.2.0" percent_indicator: dependency: "direct main" description: @@ -993,42 +993,42 @@ packages: dependency: transitive description: name: riverpod - sha256: "80e48bebc83010d5e67a11c9514af6b44bbac1ec77b4333c8ea65dbc79e2d8ef" + sha256: b0657b5b30c81a3184bdaab353045f0a403ebd60bb381591a8b7ad77dcade793 url: "https://pub.dev" source: hosted - version: "2.3.6" + version: "2.3.7" riverpod_analyzer_utils: dependency: transitive description: name: riverpod_analyzer_utils - sha256: "1b2632a6fc0b659c923a4dcc7cd5da42476f5b3294c70c86c971e63bdd443384" + sha256: aa216069d72f5478126029fa555874b4b38119f17e3f0f6c93fd63365f74502d url: "https://pub.dev" source: hosted - version: "0.3.1" + version: "0.3.3" riverpod_annotation: dependency: "direct main" description: name: riverpod_annotation - sha256: cedd6a54b6f5764ffd5c05df57b6676bfc8c01978e14ee60a2c16891038820fe + sha256: "8b3f7a54ddd5d53d6ea04bfb4ff77ee1b0816a1b563c0d9d43e73ce94bf2016d" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" riverpod_generator: dependency: "direct dev" description: name: riverpod_generator - sha256: cd0595de57ccf5d944ff4b0f68289e11ac6a2eff1e3dfd1d884a43f6f3bcee5e + sha256: f668015d7b719c413c6001d4790689ea4a7bf76d5109118a1a98d5c23b20160d url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.2.6" riverpod_lint: dependency: "direct dev" description: name: riverpod_lint - sha256: "043ff016011be4c5887b3239bfbca05d284bdb68db0a5363cee0242b7567e250" + sha256: c9a16d8cb89667696b031d66f43c12ac8d663d773093425e6ff6af7e682973b1 url: "https://pub.dev" source: hosted - version: "1.3.2" + version: "2.0.1" rxdart: dependency: "direct main" description: @@ -1049,18 +1049,18 @@ packages: dependency: "direct main" description: name: share_plus - sha256: ed3fcea4f789ed95913328e629c0c53e69e80e08b6c24542f1b3576046c614e8 + sha256: "6cec740fa0943a826951223e76218df002804adb588235a8910dc3d6b0654e11" url: "https://pub.dev" source: hosted - version: "7.0.2" + version: "7.1.0" share_plus_platform_interface: dependency: transitive description: name: share_plus_platform_interface - sha256: "0c6e61471bd71b04a138b8b588fa388e66d8b005e6f2deda63371c5c505a0981" + sha256: "357412af4178d8e11d14f41723f80f12caea54cf0d5cd29af9dcdab85d58aea7" url: "https://pub.dev" source: hosted - version: "3.2.1" + version: "3.3.0" shared_preferences: dependency: "direct main" description: @@ -1150,26 +1150,26 @@ packages: dependency: "direct main" description: name: slang - sha256: "68162dc10567b44ef39e8c5ed5a066d7c9b078c8b1b10ee49f713faa43e89a07" + sha256: "45a2ff7f32d8db403226689c88f895df454ebc01fedf08266c6d62d52190afa6" url: "https://pub.dev" source: hosted - version: "3.21.0" + version: "3.23.0" slang_build_runner: dependency: "direct dev" description: name: slang_build_runner - sha256: d7f237b3a5a1b2569c5acacbf2ad18c4384129a83a7c34748b99bfb2749d4db2 + sha256: cae2394a6a1b4a6f76360900a4124d26a7b6c513d4e1ffc0da2b882450c86e16 url: "https://pub.dev" source: hosted - version: "3.21.0" + version: "3.23.0" slang_flutter: dependency: "direct main" description: name: slang_flutter - sha256: b9c63bf4b0088edde5a09264ac86304f0acec9015aea743f9fa08946d08b832f + sha256: b2d7b4be6c5076e777b7c80a02279d661dcdc4e8758fd0ac56b125f1db5d203e url: "https://pub.dev" source: hosted - version: "3.21.0" + version: "3.23.0" sliver_tools: dependency: "direct main" description: @@ -1222,10 +1222,10 @@ packages: dependency: transitive description: name: sqlparser - sha256: "0d2c9a3b554baa10b2560d69a1c7cabd4687cc08041a7dd3d2dc6992f607b400" + sha256: "60249badd8052dec4ad8d4bf5923da7533dad0009e92e224f8abd221665bfa22" url: "https://pub.dev" source: hosted - version: "0.30.0" + version: "0.31.0" stack_trace: dependency: "direct main" description: @@ -1539,5 +1539,5 @@ packages: source: hosted version: "2.1.1" sdks: - dart: ">=3.1.0 <4.0.0" + dart: ">=3.1.0-185.0.dev <4.0.0" flutter: ">=3.10.0" diff --git a/pubspec.yaml b/pubspec.yaml index a9721db7..0eea7876 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: 'none' version: 0.1.0 environment: - sdk: '>=3.1.0 <4.0.0' + sdk: '>=3.0.5 <4.0.0' dependencies: flutter: @@ -15,8 +15,8 @@ dependencies: flutter_localizations: sdk: flutter intl: ^0.18.0 - slang: ^3.21.0 - slang_flutter: ^3.21.0 + slang: ^3.23.0 + slang_flutter: ^3.23.0 recase: ^4.1.0 timeago: ^3.5.0 duration: ^3.0.13 @@ -28,33 +28,33 @@ dependencies: json_annotation: ^4.8.1 # state management - hooks_riverpod: ^2.3.6 - flutter_hooks: ^0.18.6 - riverpod_annotation: ^2.1.1 + hooks_riverpod: ^2.3.8 + flutter_hooks: ^0.20.0 + riverpod_annotation: ^2.1.2 rxdart: ^0.27.7 # persistence - drift: ^2.10.0 + drift: ^2.11.0 sqlite3_flutter_libs: ^0.5.15 shared_preferences: ^2.2.0 # networking - dio: ^5.3.0 + dio: ^5.3.2 web_socket_channel: ^2.4.0 # native - ffi: ^2.0.2 - path_provider: ^2.0.15 + ffi: ^2.1.0 + path_provider: ^2.1.0 flutter_local_notifications: ^15.1.0+1 - mobile_scanner: ^3.3.0 + mobile_scanner: ^3.4.1 protocol_handler: ^0.1.5 - flutter_native_splash: ^2.3.1 + flutter_native_splash: ^2.3.2 icons_launcher: ^2.1.3 - file_picker: ^5.3.2 - share_plus: ^7.0.2 + file_picker: ^5.3.3 + share_plus: ^7.1.0 window_manager: ^0.3.5 tray_manager: ^0.2.0 - package_info_plus: ^4.0.2 + package_info_plus: ^4.1.0 url_launcher: ^6.1.12 # utils @@ -69,9 +69,9 @@ dependencies: tint: ^2.0.1 # widgets - go_router: ^9.1.0 + go_router: ^10.1.0 flex_color_scheme: ^7.2.0 - flutter_animate: ^4.2.0 + flutter_animate: ^4.2.0+1 flutter_svg: ^2.0.7 gap: ^3.0.1 percent_indicator: ^4.2.3 @@ -86,15 +86,18 @@ dev_dependencies: lint: ^2.1.2 build_runner: ^2.4.6 json_serializable: ^6.7.1 - freezed: ^2.4.1 - riverpod_generator: ^2.2.3 - drift_dev: ^2.10.0 + freezed: ^2.4.2 + riverpod_generator: ^2.2.6 + drift_dev: ^2.11.0 ffigen: ^8.0.2 - slang_build_runner: ^3.21.0 + slang_build_runner: ^3.23.0 flutter_gen_runner: ^5.3.1 - go_router_builder: ^2.2.3 - custom_lint: ^0.4.0 - riverpod_lint: ^1.3.2 + go_router_builder: ^2.3.0 + custom_lint: ^0.5.2 + riverpod_lint: ^2.0.1 + +dependency_overrides: + analyzer: '5.12.0' flutter: uses-material-design: true