Minor Fixes in Release (#246)

* changed the yourdost link, minor changes in  page & webview plugin changed

* version update

scp/android/app/build.gradle

@@ -12,14 +12,14 @@ if (flutterRoot == null) {
 }
 
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-//if (flutterVersionCode == null) {
-    flutterVersionCode = '42'
-//}
+if (flutterVersionCode == null) {
+    flutterVersionCode = '11'
+}
 
 def flutterVersionName = localProperties.getProperty('flutter.versionName')
-//if (flutterVersionName == null) {
-    flutterVersionName = '4.2'
-//}
+if (flutterVersionName == null) {
+    flutterVersionName = '1.1'
+}
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

scp/lib/chat.dart

@@ -1,24 +1,18 @@
+import 'dart:io';
+
 import 'package:flutter/material.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 import 'package:scp/utils/chatArgs.dart';
-import 'package:webview_flutter/webview_flutter.dart';
 
 class ChatView extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final ChatArguments args = ModalRoute.of(context).settings.arguments;
     return SafeArea(
         child: Scaffold(
-      body: WebView(
-          initialUrl: args.url,
-          javascriptMode: JavascriptMode.unrestricted,
-          zoomEnabled: true,
-          onWebResourceError: (error) {
-            print(error.errorCode);
-            return CircularProgressIndicator();
-          },
-          onProgress: (int progress) {
-            print("WebView is loading (progress : $progress%)");
-          }),
+      body: InAppWebView(
+        initialUrlRequest: URLRequest(url: Uri.parse(args.url)),
+      ),
     ));
   }
 }

scp/lib/drawer_screens/about_scs.dart

@@ -5,7 +5,7 @@ import 'package:scp/utils/sizeConfig.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 final String aboutText =
-    "Institute Counselling Services, NIT Rourkela is a noble initiative by the current Director, Prof. Animesh Biswas. This service deals with various important aspects of a student’s life. It addresses Academic, Financial, Mental and Socio-cultural issues, ensuring a seamless transition from home to hostel life for the freshmen and making life at NITR more enjoyable. \n\n"
+    "Institute Counselling Services, NIT Rourkela is a noble initiative by the former Director, Prof. Animesh Biswas. This service deals with various important aspects of a student’s life. It addresses Academic, Financial, Mental and Socio-cultural issues, ensuring a seamless transition from home to hostel life for the freshmen and making life at NITR more enjoyable. \n\n"
     "The objective of ICS is to prepare the students for a confident approach towards life and to bring about a voluntary change in themselves. The goal of counselling is to help individuals overcome their immediate problems and also to equip them to meet future problems. The goals of counselling are appropriately concerned with fundamental and basic aspects such as self-understanding and self-actualization.\n\n"
     "The service has 7 faculty members, including the Head of Unit, Prof. Pawan Kumar and 12 Student Coordinators and 11 Prefects. The Coordinators monitor the overall functioning, manage the events, programs and initiatives of ICS. Each Prefect has been assigned a set number of mentors who in turn take care of the mentees from the freshman year. Experienced mentors interact with the freshers to bridge the Junior-Senior gap and also provide personal and professional support. Professional support is provided to all the students and faculty of the institute through online counselling platform YourDOST. Institute Counselling Services also has at their premises at campus a Counsellor and a Psychiatrist, who professionally deal with various students and faculty isssues. ";
 
@@ -121,6 +121,23 @@ class AboutSCP extends StatelessWidget {
                 },
               ),
             ),
+            Padding(
+              padding: const EdgeInsets.only(top: 30, bottom: 15),
+              child: Center(
+                child: Text(
+                  "ADVISOR",
+                  textAlign: TextAlign.center,
+                  style: TextStyle(
+                    fontSize: 24,
+                    fontWeight: FontWeight.w500,
+                    fontFamily: 'PfDin',
+                    color: Color.fromRGBO(74, 232, 190, 1),
+                  ),
+                ),
+              ),
+            ),
+            contactCard(
+                context, "Amlan Das", "[email protected]", "8637252603"),
             Padding(
               padding: const EdgeInsets.only(top: 30, bottom: 15),
               child: Center(

scp/lib/slotbookingcardsplit.dart

@@ -87,11 +87,11 @@ class _SlotCardSplitState extends State<SlotCardSplit> {
             } else {
               /*cardType helps us determine upon which card have we registered the tap
               0 is for left card, 1 is for right card*/
-              if (cardType == 0) //Regular
+              if (cardType == 0) //Online
               {
-                launchURL("https://www.yourdost.in/");
+                launchURL("https://www.yourdost.com/");
               }
-              if (cardType == 1) //Remedial
+              if (cardType == 1) //Offline
               {
                 launchURL("https://forms.gle/e8K6ZVvoNZ683ZRp6");
               }

scp/lib/ui/views/ics_events/events_view.dart

@@ -40,17 +40,22 @@ class EventsPage extends StatelessWidget {
                           isGreaterThanOrEqualTo: new DateTime.now())
                       .get(),
                   builder: (BuildContext context, AsyncSnapshot snapshot) {
-                    if (snapshot.hasData) {
-                      List data = snapshot.data.docs as List;
-                      return EventsListView(data: data);
-                    }
-
                     if (!snapshot.hasData) {
                       return Center(
                         child: Text('No Upcoming Events'),
                       );
                     }
 
+                    if (snapshot.hasData) {
+                      List data = snapshot.data.docs as List;
+                      if (data.length == 0) {
+                        return Center(
+                          child: Text('No Upcoming Events'),
+                        );
+                      }
+                      return EventsListView(data: data);
+                    }
+
                     return CircularProgressIndicator();
                   },
                 ),
@@ -72,6 +77,11 @@ class EventsPage extends StatelessWidget {
                   builder: (BuildContext context, AsyncSnapshot snapshot) {
                     if (snapshot.hasData) {
                       List data = snapshot.data.docs as List;
+                      if (data.length == 0) {
+                        return Center(
+                          child: Text('No Upcoming Events'),
+                        );
+                      }
                       return EventsListView(data: data);
                     }
 

scp/pubspec.yaml

@@ -7,7 +7,7 @@ description: Mobile app of ICS NIT Rourkela
 # Both the version and the builder number may be overridden in flutter
 # build by specifying --build-name and --build-number, respectively.
 # Read more about versioning at semver.org.
-version: 1.0.0+1
+version: 4.3.0+43
 
 environment:
   sdk: ">=2.2.2 <3.0.0"
@@ -43,7 +43,7 @@ dependencies:
   stacked: ^1.7.6
   table_calendar: ^2.2.3
   url_launcher: ^6.0.10
-  webview_flutter: ^2.3.0
+  flutter_inappwebview: ^5.3.2
   firebase_analytics: ^8.3.2
 
 dev_dependencies: