Interface with new webAPI #24

MaxJohansen · 2018-07-04T15:45:46Z

Changes 🎈

Signatures are now fetched from the web API instead of from local storage! I've deleted a LOT of leftover resources and code from the old implementation and fixed the failing tests.

Types of changes

What types of changes does your code introduce? Mark boxes that apply with an x.

Bugfix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)

Checklist ✔️

Mark boxes that apply with an x. These can also be filled out after the pull request is created.

I have read the coding convention guidelines and my code follows these.
Unit tests pass locally with my changes
I have added tests that prove my fix is effective or that my feature works
I have added necessary documentation (if appropriate)

jonjohansen

Good but not 💯 🥇

jonjohansen · 2018-07-05T06:55:16Z

Diplomatic/ViewModels/TemplatePickerViewModel.cs

@@ -1,15 +1,17 @@
+using System.Collections.Generic;
 using System.Linq;
 using Diplomatic.Utils;




unnecessary newline 👎

jonjohansen · 2018-07-05T06:56:23Z

Diplomatic/Views/Templates.xaml.cs

    public partial class Templates : ContentPage
    {
-


Newline before new block?

jonjohansen · 2018-07-05T06:58:47Z

Diplomatic/Views/Templates.xaml.cs

@@ -18,8 +19,10 @@ public Templates()
            {
                return; //ItemSelected is called on deselection, which results in SelectedItem being set to null
            }
-            var next = new TextFields();
-            next.BindingContext = new TextFieldViewModel((Template)e.SelectedItem);
+            var next = new TextFields


newliner 🥈

jonjohansen · 2018-07-05T06:59:22Z

Diplomatic/Views/TextFields.xaml.cs

+                string query = string.Join("&", queryParams.ToArray());
+                string final = "https://qri7p78aml.execute-api.eu-west-2.amazonaws.com/dev/" + template.Name.ToLower() + "?" + query;
+                var endpoint = new Uri(Uri.EscapeUriString(final));
+                var next = new Result


Newliner 🥉

jonjohansen · 2018-07-05T06:59:36Z

Diplomatic/Views/TextFields.xaml.cs

+                {
+                    BindingContext = new ResultViewModel(endpoint, Filename)
+                };
+                await Navigation.PushAsync(next);


🥉 Newliner

IsakSundeSingh · 2018-07-05T07:15:37Z

Diplomatic/Models/Field.cs

@@ -10,6 +10,8 @@ public class Field
        public string Name { get; }
        [JsonIgnore]
        public string Value { get; set; }
+        [JsonIgnore]
+        virtual public bool IsValid => !string.IsNullOrEmpty(Value);


This shouldn't be virtual. 🥈

IsakSundeSingh · 2018-07-05T07:20:28Z

Diplomatic/Models/Signature.cs

+        [JsonProperty("id")]
+        public string Id { get; set; }
+        public Uri ImageUri {
+            get {


Newlines bro 🥉

IsakSundeSingh · 2018-07-05T07:22:14Z

Diplomatic/Utils/WebTemplateProvider.cs

@@ -22,7 +23,12 @@ public WebTemplateProvider()
            using (var reader = new StreamReader(response.GetResponseStream()))
            {
                string content = reader.ReadToEnd();
-                templates = JsonConvert.DeserializeObject<List<Template>>(content);
+                Dictionary<string, Template> rawTemplates = JsonConvert.DeserializeObject<Dictionary<string, Template>>(content);
+                foreach (KeyValuePair<string, Template> entry in rawTemplates)


Newline bro :4th_place_medal:

IsakSundeSingh · 2018-07-05T07:24:07Z

Diplomatic/ViewModels/TemplatePickerViewModel.cs

    public class TemplatePickerViewModel
    {
-        public Template[] TemplateList { get; set; }
+        public Template[] Templates { get; set; }
        public TemplatePickerViewModel()


IsakSundeSingh · 2018-07-05T07:24:15Z

Diplomatic/ViewModels/TextFieldViewModel.cs

@@ -1,5 +1,6 @@
 namespace Diplomatic.ViewModels
 {
+    using Models;
    public class TextFieldViewModel


IsakSundeSingh · 2018-07-05T07:24:40Z

Diplomatic/Views/MainPage.xaml.cs

 namespace Diplomatic.Views
 {
+    using ViewModels;
    public partial class MainPage : ContentPage


Newline :11st_place_medal:

IsakSundeSingh · 2018-07-05T07:26:08Z

Diplomatic/Views/MainPage.xaml.cs

        {
            var next = new Templates();
            next.BindingContext = new TemplatePickerViewModel();
            // We do not need to submit any info to the page here yet
            await Navigation.PushAsync(next);
        }

-        void OnShow ( object sender, EventArgs e)
+        private void OnShow ( object sender, EventArgs e)


No space before first function parameter.

IsakSundeSingh · 2018-07-05T07:26:48Z

Diplomatic/Views/Signatures.xaml.cs

            var queryParams = new List<string> { };
-            foreach (var field in template.Fields)
+            foreach (Field field in template.Fields)


Newline before this line

IsakSundeSingh · 2018-07-05T07:26:59Z

Diplomatic/Views/Signatures.xaml.cs

            {
                queryParams.Add($"{field.Name.ToLower()}={field.Value}");
            }
-            var query = string.Join("&", queryParams.ToArray());
-            string final = "https://qri7p78aml.execute-api.eu-west-2.amazonaws.com/dev/" + template.TemplateName.ToLower() + "?" + query;
+            queryParams.Add($"signature={template.Signature.Id}");


And after the block <3

IsakSundeSingh · 2018-07-05T07:27:16Z

Diplomatic/Views/Signatures.xaml.cs

-            string final = "https://qri7p78aml.execute-api.eu-west-2.amazonaws.com/dev/" + template.TemplateName.ToLower() + "?" + query;
+            queryParams.Add($"signature={template.Signature.Id}");
+            string query = string.Join("&", queryParams.ToArray());
+            string final = "https://qri7p78aml.execute-api.eu-west-2.amazonaws.com/dev/" + template.Name.ToLower() + "?" + query;
            var endpoint = new Uri(Uri.EscapeUriString(final));
            var next = new Result


This starts a block, so a newline before it.

Initializers aren't real blocks to me 👀

IsakSundeSingh · 2018-07-05T07:28:26Z

Diplomatic/Views/TextFields.xaml.cs

+                {
+                    BindingContext = new SignaturePickerViewModel(selectedTemplate)
+                };
+                await Navigation.PushAsync(next);


IsakSundeSingh · 2018-07-05T07:28:46Z

Diplomatic/Views/TextFields.xaml.cs

-            await Navigation.PushAsync(next);
+                Template template = ((TextFieldViewModel)BindingContext).SelectedTemplate;
+                var queryParams = new List<string> { };
+                foreach (Field field in template.Fields)


Newliner before and after ❤️

IsakSundeSingh · 2018-07-05T07:29:03Z

Diplomatic/Views/TextFields.xaml.cs

+                {
+                    BindingContext = new ResultViewModel(endpoint)
+                };
+                await Navigation.PushAsync(next);


Come on man... :22nd_place_medal:

IsakSundeSingh

Fix it

Interface for saving images has been added - Implemented on iOS - Permissions have been set for iOS Views: Result has gotten two buttons Save button now has an action, which should run a code-behind function for saving NOTE: the name of the image saved in the codebehind should be changed

It now works on android! Filename sent in is "Navn" for now. This needs to change

Images now have names (Only available on an ANDROID near you)! Also Stuff looks clean now

Resolved scaling issue (Might have to refactor this into a decent scale later) Aligned signatures to the left.

IsakSundeSingh added the review label Jul 4, 2018

MaxJohansen requested review from IsakSundeSingh, jonjohansen and vebjornhaugland and removed request for IsakSundeSingh July 4, 2018 15:45

MaxJohansen force-pushed the feature/signatures branch from 9909e76 to 0856613 Compare July 4, 2018 19:22

jonjohansen suggested changes Jul 5, 2018

View reviewed changes

IsakSundeSingh reviewed Jul 5, 2018

View reviewed changes

MaxJohansen force-pushed the feature/signatures branch from 0856613 to 1d445b0 Compare July 5, 2018 07:16

IsakSundeSingh reviewed Jul 5, 2018

View reviewed changes

IsakSundeSingh suggested changes Jul 5, 2018

View reviewed changes

MaxJohansen force-pushed the feature/signatures branch 4 times, most recently from 1e404fa to 9e52de4 Compare July 5, 2018 07:49

MaxJohansen and others added 3 commits July 5, 2018 09:50

Rewrite to use new webAPI

e188918

Clean up unused assets and fix tests

e8d9f59

jonjohansen added 2 commits July 5, 2018 09:55

Image save!

4551d4e

It now works on android! Filename sent in is "Navn" for now. This needs to change

Ground breaking new feature

d7bed33

Images now have names (Only available on an ANDROID near you)! Also Stuff looks clean now

MaxJohansen force-pushed the feature/signatures branch from 9e52de4 to d7bed33 Compare July 5, 2018 07:55

Fix signatures in view

2425d7c

Resolved scaling issue (Might have to refactor this into a decent scale later) Aligned signatures to the left.

jonjohansen force-pushed the feature/signatures branch from 72673d6 to 2425d7c Compare July 5, 2018 10:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Interface with new webAPI #24

Interface with new webAPI #24

MaxJohansen commented Jul 4, 2018

jonjohansen left a comment

jonjohansen Jul 5, 2018

jonjohansen Jul 5, 2018

MaxJohansen Jul 5, 2018

jonjohansen Jul 5, 2018

jonjohansen Jul 5, 2018

jonjohansen Jul 5, 2018

IsakSundeSingh Jul 5, 2018

IsakSundeSingh Jul 5, 2018

IsakSundeSingh Jul 5, 2018

IsakSundeSingh Jul 5, 2018

IsakSundeSingh Jul 5, 2018

IsakSundeSingh Jul 5, 2018

IsakSundeSingh Jul 5, 2018

IsakSundeSingh Jul 5, 2018

IsakSundeSingh Jul 5, 2018

IsakSundeSingh Jul 5, 2018

MaxJohansen Jul 5, 2018

IsakSundeSingh Jul 5, 2018

IsakSundeSingh Jul 5, 2018

IsakSundeSingh Jul 5, 2018

IsakSundeSingh left a comment

Interface with new webAPI #24

Are you sure you want to change the base?

Interface with new webAPI #24

Conversation

MaxJohansen commented Jul 4, 2018

Changes 🎈

Types of changes

Checklist ✔️

jonjohansen left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

IsakSundeSingh left a comment

Choose a reason for hiding this comment