Merge pull request #35 from CCExtractor/develop

Develop (V1.1.0)

Author: pratikbaid3

.github/workflows/dart.yml

@@ -17,7 +17,7 @@ jobs:
           java-version: '12.x'
       - uses: subosito/flutter-action@v1
         with:
-          flutter-version: '2.2.2'
+          flutter-version: '2.5.0'
       - run: flutter pub get
       #       - run: flutter analyze
       - run: flutter format -n --set-exit-if-changed .

android/app/src/main/AndroidManifest.xml

@@ -1,8 +1,17 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.hustlecreatives.flood_mobile">
+
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:scheme="https" />
+        </intent>
+    </queries>
+
     <application
             android:requestLegacyExternalStorage="true"
             android:label="Flood"

ios/Runner/Info.plist

@@ -51,5 +51,9 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>LSApplicationQueriesSchemes</key>
+    <array>
+      <string>https</string>
+    </array>
 </dict>
 </plist>

lib/Components/logout_alert.dart

@@ -0,0 +1,79 @@
+import 'package:flood_mobile/Constants/app_color.dart';
+import 'package:flutter/material.dart';
+
+class LogOutAlert extends StatelessWidget {
+  const LogOutAlert({Key? key, @required this.logoutOnClick})
+      : assert(logoutOnClick != null),
+        super(key: key);
+  final VoidCallback? logoutOnClick;
+
+  @override
+  Widget build(BuildContext context) {
+    final hp = MediaQuery.of(context).size.height;
+    return AlertDialog(
+      backgroundColor: AppColor.secondaryColor,
+      shape: RoundedRectangleBorder(
+        borderRadius: BorderRadius.all(
+          Radius.circular(12),
+        ),
+      ),
+      contentPadding: EdgeInsets.all(20),
+      content: Text(
+        'Are you sure you want to\n Log out ?',
+        textAlign: TextAlign.center,
+        style: TextStyle(
+          color: Colors.white,
+          fontWeight: FontWeight.bold,
+          fontSize: 20,
+        ),
+      ),
+      actionsPadding: EdgeInsets.all(5),
+      actions: [
+        // Yes - TextButton
+        TextButton(
+          style: ButtonStyle(
+            shape: MaterialStateProperty.all<RoundedRectangleBorder>(
+              RoundedRectangleBorder(
+                borderRadius: BorderRadius.circular(12),
+              ),
+            ),
+            minimumSize: MaterialStateProperty.all<Size>(
+              Size(hp * .160, hp * .059),
+            ),
+            backgroundColor:
+                MaterialStateProperty.all(AppColor.greenAccentColor),
+          ),
+          onPressed: logoutOnClick,
+          child: Text(
+            'Yes',
+            style: TextStyle(color: Colors.white),
+          ),
+        ),
+        // Space in between Buttons
+        SizedBox(width: 5),
+        // No - TextButton
+        TextButton(
+          style: ButtonStyle(
+            minimumSize: MaterialStateProperty.all<Size>(
+              Size(hp * .160, hp * .059),
+            ),
+            shape: MaterialStateProperty.all<RoundedRectangleBorder>(
+              RoundedRectangleBorder(
+                borderRadius: BorderRadius.circular(12),
+              ),
+            ),
+            backgroundColor:
+                MaterialStateProperty.all(AppColor.greyAccentColor),
+          ),
+          onPressed: () {
+            Navigator.of(context, rootNavigator: true).pop();
+          },
+          child: Text(
+            'No',
+            style: TextStyle(color: Colors.white),
+          ),
+        ),
+      ],
+    );
+  }
+}

lib/Constants/app_color.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 
 class AppColor {
   static const Color primaryColor = Color(0xff0E2537);
+  static const Color greyAccentColor = Color(0xff2A3342);
   static const Color secondaryColor = Color(0xff305067);
   static const Color greenAccentColor = Color(0xff39C481);
   static const Color textColor = Colors.white;

lib/Pages/home_screen.dart

@@ -1,6 +1,7 @@
 import 'package:badges/badges.dart';
 import 'package:flood_mobile/Api/client_api.dart';
 import 'package:flood_mobile/Api/notifications_api.dart';
+import 'package:flood_mobile/Components/logout_alert.dart';
 import 'package:flood_mobile/Components/nav_drawer_list_tile.dart';
 import 'package:flood_mobile/Components/notification_popup_dialogue_container.dart';
 import 'package:flood_mobile/Constants/app_color.dart';
@@ -14,10 +15,12 @@ import 'package:flood_mobile/Route/routes.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
 import 'package:flutter_svg/svg.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:hidden_drawer_menu/controllers/simple_hidden_drawer_controller.dart';
 import 'package:hidden_drawer_menu/simple_hidden_drawer/simple_hidden_drawer.dart';
 import 'package:provider/provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
+import 'package:url_launcher/url_launcher.dart';
 
 class HomeScreen extends StatefulWidget {
   @override
@@ -198,18 +201,36 @@ class _MenuState extends State<Menu> {
                 },
                 title: 'Settings'),
             NavDrawerListTile(
-                icon: Icons.exit_to_app,
-                onTap: () async {
+              icon: Icons.exit_to_app,
+              onTap: () async {
+                showDialog(
+                  context: context,
+                  builder: (context) => LogOutAlert(
+                    logoutOnClick: () async {
+                      controller.toggle();
+                      SharedPreferences prefs =
+                          await SharedPreferences.getInstance();
+                      prefs.setString('floodToken', '');
+                      Provider.of<UserDetailProvider>(context, listen: false)
+                          .setToken('');
+                      Navigator.of(context).pushNamedAndRemoveUntil(
+                          Routes.loginScreenRoute,
+                          (Route<dynamic> route) => false);
+                    },
+                  ),
+                );
+              },
+              title: 'Logout',
+            ),
+            NavDrawerListTile(
+                icon: FontAwesomeIcons.github,
+                onTap: () {
                   controller.toggle();
-                  SharedPreferences prefs =
-                      await SharedPreferences.getInstance();
-                  prefs.setString('floodToken', '');
-                  Provider.of<UserDetailProvider>(context, listen: false)
-                      .setToken('');
-                  Navigator.of(context).pushNamedAndRemoveUntil(
-                      Routes.loginScreenRoute, (Route<dynamic> route) => false);
+                  launch(
+                    'https://github.com/CCExtractor/Flood_Mobile#usage--screenshots',
+                  );
                 },
-                title: 'Logout'),
+                title: 'GitHub'),
             NavDrawerListTile(
                 icon: Icons.info,
                 onTap: () {

lib/Pages/login_screen.dart

@@ -5,8 +5,10 @@ import 'package:flood_mobile/Constants/app_color.dart';
 import 'package:flood_mobile/Provider/api_provider.dart';
 import 'package:flood_mobile/Route/routes.dart';
 import 'package:flutter/material.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:loading_overlay/loading_overlay.dart';
 import 'package:provider/provider.dart';
+import 'package:url_launcher/url_launcher.dart';
 
 class LoginScreen extends StatefulWidget {
   @override
@@ -21,6 +23,7 @@ class _LoginScreenState extends State<LoginScreen> {
   TextEditingController urlController =
       new TextEditingController(text: 'http://localhost:3000');
   final _formKey = GlobalKey<FormState>();
+
   @override
   Widget build(BuildContext context) {
     double hp = MediaQuery.of(context).size.height;
@@ -302,6 +305,20 @@ class _LoginScreenState extends State<LoginScreen> {
                           ),
                         ),
                       ),
+                      SizedBox(
+                        height: hp * 0.06,
+                      ),
+                      IconButton(
+                        icon: FaIcon(
+                          FontAwesomeIcons.github,
+                        ),
+                        onPressed: () {
+                          launch(
+                            'https://github.com/CCExtractor/Flood_Mobile#usage--screenshots',
+                          );
+                        },
+                        iconSize: hp * 0.05,
+                      ),
                       SizedBox(
                         height: hp * 0.02,
                       ),

pubspec.lock

@@ -28,7 +28,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.6.1"
+    version: "2.8.1"
   badges:
     dependency: "direct main"
     description:
@@ -112,7 +112,7 @@ packages:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.1"
   checked_yaml:
     dependency: transitive
     description:
@@ -755,7 +755,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.0"
+    version: "0.4.2"
   timing:
     dependency: transitive
     description:
@@ -770,6 +770,48 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.3.0"
+  url_launcher:
+    dependency: "direct main"
+    description:
+      name: url_launcher
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "6.0.12"
+  url_launcher_linux:
+    dependency: transitive
+    description:
+      name: url_launcher_linux
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.2"
+  url_launcher_macos:
+    dependency: transitive
+    description:
+      name: url_launcher_macos
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.2"
+  url_launcher_platform_interface:
+    dependency: transitive
+    description:
+      name: url_launcher_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.4"
+  url_launcher_web:
+    dependency: transitive
+    description:
+      name: url_launcher_web
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.4"
+  url_launcher_windows:
+    dependency: transitive
+    description:
+      name: url_launcher_windows
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.2"
   vector_math:
     dependency: transitive
     description:
@@ -876,5 +918,5 @@ packages:
     source: hosted
     version: "3.1.0"
 sdks:
-  dart: ">=2.13.0 <3.0.0"
-  flutter: ">=2.0.0"
+  dart: ">=2.14.0 <3.0.0"
+  flutter: ">=2.5.0"

pubspec.yaml

@@ -18,7 +18,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: ">=2.14.0 <3.0.0"
 
 dependencies:
   flutter:
@@ -58,6 +58,7 @@ dependencies:
   path_provider: ^2.0.2
   permission_handler: ^8.1.4+2
   flutter_client_sse: ^0.1.0
+  url_launcher: ^6.0.12
     #    git:
     #      url: https://github.com/pratikbaid3/flutter_client_sse
     #      path: