Disabled feedback for web

bogpie · bogpie · commit a92442e2dd7b · 2021-09-14T15:14:49.000+03:00
- RemoteConfig is not supported on web
diff --git a/lib/pages/classes/view/class_view.dart b/lib/pages/classes/view/class_view.dart
@@ -7,7 +7,6 @@ import 'package:provider/provider.dart';
 
 import '../../../authentication/service/auth_provider.dart';
 import '../../../generated/l10n.dart';
-import '../../../resources/remote_config.dart';
 import '../../../resources/utils.dart';
 import '../../../widgets/button.dart';
 import '../../../widgets/class_icon.dart';
@@ -60,7 +59,7 @@ class _ClassViewState extends State<ClassView> {
     return AppScaffold(
       title: Text(S.current.navigationClassInfo),
       actions: [
-        if (RemoteConfigService.feedbackEnabled)
+        if (Utils.feedbackEnabled)
           AppScaffoldAction(
               icon: Icons.rate_review_outlined,
               tooltip: S.current.navigationClassFeedback,
diff --git a/lib/pages/classes/view/classes_page.dart b/lib/pages/classes/view/classes_page.dart
@@ -4,7 +4,7 @@ import 'package:provider/provider.dart';
 
 import '../../../authentication/service/auth_provider.dart';
 import '../../../generated/l10n.dart';
-import '../../../resources/remote_config.dart';
+import '../../../resources/utils.dart';
 import '../../../widgets/class_icon.dart';
 import '../../../widgets/error_page.dart';
 import '../../../widgets/icon_text.dart';
@@ -34,9 +34,9 @@ class _ClassesPageState extends State<ClassesPage> {
     }
 
     final ClassProvider classProvider =
-        Provider.of<ClassProvider>(context, listen: false);
+    Provider.of<ClassProvider>(context, listen: false);
     final AuthProvider authProvider =
-        Provider.of<AuthProvider>(context, listen: false);
+    Provider.of<AuthProvider>(context, listen: false);
     headers =
         (await classProvider.fetchClassHeaders(uid: authProvider.uid)).toSet();
 
@@ -63,87 +63,100 @@ class _ClassesPageState extends State<ClassesPage> {
       // TODO(IoanaAlexandru): Simply show all classes if user is not authenticated
       needsToBeAuthenticated: true,
       actions: [
-        if (RemoteConfigService.feedbackEnabled)
+        if (Utils.feedbackEnabled)
           AppScaffoldAction(
             icon: Icons.rate_review_outlined,
             tooltip: S.current.navigationClassesFeedbackChecklist,
-            onPressed: () => Navigator.of(context).push(
-              MaterialPageRoute<ClassFeedbackChecklist>(
-                builder: (_) => ClassFeedbackChecklist(classes: headers),
-              ),
-            ),
+            onPressed: () =>
+                Navigator.of(context).push(
+                  MaterialPageRoute<ClassFeedbackChecklist>(
+                    builder: (_) => ClassFeedbackChecklist(classes: headers),
+                  ),
+                ),
           ),
         AppScaffoldAction(
           icon: Icons.edit_outlined,
           tooltip: S.current.actionChooseClasses,
-          onPressed: () => Navigator.of(context).push(
-            MaterialPageRoute<ChangeNotifierProvider>(
-              builder: (_) => ChangeNotifierProvider.value(
-                  value: classProvider,
-                  child: FutureBuilder(
-                    future: classProvider.fetchUserClassIds(authProvider.uid),
-                    builder: (context, snap) {
-                      if (snap.hasData) {
-                        return AddClassesPage(
-                            initialClassIds: snap.data,
-                            onSave: (classIds) async {
-                              await classProvider.setUserClassIds(
-                                  classIds, authProvider.uid);
-                              unawaited(updateClasses());
-                              if (!mounted) {
-                                return;
+          onPressed: () =>
+              Navigator.of(context).push(
+                MaterialPageRoute<ChangeNotifierProvider>(
+                  builder: (_) =>
+                      ChangeNotifierProvider.value(
+                          value: classProvider,
+                          child: FutureBuilder(
+                            future: classProvider.fetchUserClassIds(
+                                authProvider.uid),
+                            builder: (context, snap) {
+                              if (snap.hasData) {
+                                return AddClassesPage(
+                                    initialClassIds: snap.data,
+                                    onSave: (classIds) async {
+                                      await classProvider.setUserClassIds(
+                                          classIds, authProvider.uid);
+                                      unawaited(updateClasses());
+                                      if (!mounted) {
+                                        return;
+                                      }
+                                      Navigator.pop(context);
+                                    });
+                              } else {
+                                return const Center(
+                                    child: CircularProgressIndicator());
                               }
-                              Navigator.pop(context);
-                            });
-                      } else {
-                        return const Center(child: CircularProgressIndicator());
-                      }
-                    },
-                  )),
-            ),
-          ),
+                            },
+                          )),
+                ),
+              ),
         ),
       ],
       body: Stack(
         children: [
           if (updating != null)
             headers != null && headers.isNotEmpty
                 ? ClassList(
-                    classes: headers,
-                    sectioned: false,
-                    onTap: (classHeader) => Navigator.of(context).push(
-                      MaterialPageRoute<ChangeNotifierProvider>(
-                        builder: (context) => ChangeNotifierProvider.value(
-                          value: classProvider,
-                          child: ClassView(
-                            classHeader: classHeader,
+              classes: headers,
+              sectioned: false,
+              onTap: (classHeader) =>
+                  Navigator.of(context).push(
+                    MaterialPageRoute<ChangeNotifierProvider>(
+                      builder: (context) =>
+                          ChangeNotifierProvider.value(
+                            value: classProvider,
+                            child: ClassView(
+                              classHeader: classHeader,
+                            ),
                           ),
-                        ),
-                      ),
                     ),
-                  )
+                  ),
+            )
                 : ErrorPage(
-                    errorMessage: S.current.messageNoClassesYet,
-                    imgPath: 'assets/illustrations/undraw_empty.png',
-                    info: [
-                        TextSpan(
-                            text: '${S.current.messageGetStartedByPressing} '),
-                        WidgetSpan(
-                          alignment: PlaceholderAlignment.middle,
-                          child: Icon(
-                            Icons.edit_outlined,
-                            size:
-                                Theme.of(context).textTheme.subtitle1.fontSize +
-                                    2,
-                          ),
-                        ),
-                        TextSpan(text: ' ${S.current.messageButtonAbove}.'),
-                      ]),
+                errorMessage: S.current.messageNoClassesYet,
+                imgPath: 'assets/illustrations/undraw_empty.png',
+                info: [
+                  TextSpan(
+                      text: '${S.current.messageGetStartedByPressing} '),
+                  WidgetSpan(
+                    alignment: PlaceholderAlignment.middle,
+                    child: Icon(
+                      Icons.edit_outlined,
+                      size:
+                      Theme
+                          .of(context)
+                          .textTheme
+                          .subtitle1
+                          .fontSize +
+                          2,
+                    ),
+                  ),
+                  TextSpan(text: ' ${S.current.messageButtonAbove}.'),
+                ]),
           if (updating == null)
             const Center(child: CircularProgressIndicator()),
           if (updating == true)
             Container(
-                color: Theme.of(context).disabledColor,
+                color: Theme
+                    .of(context)
+                    .disabledColor,
                 child: const Center(child: CircularProgressIndicator())),
         ],
       ),
@@ -210,13 +223,12 @@ class _AddClassesPageState extends State<AddClassesPage> {
 }
 
 class ClassList extends StatefulWidget {
-  ClassList(
-      {this.classes,
-      void Function(bool, String) onSelected,
-      Set<String> initiallySelected,
-      this.selectable = false,
-      this.sectioned = true,
-      void Function(ClassHeader) onTap})
+  ClassList({this.classes,
+    void Function(bool, String) onSelected,
+    Set<String> initiallySelected,
+    this.selectable = false,
+    this.sectioned = true,
+    void Function(ClassHeader) onTap})
       : onSelected = onSelected ?? ((selected, classId) {}),
         onTap = onTap ?? ((_) {}),
         initiallySelected = initiallySelected ?? {};
@@ -244,8 +256,8 @@ class _ClassListState extends State<ClassList> {
   String sectionName(BuildContext context, String year, String semester) =>
       '${S.current.labelYear} $year, ${S.current.labelSemester} $semester';
 
-  Map<String, dynamic> classesBySection(
-      Set<ClassHeader> classes, BuildContext context) {
+  Map<String, dynamic> classesBySection(Set<ClassHeader> classes,
+      BuildContext context) {
     final map = <String, dynamic>{};
 
     for (final c in classes) {
@@ -279,8 +291,8 @@ class _ClassListState extends State<ClassList> {
         children.addAll(values.map<Widget>(buildClassItem));
         expanded = values.fold(
             false,
-            (dynamic selected, ClassHeader header) =>
-                selected || widget.initiallySelected.contains(header.id));
+                (dynamic selected, ClassHeader header) =>
+            selected || widget.initiallySelected.contains(header.id));
       } else {
         final s = buildSections(context, sections[section], level: level + 1);
         expanded = expanded || s.containsSelected;
@@ -302,7 +314,8 @@ class _ClassListState extends State<ClassList> {
     return _Section(widgets: children, containsSelected: expanded);
   }
 
-  Widget buildClassItem(ClassHeader header) => Column(
+  Widget buildClassItem(ClassHeader header) =>
+      Column(
         children: [
           ClassListItem(
             selectable: widget.selectable,
@@ -334,16 +347,19 @@ class _ClassListState extends State<ClassList> {
               child: IconText(
                 icon: Icons.info_outlined,
                 text: '${S.current.infoSelect} ${S.current.infoClasses}.',
-                style: Theme.of(context).textTheme.bodyText1,
+                style: Theme
+                    .of(context)
+                    .textTheme
+                    .bodyText1,
               ),
             ),
           Padding(
             padding: const EdgeInsets.all(10),
             child: Column(
                 children: widget.sectioned
                     ? (buildSections(
-                            context, classesBySection(widget.classes, context)))
-                        .widgets
+                    context, classesBySection(widget.classes, context)))
+                    .widgets
                     : widget.classes.map(buildClassItem).toList()),
           ),
         ],
@@ -371,7 +387,8 @@ class ClassListItem extends StatefulWidget {
     this.selectable = false,
     void Function() onTap,
     this.hint,
-  })  : onSelected = onSelected ?? ((_) {}),
+  })
+      : onSelected = onSelected ?? ((_) {}),
         onTap = onTap ?? (() {}),
         super(key: key);
 
@@ -408,24 +425,32 @@ class _ClassListItemState extends State<ClassListItem> {
         widget.classHeader.name,
         style: widget.selectable
             ? (selected
-                ? Theme.of(context)
-                    .textTheme
-                    .subtitle1
-                    .copyWith(fontWeight: FontWeight.bold)
-                : Theme.of(context)
-                    .textTheme
-                    .subtitle1
-                    .copyWith(color: Theme.of(context).disabledColor))
-            : Theme.of(context).textTheme.subtitle1,
+            ? Theme
+            .of(context)
+            .textTheme
+            .subtitle1
+            .copyWith(fontWeight: FontWeight.bold)
+            : Theme
+            .of(context)
+            .textTheme
+            .subtitle1
+            .copyWith(color: Theme
+            .of(context)
+            .disabledColor))
+            : Theme
+            .of(context)
+            .textTheme
+            .subtitle1,
       ),
       subtitle: widget.hint != null ? Text(widget.hint) : null,
-      onTap: () => setState(() {
-        if (widget.selectable) {
-          selected = !selected;
-          widget.onSelected(selected);
-        }
-        widget.onTap();
-      }),
+      onTap: () =>
+          setState(() {
+            if (widget.selectable) {
+              selected = !selected;
+              widget.onSelected(selected);
+            }
+            widget.onTap();
+          }),
     );
   }
 }
diff --git a/lib/pages/home/home_page.dart b/lib/pages/home/home_page.dart
@@ -1,18 +1,18 @@
-import 'package:acs_upb_mobile/pages/home/upcoming_events_card.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
 import '../../authentication/service/auth_provider.dart';
 import '../../generated/l10n.dart';
 import '../../navigation/routes.dart';
-import '../../resources/remote_config.dart';
+import '../../resources/utils.dart';
 import '../../widgets/scaffold.dart';
 import 'faq_card.dart';
 import 'favourite_websites_card.dart';
 import 'feedback_nudge.dart';
 import 'news_feed_card.dart';
 import 'profile_card.dart';
+import 'upcoming_events_card.dart';
 
 class HomePage extends StatelessWidget {
   const HomePage({this.tabController, Key key}) : super(key: key);
@@ -36,7 +36,7 @@ class HomePage extends StatelessWidget {
         children: [
           if (authProvider.isAuthenticated) ProfileCard(),
           if (authProvider.isAuthenticated && !authProvider.isAnonymous
-          && RemoteConfigService.feedbackEnabled
+          && Utils.feedbackEnabled
           )
             FeedbackNudge(),
           if (authProvider.isAuthenticated && !authProvider.isAnonymous)
diff --git a/lib/resources/remote_config.dart b/lib/resources/remote_config.dart
@@ -14,15 +14,14 @@ class RemoteConfigService {
       : _remoteConfig?.getBool(_feedbackEnabled) ?? defaults[_feedbackEnabled];
 
   static Future<dynamic> initialize() async {
-    // try {
+    try {
       _remoteConfig = RemoteConfig.instance;
       await _remoteConfig.setDefaults(defaults);
       await _remoteConfig.fetchAndActivate();
-    // } catch (e) {
-    //   print(
-    //       'Unable to fetch remote config. Cached or default values will be used.');
-    // }
-
-    // ? debug
+    } catch (e) {
+      print(
+          'Unable to fetch remote config. Cached or default values will be used.');
+    }
+    // Does not work on web
   }
 }
diff --git a/lib/resources/utils.dart b/lib/resources/utils.dart
