重构项目 (#2)

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.0.0
+
+- Add `createViewModel` method to View.
+
 ## 1.0.0
 
 - Optimize ViewModel creation, solve the issue of can't resolve route arguments when use Navigator.

README.md

@@ -15,10 +15,9 @@ Clover is an open source framework for building MVVM applications with Flutter.
 
 ## Features
 
-- StatelessViewModel
-- StatefulViewModel
-- StatelessView
-- StatefulView
+- `View<TViewModel extends ViewModel>`
+- `ViewState<TView extends View<TViewModel>, TViewModel extends ViewModel>`
+- `ViewModel`
 
 ## Getting started
 

example/android/build.gradle

@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

example/lib/main.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 
-import 'view_models.dart';
-import 'views.dart';
+import 'view.dart';
 
 void main() {
   runApp(const MyApp());
@@ -27,9 +26,7 @@ class MyApp extends StatelessWidget {
         // is not restarted.
         primarySwatch: Colors.blue,
       ),
-      home: HomeView(
-        builder: () => HomeViewModel(),
-      ),
+      home: const HomeView(),
     );
   }
 }

example/lib/view.dart

@@ -0,0 +1 @@
+export 'view/home_view.dart';

example/lib/views/home_view.dart → example/lib/view/home_view.dart

@@ -1,17 +1,17 @@
 import 'package:clover/clover.dart';
-import 'package:flutter/material.dart';
+import 'package:example/view_model.dart';
+import 'package:flutter/material.dart' hide View;
 
-import '../view_models.dart';
-
-class HomeView extends StatefulView<HomeViewModel> {
-  const HomeView({Key? key, required ViewModelBuilder<HomeViewModel> builder})
-      : super(key: key, builder: builder);
+class HomeView extends View<HomeViewModel> {
+  const HomeView({super.key});
 
   @override
-  ViewModelState<HomeView, HomeViewModel> createState() => _HomeViewState();
+  ViewState<HomeView, HomeViewModel> createState() => _HomeViewState();
+  @override
+  HomeViewModel createViewModel() => HomeViewModel();
 }
 
-class _HomeViewState extends ViewModelState<HomeView, HomeViewModel> {
+class _HomeViewState extends ViewState<HomeView, HomeViewModel> {
   @override
   Widget build(BuildContext context) {
     // This method is rerun every time setState is called, for instance as done
@@ -54,15 +54,15 @@ class _HomeViewState extends ViewModelState<HomeView, HomeViewModel> {
               builder: (context, count, child) {
                 return Text(
                   '$count',
-                  style: Theme.of(context).textTheme.headline4,
+                  style: Theme.of(context).textTheme.headlineMedium,
                 );
               },
             ),
           ],
         ),
       ),
       floatingActionButton: FloatingActionButton(
-        onPressed: viewModel.increase,
+        onPressed: () => viewModel.increase(),
         tooltip: 'Increse',
         child: const Icon(Icons.add),
       ), // This trailing comma makes auto-formatting nicer for build methods.

example/lib/view_model.dart

@@ -0,0 +1 @@
+export 'view_model/home_view_model.dart';

example/lib/view_models/home_view_model.dart → example/lib/view_model/home_view_model.dart

@@ -2,7 +2,7 @@ import 'package:clover/clover.dart';
 import 'package:flutter/foundation.dart';
 
 /// A base ViewModel used for home.
-abstract class HomeViewModel extends StatefulViewModel {
+abstract class HomeViewModel extends ViewModel {
   /// Get the title.
   String get title;
 
@@ -19,7 +19,7 @@ abstract class HomeViewModel extends StatefulViewModel {
   factory HomeViewModel() => _HomeViewModel();
 }
 
-class _HomeViewModel extends StatefulViewModel implements HomeViewModel {
+class _HomeViewModel extends ViewModel implements HomeViewModel {
   @override
   final String title;
   @override
@@ -41,7 +41,7 @@ class _HomeViewModel extends StatefulViewModel implements HomeViewModel {
 
   @override
   void dispose() {
-    count.dispose();
     super.dispose();
+    count.dispose();
   }
 }

example/pubspec.lock

@@ -5,65 +5,65 @@ packages:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.dartlang.org"
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.8.2"
+    version: "2.11.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      url: "https://pub.dartlang.org"
+      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   characters:
     dependency: transitive
     description:
       name: characters
-      url: "https://pub.dartlang.org"
+      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
-  charcode:
-    dependency: transitive
-    description:
-      name: charcode
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.3.1"
+    version: "1.3.0"
   clock:
     dependency: transitive
     description:
       name: clock
-      url: "https://pub.dartlang.org"
+      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   clover:
     dependency: "direct main"
     description:
       path: ".."
       relative: true
     source: path
-    version: "1.0.0"
+    version: "2.0.0"
   collection:
     dependency: transitive
     description:
       name: collection
-      url: "https://pub.dartlang.org"
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      url: "https://pub.dev"
     source: hosted
-    version: "1.16.0"
+    version: "1.18.0"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      url: "https://pub.dartlang.org"
+      sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d
+      url: "https://pub.dev"
     source: hosted
-    version: "1.0.5"
+    version: "1.0.6"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
-      url: "https://pub.dartlang.org"
+      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.3.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -73,9 +73,10 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      url: "https://pub.dartlang.org"
+      sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.3"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -85,37 +86,42 @@ packages:
     dependency: transitive
     description:
       name: lints
-      url: "https://pub.dartlang.org"
+      sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.1"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      url: "https://pub.dartlang.org"
+      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.12.11"
+    version: "0.12.16"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      url: "https://pub.dartlang.org"
+      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.1.4"
+    version: "0.5.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      url: "https://pub.dartlang.org"
+      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
+      url: "https://pub.dev"
     source: hosted
-    version: "1.7.0"
+    version: "1.10.0"
   path:
     dependency: transitive
     description:
       name: path
-      url: "https://pub.dartlang.org"
+      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.8.1"
+    version: "1.8.3"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -125,51 +131,66 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      url: "https://pub.dartlang.org"
+      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.8.2"
+    version: "1.10.0"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      url: "https://pub.dartlang.org"
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.11.1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      url: "https://pub.dartlang.org"
+      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.2"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      url: "https://pub.dartlang.org"
+      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      url: "https://pub.dartlang.org"
+      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
+      url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      url: "https://pub.dartlang.org"
+      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.4.9"
+    version: "0.6.1"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      url: "https://pub.dartlang.org"
+      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.4"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.0"
 sdks:
-  dart: ">=2.17.5 <3.0.0"
-  flutter: ">=1.17.0"
+  dart: ">=3.2.0-194.0.dev <4.0.0"
+  flutter: ">=3.0.0"

lib/clover.dart

@@ -1,5 +1,2 @@
+export 'src/view.dart';
 export 'src/view_model.dart';
-export 'src/stateless_view_model.dart';
-export 'src/stateful_view_model.dart';
-export 'src/stateless_view.dart';
-export 'src/stateful_view.dart';