Skip to content
This repository was archived by the owner on Jun 9, 2022. It is now read-only.

Commit c9c35dc

Browse files
wasabeefwasabeef
authored
refactor: update to riverpod dev (#90)
1 parent 1d50c19 commit c9c35dc

File tree

12 files changed

+44
-54
lines changed

12 files changed

+44
-54
lines changed

‎ios/Flutter/AppFrameworkInfo.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>8.0</string>
24+
<string>9.0</string>
2525
</dict>
2626
</plist>

‎lib/app.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ import 'package:flutter_gen/gen_l10n/l10n.dart';
55
import 'package:flutter_hooks/flutter_hooks.dart';
66
import 'package:hooks_riverpod/hooks_riverpod.dart';
77

8-
class App extends HookWidget {
8+
class App extends HookConsumerWidget {
99
const App({Key? key}) : super(key: key);
1010

1111
@override
12-
Widget build(BuildContext context) {
13-
final theme = useProvider(appThemeProvider);
14-
final themeMode = useProvider(appThemeModeProvider);
12+
Widget build(BuildContext context, WidgetRef ref) {
13+
final theme = ref.watch(appThemeProvider);
14+
final themeMode = ref.watch(appThemeModeProvider);
1515
final appRouter = useMemoized(() => AppRouter());
1616
return MaterialApp.router(
1717
theme: theme.data,

‎lib/ui/component/loading/container_with_loading.dart‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import 'package:app/ui/component/loading/loading.dart';
22
import 'package:app/ui/loading_state_view_model.dart';
33
import 'package:flutter/cupertino.dart';
4-
import 'package:flutter_hooks/flutter_hooks.dart';
54
import 'package:hooks_riverpod/hooks_riverpod.dart';
65

7-
class ContainerWithLoading extends HookWidget {
6+
class ContainerWithLoading extends ConsumerWidget {
87
const ContainerWithLoading({
98
Key? key,
109
required this.child,
@@ -13,8 +12,8 @@ class ContainerWithLoading extends HookWidget {
1312
final Widget child;
1413

1514
@override
16-
Widget build(BuildContext context) {
17-
final state = useProvider(loadingStateProvider);
15+
Widget build(BuildContext context, WidgetRef ref) {
16+
final state = ref.watch(loadingStateProvider);
1817
return Stack(children: [
1918
child,
2019
state.isLoading ? const Loading() : const SizedBox(),

‎lib/ui/component/loading/loading.dart‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
import 'package:app/ui/theme/app_theme.dart';
22
import 'package:flutter/material.dart';
3-
import 'package:flutter_hooks/flutter_hooks.dart';
43
import 'package:hooks_riverpod/hooks_riverpod.dart';
54

6-
class Loading extends HookWidget {
5+
class Loading extends ConsumerWidget {
76
const Loading({Key? key}) : super(key: key);
87

98
@override
10-
Widget build(BuildContext context) {
11-
final theme = useProvider(appThemeProvider);
9+
Widget build(BuildContext context, WidgetRef ref) {
10+
final theme = ref.watch(appThemeProvider);
1211
return Center(
1312
child: CircularProgressIndicator(
1413
valueColor: AlwaysStoppedAnimation<Color>(theme.appColors.accent),

‎lib/ui/home/home_page.dart‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@ import 'package:app/ui/route/app_route.gr.dart';
44
import 'package:app/ui/theme/app_theme.dart';
55
import 'package:auto_route/auto_route.dart';
66
import 'package:flutter/material.dart';
7-
import 'package:flutter_hooks/flutter_hooks.dart';
87
import 'package:hooks_riverpod/hooks_riverpod.dart';
98

10-
class HomePage extends HookWidget {
9+
class HomePage extends HookConsumerWidget {
1110
const HomePage({Key? key}) : super(key: key);
1211

1312
@override
14-
Widget build(BuildContext context) {
15-
final theme = useProvider(appThemeProvider);
13+
Widget build(BuildContext context, WidgetRef ref) {
14+
final theme = ref.watch(appThemeProvider);
1615
final l10n = useL10n();
1716
return AutoTabsScaffold(
1817
routes: const [

‎lib/ui/news/article_item.dart‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@ import 'package:app/ui/route/app_route.dart';
66
import 'package:app/ui/theme/app_theme.dart';
77
import 'package:flutter/cupertino.dart';
88
import 'package:flutter/material.dart';
9-
import 'package:flutter_hooks/flutter_hooks.dart';
109
import 'package:hooks_riverpod/hooks_riverpod.dart';
1110

12-
class ArticleItem extends HookWidget {
11+
class ArticleItem extends HookConsumerWidget {
1312
const ArticleItem({
1413
Key? key,
1514
required this.article,
@@ -26,8 +25,8 @@ class ArticleItem extends HookWidget {
2625
);
2726

2827
@override
29-
Widget build(BuildContext context) {
30-
final theme = useProvider(appThemeProvider);
28+
Widget build(BuildContext context, WidgetRef ref) {
29+
final theme = ref.watch(appThemeProvider);
3130
final router = useRouter();
3231
final l10n = useL10n();
3332
return Card(

‎lib/ui/news/connected_new_page.dart‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,18 @@ import 'package:app/ui/route/app_route.dart';
77
import 'package:app/ui/theme/app_theme.dart';
88
import 'package:app/ui/user_view_model.dart';
99
import 'package:flutter/material.dart';
10-
import 'package:flutter_hooks/flutter_hooks.dart';
1110
import 'package:hooks_riverpod/hooks_riverpod.dart';
1211

13-
class ConnectedNewsPage extends HookWidget {
12+
class ConnectedNewsPage extends HookConsumerWidget {
1413
const ConnectedNewsPage({Key? key}) : super(key: key);
1514

1615
@override
17-
Widget build(BuildContext context) {
18-
final theme = useProvider(appThemeProvider);
16+
Widget build(BuildContext context, WidgetRef ref) {
17+
final theme = ref.watch(appThemeProvider);
1918
final l10n = useL10n();
2019
final router = useRouter();
2120

22-
final user =
23-
useProvider(userViewModelProvider.select((value) => value.user));
21+
final user = ref.watch(userViewModelProvider.select((value) => value.user));
2422

2523
return Scaffold(
2624
appBar: AppBar(

‎lib/ui/news/news_page.dart‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,18 @@ import 'package:flutter/material.dart';
88
import 'package:flutter_hooks/flutter_hooks.dart';
99
import 'package:hooks_riverpod/hooks_riverpod.dart';
1010

11-
class NewsPage extends HookWidget {
11+
class NewsPage extends HookConsumerWidget {
1212
const NewsPage({Key? key}) : super(key: key);
1313

1414
@override
15-
Widget build(BuildContext context) {
15+
Widget build(BuildContext context, WidgetRef ref) {
1616
final l10n = useL10n();
17-
final homeViewModel = context.read(newsViewModelProvider);
18-
final news =
19-
useProvider(newsViewModelProvider.select((value) => value.news));
17+
final homeViewModel = ref.read(newsViewModelProvider);
18+
final news = ref.watch(newsViewModelProvider.select((value) => value.news));
2019

2120
final snapshot = useFuture(
2221
useMemoized(() {
23-
return context
22+
return ref
2423
.read(loadingStateProvider)
2524
.whileLoading(homeViewModel.fetchNews);
2625
}, [news?.toString()]),

‎lib/ui/signIn/sign_in_page.dart‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,19 @@ import 'package:app/ui/loading_state_view_model.dart';
66
import 'package:app/ui/theme/app_theme.dart';
77
import 'package:app/ui/user_view_model.dart';
88
import 'package:flutter/material.dart';
9-
import 'package:flutter_hooks/flutter_hooks.dart';
109
import 'package:gap/gap.dart';
1110
import 'package:hooks_riverpod/hooks_riverpod.dart';
1211

13-
class SignInPage extends HookWidget {
12+
class SignInPage extends HookConsumerWidget {
1413
const SignInPage({Key? key}) : super(key: key);
1514

1615
@override
17-
Widget build(BuildContext context) {
18-
final theme = useProvider(appThemeProvider);
16+
Widget build(BuildContext context, WidgetRef ref) {
17+
final theme = ref.watch(appThemeProvider);
1918
final l10n = useL10n();
20-
final user =
21-
useProvider(userViewModelProvider.select((value) => value.user));
22-
final userViewModel = context.read(userViewModelProvider);
23-
final loading = context.read(loadingStateProvider);
19+
final user = ref.watch(userViewModelProvider.select((value) => value.user));
20+
final userViewModel = ref.read(userViewModelProvider);
21+
final loading = ref.read(loadingStateProvider);
2422

2523
return Scaffold(
2624
appBar: AppBar(
@@ -91,7 +89,7 @@ class SignInPage extends HookWidget {
9189
),
9290
onPressed: () {
9391
loading.whileLoading(() async {
94-
return context.read(userViewModelProvider).signIn();
92+
return ref.read(userViewModelProvider).signIn();
9593
});
9694
},
9795
icon: Assets.svgs.firebase.svg(width: 24),

‎lib/ui/video/video_page.dart‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,15 @@ import 'package:app/ui/hook/use_asset_vide_player_controller.dart';
33
import 'package:app/ui/hook/use_l10n.dart';
44
import 'package:app/ui/theme/app_theme.dart';
55
import 'package:flutter/material.dart';
6-
import 'package:flutter_hooks/flutter_hooks.dart';
76
import 'package:hooks_riverpod/hooks_riverpod.dart';
87
import 'package:video_player/video_player.dart';
98

10-
class VideoPage extends HookWidget {
9+
class VideoPage extends HookConsumerWidget {
1110
const VideoPage({Key? key}) : super(key: key);
1211

1312
@override
14-
Widget build(BuildContext context) {
15-
final theme = useProvider(appThemeProvider);
13+
Widget build(BuildContext context, WidgetRef ref) {
14+
final theme = ref.watch(appThemeProvider);
1615
final l10n = useL10n();
1716
final videoController = useAssetVideoController(
1817
asset: Assets.videos.bigbuckbunny,

0 commit comments

Comments
 (0)