Syncfusion calendar renamed to Simple event calendar and initial page UI improved.

Sasikumar3595 · Sasikumar3595 · commit 9b65cfc71798 · 2021-01-20T14:49:32.000+05:30
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -7,7 +7,7 @@
          FlutterApplication and put your custom class here. -->
     <application
         android:name="io.flutter.app.FlutterApplication"
-        android:label="syncfusioncalendar"
+        android:label="Simple Event Calendar"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
diff --git a/lib/calendar_data.dart b/lib/calendar_data.dart
@@ -27,14 +27,12 @@ class _LoadingStream {
 }
 
 class CalendarData {
-  CalendarData(GoogleDataSource dataSource, VoidCallback updateCalendarUI) {
-    loadFirebase(dataSource, updateCalendarUI);
+  CalendarData() {
+    loadFirebase();
   }
 
-  void loadFirebase(
-      GoogleDataSource dataSource, VoidCallback updateCalendarUI) async {
+  void loadFirebase() async {
     _auth = auth.FirebaseAuth.instance;
-    refresh(dataSource, updateCalendarUI);
   }
 
   final DatabaseHelper db =
@@ -326,6 +324,11 @@ class CalendarData {
 
   Future<void> updateSettingFromDB(VoidCallback updateCalendarUI) async {
     if (kIsWeb) {
+      currentUser.value = await _auth.currentUser();
+      if (currentUser.value != null) {
+        googleUser ??= await _googleSignIn.signInSilently();
+      }
+
       await _initializeSettings(updateCalendarUI);
       return;
     }
@@ -347,12 +350,14 @@ class CalendarData {
       showArrows = false;
     }
 
+    if (updateCalendarUI == null) {
+      return;
+    }
     updateCalendarUI();
   }
 
   void refresh(
       GoogleDataSource dataSource, VoidCallback updateCalendarUI) async {
-    updateSettingFromDB(updateCalendarUI);
     if (kIsWeb) {
       loadingStream.send.add(true);
       currentUser.value = await _auth.currentUser();
@@ -362,6 +367,7 @@ class CalendarData {
       }
       loadingStream.send.add(false);
     } else {
+      updateSettingFromDB(updateCalendarUI);
       loadExistingAppointments(dataSource, updateCalendarUI);
     }
   }
@@ -519,6 +525,9 @@ class CalendarData {
     }
 
     await getFirebaseData();
+    if (updateCalendarUI == null) {
+      return;
+    }
     updateCalendarUI();
   }
 
diff --git a/lib/main.dart b/lib/main.dart
@@ -18,7 +18,7 @@ class MyApp extends StatelessWidget {
   Widget build(BuildContext context) {
     return MaterialApp(
       debugShowCheckedModeBanner: false,
-      title: 'Customized Calendar',
+      title: 'Simple Event Calendar',
       theme: ThemeData(
         primarySwatch: Colors.blue,
         visualDensity: VisualDensity.adaptivePlatformDensity,
@@ -49,7 +49,8 @@ class _MyHomePageState extends State<MyHomePage> {
   @override
   void initState() {
     _dataSource = GoogleDataSource();
-    calendarData = CalendarData(_dataSource, updateUI);
+    calendarData = CalendarData();
+    calendarData.refresh(_dataSource, updateUI);
     _isDBLoaded = false;
     calendarData.updateSettingFromDB(updateUI)
       ..then((value) {
@@ -95,7 +96,8 @@ class _MyHomePageState extends State<MyHomePage> {
         calendarTapDetails.targetElement == CalendarElement.allDayPanel;
     DateTime _selectedDate;
 
-    if (_controller.view == CalendarView.month && calendarTapDetails.targetElement != CalendarElement.appointment) {
+    if (_controller.view == CalendarView.month &&
+        calendarTapDetails.targetElement != CalendarElement.appointment) {
       setState(() {
         /// Update the draw content when calendar view changed.
         _controller.view = CalendarView.day;
@@ -259,7 +261,8 @@ class _MyHomePageState extends State<MyHomePage> {
                   ),
                   onTap: (() async {
                     showDialog(
-                        context: context,barrierDismissible: false,
+                        context: context,
+                        barrierDismissible: false,
                         builder: (BuildContext context) {
                           return Center(
                             child: CircularProgressIndicator(),
@@ -429,20 +432,44 @@ class _MyHomePageState extends State<MyHomePage> {
             body: Container(
                 color: Colors.white,
                 alignment: Alignment.center,
-                child: Row(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  crossAxisAlignment: CrossAxisAlignment.center,
-                  children: [
-                    Icon(
-                      Icons.widgets,
-                      color: Colors.black54,
-                    ),
-                    Text(
-                      ' Syncfusion Calendar',
-                      style: TextStyle(fontSize: 20),
-                    ),
-                  ],
-                )),
+                child: Column(children: [
+                  Expanded(
+                      child: Column(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    crossAxisAlignment: CrossAxisAlignment.center,
+                    children: [
+                      Icon(
+                        Icons.date_range,
+                        color: Colors.black54,
+                        size: 40,
+                      ),
+                      Padding(
+                          padding: EdgeInsets.only(top: 5),
+                          child: Text(
+                            ' Simple Event Calendar',
+                            style: TextStyle(fontSize: 22),
+                          )),
+                    ],
+                  )),
+                  Container(
+                      padding: EdgeInsets.symmetric(vertical: 5),
+                      child: Text(
+                        'From',
+                        style: TextStyle(
+                            color: Colors.black54,
+                            fontSize: 14,
+                            fontWeight: FontWeight.w500),
+                      )),
+                  Container(
+                      padding: EdgeInsets.only(bottom: 30),
+                      child: Text(
+                        'Syncfusion',
+                        style: TextStyle(
+                            color: Colors.deepOrange,
+                            fontSize: 22,
+                            fontWeight: FontWeight.w500),
+                      ))
+                ])),
           )
         : Scaffold(
             drawer: Container(
@@ -459,7 +486,8 @@ class _MyHomePageState extends State<MyHomePage> {
                           text: 'Sign out',
                           onTap: (() async {
                             showDialog(
-                                context: context,barrierDismissible: false,
+                                context: context,
+                                barrierDismissible: false,
                                 builder: (BuildContext context) {
                                   return Center(
                                     child: CircularProgressIndicator(),
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -24,20 +24,14 @@ dependencies:
   flutter:
     sdk: flutter
 
-
-  # The following adds the Cupertino Icons font to your application.
-  # Use with the CupertinoIcons class for iOS style icons.
-  cupertino_icons: ^0.1.3
   googleapis: ^0.54.0
   cloud_firestore: ^0.13.5
   google_sign_in: ^4.4.6
   firebase_auth: ^0.16.0
   firebase_auth_web:
   sqflite:
   path_provider:
-  syncfusion_flutter_calendar:
-    path: /Users/SasikumarArumugam/Desktop/Sasi/2020/Flutter-Calendar/Oct-13 Navigation Animation Improvement/flutter_calendar/syncfusion_flutter_calendar
-#  ^18.4.30
+  syncfusion_flutter_calendar: ^18.4.30
 
 dev_dependencies:
   flutter_test:
@@ -60,9 +54,7 @@ flutter:
   #   - images/a_dot_ham.jpeg
 
   assets:
-    - assets/
     - assets/images/
-    - assets/images/syncfusion.png
 
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.dev/assets-and-images/#resolution-aware.

Original file line number	Diff line number	Diff line change
`@@ -27,14 +27,12 @@ class _LoadingStream {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`class CalendarData {`
`30`		`- CalendarData(GoogleDataSource dataSource, VoidCallback updateCalendarUI) {`
`31`		`- loadFirebase(dataSource, updateCalendarUI);`
	`30`	`+ CalendarData() {`
	`31`	`+ loadFirebase();`
`32`	`32`	`}`
`33`	`33`
`34`		`- void loadFirebase(`
`35`		`- GoogleDataSource dataSource, VoidCallback updateCalendarUI) async {`
	`34`	`+ void loadFirebase() async {`
`36`	`35`	`_auth = auth.FirebaseAuth.instance;`
`37`		`- refresh(dataSource, updateCalendarUI);`
`38`	`36`	`}`
`39`	`37`
`40`	`38`	`final DatabaseHelper db =`
`@@ -326,6 +324,11 @@ class CalendarData {`
`326`	`324`
`327`	`325`	`Future<void> updateSettingFromDB(VoidCallback updateCalendarUI) async {`
`328`	`326`	`if (kIsWeb) {`
	`327`	`+ currentUser.value = await _auth.currentUser();`
	`328`	`+ if (currentUser.value != null) {`
	`329`	`+ googleUser ??= await _googleSignIn.signInSilently();`
	`330`	`+ }`
	`331`	`+`
`329`	`332`	`await _initializeSettings(updateCalendarUI);`
`330`	`333`	`return;`
`331`	`334`	`}`
`@@ -347,12 +350,14 @@ class CalendarData {`
`347`	`350`	`showArrows = false;`
`348`	`351`	`}`
`349`	`352`
	`353`	`+ if (updateCalendarUI == null) {`
	`354`	`+ return;`
	`355`	`+ }`
`350`	`356`	`updateCalendarUI();`
`351`	`357`	`}`
`352`	`358`
`353`	`359`	`void refresh(`
`354`	`360`	`GoogleDataSource dataSource, VoidCallback updateCalendarUI) async {`
`355`		`- updateSettingFromDB(updateCalendarUI);`
`356`	`361`	`if (kIsWeb) {`
`357`	`362`	`loadingStream.send.add(true);`
`358`	`363`	`currentUser.value = await _auth.currentUser();`
`@@ -362,6 +367,7 @@ class CalendarData {`
`362`	`367`	`}`
`363`	`368`	`loadingStream.send.add(false);`
`364`	`369`	`} else {`
	`370`	`+ updateSettingFromDB(updateCalendarUI);`
`365`	`371`	`loadExistingAppointments(dataSource, updateCalendarUI);`
`366`	`372`	`}`
`367`	`373`	`}`
`@@ -519,6 +525,9 @@ class CalendarData {`
`519`	`525`	`}`
`520`	`526`
`521`	`527`	`await getFirebaseData();`
	`528`	`+ if (updateCalendarUI == null) {`
	`529`	`+ return;`
	`530`	`+ }`
`522`	`531`	`updateCalendarUI();`
`523`	`532`	`}`
`524`	`533`