Lazy load languages

raxysstudios · Jul 11, 2022 · 07f255e · 07f255e
1 parent 26082a7
commit 07f255e
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 40 deletions.
diff --git a/lib/modules/dictionary/dictionary.dart b/lib/modules/dictionary/dictionary.dart
@@ -29,7 +29,7 @@ class DictionaryScreenState extends State<DictionaryScreen> {
     firstPageKey: 0,
   );
   late final search = SearchController(
-    GlobalStore.languages.keys,
+    GlobalStore.languages,
     algolia.index('dictionary'),
     paging.refresh,
   );
@@ -137,7 +137,7 @@ class DictionaryScreenState extends State<DictionaryScreen> {
                 leading: IconButton(
                   onPressed: () async {
                     await context.pushRoute(const HomeRoute());
-                    search.setLanguage('', GlobalStore.languages.keys);
+                    search.setLanguage('', GlobalStore.languages);
                   },
                   tooltip: 'Home',
                   icon: const Icon(Icons.landscape_outlined),

diff --git a/lib/modules/dictionary/widgets/search_toolbar.dart b/lib/modules/dictionary/widgets/search_toolbar.dart
@@ -73,7 +73,7 @@ class SearchToolbarState extends State<SearchToolbar> {
               onTap: () => setLanguage(''),
             ),
             OptionItem.divider(),
-            for (final l in GlobalStore.languages.keys)
+            for (final l in GlobalStore.languages)
               OptionItem.tile(
                 Transform.scale(
                   scale: 1.25,

diff --git a/lib/modules/home/home.dart b/lib/modules/home/home.dart
@@ -51,7 +51,7 @@ class _HomeScreenState extends State<HomeScreen> {
         .get()
         .then((r) => r.docs.map((d) => d.data()).toList());
 
-    selected = GlobalStore.languages.keys
+    selected = GlobalStore.languages
         .map((n) => catalogue.firstWhere((l) => l.name == n))
         .toSet();
     tags = {
@@ -134,7 +134,7 @@ class _HomeScreenState extends State<HomeScreen> {
           ? null
           : FloatingActionButton(
               onPressed: () {
-                GlobalStore.set(objects: selected);
+                GlobalStore.set(selected.map((l) => l.name).toList());
                 context.navigateTo(const RootRoute());
               },
               child: const Icon(Icons.done_all_outlined),

diff --git a/lib/modules/settings/widgets/editor_mode_card.dart b/lib/modules/settings/widgets/editor_mode_card.dart
@@ -7,6 +7,7 @@ import 'package:bazur/shared/widgets/column_card.dart';
 import 'package:bazur/shared/widgets/language_avatar.dart';
 import 'package:bazur/shared/widgets/span_icon.dart';
 import 'package:bazur/store.dart';
+import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/material.dart';
 
@@ -20,6 +21,7 @@ class EditorModeCard extends StatefulWidget {
 class _EditorModeCardState extends State<EditorModeCard> {
   late final StreamSubscription<User?> _authStream;
   var adminable = <String>[];
+  List<Language>? languages;
 
   @override
   void initState() {
@@ -36,6 +38,23 @@ class _EditorModeCardState extends State<EditorModeCard> {
   }
 
   void updateAdminable() async {
+    if (languages == null) {
+      languages = [];
+      for (final l in GlobalStore.languages) {
+        await FirebaseFirestore.instance
+            .doc('languages/$l')
+            .withConverter(
+              fromFirestore: (snapshot, _) =>
+                  Language.fromJson(snapshot.data()!),
+              toFirestore: (_, __) => {},
+            )
+            .get()
+            .then((d) {
+          final l = d.data();
+          if (l != null) languages!.add(l);
+        });
+      }
+    }
     adminable = await EditorStore.getAdminable();
     setState(() {});
   }
@@ -65,15 +84,14 @@ class _EditorModeCardState extends State<EditorModeCard> {
             ],
           ),
         ),
-        if (EditorStore.user != null)
+        if (EditorStore.user != null && languages != null)
           Padding(
             padding: const EdgeInsets.all(8),
             child: Wrap(
               spacing: 8,
               runSpacing: 8,
               children: [
-                for (final l
-                    in GlobalStore.languages.values.whereType<Language>())
+                for (final l in languages!)
                   InputChip(
                     materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
                     avatar: LanguageAvatar(l.name),

diff --git a/lib/store.dart b/lib/store.dart
@@ -1,8 +1,6 @@
 import 'package:algolia/algolia.dart';
-import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'models/language.dart';
 import 'shared/utils.dart';
 
 late final Algolia algolia;
@@ -48,39 +46,16 @@ class EditorStore {
 }
 
 class GlobalStore {
-  static Map<String, Language?> languages = {};
+  static var languages = <String>[];
 
-  static void set({
-    Iterable<String>? names,
-    Iterable<Language>? objects,
-  }) {
-    if (objects != null) {
-      languages = {for (final l in objects) l.name: l};
-    } else if (names != null) {
-      languages = {for (final l in names) l: null};
-    }
-    if (!languages.containsKey(EditorStore.language)) {
+  static void set(List<String> languages) {
+    GlobalStore.languages = [...languages];
+    if (!languages.contains(EditorStore.language)) {
       EditorStore.language = null;
     }
-    prefs.setStringList('languages', languages.keys.toList());
+    prefs.setStringList('languages', languages);
   }
 
-  static void init([List<String>? names]) {
-    set(
-      names: names ?? prefs.getStringList('languages') ?? ['aghul'],
-    );
-    for (final l in languages.keys) {
-      FirebaseFirestore.instance
-          .doc('languages/$l')
-          .withConverter(
-            fromFirestore: (snapshot, _) => Language.fromJson(snapshot.data()!),
-            toFirestore: (_, __) => {},
-          )
-          .get()
-          .then((r) {
-        final l = r.data();
-        if (l != null) languages[l.name] = l;
-      });
-    }
-  }
+  static void init([List<String>? names]) =>
+      set(prefs.getStringList('languages') ?? ['aghul']);
 }