Skip to content

Commit

Permalink
chore: update Flutter SDK version to 3.29.0
Browse files Browse the repository at this point in the history
  • Loading branch information
gokadzev committed Feb 13, 2025
1 parent 3e9603e commit 7944fba
Show file tree
Hide file tree
Showing 8 changed files with 241 additions and 248 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,9 @@ app.*.map.json

# Exceptions to above rules.
!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages

# Android related
android/app/.cxx/

# Generated localization dart files
lib/localization/app_*.dart
1 change: 0 additions & 1 deletion analysis_options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ linter:
- null_closures
- omit_local_variable_types
- overridden_fields
- package_api_docs
- package_names
- package_prefixed_library_names
- prefer_adjacent_string_concatenation
Expand Down
3 changes: 2 additions & 1 deletion l10n.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
arb-dir: lib/localization
template-arb-file: app_en.arb
output-localization-file: app_localizations.dart
untranslated-messages-file: no_translations.txt
untranslated-messages-file: no_translations.txt
synthetic-package: false
2 changes: 1 addition & 1 deletion lib/extensions/l10n.dart
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/

import 'package:flutter/widgets.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:musify/localization/app_localizations.dart';

extension ContextX on BuildContext {
AppLocalizations? get l10n => AppLocalizations.of(this);
Expand Down
36 changes: 18 additions & 18 deletions lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/scheduler.dart';
import 'package:flutter/services.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:hive_flutter/hive_flutter.dart';
import 'package:musify/API/musify.dart';
import 'package:musify/localization/app_localizations.dart';
import 'package:musify/services/audio_service.dart';
import 'package:musify/services/data_manager.dart';
import 'package:musify/services/logger_service.dart';
Expand Down Expand Up @@ -67,9 +67,10 @@ final appLanguages = <String, String>{
'Ukrainian': 'uk',
};

final appSupportedLocales = appLanguages.values
.map((languageCode) => Locale.fromSubtags(languageCode: languageCode))
.toList();
final appSupportedLocales =
appLanguages.values
.map((languageCode) => Locale.fromSubtags(languageCode: languageCode))
.toList();

class Musify extends StatefulWidget {
const Musify({super.key});
Expand All @@ -82,11 +83,11 @@ class Musify extends StatefulWidget {
bool? useSystemColor,
}) async {
context.findAncestorStateOfType<_MusifyState>()!.changeSettings(
newThemeMode: newThemeMode,
newLocale: newLocale,
newAccentColor: newAccentColor,
systemColorStatus: useSystemColor,
);
newThemeMode: newThemeMode,
newLocale: newLocale,
newAccentColor: newAccentColor,
systemColorStatus: useSystemColor,
);
}

@override
Expand All @@ -112,11 +113,7 @@ class _MusifyState extends State<Musify> {
if (systemColorStatus != null &&
useSystemColor.value != systemColorStatus) {
useSystemColor.value = systemColorStatus;
addOrUpdateData(
'settings',
'useSystemColor',
systemColorStatus,
);
addOrUpdateData('settings', 'useSystemColor', systemColorStatus);
}
primaryColorSetting = newAccentColor;
}
Expand All @@ -140,8 +137,9 @@ class _MusifyState extends State<Musify> {

try {
LicenseRegistry.addLicense(() async* {
final license =
await rootBundle.loadString('assets/licenses/paytone.txt');
final license = await rootBundle.loadString(
'assets/licenses/paytone.txt',
);
yield LicenseEntryWithLineBreaks(['paytoneOne'], license);
});
} catch (e, stackTrace) {
Expand Down Expand Up @@ -169,8 +167,10 @@ class _MusifyState extends State<Musify> {
Widget build(BuildContext context) {
return DynamicColorBuilder(
builder: (lightColorScheme, darkColorScheme) {
final colorScheme =
getAppColorScheme(lightColorScheme, darkColorScheme);
final colorScheme = getAppColorScheme(
lightColorScheme,
darkColorScheme,
);

return MaterialApp.router(
themeMode: themeMode,
Expand Down
Loading

0 comments on commit 7944fba

Please sign in to comment.