Skip to content

Commit

Permalink
Update packages
Browse files Browse the repository at this point in the history
  • Loading branch information
Carapacik committed Mar 2, 2025
1 parent 5fd7714 commit 82e2bd2
Show file tree
Hide file tree
Showing 11 changed files with 61 additions and 76 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import 'messages_en.dart' as messages_en;
import 'messages_ru.dart' as messages_ru;

typedef Future<dynamic> LibraryLoader();

Map<String, LibraryLoader> _deferredLibraries = {
'en': () => new SynchronousFuture(null),
'ru': () => new SynchronousFuture(null),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ class MessageLookup extends MessageLookupByLibrary {
static String m2(number) => "Level ${number}";

final messages = _notInlinedMessages(_notInlinedMessages);

static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
"about": MessageLookupByLibrary.simpleMessage("About"),
"appDictionary": MessageLookupByLibrary.simpleMessage("App dictionary"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ class MessageLookup extends MessageLookupByLibrary {
static String m2(number) => "Уровень ${number}";

final messages = _notInlinedMessages(_notInlinedMessages);

static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
"about": MessageLookupByLibrary.simpleMessage("О приложении"),
"appDictionary": MessageLookupByLibrary.simpleMessage("Язык словаря"),
Expand Down
3 changes: 0 additions & 3 deletions lib/src/core/constant/localization/generated/l10n.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion lib/src/core/utils/logger/logger.dart
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ mixin class LogObserver {
const LogObserver();

/// Called when a new log message is created.
// ignore: avoid-unused-parameters, no-empty-block
void onLog(LogMessage logMessage) {}
}

Expand Down
5 changes: 0 additions & 5 deletions lib/src/feature/game/bloc/game_bloc.freezed.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
// coverage:ignore-file
// GENERATED CODE - DO NOT MODIFY BY HAND
// ignore_for_file: type=lint
// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark

part of 'game_bloc.dart';

// **************************************************************************
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,33 +39,35 @@ class _InitializationFailedAppState extends State<InitializationFailedApp> {
}

@override
Widget build(BuildContext context) => MaterialApp(
home: Scaffold(
body: Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text('Initialization failed', style: Theme.of(context).textTheme.headlineMedium),
if (widget.onRetryInitialization != null)
IconButton(icon: const Icon(Icons.refresh), onPressed: _retryInitialization),
],
),
const SizedBox(height: 16),
Text(
'${widget.error}',
style: Theme.of(context).textTheme.bodyLarge?.copyWith(color: Theme.of(context).colorScheme.error),
),
const SizedBox(height: 16),
Padding(
padding: const EdgeInsets.all(8),
child: Text('${widget.stackTrace}', style: Theme.of(context).textTheme.bodyLarge),
),
],
Widget build(BuildContext context) {
return MaterialApp(
home: Scaffold(
body: Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text('Initialization failed', style: Theme.of(context).textTheme.headlineMedium),
if (widget.onRetryInitialization != null)
IconButton(icon: const Icon(Icons.refresh), onPressed: _retryInitialization),
],
),
const SizedBox(height: 16),
Text(
'${widget.error}',
style: Theme.of(context).textTheme.bodyLarge?.copyWith(color: Theme.of(context).colorScheme.error),
),
const SizedBox(height: 16),
Padding(
padding: const EdgeInsets.all(8),
child: Text('${widget.stackTrace}', style: Theme.of(context).textTheme.bodyLarge),
),
],
),
),
),
),
);
);
}
}
10 changes: 6 additions & 4 deletions lib/src/feature/initialization/widget/root_context.dart
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ class RootContext extends StatelessWidget {
final CompositionResult compositionResult;

@override
Widget build(BuildContext context) => DependenciesScope(
dependencies: compositionResult.dependencies,
child: const SettingsScope(child: BlocScope(child: WindowSizeScope(child: MaterialContext()))),
);
Widget build(BuildContext context) {
return DependenciesScope(
dependencies: compositionResult.dependencies,
child: const SettingsScope(child: BlocScope(child: WindowSizeScope(child: MaterialContext()))),
);
}
}
18 changes: 7 additions & 11 deletions lib/src/feature/settings/widget/settings_scope.dart
Original file line number Diff line number Diff line change
Expand Up @@ -49,24 +49,20 @@ class _SettingsScopeState extends State<SettingsScope> {
}

@override
Widget build(BuildContext context) => BlocBuilder<AppSettingsBloc, AppSettingsState>(
bloc: _appSettingsBloc,
builder: (context, state) => _InheritedSettings(settings: state.appSettings, state: this, child: widget.child),
);
Widget build(BuildContext context) {
return BlocBuilder<AppSettingsBloc, AppSettingsState>(
bloc: _appSettingsBloc,
builder: (context, state) => _InheritedSettings(settings: state.appSettings, state: this, child: widget.child),
);
}
}

/// {@template inherited_settings}
/// _InheritedSettings widget.
/// {@endtemplate}
class _InheritedSettings extends InheritedWidget {
/// {@macro inherited_settings}
const _InheritedSettings({
required super.child,
required this.state,
required this.settings,
// ignore: unused_element_parameter
super.key,
});
const _InheritedSettings({required super.child, required this.state, required this.settings});

/// _SettingsScopeState instance.
final _SettingsScopeState state;
Expand Down
32 changes: 16 additions & 16 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ packages:
dependency: transitive
description:
name: archive
sha256: "528579c7e4579719f04b21eeeeddfd73a18b31dabc22766893b7d1be7f49b967"
sha256: "0c64e928dcbefddecd234205422bcfc2b5e6d31be0b86fef0d0dd48d7b4c9742"
url: "https://pub.dev"
source: hosted
version: "4.0.3"
version: "4.0.4"
args:
dependency: transitive
description:
Expand Down Expand Up @@ -117,10 +117,10 @@ packages:
dependency: transitive
description:
name: built_value
sha256: "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2"
sha256: "8b158ab94ec6913e480dc3f752418348b5ae099eb75868b5f4775f0572999c61"
url: "https://pub.dev"
source: hosted
version: "8.9.3"
version: "8.9.4"
carapacik_lints:
dependency: "direct dev"
description:
Expand Down Expand Up @@ -250,10 +250,10 @@ packages:
dependency: "direct main"
description:
name: flutter_bloc
sha256: "153856bdaac302bbdc58a1d1403d50c40557254aa05eaeed40515d88a25a526b"
sha256: "1046d719fbdf230330d3443187cc33cc11963d15c9089f6cc56faa42a4c5f0cc"
url: "https://pub.dev"
source: hosted
version: "9.0.0"
version: "9.1.0"
flutter_colorpicker:
dependency: "direct main"
description:
Expand All @@ -266,18 +266,18 @@ packages:
dependency: transitive
description:
name: flutter_gen_core
sha256: "53890b653738f34363d9f0d40f82104c261716bd551d3ba65f648770b6764c21"
sha256: "3eaa2d3d8be58267ac4cd5e215ac965dd23cae0410dc073de2e82e227be32bfc"
url: "https://pub.dev"
source: hosted
version: "5.9.0"
version: "5.10.0"
flutter_gen_runner:
dependency: "direct dev"
description:
name: flutter_gen_runner
sha256: de70b42eb5329f712c8b041069d081ad5fb5109f32d6d1ea9c1b39596786215d
sha256: e74b4ead01df3e8f02e73a26ca856759dbbe8cb3fd60941ba9f4005cd0cd19c9
url: "https://pub.dev"
source: hosted
version: "5.9.0"
version: "5.10.0"
flutter_localizations:
dependency: "direct main"
description: flutter
Expand All @@ -292,10 +292,10 @@ packages:
dependency: "direct dev"
description:
name: freezed
sha256: d2581edbd572e6e7c50eac5a9b91022a26200e08a7f5a82dcf70f070c0e2cb67
sha256: a3d6429368603a591ca7c1795799a247998fb213ded509070c2c59708b25df31
url: "https://pub.dev"
source: hosted
version: "3.0.0"
version: "3.0.2"
freezed_annotation:
dependency: "direct main"
description:
Expand Down Expand Up @@ -372,10 +372,10 @@ packages:
dependency: "direct main"
description:
name: intl
sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5"
sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
url: "https://pub.dev"
source: hosted
version: "0.20.2"
version: "0.19.0"
io:
dependency: transitive
description:
Expand Down Expand Up @@ -905,10 +905,10 @@ packages:
dependency: transitive
description:
name: web
sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a"
url: "https://pub.dev"
source: hosted
version: "1.1.0"
version: "1.1.1"
web_socket:
dependency: transitive
description:
Expand Down
9 changes: 3 additions & 6 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies:
collection: any
flutter:
sdk: flutter
flutter_bloc: ^9.0.0
flutter_bloc: ^9.1.0
flutter_colorpicker: ^1.1.0
flutter_localizations:
sdk: flutter
Expand All @@ -30,13 +30,10 @@ dependencies:
dev_dependencies:
build_runner: ^2.4.15
carapacik_lints: ^1.11.1
flutter_gen_runner: ^5.9.0
flutter_gen_runner: ^5.10.0
#flutter_launcher_icons: ^0.14.3
#flutter_native_splash: ^2.4.5
freezed: ^3.0.0

dependency_overrides:
intl: ^0.20.2
freezed: ^3.0.2

flutter:
uses-material-design: true
Expand Down

0 comments on commit 82e2bd2

Please sign in to comment.