Merge branch 'feature/new-home' into develop

lohanidamodar · lohanidamodar · commit e683b2a50a1f · 2019-12-22T18:59:45.000+05:45
diff --git a/lib/core/presentation/pages/home.dart b/lib/core/presentation/pages/home.dart
@@ -6,7 +6,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_ui_challenges/core/presentation/pages/favorites.dart';
 import 'package:flutter_ui_challenges/features/auth/data/model/user_repository.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:provider/provider.dart';
 
 import 'main_menu.dart';
@@ -26,70 +25,43 @@ class _HomePageState extends State<HomePage> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-          appBar: PreferredSize(
-            preferredSize: Size.fromHeight(100),
-            child: Container(
-              padding: EdgeInsets.only(top: 30.0),
-              height: 100,
-              color: Colors.deepOrange,
-              child: ListTile(
-                leading: CircleAvatar(
-                  backgroundColor: Colors.white,
-                  child: Image.asset(
-                    'assets/icon/icon.png',
-                    width: 20,
+    return Theme(
+      data: ThemeData(
+        primarySwatch: Colors.deepOrange,
+        accentColor: Colors.indigo,
+      ),
+      child: Scaffold(
+        appBar: AppBar(
+          title: Text("UI Challenges"),
+        ),
+        body: Provider.of<UserRepository>(context).user != null
+            ? _pageIndex == 0 ? MainMenu() : FavoritesTab()
+            : MainMenu(),
+        bottomNavigationBar: Provider.of<UserRepository>(context).user == null
+            ? null
+            : BottomNavigationBar(
+                selectedItemColor: Theme.of(context).primaryColor,
+                showUnselectedLabels: false,
+                showSelectedLabels: false,
+                backgroundColor: Colors.grey.shade300,
+                currentIndex: _pageIndex,
+                onTap: (index) => setState(() {
+                  _pageIndex = index;
+                }),
+                items: [
+                  BottomNavigationBarItem(
+                    title: Text(""),
+                    icon: Icon(Icons.home),
                   ),
-                ),
-                title: Text("Flutter UIs",
-                    style: TextStyle(
-                        color: Colors.white,
-                        fontWeight: FontWeight.bold,
-                        fontSize: 18.0)),
-                trailing: Row(
-                  mainAxisSize: MainAxisSize.min,
-                  children: <Widget>[
-                    IconButton(
-                      color: Colors.white,
-                      icon: Icon(FontAwesomeIcons.infoCircle),
-                      onPressed: () {
-                        Navigator.pushNamed(context, "about");
-                      },
-                    ),
-                    IconButton(
-                      color: Colors.white,
-                      icon: Icon(FontAwesomeIcons.user),
-                      onPressed: () {
-                        (Provider.of<UserRepository>(context).user != null)
-                          ? Navigator.pushNamed(context, "profile") : Navigator.pushNamed(context, 'auth_home');
-                      },
-                    ),
-                  ],
-                ),
-              ),
-            ),
-          ),
-          body: Provider.of<UserRepository>(context).user != null ? _pageIndex == 0 ? MainMenu() : FavoritesTab() : MainMenu(),
-          bottomNavigationBar: Provider.of<UserRepository>(context).user == null ? null : BottomNavigationBar(
-            selectedItemColor: Theme.of(context).primaryColor,
-            showUnselectedLabels: false,
-            showSelectedLabels: false,
-            backgroundColor: Colors.grey.shade300,
-            currentIndex: _pageIndex,
-            onTap: (index) => setState((){
-              _pageIndex = index;
-            }),
-            items: [
-              BottomNavigationBarItem(
-                title: Text(""),
-                icon: Icon(Icons.home),
-              ),
-              BottomNavigationBarItem(
-                title: Text(""),
-                icon: Icon( _pageIndex == 1 ? Icons.favorite : Icons.favorite_border),
+                  BottomNavigationBarItem(
+                    title: Text(""),
+                    icon: Icon(_pageIndex == 1
+                        ? Icons.favorite
+                        : Icons.favorite_border),
+                  ),
+                ],
               ),
-            ],
-          ),
-        );
+      ),
+    );
   }
 }
diff --git a/lib/core/presentation/pages/main_menu.dart b/lib/core/presentation/pages/main_menu.dart
@@ -4,15 +4,10 @@
   */
 
 import 'dart:convert';
-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';
 import 'package:flutter_ui_challenges/features/auth/data/model/user_repository.dart';
 import 'package:package_info/package_info.dart';
@@ -26,24 +21,20 @@ class MainMenu extends StatefulWidget {
 }
 
 class _MainMenuState extends State<MainMenu> {
-  RemoteConfig remoteConfig;
   Map<String, bool> viewData = <String, bool>{};
-  List<SubMenuItem> unseen;
   bool viewDataLoaded;
+  List<SubMenuItem> unseen;
   bool dialogShowing;
   bool showNewUiDialog;
-  List<Announcement> announcements;
-  SurveyItem survey;
+  
   @override
   void initState() {
     super.initState();
     unseen = [];
     viewDataLoaded = false;
     dialogShowing = false;
     showNewUiDialog = false;
-    announcements = [];
     _getViewData();
-    _getRemoteConfig();
   }
 
   _getViewData() async {
@@ -59,26 +50,6 @@ class _MainMenuState extends State<MainMenu> {
     return;
   }
 
-  _getRemoteConfig() async {
-    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: 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)));
-    });
-  }
-
   _writeViewData() async {
     SharedPreferences prefs = await SharedPreferences.getInstance();
     await prefs.setString("page_view_data", json.encode(viewData));
@@ -88,13 +59,10 @@ 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))
diff --git a/lib/core/presentation/res/functions.dart b/lib/core/presentation/res/functions.dart
@@ -0,0 +1,33 @@
+import 'package:flutter/material.dart';
+
+PreferredSize customAppBar({@required BuildContext context}) {
+  return PreferredSize(
+    preferredSize: Size.fromHeight(100),
+    child: Container(
+      height: kToolbarHeight+20,
+      child: ListTile(
+        contentPadding: const EdgeInsets.all(0),
+        trailing: Container(
+          decoration: BoxDecoration(
+              color: Colors.white,
+              borderRadius: BorderRadius.only(
+                bottomLeft: Radius.circular(10.0),
+              )),
+          padding: const EdgeInsets.fromLTRB(8.0, 30.0, 8.0, 8.0),
+          child: Image.asset(
+            'assets/icon/icon.png',
+            width: 20,
+          ),
+        ),
+        title: Padding(
+          padding: const EdgeInsets.only(top: 35.0, left: 16.0,),
+          child: Text("Flutter UIs",
+              style: TextStyle(
+                  color: Theme.of(context).primaryColor,
+                  fontWeight: FontWeight.bold,
+                  fontSize: 18.0)),
+        ),
+      ),
+    ),
+  );
+}
diff --git a/lib/core/presentation/widgets/survey_widget.dart b/lib/core/presentation/widgets/survey_widget.dart
@@ -13,9 +13,10 @@ class SurveyWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-      color: Theme.of(context).primaryColor,
       child: Card(
-        margin: const EdgeInsets.all(8.0),
+        elevation: 0,
+        margin: const EdgeInsets.all(0),
+        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10.0)),
         child: Padding(
           padding: const EdgeInsets.all(16.0),
           child: Column(
diff --git a/lib/features/announcements/widgets/announcement_slider.dart b/lib/features/announcements/widgets/announcement_slider.dart
@@ -20,23 +20,25 @@ class AnnouncementSlider extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-      height: 140,
-      color: Theme.of(context).primaryColor,
-      child: Card(
-        margin: const EdgeInsets.all(8.0),
-        child: Swiper(
-          itemHeight: 120,
-          itemCount: news.length,
-          itemBuilder: (context, index) {
-            Announcement newsItem = news[index];
-            return AnnouncementListItem(announcement: newsItem);
-          },
-          pagination: SwiperPagination(
-            builder: DotSwiperPaginationBuilder(
-              color: Colors.grey,
-            ),
-          ),
-        ),
+      height: 170,
+      // color: Theme.of(context).primaryColor,
+      child: Swiper(
+        viewportFraction: 0.8,
+        itemHeight: 120,
+        itemCount: news.length,
+        loop: false,
+        itemBuilder: (context, index) {
+          Announcement newsItem = news[index];
+          return Padding(
+            padding: const EdgeInsets.all(8.0),
+            child: Card(
+                elevation: 0,
+                shape: RoundedRectangleBorder(
+                    borderRadius: BorderRadius.circular(10.0)),
+                margin: const EdgeInsets.all(0),
+                child: AnnouncementListItem(announcement: newsItem)),
+          );
+        },
       ),
     );
   }
diff --git a/lib/features/auth/presentation/pages/home.dart b/lib/features/auth/presentation/pages/home.dart
@@ -1,6 +1,7 @@
 import 'package:flutter_ui_challenges/core/presentation/pages/home.dart';
 import 'package:flutter_ui_challenges/features/auth/data/model/user_repository.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_ui_challenges/features/home/presentation/pages/new_home.dart';
 import 'package:provider/provider.dart';
 import './splash.dart';
 import './login.dart';
@@ -17,7 +18,7 @@ class AuthHomePage extends StatelessWidget {
             case Status.Authenticating:
               return LoginPage();
             case Status.Authenticated:
-              return HomePage();
+              return NewHomePage();
           }
         },
     );
diff --git a/lib/features/auth/presentation/pages/login.dart b/lib/features/auth/presentation/pages/login.dart
@@ -73,8 +73,8 @@ class _LoginPageState extends State<LoginPage> {
                           await prefs.setBool('login_skipped', true);
                           Navigator.pushNamedAndRemoveUntil(
                             context,
-                            'home',
-                            ModalRoute.withName('home'),
+                            '/',
+                            ModalRoute.withName('/'),
                           );
                         },
                       ),
diff --git a/lib/features/auth/presentation/pages/profile_page.dart b/lib/features/auth/presentation/pages/profile_page.dart
@@ -66,7 +66,7 @@ class ProfileInfo extends StatelessWidget {
                 color: Theme.of(context).accentColor,
                 icon: Icon(Icons.exit_to_app),
                 onPressed: () {
-                  Navigator.pushNamedAndRemoveUntil(context, 'home', ModalRoute.withName('home'));
+                  Navigator.pushNamedAndRemoveUntil(context, '/', ModalRoute.withName('/'));
                   Provider.of<UserRepository>(context).signOut();
                 },
               )
diff --git a/lib/features/home/presentation/pages/new_home.dart b/lib/features/home/presentation/pages/new_home.dart
diff --git a/lib/main.dart b/lib/main.dart

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ class ProfileInfo extends StatelessWidget {`
`66`	`66`	`color: Theme.of(context).accentColor,`
`67`	`67`	`icon: Icon(Icons.exit_to_app),`
`68`	`68`	`onPressed: () {`
`69`		`- Navigator.pushNamedAndRemoveUntil(context, 'home', ModalRoute.withName('home'));`
	`69`	`+ Navigator.pushNamedAndRemoveUntil(context, '/', ModalRoute.withName('/'));`
`70`	`70`	`Provider.of<UserRepository>(context).signOut();`
`71`	`71`	`},`
`72`	`72`	`)`