[fix] card bottom controls type, character store update

DungeonPaper · Jun 10, 2020 · c701a57 · c701a57
1 parent 2628260
commit c701a57
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 16 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -36,8 +36,8 @@ android {
         multiDexEnabled true
 
         // VERSION
-        versionCode 38
-        versionName "1.1.6+1"
+        versionCode 39
+        versionName "1.1.6+2"
     }
 
     // flavorDimensions "version"

diff --git a/lib/db/listeners.dart b/lib/db/listeners.dart
@@ -90,7 +90,7 @@ void registerCharactersListener() async {
     dwStore.dispatch(
       SetCharacters({
         for (var character in characters.documents)
-          character.reference.path: Character(
+          character.reference.documentID: Character(
             data: character.data,
             ref: character.reference,
           ),

diff --git a/lib/src/atoms/card_bottom_controls.dart b/lib/src/atoms/card_bottom_controls.dart
@@ -23,7 +23,7 @@ class CardBottomControls extends StatelessWidget {
   }
 
   List<Widget> getButtons() {
-    var buttons = [];
+    var buttons = <Widget>[];
     Widget editButton = IconButton(
       tooltip: suffixType('Edit'),
       icon: Icon(Icons.edit),

diff --git a/lib/src/molecules/move_card.dart b/lib/src/molecules/move_card.dart
@@ -31,7 +31,7 @@ class MoveCard extends StatefulWidget {
 class MoveCardState extends State<MoveCard> {
   @override
   Widget build(BuildContext context) {
-    Move move = widget.move;
+    var move = widget.move;
     Widget name =
         Text("${move.name}${widget.raceMove ? '\'s Racial Move' : ''}");
 
@@ -125,13 +125,13 @@ class MoveCardState extends State<MoveCard> {
     );
   }
 
-  _save(Move move) {
+  void _save(Move move) {
     if (widget.onSave != null) {
       widget.onSave(move);
     }
   }
 
-  _delete() {
+  void _delete() {
     if (widget.onDelete != null) {
       widget.onDelete();
     }

diff --git a/lib/src/redux/characters/characters_store.dart b/lib/src/redux/characters/characters_store.dart
@@ -22,21 +22,15 @@ CharacterStore characterReducer(CharacterStore state, action) {
       state.characters ??= {};
       state.characters.addAll(action.characters);
     }
-    if (action.characters.isNotEmpty &&
+    if (state.current != null) {
+      state.current = action.characters[state.current.documentID];
+    } else if (action.characters.isNotEmpty &&
         !state.characters.containsKey(state.current?.documentID)) {
       state.current = action.characters.values.first;
     }
     return state;
   }
 
-  if (action is UpsertCharacter) {
-    state.characters = {
-      ...state.characters,
-      action.character.documentID: action.character
-    };
-    return state;
-  }
-
   if (action is RemoveCharacter) {
     state.characters.removeWhere((k, v) => k == action.character.documentID);
     if (state.current.documentID == action.character.documentID) {
@@ -47,6 +41,9 @@ CharacterStore characterReducer(CharacterStore state, action) {
 
   if (action is UpsertCharacter) {
     state.characters[action.character.documentID] = action.character;
+    if (state.current.documentID == action.character.documentID) {
+      state.current = action.character;
+    }
     return state;
   }