Changelog v1.9.6

android/gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.jvmargs=-Xmx1536M
-
 android.enableJetifier=true
-android.useAndroidX=true
+android.useAndroidX=true
+android.enableR8=true

ios/Flutter/flutter_export_environment.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+# This is a generated file; do not edit or check into version control.
+export "FLUTTER_ROOT=G:\SW\Flutter\SDK\flutter"
+export "FLUTTER_APPLICATION_PATH=F:\Android Projects\fest_management"
+export "FLUTTER_TARGET=lib\main.dart"
+export "FLUTTER_BUILD_DIR=build"
+export "SYMROOT=${SOURCE_ROOT}/../build\ios"
+export "FLUTTER_FRAMEWORK_DIR=G:\SW\Flutter\SDK\flutter\bin\cache\artifacts\engine\ios"
+export "FLUTTER_BUILD_NAME=1.9.2"
+export "FLUTTER_BUILD_NUMBER=5"

lib/events.dart

@@ -1,67 +1,74 @@
+import 'package:fest_management/page0.dart';
 import 'package:fest_management/sports.dart';
 import 'package:fest_management/technical.dart';
 import 'package:flutter/material.dart';
 
 import 'gaming.dart';
 import 'mainstage.dart';
 import 'offstage.dart';
+import 'page1.dart';
 
 class events extends StatefulWidget {
   @override
   _eventsState createState() => _eventsState();
 }
 
 class _eventsState extends State<events> {
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      decoration: BoxDecoration(
-        image: DecorationImage(
-          image: AssetImage("images/events.jpg"),
-          fit: BoxFit.cover,
+
+  final controller = PageController(initialPage: 0);
+
+  final PageStorageBucket bucket = PageStorageBucket();
+  final List<Widget> pages = [
+    page0(
+      key: PageStorageKey('Page1'),
+    ),
+    page1(
+      key: PageStorageKey('Page2'),
+    ),
+  ];
+
+  int _selectedIndex = 0;
+  Widget _bottomNavigationBar(int selectedIndex) => BottomNavigationBar(
+    onTap: (int index) => setState(() => _selectedIndex = index),
+    currentIndex: selectedIndex,
+    items: const <BottomNavigationBarItem>[
+      BottomNavigationBarItem(
+        icon: Icon(
+          Icons.home,
+          color: Colors.black,
+        ),
+        title: Text(
+          "Events",
+          style: TextStyle(color: Colors.black),
         ),
       ),
-      child: Center(
-        child: SafeArea(
-          child: Container(
-            width: MediaQuery.of(context).size.width / 1.05,
-            height: MediaQuery.of(context).size.height / 1.05,
-            child: Card(
-              shape: RoundedRectangleBorder(
-                  borderRadius: BorderRadius.circular(30.0)),
-              child: Center(
-                child: SingleChildScrollView(
-                  child: Wrap(
-                    runAlignment: WrapAlignment.spaceEvenly,
-                    children: <Widget>[
-                      Padding(
-                        padding: const EdgeInsets.all(8.0),
-                        child: mainstage(),
-                      ),
-                      Padding(
-                        padding: const EdgeInsets.all(8.0),
-                        child: offstage(),
-                      ),
-                      Padding(
-                        padding: const EdgeInsets.all(8.0),
-                        child: technical(),
-                      ),
-                      Padding(
-                        padding: const EdgeInsets.all(8.0),
-                        child: gaming(),
-                      ),
-                      Padding(
-                        padding: const EdgeInsets.all(8.0),
-                        child: sports(),
-                      ),
-                    ],
-                  ),
-                ),
-              ),
-            ),
-          ),
+      BottomNavigationBarItem(
+        icon: Icon(
+          Icons.search,
+          color: Colors.black,
+        ),
+        title: Text(
+          "History",
+          style: TextStyle(color: Colors.black),
         ),
       ),
+
+    ],
+  );
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      bottomNavigationBar: _bottomNavigationBar(_selectedIndex),
+
+      appBar: AppBar(
+        backgroundColor: Color(0xff000000),
+        title: Text("Fest Management"),
+        centerTitle: true,
+      ),
+      body: PageStorage(
+        child: pages[_selectedIndex],
+        bucket: bucket,
+      ),
     );
   }
 }

lib/events/Dancing/dancing.dart

@@ -11,7 +11,7 @@ class _dancingState extends State<dancing> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(title: Text("Singing"), toolbarOpacity: 1, backgroundColor: Color(0xff000000), centerTitle: true,),
+      appBar: AppBar(title: Text("Dancing"), toolbarOpacity: 1, backgroundColor: Color(0xff000000), centerTitle: true,),
       body: Container(
 
         decoration: BoxDecoration(
@@ -28,6 +28,7 @@ class _dancingState extends State<dancing> {
                 width: MediaQuery.of(context).size.width / 1.05,
                 height: MediaQuery.of(context).size.height / 1.05,
                 child: Card(
+                  color: Color(0x99ffffff),
                   shape: RoundedRectangleBorder(
                       borderRadius: BorderRadius.circular(30.0)),
                   child: Flex(direction: Axis.vertical, children: <Widget>[Expanded(

lib/events/Dancing/dm.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:cloud_firestore/cloud_firestore.dart';
-import 'package:fluttertoast/fluttertoast.dart';
+import 'package:firebase_auth/firebase_auth.dart';
 
 class dm extends StatefulWidget {
   @override
@@ -242,13 +242,15 @@ class _dmState extends State<dm> {
   }
 
   submite() async {
+    final FirebaseUser user = await FirebaseAuth.instance.currentUser();
+
     print(_nameCon.text + _phCon.text + _itemSel + _slider.toInt().toString());
     if (_nameCon.text != "" && _phCon.text != "") {
       await Firestore.instance
           .collection("Main Stage")
           .document("Dancing")
-          .collection(DateTime.now().toString())
-          .document()
+          .collection(user.email)
+          .document(DateTime.now().toString())
           .setData({
         'Name': _nameCon.text,
         'Phone': _phCon.text,