Skip to content

Commit

Permalink
Migrate from scoped_model to provider (flutter#81)
Browse files Browse the repository at this point in the history
This is the minimal possible change. It is meant to be readable as a standalone Pull Request.

This does not touch comments. Additionally, it doesn’t use the niceties of provider, like automatic disposal of the model. Lastly, it doesn’t even rename the project from `scoped_model_counter`. All that will come in a follow-up PR.
  • Loading branch information
filiph authored May 20, 2019
1 parent 18e29d8 commit a335558
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 11 deletions.
15 changes: 8 additions & 7 deletions scoped_model_counter/lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'dart:async';

import 'package:flutter/material.dart';
import 'package:scoped_model/scoped_model.dart';
import 'package:provider/provider.dart';

void main() {
// Initialize the model. Can be done outside a widget, like here.
Expand All @@ -17,15 +17,15 @@ void main() {
// Now we're ready to run the app...
runApp(
// ... and provide the model to all widgets within.
ScopedModel<Counter>(
model: counter,
ChangeNotifierProvider<Counter>.value(
notifier: counter,
child: MyApp(),
),
);
}

/// Simplest possible model, with just one field.
class Counter extends Model {
class Counter extends ChangeNotifier {
int value = 0;

void increment() {
Expand Down Expand Up @@ -63,8 +63,8 @@ class MyHomePage extends StatelessWidget {
// and retrieves its model (Counter, in this case).
// Then it uses that model to build widgets, and will trigger
// rebuilds if the model is updated.
ScopedModelDescendant<Counter>(
builder: (context, child, counter) => Text(
Consumer<Counter>(
builder: (context, counter, child) => Text(
'${counter.value}',
style: Theme.of(context).textTheme.display1,
),
Expand All @@ -78,7 +78,8 @@ class MyHomePage extends StatelessWidget {
// the current model and doesn't automatically trigger rebuilds.
// Since this button always looks the same, though, no rebuilds
// are needed.
onPressed: () => ScopedModel.of<Counter>(context).increment(),
onPressed: () =>
Provider.of<Counter>(context, listen: false).increment(),
tooltip: 'Increment',
child: Icon(Icons.add),
),
Expand Down
2 changes: 1 addition & 1 deletion scoped_model_counter/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies:
flutter:
sdk: flutter

scoped_model: ^1.0.1
provider: ^2.0.1

cupertino_icons: ^0.1.2

Expand Down
6 changes: 3 additions & 3 deletions scoped_model_counter/test/widget_test.dart
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:scoped_model/scoped_model.dart';
import 'package:provider/provider.dart';
import 'package:scoped_model_counter/main.dart';

void main() {
testWidgets('Counter increments smoke test', (WidgetTester tester) async {
// Build our app, provide it with a model, and trigger a frame.
await tester.pumpWidget(
ScopedModel(
model: Counter(),
ChangeNotifierProvider(
builder: (_) => Counter(),
child: MyApp(),
),
);
Expand Down

0 comments on commit a335558

Please sign in to comment.