Merge branch 'feature/survey' into develop

Author: lohanidamodar

lib/core/data/firestore_service.dart

@@ -23,6 +23,13 @@ class FirestoreService {
       .snapshots();
   }
 
+  Future<DocumentSnapshot> getDocumentAsync(String path, String id) {
+    return _db
+      .collection(path)
+      .document(id)
+      .get();
+  }
+
   Future<void> updateDocument(String path, String id, Map<String,dynamic> data,{bool merge = true}) {
     return _db
       .collection(path)

lib/core/data/models/survey.dart

@@ -0,0 +1,14 @@
+class SurveyItem {
+  final String message;
+  final String id;
+  final List<String> options;
+  final List<String> optionKeys;
+
+  SurveyItem(this.message, this.id, this.options, this.optionKeys);
+
+  SurveyItem.fromMap(Map<String,dynamic> data):
+    id=data['id'],
+    message=data['message'],
+    optionKeys=List<String>.from(data['options_key'] ?? []),
+    options=List<String>.from(data['options']);
+}

lib/core/presentation/pages/main_menu.dart

@@ -8,7 +8,9 @@ import 'package:firebase_remote_config/firebase_remote_config.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_ui_challenges/core/data/favorite_firestore_service.dart';
 import 'package:flutter_ui_challenges/core/data/models/menu.dart';
+import 'package:flutter_ui_challenges/core/data/models/survey.dart';
 import 'package:flutter_ui_challenges/core/presentation/widgets/preview.dart';
+import 'package:flutter_ui_challenges/core/presentation/widgets/survey_widget.dart';
 import 'package:flutter_ui_challenges/features/announcements/data/model/announcement.dart';
 import 'package:flutter_ui_challenges/features/announcements/widgets/announcement_slider.dart';
 import 'package:flutter_ui_challenges/features/auth/data/model/user.dart';
@@ -24,12 +26,14 @@ class MainMenu extends StatefulWidget {
 }
 
 class _MainMenuState extends State<MainMenu> {
+  RemoteConfig remoteConfig;
   Map<String, bool> viewData = <String, bool>{};
   List<SubMenuItem> unseen;
   bool viewDataLoaded;
   bool dialogShowing;
   bool showNewUiDialog;
   List<Announcement> announcements;
+  SurveyItem survey;
   @override
   void initState() {
     super.initState();
@@ -56,18 +60,22 @@ class _MainMenuState extends State<MainMenu> {
   }
 
   _getRemoteConfig() async {
-    final RemoteConfig remoteConfig = await RemoteConfig.instance;
+    if(remoteConfig == null)
+      remoteConfig = await RemoteConfig.instance;
     final Map<String, dynamic> defaults = {
       "news": "[]",
+      "survey":{},
     };
     await remoteConfig.setDefaults(defaults);
-    await remoteConfig.fetch(expiration: const Duration(hours: 1));
+    await remoteConfig.fetch(expiration: const Duration(hours: 12));
     await remoteConfig.activateFetched();
     final String value = remoteConfig.getString('news');
+    final String surval = remoteConfig.getString('survey');
     setState(() {
       announcements = List<Map<String, dynamic>>.from(json.decode(value))
           .map((data) => Announcement.fromMap(data))
           .toList();
+          survey = SurveyItem.fromMap(Map<String, dynamic>.from(json.decode(surval)));
     });
   }
 
@@ -80,11 +88,13 @@ class _MainMenuState extends State<MainMenu> {
   Widget build(BuildContext context) => _buildMenuPage();
 
   ListView _buildMenuPage() {
+    User user = Provider.of<User>(context);
     if (showNewUiDialog && viewDataLoaded) _checkToShowDialog(context);
     return ListView(
       physics: BouncingScrollPhysics(),
       children: <Widget>[
         if (announcements.length > 0) AnnouncementSlider(news: announcements),
+        if(survey != null && user != null && !user.surveys.contains(survey?.id)) SurveyWidget(survey: survey),
         ...pages.map((page) => page is MenuItem
             ? _buildExpandableMenu(page, context)
             : _buildSubMenu(page, context))

lib/core/presentation/widgets/survey_widget.dart

@@ -0,0 +1,48 @@
+import 'package:cloud_firestore/cloud_firestore.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_ui_challenges/core/data/firestore_service.dart';
+import 'package:flutter_ui_challenges/core/data/models/survey.dart';
+import 'package:flutter_ui_challenges/features/auth/data/model/user_repository.dart';
+import 'package:flutter_ui_challenges/features/auth/data/service/firestore_service.dart';
+import 'package:provider/provider.dart';
+
+class SurveyWidget extends StatelessWidget {
+  final SurveyItem survey;
+
+  const SurveyWidget({Key key, this.survey}) : super(key: key);
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      color: Theme.of(context).primaryColor,
+      child: Card(
+        margin: const EdgeInsets.all(8.0),
+        child: Padding(
+          padding: const EdgeInsets.all(16.0),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: <Widget>[
+              Text(survey.message,style: TextStyle(
+                fontSize: 20.0,
+                fontWeight: FontWeight.w500,
+              ),),
+              ...survey.options.map((option) =>RadioListTile(
+                groupValue: null,
+                value: survey.optionKeys[survey.options.indexOf(option)],
+                title: Text(option),
+                onChanged: (val){
+                  FirestoreService().updateDocument('surveys', survey.id, {
+                    val: FieldValue.increment(1),
+                  });
+                  AuthFirestoreService().updateUserData(Provider.of<UserRepository>(context).user.uid, {"surveys": FieldValue.arrayUnion([survey.id])});
+                  Scaffold.of(context).showSnackBar(SnackBar(
+                    content: Text("Thank you for providing us feedback")
+                  ));
+                },
+              ))
+            ],
+          ),
+        )
+      ),
+    );
+  }
+}

lib/features/auth/data/model/user.dart

@@ -4,19 +4,22 @@ class User {
   final String email;
   final String photoUrl;
   final List<String> favorites;
+  final List<String> surveys;
 
   User({
     this.id,
     this.name,
     this.email,
     this.photoUrl,
     this.favorites,
+    this.surveys,
   });
 
   User.fromMap(Map<String, dynamic> data, String id)
       : id = id,
         name = data['name'] ?? '',
         email = data['email'],
         favorites=List<String>.from(data['favorites'] ?? []),
+        surveys=List<String>.from(data['surveys'] ?? []),
         photoUrl = data['photo_url'];
 }

lib/features/auth/data/service/firestore_service.dart

@@ -27,4 +27,15 @@ class AuthFirestoreService {
           (doc) => User.fromMap(doc.data, doc.documentID),
         );
   }
+
+  Future<User> getUserAsync(String id) async {
+    var fs = await FirestoreService().getDocumentAsync('users', id);
+    if(fs!=null)
+      return User.fromMap(fs.data,fs.documentID);
+    return null;
+  }
+
+  Future<void> updateUserData(String id, Map<String,dynamic> data) {
+    return FirestoreService().updateDocument('users', id, data,merge: true);
+  }
 }