Merge branch 'release/1.2.1.1' into main

Author: tokku5552

lib/domain/storage_repository.dart

@@ -12,4 +12,3 @@ abstract class StorageRepository {
 }
 
 const String VIEW_COMPLETED_ITEMS_KEY = "view_completed_items";
-const String VIEW_COMPLETED_ITEMS_KEY_NONE = "NONE";

lib/presentation/todo_list/todo_list_model.dart

@@ -15,16 +15,17 @@ class TodoListModel extends ChangeNotifier {
     @required StorageRepository storageRepository,
     @required TodoItemRepository todoItemRepository,
   })  : _storageRepository = storageRepository,
-        _todoItemRepository = todoItemRepository {
-    this.viewCompletedItems =
-        (loadViewCompletedItems().toString() == "true") ? true : false;
-  }
-
+        _todoItemRepository = todoItemRepository;
   final TodoItemRepository _todoItemRepository;
   final StorageRepository _storageRepository;
   List<TodoItem> list = [];
   bool viewCompletedItems;
 
+  Future<void> init() async {
+    viewCompletedItems = await loadViewCompletedItems();
+    await getTodoList();
+  }
+
   Future<void> getTodoList() async {
     list = await _todoItemRepository.findAll(
         viewCompletedItems: viewCompletedItems);
@@ -54,12 +55,13 @@ class TodoListModel extends ChangeNotifier {
         VIEW_COMPLETED_ITEMS_KEY, viewCompletedItems.toString());
   }
 
-  Future<String> loadViewCompletedItems() async {
+  Future<bool> loadViewCompletedItems() async {
     if (!await _storageRepository.isExistKey(VIEW_COMPLETED_ITEMS_KEY)) {
-      return VIEW_COMPLETED_ITEMS_KEY_NONE;
+      return null;
     } else {
-      return await _storageRepository
+      final result = await _storageRepository
           .loadPersistenceStorage(VIEW_COMPLETED_ITEMS_KEY);
+      return result == 'true';
     }
   }
 }

lib/presentation/todo_list/todo_list_page.dart

@@ -25,7 +25,7 @@ class TodoListPage extends StatelessWidget {
       create: (_) => TodoListModel(
         storageRepository: context.read<StorageRepository>(),
         todoItemRepository: context.read<TodoItemRepository>(),
-      )..getTodoList(),
+      )..init(),
       child: Scaffold(
         appBar: AppBar(
           title: Text("TODOAppSample-Flutter"),

test/todo_list_model_test.dart

@@ -149,7 +149,7 @@ void main() {
       // 結果確認
       expect(
           await storageRepository.isExistKey(VIEW_COMPLETED_ITEMS_KEY), false);
-      expect(result, VIEW_COMPLETED_ITEMS_KEY_NONE);
+      expect(result, null);
     });
 
     test('正常系:keyがある時', () async {