Skip to content

Commit

Permalink
feat: update lastest version packages
Browse files Browse the repository at this point in the history
  • Loading branch information
hoangtm committed Jun 26, 2024
1 parent 00280d9 commit 1be59b0
Show file tree
Hide file tree
Showing 21 changed files with 70 additions and 52 deletions.
3 changes: 0 additions & 3 deletions lib/core/_style/app_color_scheme.dart
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ const defLightScheme = ColorScheme(
errorContainer: AppStaticColors.errorContainer,
onError: AppStaticColors.onError,
onErrorContainer: AppStaticColors.onErrorContainer,
background: AppStaticColors.background,
onBackground: AppStaticColors.onBackground,
outline: AppStaticColors.outline,
onInverseSurface: AppStaticColors.onInverseSurface,
inverseSurface: AppStaticColors.inverseSurface,
Expand All @@ -74,7 +72,6 @@ const defLightScheme = ColorScheme(
scrim: AppStaticColors.scrim,
surface: AppStaticColors.surface,
onSurface: AppStaticColors.onSurface,
surfaceVariant: AppStaticColors.surfaceVariant,
onSurfaceVariant: AppStaticColors.onSurfaceVariant,
brightness: Brightness.light,
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ class ProviderAddLog extends TalkerLog {
String get title => talkerTitle;

@override
String generateTextMessage() {
String generateTextMessage(
{TimeFormat timeFormat = TimeFormat.timeAndSeconds}) {
return _createMessage();
}

Expand Down Expand Up @@ -61,7 +62,8 @@ class ProviderUpdateLog extends TalkerLog {
String get title => talkerTitle;

@override
String generateTextMessage() {
String generateTextMessage(
{TimeFormat timeFormat = TimeFormat.timeAndSeconds}) {
return _createMessage();
}

Expand Down
1 change: 1 addition & 0 deletions lib/core/widgets/async_button.dart
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ class AsyncButton extends HookWidget {
}
}

// ignore: deprecated_member_use
return ERbElevatedButton(
onPressed: enabled
? switch (snapshot) {
Expand Down
2 changes: 2 additions & 0 deletions lib/core/widgets/dialogs/dialogs.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// ignore_for_file: deprecated_member_use

import 'dart:async';

import 'package:erb_ui/widgets.dart';
Expand Down
1 change: 1 addition & 0 deletions lib/features/home/presentation/screens/home_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ class HomeScreen extends HookConsumerWidget {
// child: const Text('Toggle theme'),
),
KSizedBox.h12.size.flex,
// ignore: deprecated_member_use
ERbElevatedButton(
label: 'Go Demos',
onPressed: () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ class LanguageSettingScreen extends HookConsumerWidget {
ref.read(appSettingsServiceProvider.notifier).setLocale(locale);
Future.delayed(
const Duration(milliseconds: 500),
// ignore: deprecated_member_use
() => AutoRouter.of(context).pop(),
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ class SettingBiometricTile extends ERbSettingsTile {
reason: t.system.requestPermissionMsg.biometric,
onPositiveClick: (context) {
goAppSetting();
// ignore: deprecated_member_use
AutoRouter.of(context).pop();
},
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ class SettingNotificationTile extends ERbSettingsTile {
reason: t.system.requestPermissionMsg.notification,
onPositiveClick: (context) {
goAppSetting(type: AppSettingsType.notification);
// ignore: deprecated_member_use
AutoRouter.of(context).pop();
},
);
Expand Down
1 change: 1 addition & 0 deletions lib/routes/guards/auth_guard.dart
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ class AuthGuard extends AutoRouteGuard {
router.push(
SignInRoute(
onSignInResult: (_) {
// ignore: deprecated_member_use
router.pop();
resolver.next();
},
Expand Down
3 changes: 3 additions & 0 deletions packages/env/.env.prod
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# Copy this file and remove the .example extension
BASE_URL=https://example.com
TMDB_URL=https://api.themoviedb.org/3
TMDB_IMG=https://image.tmdb.org/t/p/w185
TMDB_TOKEN=eyJhbGciOiJIUzI1NiJ9.eyJhdWQiOiIxYzA2YzBmN2Q5OTRlNjYxYzc1MDVmMDg2N2YyMTQxNSIsInN1YiI6IjY1ZDNmZjJlYmJjYWUwMDE4MjA0MmVlYiIsInNjb3BlcyI6WyJhcGlfcmVhZCJdLCJ2ZXJzaW9uIjoxfQ.L62HtqkvkssCvkd2AI1njHBIQtv9Xp16GkuaMbwvRyc
3 changes: 3 additions & 0 deletions packages/env/.env.staging
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# Copy this file and remove the .example extension
BASE_URL=https://staging.example.com
TMDB_URL=https://api.themoviedb.org/3
TMDB_IMG=https://image.tmdb.org/t/p/w185
TMDB_TOKEN=eyJhbGciOiJIUzI1NiJ9.eyJhdWQiOiIxYzA2YzBmN2Q5OTRlNjYxYzc1MDVmMDg2N2YyMTQxNSIsInN1YiI6IjY1ZDNmZjJlYmJjYWUwMDE4MjA0MmVlYiIsInNjb3BlcyI6WyJhcGlfcmVhZCJdLCJ2ZXJzaW9uIjoxfQ.L62HtqkvkssCvkd2AI1njHBIQtv9Xp16GkuaMbwvRyc
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class PagedState<ItemType> {
}

@override
bool operator ==(dynamic other) {
bool operator ==(Object other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is PagedState &&
Expand Down
2 changes: 1 addition & 1 deletion packages/erb_infinite_scroll/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies:
dev_dependencies:
flutter_test:
sdk: flutter
flutter_lints: ^3.0.1
flutter_lints: ^4.0.0
riverpod_annotation: ^2.3.5
riverpod_generator: ^2.4.0

Expand Down
2 changes: 1 addition & 1 deletion packages/erb_shared/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ dependencies:
dev_dependencies:
flutter_test:
sdk: flutter
flutter_lints: ^3.0.1
flutter_lints: ^4.0.0

flutter:
2 changes: 1 addition & 1 deletion packages/erb_ui/lib/src/theme/erb_theme_data.dart
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class ERbThemeData {
floatingLabelStyle: TextStyle(
fontWeight: FontWeight.w700,
fontSize: 13,
color: colorScheme.onBackground,
color: colorScheme.onSurface,
),
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class ERbButtonStyle {
backgroundColor = Theme.of(context).colorScheme.primaryContainer;
break;
case ERbButtonTheme.defaultTheme:
backgroundColor = Theme.of(context).colorScheme.surfaceVariant;
backgroundColor = Theme.of(context).colorScheme.surfaceContainerHighest;
textColor = Theme.of(context).colorScheme.onSurfaceVariant;
break;

Expand Down
4 changes: 3 additions & 1 deletion packages/erb_ui/lib/src/widgets/erb_elevated_button.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// ignore_for_file: deprecated_member_use_from_same_package

import 'package:erb_ui/theme.dart';
import 'package:flutter/material.dart';

Expand Down Expand Up @@ -112,7 +114,7 @@ class _ERbElevatedButtonState extends State<ERbElevatedButton> {
widget.gradient ?? theme.eRbColorScheme.primaryGradient;

final padding = theme.elevatedButtonTheme.style!.padding!
.resolve({MaterialState.pressed});
.resolve({WidgetState.pressed});

final btnDisabled = widget.onPressed == null;

Expand Down
2 changes: 1 addition & 1 deletion packages/erb_ui/lib/src/widgets/erb_outlined_button.dart
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class ERbOutlineGradientButton extends StatelessWidget {
const DefaultERbColorScheme.light().primaryGradient;

final padding = theme.elevatedButtonTheme.style!.padding!
.resolve({MaterialState.pressed})!;
.resolve({WidgetState.pressed})!;

return Material(
color: backgroundColor,
Expand Down
36 changes: 18 additions & 18 deletions packages/erb_ui/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,10 @@ packages:
dependency: "direct dev"
description:
name: flutter_lints
sha256: e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7
sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
url: "https://pub.dev"
source: hosted
version: "3.0.1"
version: "4.0.0"
flutter_test:
dependency: "direct dev"
description: flutter
Expand All @@ -110,34 +110,34 @@ packages:
dependency: transitive
description:
name: leak_tracker
sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
url: "https://pub.dev"
source: hosted
version: "10.0.0"
version: "10.0.4"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
url: "https://pub.dev"
source: hosted
version: "2.0.1"
version: "3.0.3"
leak_tracker_testing:
dependency: transitive
description:
name: leak_tracker_testing
sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
url: "https://pub.dev"
source: hosted
version: "2.0.1"
version: "3.0.1"
lints:
dependency: transitive
description:
name: lints
sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290
sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
url: "https://pub.dev"
source: hosted
version: "3.0.0"
version: "4.0.0"
matcher:
dependency: transitive
description:
Expand All @@ -158,10 +158,10 @@ packages:
dependency: transitive
description:
name: meta
sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
url: "https://pub.dev"
source: hosted
version: "1.11.0"
version: "1.12.0"
path:
dependency: transitive
description:
Expand Down Expand Up @@ -219,10 +219,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
url: "https://pub.dev"
source: hosted
version: "0.6.1"
version: "0.7.0"
time:
dependency: transitive
description:
Expand Down Expand Up @@ -251,10 +251,10 @@ packages:
dependency: transitive
description:
name: vm_service
sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
url: "https://pub.dev"
source: hosted
version: "13.0.0"
version: "14.2.1"
sdks:
dart: ">=3.2.0 <4.0.0"
flutter: ">=1.17.0"
dart: ">=3.3.0 <4.0.0"
flutter: ">=3.18.0-18.0.pre.54"
7 changes: 5 additions & 2 deletions packages/erb_ui/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,21 @@ name: erb_ui
description: ERb libs - simple, generic widgets
version: 0.0.4

publish_to: "none"

environment:
sdk: ">=3.2.0 <4.0.0"
flutter: ">=1.17.0"

dependencies:
flutter:
sdk: flutter
erb_shared: ^0.0.1
erb_shared:
path: ../erb_shared

dev_dependencies:
flutter_test:
sdk: flutter
flutter_lints: ^3.0.1
flutter_lints: ^4.0.0

flutter:
40 changes: 20 additions & 20 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ dependencies:
flutter_localizations: # add this
sdk: flutter

cupertino_icons: ^1.0.6
cupertino_icons: ^1.0.8

# logger
talker_flutter: ^4.1.0
talker_dio_logger: ^4.1.0

# dart utils
dio: ^5.4.1
dio: ^5.4.3+1
dio_smart_retry: ^6.0.0
fpdart: ^1.1.0
fast_immutable_collections: ^10.2.1
Expand All @@ -33,7 +33,7 @@ dependencies:
slang: ^3.30.1
slang_flutter: ^3.30.0
#https://github.com/flutter/flutter/issues/139861
intl: ^0.18.1
intl: ^0.19.0

# db local
hive: ^2.2.3
Expand All @@ -42,34 +42,34 @@ dependencies:
# flutter utils
hooks_riverpod: ^2.5.1
flutter_hooks: ^0.20.5
auto_route: ^7.9.2
url_launcher: ^6.2.5
permission_handler: ^11.3.0
auto_route: ^8.2.0
url_launcher: ^6.3.0
permission_handler: ^11.3.1
local_auth: ^2.2.0
flutter_flavor: ^3.1.3
app_settings: ^5.1.1
responsive_framework: ^1.4.0
flutter_cache_manager: ^3.3.1
flutter_screenutil: ^5.9.0
flutter_secure_storage: ^9.0.0
flutter_cache_manager: ^3.3.2
flutter_screenutil: ^5.9.3
flutter_secure_storage: ^9.2.2
flutter_local_notifications: ^17.0.0

# Device Identification
device_info_plus: ^10.0.1
package_info_plus: ^6.0.0
android_id: ^0.3.6
package_info_plus: ^8.0.0
android_id: ^0.4.0

# flutter widgets
cached_network_image: ^3.3.1
infinite_scroll_pagination: ^4.0.0

# Firebase service
firebase_core: ^2.27.1
firebase_messaging: ^14.7.20
firebase_core: ^3.1.0
firebase_messaging: ^15.0.1

# annotations
riverpod_annotation: ^2.3.5
reactive_forms_annotations: ^4.3.0
reactive_forms_annotations: ^5.0.0

# Mock

Expand All @@ -91,21 +91,21 @@ dev_dependencies:
flutter_test:
sdk: flutter
# workflow
melos: ^5.2.1
change_app_package_name: ^1.1.0
melos: ^6.1.0
change_app_package_name: ^1.2.0
flutter_native_splash: ^2.4.0

flutter_lints: ^3.0.1
flutter_lints: ^4.0.0
custom_lint: ^0.6.4
riverpod_lint: ^2.3.10

# generators
riverpod_generator: ^2.4.0
build_runner: ^2.4.8
build_runner: ^2.4.11
slang_build_runner: ^3.30.0
auto_route_generator: ^7.3.2
auto_route_generator: ^8.0.0
retrofit_generator: ^8.1.0
reactive_forms_generator: ^4.5.2
reactive_forms_generator: ^5.0.4
hive_generator: ^2.0.1
dart_mappable_builder: ^4.2.1
husky: 0.1.7
Expand Down

0 comments on commit 1be59b0

Please sign in to comment.