revert for release 1.1.4

theachoem · Jan 5, 2022 · 6c7daad · 6c7daad
1 parent 15dce92
commit 6c7daad
Show file tree

Hide file tree

Showing 11 changed files with 170 additions and 97 deletions.
diff --git a/.fvm/flutter_sdk b/.fvm/flutter_sdk
@@ -1 +1 @@
-/Users/theachoem/fvm/versions/2.5.3
+/Users/theachoem/fvm/versions/2.8.0
diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json
@@ -1,4 +1,4 @@
 {
-  "flutterSdkVersion": "2.5.3",
+  "flutterSdkVersion": "2.8.0",
   "flavors": {}
 }
diff --git a/lib/notifier/remote_database_notifier.dart b/lib/notifier/remote_database_notifier.dart
@@ -36,15 +36,16 @@ class RemoteDatabaseNotifier with ChangeNotifier, DialogMixin, WSnackBarMixin {
 
   load() async {
     if (auth.user != null) {
-      // DbBackupModel? result = await GoogleDriveApi.fetchTxtData();
-      DbBackupModel? result = await service.backup(auth.user!.uid);
-      useCsv = false;
-      // if (result == null) {
-      //   result = await service.backup(auth.user!.uid);
-      //   useCsv = false;
-      // } else {
-      //   useCsv = true;
-      // }
+      DbBackupModel? result = await GoogleDriveApi.fetchTxtData();
+
+      if (result == null) {
+        result = await service.backup(auth.user!.uid);
+        useCsv = false;
+      } else {
+        useCsv = true;
+      }
+
+      print(result?.db);
 
       if (result != null && result.db != null) {
         this._backup = result;

diff --git a/lib/screens/story_detail/local_widgets/w_quil_toolbar.dart b/lib/screens/story_detail/local_widgets/w_quil_toolbar.dart
@@ -1,9 +1,6 @@
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_quill/models/documents/attribute.dart';
-import 'package:flutter_quill/widgets/controller.dart';
+import 'package:flutter_quill/flutter_quill.dart';
 import 'package:flutter_quill/widgets/toolbar.dart' as toolbar;
-import 'package:image_picker/image_picker.dart';
 import 'package:storypad/widgets/w_tap_effect.dart';
 import 'package:storypad/screens/story_detail/local_widgets/w_clear_format_btn.dart';
 import 'package:storypad/screens/story_detail/local_widgets/w_color_button.dart';
@@ -147,19 +144,20 @@ class WQuillToolbar extends StatefulWidget implements PreferredSizeWidget {
               IconData icon,
               Color? fillColor,
               bool? isToggled,
-              VoidCallback? _onPressed, [
-              double iconSize = 24.0,
+              VoidCallback? onPressed, [
+              double iconSize = WTOOLBARICONSIZE,
+              QuillIconTheme? iconTheme,
             ]) {
               final _attributes = controller.getSelectionStyle().attributes;
               final bool hasBlockList = _attributes.containsKey("blockquote");
-              final onPressed = hasBlockList ? null : _onPressed;
+              final _onPressed = hasBlockList ? null : onPressed;
               return defaultToggleStyleButtonBuilder(
                 context,
                 attribute,
                 icon,
                 fillColor,
                 isToggled,
-                onPressed,
+                _onPressed,
                 iconSize,
               );
             },
@@ -177,19 +175,20 @@ class WQuillToolbar extends StatefulWidget implements PreferredSizeWidget {
               IconData icon,
               Color? fillColor,
               bool? isToggled,
-              VoidCallback? _onPressed, [
-              double iconSize = 24.0,
+              VoidCallback? onPressed, [
+              double iconSize = WTOOLBARICONSIZE,
+              QuillIconTheme? iconTheme,
             ]) {
               final _attributes = controller.getSelectionStyle().attributes;
               final bool hasBlockList = _attributes.containsKey("blockquote");
-              final onPressed = hasBlockList ? null : _onPressed;
+              final _onPressed = hasBlockList ? null : onPressed;
               return defaultToggleStyleButtonBuilder(
                 context,
                 attribute,
                 icon,
                 fillColor,
                 isToggled,
-                onPressed,
+                _onPressed,
                 iconSize,
               );
             },
@@ -207,19 +206,20 @@ class WQuillToolbar extends StatefulWidget implements PreferredSizeWidget {
               IconData icon,
               Color? fillColor,
               bool? isToggled,
-              VoidCallback? _onPressed, [
-              double iconSize = 24.0,
+              VoidCallback? onPressed, [
+              double iconSize = WTOOLBARICONSIZE,
+              QuillIconTheme? iconTheme,
             ]) {
               final _attributes = controller.getSelectionStyle().attributes;
               final bool hasBlockList = _attributes.containsKey("blockquote");
-              final onPressed = hasBlockList ? null : _onPressed;
+              final _onPressed = hasBlockList ? null : onPressed;
               return defaultToggleStyleButtonBuilder(
                 context,
                 attribute,
                 icon,
                 fillColor,
                 isToggled,
-                onPressed,
+                _onPressed,
                 iconSize,
               );
             },
@@ -242,20 +242,21 @@ class WQuillToolbar extends StatefulWidget implements PreferredSizeWidget {
               IconData icon,
               Color? fillColor,
               bool? isToggled,
-              VoidCallback? _onPressed, [
-              double iconSize = 24.0,
+              VoidCallback? onPressed, [
+              double iconSize = WTOOLBARICONSIZE,
+              QuillIconTheme? iconTheme,
             ]) {
               final _attributes = controller.getSelectionStyle().attributes;
               final bool hasBlockQuote = _attributes.containsKey("blockquote");
               final bool hasBlockList = _attributes.containsKey("list");
-              final onPressed = hasBlockQuote || hasBlockList ? null : _onPressed;
+              final _onPressed = hasBlockQuote || hasBlockList ? null : onPressed;
               return defaultToggleStyleButtonBuilder(
                 context,
                 attribute,
                 icon,
                 fillColor,
                 isToggled,
-                onPressed,
+                _onPressed,
                 iconSize,
               );
             },
@@ -273,19 +274,20 @@ class WQuillToolbar extends StatefulWidget implements PreferredSizeWidget {
               IconData icon,
               Color? fillColor,
               bool? isToggled,
-              VoidCallback? _onPressed, [
-              double iconSize = 24.0,
+              VoidCallback? onPressed, [
+              double iconSize = WTOOLBARICONSIZE,
+              QuillIconTheme? iconTheme,
             ]) {
               final _attributes = controller.getSelectionStyle().attributes;
               final bool hasBlockList = _attributes.containsKey("list");
-              final onPressed = hasBlockList ? null : _onPressed;
+              final _onPressed = hasBlockList ? null : onPressed;
               return defaultToggleStyleButtonBuilder(
                 context,
                 attribute,
                 icon,
                 fillColor,
                 isToggled,
-                onPressed,
+                _onPressed,
                 iconSize,
               );
             },
@@ -353,22 +355,11 @@ class WQuillToolbar extends StatefulWidget implements PreferredSizeWidget {
           child: toolbar.ImageButton(
             icon: Icons.image,
             controller: controller,
-            imageSource: ImageSource.gallery,
             onImagePickCallback: onImagePickCallback,
             iconSize: WTOOLBARICONSIZE,
           ),
         ),
         spaceBetween,
-        Visibility(
-          visible: onImagePickCallback != null,
-          child: toolbar.ImageButton(
-            icon: Icons.photo_camera,
-            controller: controller,
-            imageSource: ImageSource.camera,
-            onImagePickCallback: onImagePickCallback,
-            iconSize: WTOOLBARICONSIZE,
-          ),
-        ),
         spaceBetween2,
       ],
     );
@@ -382,6 +373,7 @@ class WQuillToolbar extends StatefulWidget implements PreferredSizeWidget {
     bool? isToggled,
     VoidCallback? onPressed, [
     double iconSize = WTOOLBARICONSIZE,
+    QuillIconTheme? iconTheme,
   ]) {
     final theme = Theme.of(context);
     final isEnabled = onPressed != null;

diff --git a/lib/screens/story_detail/local_widgets/w_select_header_style_button.dart b/lib/screens/story_detail/local_widgets/w_select_header_style_button.dart
@@ -95,7 +95,7 @@ class _WSelectHeaderStyleButtonState extends State<WSelectHeaderStyleButton> {
       mainAxisSize: MainAxisSize.min,
       children: List.generate(3, (index) {
         return Padding(
-          padding: const EdgeInsets.symmetric(horizontal: !kIsWeb ? 1.0 : 5.0),
+          padding: EdgeInsets.symmetric(horizontal: !kIsWeb ? 1.0 : 5.0),
           child: ConstrainedBox(
             constraints: BoxConstraints.tightFor(
               width: iconSize * 1.77,

diff --git a/lib/screens/story_detail/story_detail_screen.dart b/lib/screens/story_detail/story_detail_screen.dart
@@ -213,7 +213,7 @@ class StoryDetailScreen extends HookWidget with StoryDetailMethodMixin, HookCont
                   keyboardAppearance: _theme.colorScheme.brightness,
                   enableInteractiveSelection: true,
                   expands: false,
-                  embedBuilder: (BuildContext context, leaf.Embed node) {
+                  embedBuilder: (BuildContext context, leaf.Embed node, bool readOnly) {
                     return _embedBuilder(
                       context: context,
                       node: node,

diff --git a/lib/services/local_storages/databases/base_database.dart b/lib/services/local_storages/databases/base_database.dart
@@ -35,7 +35,8 @@ abstract class BaseDatabase {
       List<Map<dynamic, dynamic>>? result = await database?.query(table());
       if (result == null) return null;
       if (result.isEmpty) return null;
-      return itemsTransformer(result);
+      var rt = itemsTransformer(result);
+      return rt;
     });
   }
 
@@ -74,8 +75,11 @@ abstract class BaseDatabase {
     List<BaseModel?> items = list.map((json) {
       return objectTransformer(json);
     }).toList();
-    items.removeWhere((element) => element == null);
-    return items as List<BaseModel>?;
+    List<BaseModel> result = [];
+    items.forEach((e) {
+      if (e is BaseModel) result.add(e);
+    });
+    return result;
   }
 
   BaseModel? objectTransformer(Map<dynamic, dynamic>? json);

diff --git a/lib/services/local_storages/databases/story_database.dart b/lib/services/local_storages/databases/story_database.dart
@@ -14,13 +14,15 @@ class StoryDatabase extends BaseDatabase {
 
   Future<Map<int, StoryModel>> storyById({String? where}) async {
     final list = await super.fetchAll();
+
     Map<int, StoryModel> map = {};
     list?.forEach((e) {
       if (e is StoryModel) {
         String? _paragraph = e.paragraph != null ? HtmlCharacterEntities.decode(e.paragraph!) : null;
         map[e.id] = e.copyWith(paragraph: _paragraph?.replaceAll(this.singleQuote, "'"));
       }
     });
+
     return map;
   }
 

diff --git a/lib/services/local_storages/databases/w_database.dart b/lib/services/local_storages/databases/w_database.dart
@@ -58,8 +58,10 @@ class WDatabase {
     /// add new feeling column if not existed
     try {
       await database.rawQuery("SELECT feeling from story;");
+      await database.rawQuery("SELECT is_share from story");
     } catch (e) {
       await database.execute("ALTER TABLE story ADD COLUMN feeling char(50);");
+      await database.execute("ALTER TABLE story ADD COLUMN is_share INTEGER");
     }
   }
 }