Fix use of AppStore in example

Sugers3 · May 27, 2019 · df964a8 · df964a8
1 parent 5999684
commit df964a8
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 23 deletions.
diff --git a/example/lib/global_store/action.dart b/example/lib/global_store/action.dart
@@ -5,7 +5,7 @@ import 'package:fish_redux/fish_redux.dart';
 enum GlobalAction { changeThemeColor }
 
 class GlobalActionCreator {
-  static Action onchangeThemeColor(Color color) {
-    return Action(GlobalAction.changeThemeColor, payload: color);
+  static Action onchangeThemeColor() {
+    return const Action(GlobalAction.changeThemeColor);
   }
 }
diff --git a/example/lib/global_store/reducer.dart b/example/lib/global_store/reducer.dart
@@ -1,6 +1,7 @@
 import 'dart:ui';
 
 import 'package:fish_redux/fish_redux.dart';
+import 'package:flutter/material.dart';
 
 import 'action.dart';
 import 'state.dart';
@@ -13,5 +14,15 @@ Reducer<GlobalState> buildReducer() {
   );
 }
 
-GlobalState _onchangeThemeColor(GlobalState state, Action action) =>
-    state.clone()..themeColor = action.payload;
+List<Color> _colors = <Color>[
+  Colors.green,
+  Colors.red,
+  Colors.black,
+  Colors.blue
+];
+
+GlobalState _onchangeThemeColor(GlobalState state, Action action) {
+  final Color next =
+      _colors[((_colors.indexOf(state.themeColor) + 1) % _colors.length)];
+  return state.clone()..themeColor = next;
+}
diff --git a/example/lib/todo_edit_page/effect.dart b/example/lib/todo_edit_page/effect.dart
@@ -31,13 +31,6 @@ void _onDone(Action action, Context<TodoEditState> ctx) {
 }
 
 void _onChangeTheme(Action action, Context<TodoEditState> ctx) {
-  ctx.state.themeIdx++;
-  if (ctx.state.themeIdx >= ctx.state.themeColorSlots.length) {
-    ctx.state.themeIdx = 0;
-  }
   //change global data
-  GlobalStore.store.dispatch(GlobalActionCreator.onchangeThemeColor(
-      ctx.state.themeColorSlots[ctx.state.themeIdx]));
-  //notify todo edit page update data
-  ToDoEditActionCreator.update(null, null, ctx.state.themeIdx.toString());
+  GlobalStore.store.dispatch(GlobalActionCreator.onchangeThemeColor());
 }
diff --git a/example/lib/todo_edit_page/reducer.dart b/example/lib/todo_edit_page/reducer.dart
@@ -13,7 +13,5 @@ TodoEditState _update(TodoEditState state, Action action) {
   final TodoEditState newState = state.clone();
   newState.toDo.title = update['name'] ?? newState.toDo.title;
   newState.toDo.desc = update['desc'] ?? newState.toDo.desc;
-  final String strThemeIdx = update['themeidx'] ?? newState.themeIdx.toString();
-  newState.themeIdx = int.tryParse(strThemeIdx);
   return newState;
 }
diff --git a/example/lib/todo_edit_page/state.dart b/example/lib/todo_edit_page/state.dart
@@ -14,19 +14,14 @@ class TodoEditState implements GlobalBaseState<TodoEditState> {
   @override
   Color themeColor;
 
-  int themeIdx;
-  List<Color> themeColorSlots;
-
   @override
   TodoEditState clone() {
     return TodoEditState()
       ..nameEditController = nameEditController
       ..descEditController = descEditController
       ..focusNodeName = focusNodeName
       ..focusNodeDesc = focusNodeDesc
-      ..toDo = toDo
-      ..themeIdx = themeIdx
-      ..themeColorSlots = themeColorSlots;
+      ..toDo = toDo;
   }
 }
 
@@ -37,7 +32,6 @@ TodoEditState initState(ToDoState arg) {
   state.descEditController = TextEditingController(text: arg?.desc);
   state.focusNodeName = FocusNode();
   state.focusNodeDesc = FocusNode();
-  state.themeIdx = 0;
-  state.themeColorSlots = [Colors.green, Colors.red, Colors.black, Colors.blue];
+
   return state;
 }
diff --git a/example/lib/todo_list_page/state.dart b/example/lib/todo_list_page/state.dart
@@ -13,7 +13,9 @@ class PageState implements GlobalBaseState<PageState> {
 
   @override
   PageState clone() {
-    return PageState()..toDos = toDos;
+    return PageState()
+      ..toDos = toDos
+      ..themeColor = themeColor;
   }
 }