From 4fe36c4b0c44e047b2ca126682ff3e5d13d6ba12 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Wed, 13 Nov 2024 22:43:44 +0100 Subject: [PATCH] WIP --- android/app/build.gradle | 3 +- .../app/FlutterMultiDexApplication.java | 20 - android/build.gradle | 6 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- ...search_bar.dart => global_search_bar.dart} | 4 +- .../parts/{badge.dart => circle_badge.dart} | 4 +- .../parts/common_badge.dart | 4 +- .../search_results_body/parts/jlpt_badge.dart | 4 +- .../search_results_body/parts/links.dart | 8 +- .../parts/wanikani_badge.dart | 4 +- lib/models/history/search.dart | 11 +- lib/screens/info/about.dart | 14 +- lib/screens/search/search_view.dart | 4 +- lib/screens/settings.dart | 125 +-- pubspec.lock | 835 +++++++++++------- pubspec.yaml | 30 +- 16 files changed, 618 insertions(+), 460 deletions(-) delete mode 100644 android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java rename lib/components/search/{search_bar.dart => global_search_bar.dart} (94%) rename lib/components/search/search_results_body/parts/{badge.dart => circle_badge.dart} (88%) diff --git a/android/app/build.gradle b/android/app/build.gradle index f3e594e..dd28dc7 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -26,6 +26,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { + namespace = "app.jishostudytool.jisho_study_tool" compileSdkVersion flutter.compileSdkVersion compileOptions { @@ -45,7 +46,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "app.jishostudytool.jisho_study_tool" // minSdkVersion flutter.minSdkVersion - minSdkVersion 19 + minSdkVersion flutter.minSdkVersion targetSdkVersion flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() versionName flutterVersionName diff --git a/android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java b/android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java deleted file mode 100644 index 9213f13..0000000 --- a/android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java +++ /dev/null @@ -1,20 +0,0 @@ -// Generated file. -// If you wish to remove Flutter's multidex support, delete this entire file. - -package io.flutter.app; - -import android.content.Context; -import androidx.annotation.CallSuper; -import androidx.multidex.MultiDex; - -/** - * Extension of {@link io.flutter.app.FlutterApplication}, adding multidex support. - */ -public class FlutterMultiDexApplication extends FlutterApplication { - @Override - @CallSuper - protected void attachBaseContext(Context base) { - super.attachBaseContext(base); - MultiDex.install(this); - } -} diff --git a/android/build.gradle b/android/build.gradle index 4256f91..76a17d0 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.6.10' + ext.kotlin_version = '1.9.22' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.0' + classpath 'com.android.tools.build:gradle:8.7.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -26,6 +26,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index bc6a58a..2aaed3a 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip diff --git a/lib/components/search/search_bar.dart b/lib/components/search/global_search_bar.dart similarity index 94% rename from lib/components/search/search_bar.dart rename to lib/components/search/global_search_bar.dart index da5bdee..b88311b 100644 --- a/lib/components/search/search_bar.dart +++ b/lib/components/search/global_search_bar.dart @@ -5,10 +5,10 @@ import '../../routing/routes.dart'; import '../../settings.dart'; import 'language_selector.dart'; -class SearchBar extends StatelessWidget { +class GlobalSearchBar extends StatelessWidget { final TextEditingController controller = TextEditingController(); - SearchBar({Key? key}) : super(key: key); + GlobalSearchBar({Key? key}) : super(key: key); void _search(BuildContext context, String text) => Navigator.pushNamed( context, diff --git a/lib/components/search/search_results_body/parts/badge.dart b/lib/components/search/search_results_body/parts/circle_badge.dart similarity index 88% rename from lib/components/search/search_results_body/parts/badge.dart rename to lib/components/search/search_results_body/parts/circle_badge.dart index fcbc98c..55a66ba 100644 --- a/lib/components/search/search_results_body/parts/badge.dart +++ b/lib/components/search/search_results_body/parts/circle_badge.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; -class Badge extends StatelessWidget { +class CircleBadge extends StatelessWidget { final Widget? child; final Color color; - const Badge({ + const CircleBadge({ Key? key, this.child, required this.color, diff --git a/lib/components/search/search_results_body/parts/common_badge.dart b/lib/components/search/search_results_body/parts/common_badge.dart index bdcaad2..d206328 100644 --- a/lib/components/search/search_results_body/parts/common_badge.dart +++ b/lib/components/search/search_results_body/parts/common_badge.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import './badge.dart'; +import 'circle_badge.dart'; class CommonBadge extends StatelessWidget { final bool isCommon; @@ -11,7 +11,7 @@ class CommonBadge extends StatelessWidget { @override Widget build(BuildContext context) { - return Badge( + return CircleBadge( color: isCommon ? Colors.green : Colors.transparent, child: Text( 'C', diff --git a/lib/components/search/search_results_body/parts/jlpt_badge.dart b/lib/components/search/search_results_body/parts/jlpt_badge.dart index b15fcdb..a33194c 100644 --- a/lib/components/search/search_results_body/parts/jlpt_badge.dart +++ b/lib/components/search/search_results_body/parts/jlpt_badge.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import './badge.dart'; +import 'circle_badge.dart'; class JLPTBadge extends StatelessWidget { final String? jlptLevel; @@ -14,7 +14,7 @@ class JLPTBadge extends StatelessWidget { @override Widget build(BuildContext context) { - return Badge( + return CircleBadge( color: jlptLevel != null ? Colors.blue : Colors.transparent, child: Text( formattedJlptLevel, diff --git a/lib/components/search/search_results_body/parts/links.dart b/lib/components/search/search_results_body/parts/links.dart index 9502c9a..4ce2704 100644 --- a/lib/components/search/search_results_body/parts/links.dart +++ b/lib/components/search/search_results_body/parts/links.dart @@ -24,7 +24,11 @@ Widget _wiki({ margin: EdgeInsets.fromLTRB(0, 0, 10, isJapanese ? 12 : 10), child: IconButton( onPressed: () => open_webpage(link), - icon: SvgPicture.asset('assets/images/links/wikipedia.svg'), + icon: SvgPicture.asset( + 'assets/images/links/wikipedia.svg', + height: 50, + width: 50, + ), ), ), Container( @@ -52,6 +56,8 @@ Widget _dbpedia(String link) => Container( onPressed: () => open_webpage(link), icon: Image.asset( 'assets/images/links/dbpedia.png', + height: 50, + width: 50, ), ), ); diff --git a/lib/components/search/search_results_body/parts/wanikani_badge.dart b/lib/components/search/search_results_body/parts/wanikani_badge.dart index 96df9c8..04adc09 100644 --- a/lib/components/search/search_results_body/parts/wanikani_badge.dart +++ b/lib/components/search/search_results_body/parts/wanikani_badge.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import './badge.dart'; +import 'circle_badge.dart'; class WKBadge extends StatelessWidget { final String level; @@ -15,7 +15,7 @@ class WKBadge extends StatelessWidget { @override Widget build(BuildContext context) { - return Badge( + return CircleBadge( color: level.isNotEmpty ? Colors.red : Colors.transparent, child: Text( _extractWkLevel(level), diff --git a/lib/models/history/search.dart b/lib/models/history/search.dart index 6f95ae5..8ff235b 100644 --- a/lib/models/history/search.dart +++ b/lib/models/history/search.dart @@ -30,9 +30,8 @@ class Search { Map toJson() => { 'timestamps': [for (final ts in timestamps) ts.millisecondsSinceEpoch], - 'lastTimestamp': timestamps.last.millisecondsSinceEpoch, - 'wordQuery': wordQuery?.toJson(), - 'kanjiQuery': kanjiQuery?.toJson(), + 'word': wordQuery?.toJson(), + 'kanji': kanjiQuery?.toJson(), }; factory Search.fromJson(Map json) { @@ -41,13 +40,13 @@ class Search { DateTime.fromMillisecondsSinceEpoch(ts as int) ]; - return json['wordQuery'] != null + return json['word'] != null ? Search.fromWordQuery( - wordQuery: WordQuery.fromJson(json['wordQuery']), + wordQuery: WordQuery.fromJson(json['word']), timestamps: timestamps, ) : Search.fromKanjiQuery( - kanjiQuery: KanjiQuery.fromJson(json['kanjiQuery']), + kanjiQuery: KanjiQuery.fromJson(json['kanji']), timestamps: timestamps, ); } diff --git a/lib/screens/info/about.dart b/lib/screens/info/about.dart index d13bda5..8e807c3 100644 --- a/lib/screens/info/about.dart +++ b/lib/screens/info/about.dart @@ -15,7 +15,7 @@ class AboutView extends StatelessWidget { const SizedBox(height: _verticalSeparation), Text( 'Jisho Study Tool', - style: Theme.of(context).textTheme.headline5, + style: Theme.of(context).textTheme.headlineSmall, ), const SizedBox(height: _verticalSeparation), Row( @@ -32,7 +32,7 @@ class AboutView extends StatelessWidget { const SizedBox(height: _verticalSeparation), Text( 'Version: $appVersion', - style: Theme.of(context).textTheme.bodyText2, + style: Theme.of(context).textTheme.headlineLarge, ), const SizedBox(height: _verticalSeparation), ], @@ -56,13 +56,13 @@ class AboutView extends StatelessWidget { 'Jisho Study Tool is a frontend for Jisho.org, a a powerful Japanese-English dictionary. ' "It's made to aid you in your journey towards Japanese proficiency. " 'More features to come!', - style: Theme.of(context).textTheme.bodyText2, + style: Theme.of(context).textTheme.bodyMedium, ), ), const SizedBox(height: 2 * _verticalSeparation), - Text('Contact:', style: Theme.of(context).textTheme.headline6), + Text('Contact:', style: Theme.of(context).textTheme.headlineSmall), const SizedBox(height: _verticalSeparation), IntrinsicHeight( child: Row( @@ -105,7 +105,7 @@ class AboutView extends StatelessWidget { const SizedBox(height: _verticalSeparation), Text( 'File a bug report:', - style: Theme.of(context).textTheme.headline6, + style: Theme.of(context).textTheme.headlineSmall, ), InkWell( onTap: () => open_webpage( @@ -126,7 +126,7 @@ class AboutView extends StatelessWidget { 'I would really appreciate it if you send in some bug reports! ' 'If you find something weird, ' 'please send me a mail, or open an issue on GitHub.', - style: Theme.of(context).textTheme.bodyText2, + style: Theme.of(context).textTheme.bodyMedium, ), const SizedBox(height: _verticalSeparation), Center( @@ -134,7 +134,7 @@ class AboutView extends StatelessWidget { '頑張れ！', style: Theme.of(context) .textTheme - .headline5 + .headlineSmall ?.merge(japaneseFont.textStyle), ), ), diff --git a/lib/screens/search/search_view.dart b/lib/screens/search/search_view.dart index 95f8f2f..f2505b8 100644 --- a/lib/screens/search/search_view.dart +++ b/lib/screens/search/search_view.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import '../../components/search/search_bar.dart'; +import '../../components/search/global_search_bar.dart'; class SearchView extends StatelessWidget { const SearchView({Key? key}) : super(key: key); @@ -8,7 +8,7 @@ class SearchView extends StatelessWidget { Widget build(BuildContext context) { return Column( mainAxisAlignment: MainAxisAlignment.center, - children: [SearchBar()], + children: [GlobalSearchBar()], ); } } diff --git a/lib/screens/settings.dart b/lib/screens/settings.dart index edae4f4..914c603 100644 --- a/lib/screens/settings.dart +++ b/lib/screens/settings.dart @@ -92,11 +92,12 @@ class _SettingsViewState extends State { .toList(); late final List importedSearches; try { - importedSearches = ((((jsonDecode(await file.readAsString()) - as Map)['stores']! as List) - .map((e) => e as Map) - .where((e) => e['name'] == 'search') - .first)['values'] as List) + importedSearches = (jsonDecode(await file.readAsString()) as List) + // importedSearches = (((jsonDecode(await file.readAsString()) + // as Map)['stores']! as List) + // .map((e) => e! as Map) + // .where((e) => e['name'] == 'search') + // .first['values'] as List) .map((item) => Search.fromJson(item)) .toList(); } catch (e) { @@ -166,81 +167,81 @@ class _SettingsViewState extends State { @override Widget build(BuildContext context) => BlocBuilder( builder: (context, state) { - final TextStyle _titleTextStyle = TextStyle( - color: - state is DarkThemeState ? AppTheme.jishoGreen.background : null, - ); + // final TextStyle _titleTextStyle = TextStyle( + // color: + // state is DarkThemeState ? AppTheme.jishoGreen.background : null, + // ); - const SettingsTileTheme theme = SettingsTileTheme( - horizontalTitleGap: 0, - ); + // const SettingsTileTheme theme = SettingsTileTheme( + // horizontalTitleGap: 0, + // ); return SettingsList( - backgroundColor: Colors.transparent, + // backgroundColor: Colors.transparent, contentPadding: const EdgeInsets.symmetric(vertical: 10), sections: [ SettingsSection( - title: 'Dictionary', - titleTextStyle: _titleTextStyle, + title: const Text('Dictionary'), + // titleTextStyle: _titleTextStyle, tiles: [ SettingsTile.switchTile( - title: 'Use romaji', + title: const Text('Use romaji'), leading: const Icon(Mdi.alphabetical), onToggle: (b) => setState(() => romajiEnabled = b), - switchValue: romajiEnabled, - theme: theme, - switchActiveColor: AppTheme.jishoGreen.background, + initialValue: romajiEnabled, + // theme: theme, + activeSwitchColor: AppTheme.jishoGreen.background, ), SettingsTile.switchTile( - title: 'Extensive search', + title: const Text('Extensive search'), leading: const Icon(Icons.downloading), onToggle: (b) => setState(() => extensiveSearchEnabled = b), - switchValue: extensiveSearchEnabled, - theme: theme, - switchActiveColor: AppTheme.jishoGreen.background, + initialValue: extensiveSearchEnabled, + // theme: theme, + activeSwitchColor: AppTheme.jishoGreen.background, // subtitle: // 'Gathers extra data when searching for words, at the expense of having to wait for extra word details.', // subtitleWidget: trailing: const Icon(Icons.info), - subtitleMaxLines: 3, + // subtitleMaxLines: 3, ), SettingsTile( - title: 'Japanese font', + title: const Text('Japanese font'), leading: const Icon(Icons.format_size), onPressed: changeFont, - theme: theme, + // theme: theme, trailing: Text(japaneseFont.name), // subtitle: // 'Which font to use for japanese text. This might be useful if your phone shows kanji with a Chinese font.', - subtitleMaxLines: 3, + // subtitleMaxLines: 3, ), ], ), SettingsSection( - title: 'Theme', - titleTextStyle: _titleTextStyle, + title: const Text('Theme'), + // titleTextStyle: _titleTextStyle, tiles: [ SettingsTile.switchTile( - title: 'Automatic theme', + title: const Text('Automatic theme'), leading: const Icon(Icons.brightness_auto), onToggle: toggleAutoTheme, - switchValue: autoThemeEnabled, - theme: theme, - switchActiveColor: AppTheme.jishoGreen.background, + initialValue: autoThemeEnabled, + // theme: theme, + activeSwitchColor: AppTheme.jishoGreen.background, ), SettingsTile.switchTile( - title: 'Dark Theme', + title: const Text('Dark Theme'), leading: const Icon(Icons.dark_mode), onToggle: (b) { BlocProvider.of(context) .add(SetTheme(themeIsDark: b)); setState(() => darkThemeEnabled = b); }, - switchValue: darkThemeEnabled, + initialValue: darkThemeEnabled, enabled: !autoThemeEnabled, - theme: theme, - switchActiveColor: AppTheme.jishoGreen.background, + // theme: theme, + activeSwitchColor: AppTheme.jishoGreen.background, ), ], ), @@ -282,53 +283,53 @@ class _SettingsViewState extends State { // ), SettingsSection( - title: 'Data', - titleTextStyle: _titleTextStyle, + title: const Text('Data'), + // titleTextStyle: _titleTextStyle, tiles: [ SettingsTile( leading: const Icon(Icons.file_upload), - title: 'Import Data', + title: const Text('Import Data'), onPressed: importData, enabled: Platform.isAndroid, - subtitle: - Platform.isAndroid ? null : 'Not available on iOS yet', - subtitleWidget: dataImportIsLoading - ? const LinearProgressIndicator() - : null, + // subtitle: + // Platform.isAndroid ? null : 'Not available on iOS yet', + // subtitleWidget: dataImportIsLoading + // ? const LinearProgressIndicator() + // : null, ), SettingsTile( leading: const Icon(Icons.file_download), - title: 'Export Data', + title: const Text('Export Data'), enabled: Platform.isAndroid, - subtitle: - Platform.isAndroid ? null : 'Not available on iOS yet', - subtitleWidget: dataExportIsLoading - ? const LinearProgressIndicator() - : null, + // subtitle: + // Platform.isAndroid ? null : 'Not available on iOS yet', + // subtitleWidget: dataExportIsLoading + // ? const LinearProgressIndicator() + // : null, ), SettingsTile( leading: const Icon(Icons.delete), - title: 'Clear History', + title: const Text('Clear History'), onPressed: clearHistory, - titleTextStyle: const TextStyle(color: Colors.red), + // titleTextStyle: const TextStyle(color: Colors.red), ), SettingsTile( leading: const Icon(Icons.delete), - title: 'Clear Favourites', + title: const Text('Clear Favourites'), onPressed: (c) {}, - titleTextStyle: const TextStyle(color: Colors.red), + // titleTextStyle: const TextStyle(color: Colors.red), enabled: false, - ) + ), ], ), SettingsSection( - title: 'Info', - titleTextStyle: _titleTextStyle, + title: const Text('Info'), + // titleTextStyle: _titleTextStyle, tiles: [ SettingsTile( leading: const Icon(Icons.info), - title: 'About', + title: const Text('About'), onPressed: (c) => Navigator.pushNamed(context, Routes.about), ), @@ -337,17 +338,17 @@ class _SettingsViewState extends State { 'assets/images/logo/logo_icon_transparent_green.png', width: 30, ), - title: 'Jisho', + title: const Text('Jisho'), onPressed: (c) => open_webpage('https://jisho.org/about'), ), SettingsTile( leading: const Icon(Icons.copyright), - title: 'Licenses', + title: const Text('Licenses'), onPressed: (c) => Navigator.pushNamed(context, Routes.aboutLicenses), ), ], - ) + ), ], ); }, diff --git a/pubspec.lock b/pubspec.lock index d2cf37b..03344bd 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,254 +5,311 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - url: "https://pub.dartlang.org" + sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834 + url: "https://pub.dev" source: hosted - version: "31.0.0" + version: "72.0.0" + _macros: + dependency: transitive + description: dart + source: sdk + version: "0.3.2" analyzer: dependency: transitive description: name: analyzer - url: "https://pub.dartlang.org" + sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139 + url: "https://pub.dev" source: hosted - version: "2.8.0" + version: "6.7.0" animated_size_and_fade: dependency: "direct main" description: name: animated_size_and_fade - url: "https://pub.dartlang.org" + sha256: "8e946d67a481bceb36787b5d05c4991678c302e4f3cab5068ecc57429783b8b2" + url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "5.0.0" + ansicolor: + dependency: transitive + description: + name: ansicolor + sha256: "50e982d500bc863e1d703448afdbf9e5a72eb48840a4f766fa361ffd6877055f" + url: "https://pub.dev" + source: hosted + version: "2.0.3" archive: dependency: transitive description: name: archive - url: "https://pub.dartlang.org" + sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d + url: "https://pub.dev" source: hosted - version: "3.3.0" + version: "3.6.1" args: dependency: transitive description: name: args - url: "https://pub.dartlang.org" + sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6 + url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.6.0" async: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + url: "https://pub.dev" source: hosted - version: "2.8.2" + version: "2.11.0" audio_session: dependency: transitive description: name: audio_session - url: "https://pub.dartlang.org" + sha256: "343e83bc7809fbda2591a49e525d6b63213ade10c76f15813be9aed6657b3261" + url: "https://pub.dev" source: hosted - version: "0.1.6+1" + version: "0.1.21" bloc: dependency: transitive description: name: bloc - url: "https://pub.dartlang.org" + sha256: "106842ad6569f0b60297619e9e0b1885c2fb9bf84812935490e6c5275777804e" + url: "https://pub.dev" source: hosted - version: "8.0.3" + version: "8.1.4" 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" build: dependency: transitive description: name: build - url: "https://pub.dartlang.org" + sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0" + url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.4.1" build_config: dependency: transitive description: name: build_config - url: "https://pub.dartlang.org" + sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1 + url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.1.1" build_daemon: dependency: transitive description: name: build_daemon - url: "https://pub.dartlang.org" + sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9" + url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "4.0.2" build_resolvers: dependency: transitive description: name: build_resolvers - url: "https://pub.dartlang.org" + sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a" + url: "https://pub.dev" source: hosted - version: "2.0.6" + version: "2.4.2" build_runner: dependency: "direct dev" description: name: build_runner - url: "https://pub.dartlang.org" + sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d" + url: "https://pub.dev" source: hosted - version: "2.1.10" + version: "2.4.13" build_runner_core: dependency: transitive description: name: build_runner_core - url: "https://pub.dartlang.org" + sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0 + url: "https://pub.dev" source: hosted - version: "7.2.3" + version: "7.3.2" built_collection: dependency: transitive description: name: built_collection - url: "https://pub.dartlang.org" + sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100" + url: "https://pub.dev" source: hosted version: "5.1.1" built_value: dependency: transitive description: name: built_value - url: "https://pub.dartlang.org" + sha256: c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb + url: "https://pub.dev" source: hosted - version: "8.2.3" + version: "8.9.2" characters: dependency: transitive description: name: characters - url: "https://pub.dartlang.org" + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + url: "https://pub.dev" source: hosted - version: "1.2.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.1" + version: "1.3.0" checked_yaml: dependency: transitive description: name: checked_yaml - url: "https://pub.dartlang.org" + sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff + url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.0.3" cli_util: dependency: transitive description: name: cli_util - url: "https://pub.dartlang.org" + sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c + url: "https://pub.dev" source: hosted - version: "0.3.5" + version: "0.4.2" clock: dependency: transitive description: name: clock - url: "https://pub.dartlang.org" + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" code_builder: dependency: transitive description: name: code_builder - url: "https://pub.dartlang.org" + sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e" + url: "https://pub.dev" source: hosted - version: "4.1.0" + version: "4.10.1" collection: dependency: "direct main" description: name: collection - url: "https://pub.dartlang.org" + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.18.0" confirm_dialog: dependency: "direct main" description: name: confirm_dialog - url: "https://pub.dartlang.org" + sha256: "99b431d2f13bf64a6056fc8f1b2b85a1fc7be572da3f28a17f8a009438542327" + url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.0.4" convert: dependency: transitive description: name: convert - url: "https://pub.dartlang.org" + sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68 + url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.1.2" coverage: dependency: transitive description: name: coverage - url: "https://pub.dartlang.org" + sha256: "4b03e11f6d5b8f6e5bb5e9f7889a56fe6c5cbe942da5378ea4d4d7f73ef9dfe5" + url: "https://pub.dev" source: hosted - version: "1.0.3" + version: "1.11.0" + cross_file: + dependency: transitive + description: + name: cross_file + sha256: "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670" + url: "https://pub.dev" + source: hosted + version: "0.3.4+2" crypto: dependency: transitive description: name: crypto - url: "https://pub.dartlang.org" + sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" + url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.6" csslib: dependency: transitive description: name: csslib - url: "https://pub.dartlang.org" + sha256: "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e" + url: "https://pub.dev" source: hosted - version: "0.17.1" + version: "1.0.2" dart_style: dependency: transitive description: name: dart_style - url: "https://pub.dartlang.org" + sha256: "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab" + url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.3.7" division: dependency: "direct main" description: name: division - url: "https://pub.dartlang.org" + sha256: d1868eb2fb561d614c2b740f384b47da861df3ac7fa8c35fe9b0e5936672a30a + url: "https://pub.dev" source: hosted version: "0.9.0" + equatable: + dependency: transitive + description: + name: equatable + sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2 + url: "https://pub.dev" + source: hosted + version: "2.0.5" fake_async: dependency: transitive description: name: fake_async - url: "https://pub.dartlang.org" + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.1" ffi: dependency: transitive description: name: ffi - url: "https://pub.dartlang.org" + sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6" + url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "2.1.3" file: dependency: transitive description: name: file - url: "https://pub.dartlang.org" + sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 + url: "https://pub.dev" source: hosted - version: "6.1.2" + version: "7.0.1" file_picker: dependency: "direct main" description: name: file_picker - url: "https://pub.dartlang.org" + sha256: "16dc141db5a2ccc6520ebb6a2eb5945b1b09e95085c021d9f914f8ded7f1465c" + url: "https://pub.dev" source: hosted - version: "4.5.1" + version: "8.1.4" fixnum: dependency: transitive description: name: fixnum - url: "https://pub.dartlang.org" + sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be + url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.1.1" flutter: dependency: "direct main" description: flutter @@ -262,51 +319,58 @@ packages: dependency: "direct main" description: name: flutter_bloc - url: "https://pub.dartlang.org" + sha256: b594505eac31a0518bdcb4b5b79573b8d9117b193cc80cc12e17d639b10aa27a + url: "https://pub.dev" source: hosted - version: "8.0.1" + version: "8.1.6" flutter_launcher_icons: dependency: "direct dev" description: name: flutter_launcher_icons - url: "https://pub.dartlang.org" + sha256: "619817c4b65b322b5104b6bb6dfe6cda62d9729bd7ad4303ecc8b4e690a67a77" + url: "https://pub.dev" source: hosted - version: "0.9.2" + version: "0.14.1" flutter_native_splash: dependency: "direct dev" description: name: flutter_native_splash - url: "https://pub.dartlang.org" + sha256: ee5c9bd2b74ea8676442fd4ab876b5d41681df49276488854d6c81a5377c0ef1 + url: "https://pub.dev" source: hosted - version: "2.1.6" + version: "2.4.2" flutter_plugin_android_lifecycle: dependency: transitive description: name: flutter_plugin_android_lifecycle - url: "https://pub.dartlang.org" + sha256: "9b78450b89f059e96c9ebb355fa6b3df1d6b330436e0b885fb49594c41721398" + url: "https://pub.dev" source: hosted - version: "2.0.5" + version: "2.0.23" flutter_settings_ui: dependency: "direct main" description: name: flutter_settings_ui - url: "https://pub.dartlang.org" + sha256: dcc506fab724192594e5c232b6214a941abd6e7b5151626635b89258fadbc17c + url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.1" flutter_slidable: dependency: "direct main" description: name: flutter_slidable - url: "https://pub.dartlang.org" + sha256: "2c5611c0b44e20d180e4342318e1bbc28b0a44ad2c442f5df16962606fd3e8e3" + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "3.1.1" flutter_svg: dependency: "direct main" description: name: flutter_svg - url: "https://pub.dartlang.org" + sha256: d39e7f95621fc84376bc0f7d504f05c3a41488c562f4a8ad410569127507402c + url: "https://pub.dev" source: hosted - version: "1.0.3" + version: "2.0.9" flutter_test: dependency: "direct dev" description: flutter @@ -321,457 +385,482 @@ packages: dependency: transitive description: name: frontend_server_client - url: "https://pub.dartlang.org" + sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694 + url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "4.0.0" get_it: dependency: "direct main" description: name: get_it - url: "https://pub.dartlang.org" + sha256: c49895c1ecb0ee2a0ec568d39de882e2c299ba26355aa6744ab1001f98cebd15 + url: "https://pub.dev" source: hosted - version: "7.2.0" + version: "8.0.2" glob: dependency: transitive description: name: glob - url: "https://pub.dartlang.org" + sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63" + url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.1.2" graphs: dependency: transitive description: name: graphs - url: "https://pub.dartlang.org" + sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.3.2" html: dependency: transitive description: name: html - url: "https://pub.dartlang.org" + sha256: "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec" + url: "https://pub.dev" source: hosted - version: "0.15.0" + version: "0.15.5" html_unescape: dependency: transitive description: name: html_unescape - url: "https://pub.dartlang.org" + sha256: "15362d7a18f19d7b742ef8dcb811f5fd2a2df98db9f80ea393c075189e0b61e3" + url: "https://pub.dev" source: hosted version: "2.0.0" http: dependency: "direct main" description: name: http - url: "https://pub.dartlang.org" + sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2" + url: "https://pub.dev" source: hosted - version: "0.13.4" + version: "0.13.6" http_multi_server: dependency: transitive description: name: http_multi_server - url: "https://pub.dartlang.org" + sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b" + url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "3.2.1" http_parser: dependency: transitive description: name: http_parser - url: "https://pub.dartlang.org" + sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "4.0.2" image: dependency: transitive description: name: image - url: "https://pub.dartlang.org" + sha256: f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d + url: "https://pub.dev" source: hosted - version: "3.1.3" + version: "4.3.0" io: dependency: transitive description: name: io - url: "https://pub.dartlang.org" + sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e" + url: "https://pub.dev" source: hosted - version: "1.0.3" + version: "1.0.4" js: dependency: transitive description: name: js - url: "https://pub.dartlang.org" + sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf + url: "https://pub.dev" source: hosted - version: "0.6.3" + version: "0.7.1" json_annotation: dependency: transitive description: name: json_annotation - url: "https://pub.dartlang.org" + sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1" + url: "https://pub.dev" source: hosted - version: "4.5.0" + version: "4.9.0" just_audio: dependency: "direct main" description: name: just_audio - url: "https://pub.dartlang.org" + sha256: a49e7120b95600bd357f37a2bb04cd1e88252f7cdea8f3368803779b925b1049 + url: "https://pub.dev" source: hosted - version: "0.9.21" + version: "0.9.42" just_audio_platform_interface: dependency: transitive description: name: just_audio_platform_interface - url: "https://pub.dartlang.org" + sha256: "0243828cce503c8366cc2090cefb2b3c871aa8ed2f520670d76fd47aa1ab2790" + url: "https://pub.dev" source: hosted - version: "4.1.0" + version: "4.3.0" just_audio_web: dependency: transitive description: name: just_audio_web - url: "https://pub.dartlang.org" + sha256: "9a98035b8b24b40749507687520ec5ab404e291d2b0937823ff45d92cb18d448" + url: "https://pub.dev" source: hosted - version: "0.4.7" - lint: + version: "0.4.13" + leak_tracker: dependency: transitive description: - name: lint - url: "https://pub.dartlang.org" + name: leak_tracker + sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" + url: "https://pub.dev" source: hosted - version: "1.8.2" + version: "10.0.5" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" + url: "https://pub.dev" + source: hosted + version: "3.0.5" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + url: "https://pub.dev" + source: hosted + version: "3.0.1" logging: dependency: transitive description: name: logging - url: "https://pub.dartlang.org" + sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 + url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "1.3.0" + macros: + dependency: transitive + description: + name: macros + sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536" + url: "https://pub.dev" + source: hosted + version: "0.1.2-main.4" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + url: "https://pub.dev" source: hosted - version: "0.12.11" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - url: "https://pub.dartlang.org" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec + url: "https://pub.dev" source: hosted - version: "0.1.3" + version: "0.11.1" mdi: dependency: "direct main" description: name: mdi - url: "https://pub.dartlang.org" + sha256: "2b03a2279a0e122b7e8df0c9f22238697fe4788e8b317a2ed5554dee755b8d99" + url: "https://pub.dev" source: hosted version: "5.0.0-nullsafety.0" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + url: "https://pub.dev" source: hosted - version: "1.7.0" + version: "1.15.0" mime: dependency: transitive description: name: mime - url: "https://pub.dartlang.org" + sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6" + url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "2.0.0" nested: dependency: transitive description: name: nested - url: "https://pub.dartlang.org" + sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20" + url: "https://pub.dev" source: hosted version: "1.0.0" node_preamble: dependency: transitive description: name: node_preamble - url: "https://pub.dartlang.org" + sha256: "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db" + url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.0.2" package_config: dependency: transitive description: name: package_config - url: "https://pub.dartlang.org" + sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd" + url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.1.0" path: dependency: "direct main" description: name: path - url: "https://pub.dartlang.org" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + url: "https://pub.dev" source: hosted - version: "1.8.0" - path_drawing: - dependency: transitive - description: - name: path_drawing - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.0" + version: "1.9.0" path_parsing: dependency: transitive description: name: path_parsing - url: "https://pub.dartlang.org" + sha256: "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca" + url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.1.0" path_provider: dependency: "direct main" description: name: path_provider - url: "https://pub.dartlang.org" + sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd" + url: "https://pub.dev" source: hosted - version: "2.0.9" + version: "2.1.5" path_provider_android: dependency: transitive description: name: path_provider_android - url: "https://pub.dartlang.org" + sha256: c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a + url: "https://pub.dev" source: hosted - version: "2.0.13" - path_provider_ios: + version: "2.2.12" + path_provider_foundation: dependency: transitive description: - name: path_provider_ios - url: "https://pub.dartlang.org" + name: path_provider_foundation + sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16 + url: "https://pub.dev" source: hosted - version: "2.0.8" + version: "2.4.0" path_provider_linux: dependency: transitive description: name: path_provider_linux - url: "https://pub.dartlang.org" + sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279 + url: "https://pub.dev" source: hosted - version: "2.1.5" - path_provider_macos: - dependency: transitive - description: - name: path_provider_macos - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.5" + version: "2.2.1" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface - url: "https://pub.dartlang.org" + sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334" + url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "2.1.2" path_provider_windows: dependency: transitive description: name: path_provider_windows - url: "https://pub.dartlang.org" + sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 + url: "https://pub.dev" source: hosted - version: "2.0.5" + version: "2.3.0" petitparser: dependency: transitive description: name: petitparser - url: "https://pub.dartlang.org" + sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27 + url: "https://pub.dev" source: hosted - version: "4.4.0" + version: "6.0.2" platform: dependency: transitive description: name: platform - url: "https://pub.dartlang.org" + sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984" + url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.1.6" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - url: "https://pub.dartlang.org" + sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" + url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.8" pool: dependency: transitive description: name: pool - url: "https://pub.dartlang.org" + sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a" + url: "https://pub.dev" source: hosted - version: "1.5.0" - process: - dependency: transitive - description: - name: process - url: "https://pub.dartlang.org" - source: hosted - version: "4.2.4" + version: "1.5.1" provider: dependency: transitive description: name: provider - url: "https://pub.dartlang.org" + sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c + url: "https://pub.dev" source: hosted - version: "6.0.2" + version: "6.1.2" pub_semver: dependency: transitive description: name: pub_semver - url: "https://pub.dartlang.org" + sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c" + url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.4" pubspec_parse: dependency: transitive description: name: pubspec_parse - url: "https://pub.dartlang.org" + sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8 + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.0" rxdart: dependency: transitive description: name: rxdart - url: "https://pub.dartlang.org" + sha256: "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962" + url: "https://pub.dev" source: hosted - version: "0.27.3" + version: "0.28.0" sembast: dependency: "direct main" description: name: sembast - url: "https://pub.dartlang.org" + sha256: "61f893e50fe2fa7d14529d275d45ac31871d7ad2ae3a745f9aa3afc0b447d75b" + url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "3.7.5+2" share_plus: dependency: "direct main" description: name: share_plus - url: "https://pub.dartlang.org" + sha256: "9c9bafd4060728d7cdb2464c341743adbd79d327cb067ec7afb64583540b47c8" + url: "https://pub.dev" source: hosted - version: "4.0.4" - share_plus_linux: - dependency: transitive - description: - name: share_plus_linux - url: "https://pub.dartlang.org" - source: hosted - version: "3.0.0" - share_plus_macos: - dependency: transitive - description: - name: share_plus_macos - url: "https://pub.dartlang.org" - source: hosted - version: "3.0.0" + version: "10.1.2" share_plus_platform_interface: dependency: transitive description: name: share_plus_platform_interface - url: "https://pub.dartlang.org" + sha256: c57c0bbfec7142e3a0f55633be504b796af72e60e3c791b44d5a017b985f7a48 + url: "https://pub.dev" source: hosted - version: "3.0.2" - share_plus_web: - dependency: transitive - description: - name: share_plus_web - url: "https://pub.dartlang.org" - source: hosted - version: "3.0.0" - share_plus_windows: - dependency: transitive - description: - name: share_plus_windows - url: "https://pub.dartlang.org" - source: hosted - version: "3.0.0" + version: "5.0.1" shared_preferences: dependency: "direct main" description: name: shared_preferences - url: "https://pub.dartlang.org" + sha256: "95f9997ca1fb9799d494d0cb2a780fd7be075818d59f00c43832ed112b158a82" + url: "https://pub.dev" source: hosted - version: "2.0.13" + version: "2.3.3" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - url: "https://pub.dartlang.org" + sha256: "3b9febd815c9ca29c9e3520d50ec32f49157711e143b7a4ca039eb87e8ade5ab" + url: "https://pub.dev" source: hosted - version: "2.0.11" - shared_preferences_ios: + version: "2.3.3" + shared_preferences_foundation: dependency: transitive description: - name: shared_preferences_ios - url: "https://pub.dartlang.org" + name: shared_preferences_foundation + sha256: "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.5.3" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux - url: "https://pub.dartlang.org" + sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f" + url: "https://pub.dev" source: hosted - version: "2.1.0" - shared_preferences_macos: - dependency: transitive - description: - name: shared_preferences_macos - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.3" + version: "2.4.1" shared_preferences_platform_interface: dependency: transitive description: name: shared_preferences_platform_interface - url: "https://pub.dartlang.org" + sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80" + url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.4.1" shared_preferences_web: dependency: transitive description: name: shared_preferences_web - url: "https://pub.dartlang.org" + sha256: d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e + url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "2.4.2" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows - url: "https://pub.dartlang.org" + sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.4.1" shelf: dependency: transitive description: name: shelf - url: "https://pub.dartlang.org" + sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4 + url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.1" shelf_packages_handler: dependency: transitive description: name: shelf_packages_handler - url: "https://pub.dartlang.org" + sha256: "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e" + url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.0.2" shelf_static: dependency: transitive description: name: shelf_static - url: "https://pub.dartlang.org" + sha256: c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3 + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.3" shelf_web_socket: dependency: transitive description: name: shelf_web_socket - url: "https://pub.dartlang.org" + sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611" + url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "2.0.0" signature: dependency: "direct main" description: name: signature - url: "https://pub.dartlang.org" + sha256: "8056e091ad59c2eb5735fee975ec649d0caf8ce802bb1ffb1e0955b00a6d0daa" + url: "https://pub.dev" source: hosted - version: "5.0.0" + version: "5.5.0" sky_engine: dependency: transitive description: flutter @@ -781,240 +870,322 @@ packages: dependency: transitive description: name: source_map_stack_trace - url: "https://pub.dartlang.org" + sha256: c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.2" source_maps: dependency: transitive description: name: source_maps - url: "https://pub.dartlang.org" + sha256: "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703" + url: "https://pub.dev" source: hosted - version: "0.10.10" + version: "0.10.12" source_span: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + url: "https://pub.dev" source: hosted - version: "1.8.1" + version: "1.10.0" + sprintf: + dependency: transitive + description: + name: sprintf + sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23" + url: "https://pub.dev" + source: hosted + version: "7.0.0" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.2" stream_transform: dependency: transitive description: name: stream_transform - url: "https://pub.dartlang.org" + sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f" + url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.1.0" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.2.0" synchronized: dependency: transitive description: name: synchronized - url: "https://pub.dartlang.org" + sha256: "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225" + url: "https://pub.dev" source: hosted - version: "3.0.0+2" + version: "3.3.0+3" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.1" test: dependency: "direct main" description: name: test - url: "https://pub.dartlang.org" + sha256: "7ee44229615f8f642b68120165ae4c2a75fe77ae2065b1e55ae4711f6cf0899e" + url: "https://pub.dev" source: hosted - version: "1.19.5" + version: "1.25.7" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org" + sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" + url: "https://pub.dev" source: hosted - version: "0.4.8" + version: "0.7.2" test_core: dependency: transitive description: name: test_core - url: "https://pub.dartlang.org" + sha256: "55ea5a652e38a1dfb32943a7973f3681a60f872f8c3a05a14664ad54ef9c6696" + url: "https://pub.dev" source: hosted - version: "0.4.9" + version: "0.6.4" timing: dependency: transitive description: name: timing - url: "https://pub.dartlang.org" + sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32" + url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.0.1" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.dartlang.org" + sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 + url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.0" universal_io: dependency: transitive description: name: universal_io - url: "https://pub.dartlang.org" + sha256: "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad" + url: "https://pub.dev" source: hosted - version: "2.0.4" + version: "2.2.2" unofficial_jisho_api: dependency: "direct main" description: name: unofficial_jisho_api - url: "https://pub.dartlang.org" + sha256: "29065e010f9ea57eae59c6114e25d50ca33d7525383243f7ce205e86b803aa39" + url: "https://pub.dev" source: hosted - version: "2.0.4" + version: "3.0.0" url_launcher: dependency: "direct main" description: name: url_launcher - url: "https://pub.dartlang.org" + sha256: "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603" + url: "https://pub.dev" source: hosted - version: "6.1.0" + version: "6.3.1" url_launcher_android: dependency: transitive description: name: url_launcher_android - url: "https://pub.dartlang.org" + sha256: "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193" + url: "https://pub.dev" source: hosted - version: "6.0.16" + version: "6.3.14" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - url: "https://pub.dartlang.org" + sha256: e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e + url: "https://pub.dev" source: hosted - version: "6.0.15" + version: "6.3.1" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - url: "https://pub.dartlang.org" + sha256: "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935" + url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.2.1" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - url: "https://pub.dartlang.org" + sha256: "769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672" + url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.2.1" url_launcher_platform_interface: dependency: transitive description: name: url_launcher_platform_interface - url: "https://pub.dartlang.org" + sha256: "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029" + url: "https://pub.dev" source: hosted - version: "2.0.5" + version: "2.3.2" url_launcher_web: dependency: transitive description: name: url_launcher_web - url: "https://pub.dartlang.org" + sha256: "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e" + url: "https://pub.dev" source: hosted - version: "2.0.9" + version: "2.3.3" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - url: "https://pub.dartlang.org" + sha256: "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4" + url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.1.3" uuid: dependency: transitive description: name: uuid - url: "https://pub.dartlang.org" + sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff + url: "https://pub.dev" source: hosted - version: "3.0.6" + version: "4.5.1" + vector_graphics: + dependency: transitive + description: + name: vector_graphics + sha256: "4ac59808bbfca6da38c99f415ff2d3a5d7ca0a6b4809c71d9cf30fba5daf9752" + url: "https://pub.dev" + source: hosted + version: "1.1.10+1" + vector_graphics_codec: + dependency: transitive + description: + name: vector_graphics_codec + sha256: f3247e7ab0ec77dc759263e68394990edc608fb2b480b80db8aa86ed09279e33 + url: "https://pub.dev" + source: hosted + version: "1.1.10+1" + vector_graphics_compiler: + dependency: transitive + description: + name: vector_graphics_compiler + sha256: "18489bdd8850de3dd7ca8a34e0c446f719ec63e2bab2e7a8cc66a9028dd76c5a" + url: "https://pub.dev" + source: hosted + version: "1.1.10+1" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.dartlang.org" + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.4" vm_service: dependency: transitive description: name: vm_service - url: "https://pub.dartlang.org" + sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" + url: "https://pub.dev" source: hosted - version: "7.5.0" + version: "14.2.5" watcher: dependency: transitive description: name: watcher - url: "https://pub.dartlang.org" + sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8" + url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.1.0" + web: + dependency: transitive + description: + name: web + sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb + url: "https://pub.dev" + source: hosted + version: "1.1.0" + web_socket: + dependency: transitive + description: + name: web_socket + sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83" + url: "https://pub.dev" + source: hosted + version: "0.1.6" web_socket_channel: dependency: transitive description: name: web_socket_channel - url: "https://pub.dartlang.org" + sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f" + url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "3.0.1" webkit_inspection_protocol: dependency: transitive description: name: webkit_inspection_protocol - url: "https://pub.dartlang.org" + sha256: "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572" + url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.2.1" win32: dependency: transitive description: name: win32 - url: "https://pub.dartlang.org" + sha256: "84ba388638ed7a8cb3445a320c8273136ab2631cd5f2c57888335504ddab1bc2" + url: "https://pub.dev" source: hosted - version: "2.5.2" + version: "5.8.0" xdg_directories: dependency: transitive description: name: xdg_directories - url: "https://pub.dartlang.org" + sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15" + url: "https://pub.dev" source: hosted - version: "0.2.0+1" + version: "1.1.0" xml: dependency: transitive description: name: xml - url: "https://pub.dartlang.org" + sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226 + url: "https://pub.dev" source: hosted - version: "5.3.1" + version: "6.5.0" yaml: dependency: transitive description: name: yaml - url: "https://pub.dartlang.org" + sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" + url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.1.2" sdks: - dart: ">=2.16.0 <3.0.0" - flutter: ">=2.10.0" + dart: ">=3.5.0 <4.0.0" + flutter: ">=3.24.0" diff --git a/pubspec.yaml b/pubspec.yaml index 1ce7037..3b5a2e9 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,40 +3,40 @@ description: A dictionary app for studying japanese version: 1.0.0+1 environment: - sdk: ">=2.12.0 <3.0.0" + sdk: ">=3.2.0<4.0.0" dependencies: - animated_size_and_fade: ^3.0.0 + animated_size_and_fade: ^5.0.0 collection: ^1.15.0 confirm_dialog: ^1.0.0 division: ^0.9.0 - file_picker: ^4.5.1 + file_picker: ^8.1.4 flutter: sdk: flutter - flutter_bloc: ^8.0.0 - flutter_settings_ui: ^2.0.1 - flutter_slidable: ^1.1.0 - flutter_svg: ^1.0.2 - get_it: ^7.2.0 - http: ^0.13.4 + flutter_bloc: ^8.1.3 + flutter_settings_ui: ^3.0.0 + flutter_slidable: ^3.0.1 + flutter_svg: ^2.0.9 + get_it: ^8.0.2 + http: ^0.13.0 just_audio: ^0.9.18 mdi: ^5.0.0-nullsafety.0 path: ^1.8.0 path_provider: ^2.0.2 - sembast: ^3.1.1 - share_plus: ^4.0.4 - test: ^1.19.5 - shared_preferences: ^2.0.6 + sembast: ^3.5.0 + share_plus: ^10.1.2 + test: ^1.24.9 + shared_preferences: ^2.2.2 signature: ^5.0.0 unofficial_jisho_api: ^3.0.0 - url_launcher: ^6.0.9 + url_launcher: ^6.2.4 dev_dependencies: build_runner: ^2.0.6 flutter_test: sdk: flutter flutter_native_splash: ^2.1.6 - flutter_launcher_icons: "^0.9.2" + flutter_launcher_icons: ^0.14.1 flutter_icons: android: "launcher_icon"