From d5313a825daa177434cf9c20bbf25b0fa400f679 Mon Sep 17 00:00:00 2001
From: Matthew <matthew.danics@tapmango.com>
Date: Wed, 21 Mar 2018 20:50:12 +0100
Subject: [PATCH] added loading indicator + compression before uploading

---
 lib/upload_page.dart | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/lib/upload_page.dart b/lib/upload_page.dart
index 2547097..0fce40e 100644
--- a/lib/upload_page.dart
+++ b/lib/upload_page.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:image_picker/image_picker.dart'; // new
+import 'package:image_picker/image_picker.dart';
 import 'package:firebase_storage/firebase_storage.dart';
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:uuid/uuid.dart';
@@ -18,6 +18,8 @@ class _Uploader extends State<Uploader> {
   File file;
   TextEditingController descriptionController = new TextEditingController();
 
+  bool uploading = false;
+
   Widget build(BuildContext context) {
     return file == null
         ? new IconButton(
@@ -50,9 +52,8 @@ class _Uploader extends State<Uploader> {
                 new PostForm(
                   imageFile: file,
                   descriptionController: descriptionController,
+                  loading: uploading,
                 ),
-                new FlatButton(
-                    onPressed: compressImage, child: new Text('sketch'))
               ],
             ));
   }
@@ -75,7 +76,7 @@ class _Uploader extends State<Uploader> {
 
 //    image.format = Im.Image.RGBA;
 //    Im.Image newim = Im.remapColors(image, alpha: Im.LUMINANCE);
-    
+
     var newim2 = new File('$path/img_$rand.jpg')
       ..writeAsBytesSync(Im.encodeJpg(image, quality: 85));
 
@@ -92,10 +93,17 @@ class _Uploader extends State<Uploader> {
   }
 
   void postImage() {
+    setState(() {
+      uploading = true;
+    });
+    compressImage();
     Future<String> upload = uploadImage(file).then((String data) {
       postToFireStore(mediaUrl: data, description: descriptionController.text);
     }).then((_) {
-      setState((){file = null;});
+      setState(() {
+        file = null;
+        uploading = false;
+      });
     });
   }
 }
@@ -103,18 +111,20 @@ class _Uploader extends State<Uploader> {
 class PostForm extends StatelessWidget {
   var imageFile;
   TextEditingController descriptionController;
-  PostForm({this.imageFile, this.descriptionController});
+  bool loading;
+  PostForm({this.imageFile, this.descriptionController, this.loading});
 
   Widget build(BuildContext context) {
     return new Column(
       children: <Widget>[
-        new Padding(padding: new EdgeInsets.only(top: 10.0)),
+        loading
+            ? new LinearProgressIndicator()
+            : new Padding(padding: new EdgeInsets.only(top: 0.0)),
         new Container(
-            height: 250.0,
             child: new Image.file(
-              imageFile,
-              fit: BoxFit.fitHeight,
-            )),
+          imageFile,
+          fit: BoxFit.fitWidth,
+        )),
         new Divider(),
         new Row(
           mainAxisAlignment: MainAxisAlignment.spaceAround,
@@ -153,7 +163,7 @@ void postToFireStore(
   reference.add({
     "username": "testeronslice",
     "location": "nice location",
-    "likes": 0,
+    "likes": {},
     "mediaUrl": mediaUrl,
     "description": description,
     "ownerId": googleSignIn.currentUser.id