Merge pull request #2 from BakaOtaku/app

Cosmetic changes
BakaOtaku · Sep 6, 2020 · 4b79b39 · 4b79b39 · vercel · Sep 6, 2020
2 parents fb0db3e + 94b3af1
commit 4b79b39
Show file tree

Hide file tree

Showing 6 changed files with 90 additions and 22 deletions.
diff --git a/app/android/settings_aar.gradle b/app/android/settings_aar.gradle
@@ -0,0 +1 @@
+include ':app'
diff --git a/app/lib/decryptHandler.dart b/app/lib/decryptHandler.dart
@@ -14,6 +14,7 @@ class _DecrypthandlerState extends State<Decrypthandler> {
   TextEditingController _password = TextEditingController();
   var platformChannel = MethodChannel("exam");
   File file;
+  bool _fileVisibility = false;
   @override
   void initState() {
     super.initState();
@@ -30,19 +31,33 @@ class _DecrypthandlerState extends State<Decrypthandler> {
         child: Column(
           mainAxisAlignment: MainAxisAlignment.center,
           children: [
+            Visibility(
+              visible: _fileVisibility,
+              child: Text(file?.path?.split("/")?.last ?? ''),
+            ),
+            SizedBox(height: 30),
             RaisedButton(
               child: Text("Choose File"),
               onPressed: () async {
                 file = await FilePicker.getFile(type: FileType.any);
                 print("File path: ${file.absolute}");
+                setState(() {
+                  if (file != null) {
+                    _fileVisibility = true;
+                  } else {
+                    _fileVisibility = false;
+                  }
+                });
               },
             ),
+            SizedBox(height: 30),
             TextFormField(
               controller: _password,
               decoration: InputDecoration(
                 labelText: "Password",
               ),
             ),
+            SizedBox(height: 20),
             RaisedButton(
               child: Text("Decrypt"),
               onPressed: () async {

diff --git a/app/lib/downloadHandler.dart b/app/lib/downloadHandler.dart
@@ -1,8 +1,14 @@
 import 'package:app/pathHandler.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_downloader/flutter_downloader.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 
-class DownloadHandler extends StatelessWidget {
+class DownloadHandler extends StatefulWidget {
+  @override
+  _DownloadHandlerState createState() => _DownloadHandlerState();
+}
+
+class _DownloadHandlerState extends State<DownloadHandler> {
   final TextEditingController _downloadLink = TextEditingController();
 
   @override
@@ -11,28 +17,44 @@ class DownloadHandler extends StatelessWidget {
       appBar: AppBar(
         title: Text("Download Question"),
       ),
-      body: Column(
-        mainAxisAlignment: MainAxisAlignment.center,
-        children: [
-          TextFormField(
-            controller: _downloadLink,
-            decoration: InputDecoration(
-              labelText: "Link",
+      body: Padding(
+        padding: const EdgeInsets.all(20.0),
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            TextFormField(
+              controller: _downloadLink,
+              decoration: InputDecoration(
+                labelText: "Link",
+              ),
+            ),
+            SizedBox(height: 20),
+            RaisedButton(
+              child: Text("Download"),
+              onPressed: () async {
+                final taskId = await FlutterDownloader.enqueue(
+                  url: _downloadLink.text,
+                  savedDir: await PathHandler.getPath(),
+                  showNotification: true,
+                  openFileFromNotification: true,
+                );
+                print("Task - Downloading file task ID: $taskId");
+                setState(() {
+                  _downloadLink.clear();
+                });
+                Fluttertoast.showToast(
+                  msg: "Check notification for download status",
+                  toastLength: Toast.LENGTH_SHORT,
+                  gravity: ToastGravity.BOTTOM,
+                  timeInSecForIosWeb: 1,
+                  backgroundColor: Colors.grey,
+                  textColor: Colors.white,
+                  fontSize: 16.0,
+                );
+              },
             ),
-          ),
-          RaisedButton(
-            child: Text("Download"),
-            onPressed: () async {
-              final taskId = await FlutterDownloader.enqueue(
-                url: _downloadLink.text,
-                savedDir: await PathHandler.getPath(),
-                showNotification: true,
-                openFileFromNotification: true,
-              );
-              print("Task - Downloading file task ID: $taskId");
-            },
-          ),
-        ],
+          ],
+        ),
       ),
     );
   }

diff --git a/app/lib/main.dart b/app/lib/main.dart
@@ -13,6 +13,7 @@ class MyApp extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return MaterialApp(
+      debugShowCheckedModeBanner: false,
       title: "Exam App",
       home: HomePage(),
       theme: ThemeData.dark(),

diff --git a/app/lib/submissionHandler.dart b/app/lib/submissionHandler.dart
@@ -15,6 +15,7 @@ class SubmissionHandler extends StatefulWidget {
 class _SubmissionHandlerState extends State<SubmissionHandler> {
   final TextEditingController _subController = TextEditingController();
 
+  bool _fileVisibility = false;
   File file;
   String data = '';
   bool visible = false;
@@ -30,19 +31,33 @@ class _SubmissionHandlerState extends State<SubmissionHandler> {
         child: Column(
           mainAxisAlignment: MainAxisAlignment.center,
           children: <Widget>[
+            Visibility(
+              visible: _fileVisibility,
+              child: Text(file?.path?.split("/")?.last ?? ''),
+            ),
+            SizedBox(height: 30),
             RaisedButton(
               child: Text("Choose File"),
               onPressed: () async {
                 file = await FilePicker.getFile(type: FileType.any);
                 print("File path: ${file.absolute}");
+                setState(() {
+                  if (file != null) {
+                    _fileVisibility = true;
+                  } else {
+                    _fileVisibility = false;
+                  }
+                });
               },
             ),
+            SizedBox(height: 30),
             TextFormField(
               controller: _subController,
               decoration: InputDecoration(
                 labelText: "Subject ID",
               ),
             ),
+            SizedBox(height: 20),
             RaisedButton(
               child: Text("Generate"),
               onPressed: () async {

diff --git a/app/lib/uploadHandler.dart b/app/lib/uploadHandler.dart
@@ -12,6 +12,7 @@ class UploadHandler extends StatefulWidget {
 
 class _UploadHandlerState extends State<UploadHandler> {
   File file;
+  bool _fileVisibility = false;
 
   @override
   Widget build(BuildContext context) {
@@ -25,13 +26,26 @@ class _UploadHandlerState extends State<UploadHandler> {
           crossAxisAlignment: CrossAxisAlignment.stretch,
           mainAxisAlignment: MainAxisAlignment.center,
           children: [
+            Visibility(
+              visible: _fileVisibility,
+              child: Text(file?.path?.split("/")?.last ?? ''),
+            ),
+            SizedBox(height: 30),
             RaisedButton(
               child: Text("Choose File"),
               onPressed: () async {
                 file = await FilePicker.getFile(type: FileType.any);
                 print("File path: ${file.absolute}");
+                setState(() {
+                  if (file != null) {
+                    _fileVisibility = true;
+                  } else {
+                    _fileVisibility = false;
+                  }
+                });
               },
             ),
+            SizedBox(height: 20),
             RaisedButton(
               child: Text("Upload"),
               onPressed: () async {