Skip to content
This repository has been archived by the owner on Oct 2, 2024. It is now read-only.

Commit

Permalink
Update Dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
tsinis committed Jul 8, 2022
1 parent a224493 commit 2f48b11
Show file tree
Hide file tree
Showing 11 changed files with 57 additions and 51 deletions.
2 changes: 1 addition & 1 deletion lib/about/blocs/about_event.freezed.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1071,7 +1071,7 @@ abstract class _AboutStarted implements AboutEvent {
const factory _AboutStarted({required final String currentLocale}) =
_$_AboutStarted;

String get currentLocale => throw _privateConstructorUsedError;
String get currentLocale;
@JsonKey(ignore: true)
_$$_AboutStartedCopyWith<_$_AboutStarted> get copyWith =>
throw _privateConstructorUsedError;
Expand Down
4 changes: 2 additions & 2 deletions lib/about/blocs/about_state.freezed.dart
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ abstract class _AboutLoaded implements AboutState {
const factory _AboutLoaded({required final String appVersion}) =
_$_AboutLoaded;

String get appVersion => throw _privateConstructorUsedError;
String get appVersion;
@JsonKey(ignore: true)
_$$_AboutLoadedCopyWith<_$_AboutLoaded> get copyWith =>
throw _privateConstructorUsedError;
Expand Down Expand Up @@ -604,7 +604,7 @@ abstract class _AboutStarted implements AboutState {
const factory _AboutStarted({required final String currentLocale}) =
_$_AboutStarted;

String get currentLocale => throw _privateConstructorUsedError;
String get currentLocale;
@JsonKey(ignore: true)
_$$_AboutStartedCopyWith<_$_AboutStarted> get copyWith =>
throw _privateConstructorUsedError;
Expand Down
50 changes: 25 additions & 25 deletions lib/app/theme/app_theme.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,36 @@ import 'package:flutter/scheduler.dart' show SchedulerBinding;
class AppTheme {
final bool? isDark;

static const Color _grey800 = Color(0xFF424242); // Constant value of Colors.grey[800].
static const Color _grey800 = Color(0xFF424242); // Constant value of Colors.grey.shade800.

static const VisualDensity _visualDensity = VisualDensity.standard;

final ThemeData _darkTheme = ThemeData.from(
colorScheme: ColorScheme.fromSwatch(primarySwatch: Colors.grey, brightness: Brightness.dark).copyWith(
error: Colors.red,
secondary: Colors.grey[600],
secondary: Colors.grey.shade600,
),
).copyWith(
useMaterial3: true,
scaffoldBackgroundColor: Colors.grey[700],
scaffoldBackgroundColor: Colors.grey.shade700,
checkboxTheme: CheckboxThemeData(fillColor: MaterialStateProperty.all<Color>(Colors.grey)),
focusColor: Colors.grey,
indicatorColor: Colors.teal[200],
disabledColor: Colors.grey[600],
indicatorColor: Colors.teal.shade200,
disabledColor: Colors.grey.shade600,
primaryIconTheme: IconThemeData(color: Colors.grey[350]),
appBarTheme: const AppBarTheme(shadowColor: Colors.black54, elevation: 2),
radioTheme: RadioThemeData(fillColor: MaterialStateProperty.all<Color?>(Colors.grey[400])),
radioTheme: RadioThemeData(fillColor: MaterialStateProperty.all<Color?>(Colors.grey.shade400)),
textButtonTheme: TextButtonThemeData(style: TextButton.styleFrom(primary: Colors.grey[350])),
elevatedButtonTheme: ElevatedButtonThemeData(
style: ElevatedButton.styleFrom(
primary: Colors.grey[800],
primary: Colors.grey.shade800,
onPrimary: Colors.grey[350],
visualDensity: _visualDensity,
),
),
floatingActionButtonTheme: FloatingActionButtonThemeData(
extendedPadding: const EdgeInsets.symmetric(horizontal: 16),
backgroundColor: Colors.grey[600],
backgroundColor: Colors.grey.shade600,
foregroundColor: Colors.white,
disabledElevation: 0,
),
Expand All @@ -44,36 +44,36 @@ class AppTheme {
),
),
navigationRailTheme: NavigationRailThemeData(
indicatorColor: Colors.grey[600],
indicatorColor: Colors.grey.shade600,
backgroundColor: const Color(0xFF585858),
selectedIconTheme: IconThemeData(color: Colors.grey[200]),
selectedIconTheme: IconThemeData(color: Colors.grey.shade200),
unselectedIconTheme: IconThemeData(color: Colors.grey[350]),
selectedLabelTextStyle: TextStyle(color: Colors.grey[200]),
selectedLabelTextStyle: TextStyle(color: Colors.grey.shade200),
unselectedLabelTextStyle: TextStyle(color: Colors.grey[350]),
),
outlinedButtonTheme: OutlinedButtonThemeData(
style: OutlinedButton.styleFrom(
visualDensity: _visualDensity,
primary: Colors.grey[300],
primary: Colors.grey.shade300,
backgroundColor: Colors.transparent,
side: BorderSide(color: Colors.grey[400]!),
side: BorderSide(color: Colors.grey.shade400),
),
),
);

final ThemeData _lightTheme = ThemeData(
useMaterial3: true,
primarySwatch: Colors.grey,
primaryColor: Colors.grey[400],
disabledColor: Colors.grey[600],
errorColor: Colors.red[900],
primaryColor: Colors.grey.shade400,
disabledColor: Colors.grey.shade600,
errorColor: Colors.red.shade900,
scaffoldBackgroundColor: Colors.grey[350], //AAA compliant.
primaryIconTheme: IconThemeData(color: Colors.grey[850]),
dialogBackgroundColor: Colors.grey[350],
splashColor: Colors.grey[300],
focusColor: Colors.grey[200],
splashColor: Colors.grey.shade300,
focusColor: Colors.grey.shade200,
indicatorColor: Colors.teal,
dialogTheme: DialogTheme(backgroundColor: Colors.grey[100]),
dialogTheme: DialogTheme(backgroundColor: Colors.grey.shade100),
radioTheme: RadioThemeData(fillColor: MaterialStateProperty.all<Color>(Colors.black)),
textButtonTheme: TextButtonThemeData(
style: TextButton.styleFrom(
Expand All @@ -84,7 +84,7 @@ class AppTheme {
),
elevatedButtonTheme: ElevatedButtonThemeData(
style: ElevatedButton.styleFrom(
primary: Colors.grey[100],
primary: Colors.grey.shade100,
onPrimary: Colors.grey[850],
visualDensity: _visualDensity,
),
Expand All @@ -93,11 +93,11 @@ class AppTheme {
elevation: 2,
shadowColor: Colors.black45,
iconTheme: const IconThemeData(color: _grey800),
backgroundColor: Colors.grey[400],
backgroundColor: Colors.grey.shade400,
),
floatingActionButtonTheme: FloatingActionButtonThemeData(
extendedPadding: const EdgeInsets.symmetric(horizontal: 16),
backgroundColor: Colors.grey[100],
backgroundColor: Colors.grey.shade100,
foregroundColor: Colors.grey[850],
focusElevation: 10,
),
Expand All @@ -110,10 +110,10 @@ class AppTheme {
),
),
navigationRailTheme: NavigationRailThemeData(
backgroundColor: Colors.grey[400],
selectedIconTheme: IconThemeData(color: Colors.grey[900]),
backgroundColor: Colors.grey.shade400,
selectedIconTheme: IconThemeData(color: Colors.grey.shade900),
unselectedIconTheme: IconThemeData(color: Colors.grey[850]),
selectedLabelTextStyle: TextStyle(color: Colors.grey[900]),
selectedLabelTextStyle: TextStyle(color: Colors.grey.shade900),
unselectedLabelTextStyle: TextStyle(color: Colors.grey[850]),
),
);
Expand Down
2 changes: 1 addition & 1 deletion lib/color_picker/blocs/colorpicker_event.freezed.dart
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ class _$_ColorPickerCopied implements _ColorPickerCopied {
abstract class _ColorPickerCopied implements ColorPickerEvent {
const factory _ColorPickerCopied(final Color color) = _$_ColorPickerCopied;

Color get color => throw _privateConstructorUsedError;
Color get color;
@JsonKey(ignore: true)
_$$_ColorPickerCopiedCopyWith<_$_ColorPickerCopied> get copyWith =>
throw _privateConstructorUsedError;
Expand Down
7 changes: 4 additions & 3 deletions lib/core/ui/view/main_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ class _NavigationScreenState extends State<MainScreen> {
listener: (BuildContext context, SnackbarState snackbarState) {
if (snackbarState is! SnackbarsInitial) {
BlocProvider.of<SoundBloc>(context).add(const SoundEvent.copied());
late String message;
String? message;
final bool isUrlCopied = snackbarState is UrlCopySuccess;
final bool isFileCopied = snackbarState is FileCopySuccess;
final bool isShareFailed = snackbarState is ShareAttemptFailure;
Expand All @@ -133,8 +133,9 @@ class _NavigationScreenState extends State<MainScreen> {
message = context.l10n.serverMaintenanceMessage;
} else if (isShareFailed) {
message = context.l10n.shareFailedMessage;
} else {
// TODO: Add Error message.
}
if (message == null) {
return;
}
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
Expand Down
2 changes: 1 addition & 1 deletion lib/navigation/blocs/navigation_event.freezed.dart
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ abstract class _NavigationTabChanged implements NavigationEvent {
const factory _NavigationTabChanged(final int newTabIndex) =
_$_NavigationTabChanged;

int get newTabIndex => throw _privateConstructorUsedError;
int get newTabIndex;
@JsonKey(ignore: true)
_$$_NavigationTabChangedCopyWith<_$_NavigationTabChanged> get copyWith =>
throw _privateConstructorUsedError;
Expand Down
12 changes: 6 additions & 6 deletions lib/share/blocs/share_event.freezed.dart
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ class _$_ShareUrlShared implements _ShareUrlShared {
abstract class _ShareUrlShared implements ShareEvent {
const factory _ShareUrlShared(final ColorPalette palette) = _$_ShareUrlShared;

ColorPalette get palette => throw _privateConstructorUsedError;
ColorPalette get palette;
@JsonKey(ignore: true)
_$$_ShareUrlSharedCopyWith<_$_ShareUrlShared> get copyWith =>
throw _privateConstructorUsedError;
Expand Down Expand Up @@ -566,7 +566,7 @@ class _$_ShareUrlCopied implements _ShareUrlCopied {
abstract class _ShareUrlCopied implements ShareEvent {
const factory _ShareUrlCopied(final ColorPalette palette) = _$_ShareUrlCopied;

ColorPalette get palette => throw _privateConstructorUsedError;
ColorPalette get palette;
@JsonKey(ignore: true)
_$$_ShareUrlCopiedCopyWith<_$_ShareUrlCopied> get copyWith =>
throw _privateConstructorUsedError;
Expand Down Expand Up @@ -733,7 +733,7 @@ abstract class _ShareFileShared implements ShareEvent {
const factory _ShareFileShared(final ColorPalette palette) =
_$_ShareFileShared;

ColorPalette get palette => throw _privateConstructorUsedError;
ColorPalette get palette;
@JsonKey(ignore: true)
_$$_ShareFileSharedCopyWith<_$_ShareFileShared> get copyWith =>
throw _privateConstructorUsedError;
Expand Down Expand Up @@ -900,7 +900,7 @@ abstract class _ShareFileCopied implements ShareEvent {
const factory _ShareFileCopied(final ColorPalette palette) =
_$_ShareFileCopied;

ColorPalette get palette => throw _privateConstructorUsedError;
ColorPalette get palette;
@JsonKey(ignore: true)
_$$_ShareFileCopiedCopyWith<_$_ShareFileCopied> get copyWith =>
throw _privateConstructorUsedError;
Expand Down Expand Up @@ -1068,7 +1068,7 @@ abstract class _ShareFormatSelected implements ShareEvent {
const factory _ShareFormatSelected({required final FileFormat? format}) =
_$_ShareFormatSelected;

FileFormat? get format => throw _privateConstructorUsedError;
FileFormat? get format;
@JsonKey(ignore: true)
_$$_ShareFormatSelectedCopyWith<_$_ShareFormatSelected> get copyWith =>
throw _privateConstructorUsedError;
Expand Down Expand Up @@ -1240,7 +1240,7 @@ abstract class _ShareUrlProviderSelected implements ShareEvent {
{required final ColorsUrlProvider? urlProvider}) =
_$_ShareUrlProviderSelected;

ColorsUrlProvider? get urlProvider => throw _privateConstructorUsedError;
ColorsUrlProvider? get urlProvider;
@JsonKey(ignore: true)
_$$_ShareUrlProviderSelectedCopyWith<_$_ShareUrlProviderSelected>
get copyWith => throw _privateConstructorUsedError;
Expand Down
8 changes: 4 additions & 4 deletions lib/share/blocs/share_state.freezed.dart
Original file line number Diff line number Diff line change
Expand Up @@ -508,10 +508,10 @@ abstract class _ShareFormatSelectedInitial implements ShareState {
required final bool canSharePdf,
required final bool canSharePng}) = _$_ShareFormatSelectedInitial;

ColorsUrlProvider? get selectedProvider => throw _privateConstructorUsedError;
FileFormat? get selectedFormat => throw _privateConstructorUsedError;
bool get canSharePdf => throw _privateConstructorUsedError;
bool get canSharePng => throw _privateConstructorUsedError;
ColorsUrlProvider? get selectedProvider;
FileFormat? get selectedFormat;
bool get canSharePdf;
bool get canSharePng;
@JsonKey(ignore: true)
_$$_ShareFormatSelectedInitialCopyWith<_$_ShareFormatSelectedInitial>
get copyWith => throw _privateConstructorUsedError;
Expand Down
10 changes: 5 additions & 5 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ packages:
name: _fe_analyzer_shared
url: "https://pub.dartlang.org"
source: hosted
version: "38.0.0"
version: "41.0.0"
analyzer:
dependency: transitive
dependency: "direct dev"
description:
name: analyzer
url: "https://pub.dartlang.org"
source: hosted
version: "3.4.1"
version: "4.2.0"
analyzer_plugin:
dependency: transitive
description:
Expand Down Expand Up @@ -609,14 +609,14 @@ packages:
name: json_annotation
url: "https://pub.dartlang.org"
source: hosted
version: "4.5.0"
version: "4.6.0"
json_serializable:
dependency: "direct dev"
description:
name: json_serializable
url: "https://pub.dartlang.org"
source: hosted
version: "6.2.0"
version: "6.3.0"
lints:
dependency: transitive
description:
Expand Down
8 changes: 6 additions & 2 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dependencies:
http: ^0.13.0-nullsafety.0 # From Google
hydrated_bloc: 7.0.1
intl: ^0.17.0 # From Google
json_annotation: ^4.5.0 # From Google
json_annotation: ^4.6.0 # From Google
mdi: ^5.0.0-nullsafety.0
package_info_plus: ^1.4.2 # From Flutter Community (former Google)
path_provider: ^2.0.11 # From Google
Expand All @@ -48,6 +48,7 @@ dependencies:
ref: 5c51870ced62a00e809ba4b81a846a052d241c9f

dev_dependencies:
analyzer: ^4.2.0
bloc_test: 8.5.0
build_runner: ^2.1.11 # From Google
dart_code_metrics: ^4.16.0 # Flutter Favorite
Expand All @@ -59,10 +60,13 @@ dev_dependencies:
hive_generator: ^1.1.3
integration_test: # From Google
sdk: flutter
json_serializable: ^6.2.0 # From Google
json_serializable: ^6.3.0 # From Google
mockito: ^5.0.0-nullsafety.5 # From Google
msix: 2.7.3 # Flutter Favorite (generating from SVG)

dependency_overrides:
analyzer: ">=4.2.0 <5.0.0" # From Google

flutter:
generate: true
uses-material-design: true
Expand Down
3 changes: 2 additions & 1 deletion snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ base: core20
grade: stable
compression: lzo
architectures:
- build-on: [arm64]
- build-on: [amd64]

parts:
flutter-git:
Expand All @@ -23,6 +23,7 @@ parts:
cp -r $SNAPCRAFT_PART_SRC $SNAPCRAFT_PART_INSTALL/usr/libexec/flutter
ln -s $SNAPCRAFT_PART_INSTALL/usr/libexec/flutter/bin/flutter $SNAPCRAFT_PART_INSTALL/usr/bin/flutter
build-packages:
- libblkid1
- libjsoncpp-dev
- libsecret-1-dev
- cmake
Expand Down

0 comments on commit 2f48b11

Please sign in to comment.