From e4dcdf86b32ab6e80747b68eec638b7af24d4171 Mon Sep 17 00:00:00 2001
From: faiyyazs <faiyyazshaikh2010@gmail.com>
Date: Thu, 13 Oct 2022 11:05:44 +0530
Subject: [PATCH] Riverpod version update

---
 app/lib/feature/splash/splash_page.dart           |  2 +-
 app/lib/feature/splash/splash_page_view.dart      |  2 +-
 app/pubspec.yaml                                  |  2 +-
 statemanagement-core/pubspec.yaml                 |  2 +-
 statemanagement-riverpod/lib/src/base_page.dart   | 10 +++++-----
 statemanagement-riverpod/lib/src/base_widget.dart |  6 +++---
 statemanagement-riverpod/pubspec.yaml             |  2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/lib/feature/splash/splash_page.dart b/app/lib/feature/splash/splash_page.dart
index 8a504fc..f7440f0 100644
--- a/app/lib/feature/splash/splash_page.dart
+++ b/app/lib/feature/splash/splash_page.dart
@@ -15,7 +15,7 @@ class SplashPage extends BasePage<SplashViewModel> {
 
 class SplashPageState extends BaseStatefulPage<SplashViewModel, SplashPage> {
   @override
-  ProviderBase provideBase() {
+  ProviderBase<SplashViewModel> provideBase() {
     return splashViewModelProvider;
   }
 
diff --git a/app/lib/feature/splash/splash_page_view.dart b/app/lib/feature/splash/splash_page_view.dart
index 3ac1931..cf30b80 100644
--- a/app/lib/feature/splash/splash_page_view.dart
+++ b/app/lib/feature/splash/splash_page_view.dart
@@ -5,7 +5,7 @@ import 'package:statemanagement_riverpod/statemanagement_riverpod.dart';
 import 'splash_page_model.dart';
 
 class SplashPageView extends BasePageViewWidget<SplashViewModel> {
-  SplashPageView(ProviderBase model) : super(model);
+  SplashPageView(ProviderBase<SplashViewModel> model) : super(model);
 
   @override
   Widget build(BuildContext context, model) {
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index b8c4748..3e87fc5 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -29,7 +29,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  flutter_riverpod: 0.14.0+1
+  flutter_riverpod: ^2.0.2
   cupertino_icons: ^1.0.2
   responsive_framework: ^0.2.0
   get_it:
diff --git a/statemanagement-core/pubspec.yaml b/statemanagement-core/pubspec.yaml
index 97feb39..1094b01 100644
--- a/statemanagement-core/pubspec.yaml
+++ b/statemanagement-core/pubspec.yaml
@@ -11,7 +11,7 @@ dependencies:
   flutter:
     sdk: flutter
   flutter_bloc: ^7.3.0
-  flutter_riverpod: 0.14.0+1
+  flutter_riverpod: ^2.0.2
   flutter_errors:
     git:
       url: https://github.com/faiyyazs/flutter-errors.git
diff --git a/statemanagement-riverpod/lib/src/base_page.dart b/statemanagement-riverpod/lib/src/base_page.dart
index f2abf41..a6b38a0 100644
--- a/statemanagement-riverpod/lib/src/base_page.dart
+++ b/statemanagement-riverpod/lib/src/base_page.dart
@@ -13,7 +13,7 @@ abstract class BasePage<VM extends BasePageViewModel> extends StatefulWidget {
 abstract class BasePageState<VM extends BasePageViewModel,
     T extends BasePage<VM>> extends CoreBasePageState<VM, T> {
   /// Declare and initialization of viewModel for the page
-  ProviderBase provideBase();
+  ProviderBase<VM> provideBase();
 }
 
 abstract class BaseStatefulPage<VM extends BasePageViewModel,
@@ -30,7 +30,7 @@ abstract class BaseStatefulPage<VM extends BasePageViewModel,
 }
 
 abstract class BasePageViewWidget<T extends BasePageViewModel> extends Widget {
-  final ProviderBase providerBase;
+  final ProviderBase<T> providerBase;
 
   BasePageViewWidget(this.providerBase);
 
@@ -44,13 +44,13 @@ abstract class BasePageViewWidget<T extends BasePageViewModel> extends Widget {
 
 class DataProviderElement<T extends BasePageViewModel>
     extends ComponentElement {
-  final ProviderBase providerBase;
+  final ProviderBase<T> providerBase;
 
-  DataProviderElement(BasePageViewWidget widget, this.providerBase)
+  DataProviderElement(BasePageViewWidget<T> widget, this.providerBase)
       : super(widget);
 
   @override
-  BasePageViewWidget get widget => super.widget as BasePageViewWidget;
+  BasePageViewWidget<T> get widget => super.widget as BasePageViewWidget<T>;
 
   @override
   Widget build() {
diff --git a/statemanagement-riverpod/lib/src/base_widget.dart b/statemanagement-riverpod/lib/src/base_widget.dart
index cce3883..18e6b59 100644
--- a/statemanagement-riverpod/lib/src/base_widget.dart
+++ b/statemanagement-riverpod/lib/src/base_widget.dart
@@ -4,7 +4,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 /// StatefulWidget for T type of ViewModel / ChangeNotifier
 class BaseWidget<T extends ChangeNotifier> extends StatefulWidget {
   final Widget Function(BuildContext context, T? model, Widget? child) builder;
-  final ProviderBase providerBase;
+  final ProviderBase<T> providerBase;
   final Function(T)? onModelReady;
   final Widget? child;
 
@@ -27,8 +27,8 @@ class _BaseWidget<T extends ChangeNotifier> extends State<BaseWidget<T>> {
   @override
   Widget build(BuildContext context) {
     return Consumer(
-      builder: (context, watch, child) {
-        _model = watch(widget.providerBase as ProviderBase<Object?, T>);
+      builder: (context, ref, child) {
+        _model = ref.watch(widget.providerBase);
         widget.onModelReady?.call(_model!);
         return widget.builder(context, _model, child);
       },
diff --git a/statemanagement-riverpod/pubspec.yaml b/statemanagement-riverpod/pubspec.yaml
index eab1753..9a8a87a 100644
--- a/statemanagement-riverpod/pubspec.yaml
+++ b/statemanagement-riverpod/pubspec.yaml
@@ -10,7 +10,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  flutter_riverpod: 0.14.0+1
+  flutter_riverpod: ^2.0.2
   statemanagement_core:
     path: ../statemanagement-core/