[Modify]modify app store state

Sugers3 · May 24, 2019 · c33ffae · c33ffae
1 parent 82af468
commit c33ffae
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 11 deletions.
diff --git a/example/lib/app.dart b/example/lib/app.dart
@@ -1,17 +1,18 @@
 import 'package:flutter/material.dart';
 
 import 'package:fish_redux/fish_redux.dart';
+import 'package:sample/global_store/global_base_state.dart';
 import 'package:sample/global_store/state.dart';
 import 'global_store/global_store.dart';
 import 'todo_edit_page/page.dart';
 import 'todo_list_page/page.dart';
 
 //create global page helper
-Page<T, dynamic> createGlobalPage<T extends Cloneable<T>>(
+Page<T, dynamic> createGlobalPage<T extends GlobalBaseState<T> >(
     Page<T, dynamic> page) {
   return page
     ..connectExtraStore(GlobalStore.store, (T pagestate, GlobalState appState) {
-      return pagestate.clone();
+      return pagestate.lessClone(appState);
     });
 }
 

diff --git a/example/lib/global_store/global_base_state.dart b/example/lib/global_store/global_base_state.dart
@@ -0,0 +1,7 @@
+import 'package:fish_redux/fish_redux.dart';
+import 'package:sample/global_store/state.dart';
+
+/// Definition of Cloneable
+mixin GlobalBaseState<T extends Cloneable<T>> implements Cloneable<T> {
+  T lessClone(GlobalState state);
+}
diff --git a/example/lib/global_store/global_store.dart b/example/lib/global_store/global_store.dart
@@ -8,7 +8,7 @@ class GlobalStore{
 
   static Store<GlobalState> get store{
     if(null == _globalStore){
-      _globalStore = createStore<GlobalState>(initState(null), buildReducer());
+      _globalStore = createStore<GlobalState>(initGlobalState(null), buildReducer());
     }
     return _globalStore;
   }

diff --git a/example/lib/global_store/state.dart b/example/lib/global_store/state.dart
@@ -10,6 +10,6 @@ class GlobalState implements Cloneable<GlobalState> {
   }
 }
 
-GlobalState initState(Map<String, dynamic> args) {
+GlobalState initGlobalState(Map<String, dynamic> args) {
   return GlobalState();
 }
diff --git a/example/lib/todo_edit_page/state.dart b/example/lib/todo_edit_page/state.dart
@@ -1,8 +1,10 @@
 import 'package:fish_redux/fish_redux.dart';
 import 'package:flutter/material.dart';
+import 'package:sample/global_store/global_base_state.dart';
+import 'package:sample/global_store/state.dart';
 import '../todo_list_page/todo_component/component.dart';
 
-class TodoEditState implements Cloneable<TodoEditState> {
+class TodoEditState with GlobalBaseState<TodoEditState> {
   ToDoState toDo;
 
   TextEditingController nameEditController;
@@ -11,6 +13,8 @@ class TodoEditState implements Cloneable<TodoEditState> {
   FocusNode focusNodeName;
   FocusNode focusNodeDesc;
 
+  Color themeColor;
+
   int themeIdx;
   List<Color> themeColorSlots;
 
@@ -25,6 +29,11 @@ class TodoEditState implements Cloneable<TodoEditState> {
       ..themeIdx = themeIdx
       ..themeColorSlots = themeColorSlots;
   }
+  @override
+  TodoEditState lessClone(GlobalState state)
+  {
+    return (state.themeColor == themeColor) ? this : clone()..themeColor = state.themeColor;
+  }
 }
 
 TodoEditState initState(ToDoState arg) {

diff --git a/example/lib/todo_edit_page/view.dart b/example/lib/todo_edit_page/view.dart
@@ -1,6 +1,5 @@
 import 'package:fish_redux/fish_redux.dart';
 import 'package:flutter/material.dart';
-import 'package:sample/global_store/global_store.dart';
 
 import 'action.dart';
 import 'state.dart';
@@ -9,7 +8,7 @@ Widget buildView(
     TodoEditState state, Dispatch dispatch, ViewService viewService) {
   return Scaffold(
     appBar: AppBar(
-      backgroundColor:GlobalStore.state.themeColor,
+      backgroundColor:state.themeColor,
       title: const Text('Todo'),
     ),
     body: Container(

diff --git a/example/lib/todo_list_page/page.dart b/example/lib/todo_list_page/page.dart
@@ -1,4 +1,6 @@
 import 'package:fish_redux/fish_redux.dart';
+import 'package:sample/global_store/global_store.dart';
+import 'package:sample/global_store/state.dart';
 
 import 'effect.dart';
 import 'list_adapter/adapter.dart';
@@ -24,4 +26,4 @@ class ToDoListPage extends Page<PageState, Map<String, dynamic>> {
             logMiddleware(tag: 'ToDoListPage'),
           ],
         );
-}
+}
diff --git a/example/lib/todo_list_page/state.dart b/example/lib/todo_list_page/state.dart
@@ -1,14 +1,25 @@
+import 'dart:ui';
+
 import 'package:fish_redux/fish_redux.dart';
+import 'package:sample/global_store/global_base_state.dart';
+import 'package:sample/global_store/state.dart';
 import 'report_component/component.dart';
 import 'todo_component/component.dart';
 
-class PageState implements Cloneable<PageState> {
+class PageState with GlobalBaseState<PageState>{
   List<ToDoState> toDos;
+  Color themeColor;
 
   @override
   PageState clone() {
     return PageState()..toDos = toDos;
   }
+
+  @override
+  PageState lessClone(GlobalState state)
+  {
+    return (state.themeColor == themeColor) ? this : clone()..themeColor = state.themeColor;
+  }
 }
 
 PageState initState(Map<String, dynamic> args) {

diff --git a/example/lib/todo_list_page/view.dart b/example/lib/todo_list_page/view.dart
@@ -1,6 +1,5 @@
 import 'package:fish_redux/fish_redux.dart';
 import 'package:flutter/material.dart';
-import 'package:sample/global_store/global_store.dart';
 
 import 'action.dart';
 import 'state.dart';
@@ -9,7 +8,7 @@ Widget buildView(PageState state, Dispatch dispatch, ViewService viewService) {
   final ListAdapter adapter = viewService.buildAdapter();
   return Scaffold(
     appBar: AppBar(
-      backgroundColor:GlobalStore.state.themeColor,
+      backgroundColor:state.themeColor,
       title: const Text('ToDoList'),
     ),
     body: Container(