Merge pull request #41 from raxysstudios/dev

Lints
raxysstudios · May 18, 2022 · d342e54 · d342e54
2 parents 764a04a + c901aa4
commit d342e54
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 86 deletions.
diff --git a/lib/modules/dictionary/screens/dictionary.dart b/lib/modules/dictionary/screens/dictionary.dart
@@ -1,8 +1,8 @@
-import 'package:avzag/store.dart';
 import 'package:avzag/modules/dictionary/widgets/entry_group.dart';
 import 'package:avzag/modules/navigation/nav_drawer.dart';
 import 'package:avzag/shared/widgets/caption.dart';
 import 'package:avzag/shared/widgets/rounded_menu_button.dart';
+import 'package:avzag/store.dart';
 import 'package:flutter/material.dart';
 import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
 import 'package:provider/provider.dart';

diff --git a/lib/modules/dictionary/screens/word.dart b/lib/modules/dictionary/screens/word.dart
@@ -1,4 +1,3 @@
-import 'package:avzag/store.dart';
 import 'package:avzag/modules/dictionary/widgets/samples_column.dart';
 import 'package:avzag/shared/utils/utils.dart';
 import 'package:avzag/shared/widgets/caption.dart';

diff --git a/lib/modules/dictionary/screens/word_editor.dart b/lib/modules/dictionary/screens/word_editor.dart
@@ -1,4 +1,3 @@
-import 'package:avzag/store.dart';
 import 'package:avzag/modules/dictionary/widgets/samples_editor.dart';
 import 'package:avzag/shared/utils/utils.dart';
 import 'package:avzag/shared/widgets/column_card.dart';
@@ -7,6 +6,7 @@ import 'package:avzag/shared/widgets/language_flag.dart';
 import 'package:avzag/shared/widgets/modals/danger_dialog.dart';
 import 'package:avzag/shared/widgets/options_button.dart';
 import 'package:avzag/shared/widgets/rounded_back_button.dart';
+import 'package:avzag/store.dart';
 import 'package:flutter/material.dart';
 
 import '../models/use.dart';

diff --git a/lib/modules/dictionary/services/word.dart b/lib/modules/dictionary/services/word.dart
@@ -1,8 +1,8 @@
-import 'package:avzag/store.dart';
 import 'package:avzag/shared/utils/contribution.dart';
 import 'package:avzag/shared/widgets/modals/danger_dialog.dart';
 import 'package:avzag/shared/widgets/modals/loading_dialog.dart';
 import 'package:avzag/shared/widgets/modals/snackbar_manager.dart';
+import 'package:avzag/store.dart';
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:flutter/material.dart';
 

diff --git a/lib/modules/dictionary/widgets/search_toolbar.dart b/lib/modules/dictionary/widgets/search_toolbar.dart
@@ -1,9 +1,9 @@
 import 'dart:async';
 
-import 'package:avzag/store.dart';
 import 'package:avzag/shared/utils/utils.dart';
 import 'package:avzag/shared/widgets/language_avatar.dart';
 import 'package:avzag/shared/widgets/options_button.dart';
+import 'package:avzag/store.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

diff --git a/lib/modules/navigation/account.dart b/lib/modules/navigation/account.dart
@@ -1,11 +1,10 @@
-import 'package:avzag/store.dart';
 import 'package:avzag/modules/navigation/sign_in_buttons.dart';
 import 'package:avzag/shared/utils/open_link.dart';
 import 'package:avzag/shared/utils/utils.dart';
 import 'package:avzag/shared/widgets/column_card.dart';
 import 'package:avzag/shared/widgets/language_avatar.dart';
 import 'package:avzag/shared/widgets/span_icon.dart';
-
+import 'package:avzag/store.dart';
 import 'package:badges/badges.dart';
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/material.dart';

diff --git a/lib/modules/navigation/nav_drawer.dart b/lib/modules/navigation/nav_drawer.dart
@@ -1,4 +1,3 @@
-import 'package:avzag/store.dart';
 import 'package:avzag/modules/dictionary/screens/dictionary.dart';
 import 'package:avzag/modules/home/screens/home.dart';
 import 'package:avzag/shared/utils/open_link.dart';
@@ -7,9 +6,11 @@ import 'package:avzag/shared/widgets/column_card.dart';
 import 'package:avzag/shared/widgets/expandable_tile.dart';
 import 'package:avzag/shared/widgets/raxys_logo.dart';
 import 'package:avzag/shared/widgets/span_icon.dart';
+import 'package:avzag/store.dart';
 import 'package:flutter/material.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:shared_preferences/shared_preferences.dart';
+
 import 'account.dart';
 
 Future<void> navigate(

diff --git a/lib/shared/widgets/compact_input.dart b/lib/shared/widgets/compact_input.dart
@@ -1,7 +1,9 @@
 import 'package:flutter/material.dart';
 
-import '../utils/utils.dart';
-import 'modals/editor_dialog.dart';
+String? _emptyValidator(String? value) {
+  value = value?.trim() ?? '';
+  return value.isEmpty ? '' : null;
+}
 
 class CompactInput extends StatelessWidget {
   const CompactInput(
@@ -43,9 +45,12 @@ class CompactInput extends StatelessWidget {
         ),
         maxLines: multiline ? 0 : null,
         initialValue: initial,
-        validator: noEmpty ? emptyValidator : null,
-        inputFormatters: lowercase ? [LowerCaseTextFormatter()] : null,
-        onChanged: (s) => onChanged(s.trim()),
+        validator: noEmpty ? _emptyValidator : null,
+        onChanged: (s) {
+          s = s.trim();
+          if (lowercase) s = s.toLowerCase();
+          onChanged(s);
+        },
       ),
     );
   }

diff --git a/lib/shared/widgets/modals/editor_dialog.dart b/lib/shared/widgets/modals/editor_dialog.dart