Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/navigation/router.dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ part 'router.g.dart';
GoRouter router(_) => GoRouter(
routes: $appRoutes,
redirect: (context, state) =>
state.location.isEmpty ? const MainMenuRoute().location : null,
state.uri.toString().isEmpty ? const MainMenuRoute().location : null,
);

@TypedGoRoute<MainMenuRoute>(
Expand Down
2 changes: 1 addition & 1 deletion lib/themes.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const lightBackgroundColor = Color(0xFFECECEC);

final lightTheme = ThemeData.from(
colorScheme: const ColorScheme.light(
background: lightBackgroundColor,
surface: lightBackgroundColor,
primary: Colors.grey,
),
).copyWith(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ class _ChoiceChip extends StatelessWidget {
final color = selected ? Colors.white : Colors.black;

return ChoiceChip(
color: MaterialStateProperty.resolveWith((states) {
if (states.contains(MaterialState.selected)) {
color: WidgetStateProperty.resolveWith((states) {
if (states.contains(WidgetState.selected)) {
return Colors.black;
}

Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/image_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ class _ImageViewState extends State<ImageView>
return Scaffold(
appBar: AppBar(
elevation: 0,
backgroundColor: Theme.of(context).colorScheme.background,
backgroundColor: Theme.of(context).colorScheme.surface,
leading: const CloseButton(color: Colors.black),
),
body: GestureDetector(
Expand Down
24 changes: 12 additions & 12 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,27 @@ environment:
sdk: ">=3.0.0 <4.0.0"

dependencies:
cupertino_icons: ^1.0.5
cupertino_icons: ^1.0.8
faker: ^2.1.0
flutter:
sdk: flutter
flutter_markdown: ^0.6.14
flutter_riverpod: ^2.3.6
font_awesome_flutter: ^10.4.0
go_router: ^7.0.1
flutter_markdown: ^0.7.1
flutter_riverpod: ^2.5.1
font_awesome_flutter: ^10.7.0
go_router: ^14.1.4
highlight: ^0.7.0
riverpod_annotation: ^2.1.1
url_launcher: ^6.1.11
riverpod_annotation: ^2.3.5
url_launcher: ^6.2.6
url_strategy: ^0.2.0
xml: ^6.3.0
xml: ^6.5.0

dev_dependencies:
build_runner: ^2.4.4
build_runner: ^2.4.10
flutter_test:
sdk: flutter
go_router_builder: ^2.0.1
lint: ^2.1.2
riverpod_generator: ^2.2.3
go_router_builder: ^2.7.0
lint: ^2.3.0
riverpod_generator: ^2.4.0

flutter:
uses-material-design: true
Expand Down