From 87cb3abc76759f5302e4e43a2f940e0aa1b9e821 Mon Sep 17 00:00:00 2001 From: "Sadra Babai (ac)" Date: Thu, 2 Feb 2023 23:25:09 +0100 Subject: [PATCH] [Riverpod2x][PicoGram] Finish the PicoGram tutorial --- .../Vandad/Riverpod2.x/picogram/lib/main.dart | 57 ++++--------------- .../picogram/lib/views/main/main_view.dart | 4 +- .../picogram/lib/views/tabs/tabs.dart | 3 +- 3 files changed, 15 insertions(+), 49 deletions(-) diff --git a/Riverpod/Vandad/Riverpod2.x/picogram/lib/main.dart b/Riverpod/Vandad/Riverpod2.x/picogram/lib/main.dart index bff2b51..92e1333 100644 --- a/Riverpod/Vandad/Riverpod2.x/picogram/lib/main.dart +++ b/Riverpod/Vandad/Riverpod2.x/picogram/lib/main.dart @@ -1,18 +1,17 @@ +import 'dart:developer' show log; + +import 'package:firebase_core/firebase_core.dart'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:firebase_core/firebase_core.dart'; import 'firebase_options.dart'; -import 'state/auth/providers/providers.dart'; -import 'views/components/animations/animations.dart'; -import 'views/components/components.dart'; -import 'views/login/login.dart'; - -extension Log on Object { - void log([String? message]) { - debugPrint('$runtimeType: $message - ${toString()}'); - } -} +import 'lib.dart' + show + LoadingScreen, + LoginView, + MainView, + isLoadingProvider, + isLoggedInProvider; Future main() async { WidgetsFlutterBinding.ensureInitialized(); @@ -38,6 +37,7 @@ class MyApp extends StatelessWidget { home: Consumer( builder: (BuildContext context, WidgetRef ref, Widget? child) { ref.listen(isLoadingProvider, (_, isLoading) { + log(isLoading.toString(), name: 'isLoading'); if (isLoading) { LoadingScreen.instance().show(context: context); } else { @@ -52,38 +52,3 @@ class MyApp extends StatelessWidget { ); } } - -class MainView extends ConsumerWidget { - const MainView({ - Key? key, - }) : super(key: key); - - @override - Widget build(BuildContext context, WidgetRef ref) { - return Scaffold( - appBar: AppBar( - title: const Text('PicoGram'), - actions: [ - IconButton( - icon: const Icon(Icons.logout), - onPressed: () { - ref.read(authStateProvider.notifier).logout(); - }, - ), - ], - ), - body: SingleChildScrollView( - child: Column( - children: const [ - DataNotFoundAnimationView(), - EmptyContentsAnimationView(), - EmptyContentsWithTextAnimationView(text: 'text'), - ErrorAnimationView(), - SmallErrorAnimationView(), - LoadingAnimationView(), - ], - ), - ), - ); - } -} diff --git a/Riverpod/Vandad/Riverpod2.x/picogram/lib/views/main/main_view.dart b/Riverpod/Vandad/Riverpod2.x/picogram/lib/views/main/main_view.dart index 865b771..8985fd4 100644 --- a/Riverpod/Vandad/Riverpod2.x/picogram/lib/views/main/main_view.dart +++ b/Riverpod/Vandad/Riverpod2.x/picogram/lib/views/main/main_view.dart @@ -94,8 +94,8 @@ class _MainViewState extends ConsumerState { body: const TabBarView( children: [ UserPostsView(), - UserPostsView(), - UserPostsView(), + SearchView(), + HomeView(), ], ), ), diff --git a/Riverpod/Vandad/Riverpod2.x/picogram/lib/views/tabs/tabs.dart b/Riverpod/Vandad/Riverpod2.x/picogram/lib/views/tabs/tabs.dart index f1a476f..45e86ff 100644 --- a/Riverpod/Vandad/Riverpod2.x/picogram/lib/views/tabs/tabs.dart +++ b/Riverpod/Vandad/Riverpod2.x/picogram/lib/views/tabs/tabs.dart @@ -1,2 +1,3 @@ export 'users_posts/users_posts.dart'; -export 'search/search.dart'; \ No newline at end of file +export 'search/search.dart'; +export 'home/home.dart'; \ No newline at end of file