Merge branch 'master' into feature/signatures

Diplomatic.Android/Classes/Picture_Droid.cs

@@ -0,0 +1,36 @@
+using System;
+using Android.Content;
+using Android.Net;
+using Diplomatic.Droid.Classes;
+using Diplomatic.Interfaces;
+using Java.IO;
+
+[assembly: Xamarin.Forms.Dependency(typeof(Picture_Droid))]
+
+namespace Diplomatic.Droid.Classes
+{
+    public class Picture_Droid : IPicture
+    {
+        public void SavePictureToDisk(string filename, byte[] imageArray)
+        {
+            File dir = Android.OS.Environment.GetExternalStoragePublicDirectory(Android.OS.Environment.DirectoryDcim);
+            string pictures = dir.Path;
+
+            string FilePath = System.IO.Path.Combine(pictures, filename+".png");
+            try
+            {
+                // Write file to the android disk
+                System.IO.File.WriteAllBytes(FilePath, imageArray);
+
+                // Now it needs to be added to image gallery
+                var mediaScanIntent = new Intent(Intent.ActionMediaScannerScanFile);
+                mediaScanIntent.SetData(Android.Net.Uri.FromFile(new File(FilePath)));
+                Android.App.Application.Context.SendBroadcast(mediaScanIntent);
+            }
+            catch (System.Exception e)
+            {
+                System.Console.WriteLine(e.ToString());
+            }
+        }
+    }
+}

Diplomatic.Android/Diplomatic.Android.csproj → Diplomatic.Android/Diplomatic.Droid.csproj

@@ -60,6 +60,7 @@
     <Compile Include="Resources\Resource.Designer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SplashScreen.cs" />
+    <Compile Include="Classes\Picture_Droid.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Resources\AboutResources.txt" />
@@ -106,5 +107,8 @@
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\splash.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Classes\" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>

Diplomatic.Android/Properties/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.companyname.Diplomatic" android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="27" />
+	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 	<application android:label="Diplomatic.Android" android:icon="@drawable/icon512"></application>
 </manifest>

Diplomatic.Android/Resources/drawable/splash_screen.xml

@@ -10,3 +10,5 @@
         android:gravity="center"/>
   </item>
 </layer-list>
+
+<!---->

Diplomatic.iOS/Classes/Picture_iOS.cs

@@ -0,0 +1,24 @@
+using System;
+using Diplomatic.Interfaces;
+using Diplomatic.iOS.Classes;
+using Foundation;
+using UIKit;
+
+[assembly: Xamarin.Forms.Dependency(typeof(Picture_iOS))]
+namespace Diplomatic.iOS.Classes
+{
+    public class Picture_iOS : IPicture
+    {
+        public void SavePictureToDisk(string filename, byte[] imageArray)
+        {
+            var Img = new UIImage(NSData.FromArray(imageArray));
+            Img.SaveToPhotosAlbum((image, error) =>
+            {
+                if (error != null)
+                {
+                    Console.WriteLine(error);
+                }
+            });
+        }
+    }
+}

Diplomatic.iOS/Diplomatic.iOS.csproj

@@ -98,6 +98,7 @@
     <None Include="Entitlements.plist" />
     <None Include="Info.plist" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Classes\Picture_iOS.cs" />
   </ItemGroup>
   <ItemGroup>
     <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-1024.png">

Diplomatic.iOS/Info.plist

@@ -21,7 +21,7 @@
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>MinimumOSVersion</key>
-	<string>8.0</string>
+	<string>11.0</string>
 	<key>CFBundleDisplayName</key>
 	<string>Diplomatic</string>
 	<key>CFBundleIdentifier</key>
@@ -36,5 +36,7 @@
 	<string>Assets.xcassets/AppIcon.appiconset</string>
 	<key>XSLaunchImageAssets</key>
 	<string>Assets.xcassets/LaunchImage.launchimage</string>
+	<key>NSPhotoLibraryAddUsageDescription</key>
+	<string></string>
 </dict>
 </plist>

Diplomatic.sln

@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27703.2026
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Diplomatic", "Diplomatic\Diplomatic.csproj", "{CDB8B215-5C59-4F03-A016-E3C7A8DEABCC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Diplomatic", "Diplomatic\Diplomatic.csproj", "{CDB8B215-5C59-4F03-A016-E3C7A8DEABCC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Diplomatic.Android", "Diplomatic.Android\Diplomatic.Android.csproj", "{86FD3DB4-B1E4-4FDF-9442-01A9ADC6FAB7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Diplomatic.Droid", "Diplomatic.Android\Diplomatic.Droid.csproj", "{86FD3DB4-B1E4-4FDF-9442-01A9ADC6FAB7}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Diplomatic.iOS", "Diplomatic.iOS\Diplomatic.iOS.csproj", "{EE7E1D42-0BF7-4A64-A8CF-29014B444061}"
 EndProject

Diplomatic/App.xaml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Application xmlns="http://xamarin.com/schemas/2014/forms"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:local="clr-namespace:Diplomatic.Utils.Triggers"
              x:Class="Diplomatic.App">
 	<Application.Resources>
         <Color x:Key="backgroundColor">#e5f4f2</Color>
@@ -15,6 +16,28 @@
             <Setter Property="WidthRequest" Value="75" />
         </Style>
 
+        <Style TargetType="Label">
+            <Setter Property="Opacity" Value="1"/>
+            <Style.Triggers>
+                <Trigger TargetType="Label"
+                         Property="IsVisible" Value="True">
+                    <Trigger.EnterActions>
+                        <local:OpacityTriggerAction StartsFrom="0"/>
+                    </Trigger.EnterActions>
+                </Trigger>
+            </Style.Triggers>
+        </Style>
+
+        <Style TargetType="Entry">
+            <Setter Property="Opacity" Value="0.75"/>
+            <Style.Triggers>
+                <Trigger TargetType="Entry"
+                         Property="IsFocused" Value="True">
+                    <Setter Property="Opacity" Value="1"/>
+                </Trigger>
+            </Style.Triggers>
+        </Style>
+
         <OnPlatform
             x:Key="EntryMargins"
             x:TypeArguments="Thickness"

Diplomatic/Diplomatic.csproj

@@ -26,6 +26,7 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
+    <Folder Include="Interfaces\" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Update="Views\Result.xaml">

Diplomatic/Interfaces/IPicture.cs

@@ -0,0 +1,8 @@
+using System;
+namespace Diplomatic.Interfaces
+{
+    public interface IPicture
+    {
+        void SavePictureToDisk(string filename, byte[] imageArray);
+    }
+}

Diplomatic/Utils/Behaviors/FormatValidator.cs

@@ -1,4 +1,4 @@
-using System.Text.RegularExpressions;
+using System.Text.RegularExpressions;
 using Xamarin.Forms;
 
 namespace Diplomatic.Utils.Behaviors
@@ -20,9 +20,9 @@ protected override void OnDetachingFrom(Entry entry)
 
         public void ValidateFormat(object sender, TextChangedEventArgs args)
         {
-            string text = (sender as Entry).Text;
-            var regex = new Regex(Pattern, RegexOptions.Compiled);
-            (sender as Entry).TextColor = regex.IsMatch(text) ? Color.Default : Color.Red;
+            var entry = (Entry)sender;
+            string text = entry.Text;
+            entry.TextColor = Regex.IsMatch(text, Pattern) ? Color.Default : Color.Red;
         }
     }
 }

Diplomatic/Utils/Triggers/OpacityAnimation.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xamarin.Forms;
+
+namespace Diplomatic.Utils.Triggers
+{
+    public class OpacityTriggerAction : TriggerAction<VisualElement>
+    {
+        public int StartsFrom { set; get; } = 0;
+
+        protected override void Invoke(VisualElement visual)
+        {
+            visual.Animate("label", new Animation((d) => {
+                var val = StartsFrom == 0 ? d : 1 - d;
+                visual.Opacity = val;
+
+            }),
+            length: 500,
+            easing: Easing.Linear);
+        }
+    }
+}

Diplomatic/Utils/Triggers/ScaleAnimation.cs

@@ -1,4 +1,4 @@
-using Xamarin.Forms;
+using Xamarin.Forms;
 
 namespace Diplomatic.Utils.Triggers
 {

Diplomatic/ViewModels/ResultViewModel.cs

@@ -8,6 +8,11 @@ namespace Diplomatic.ViewModels
     public class ResultViewModel
     {
         public Uri ImageUri { get; }
-        public ResultViewModel(Uri imageuri) => ImageUri = imageuri;
+        public string Filename { get; set; } 
+        public ResultViewModel(Uri imageuri, string filename)
+        {
+            ImageUri = imageuri;
+            Filename = filename;
+        }
     }
 }

Diplomatic/Views/Result.xaml

@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="Diplomatic.Views.Result">
+             x:Class="Diplomatic.Views.Result"
+             Title="Result">
+    <ContentPage.ToolbarItems>
+        <ToolbarItem Name="Save" Order="Primary" Text="Save" Priority="1" Activated="SaveButtonClicked" />
+        <ToolbarItem Name="Share" Order="Primary" Text="Share" Priority="2" />
+    </ContentPage.ToolbarItems>
     <ContentPage.Content>
         <StackLayout>
             <Image x:Name="theImage" Source="{Binding ImageUri}"/>

Diplomatic/Views/Result.xaml.cs

@@ -1,20 +1,28 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
+using System.Net;
+using Diplomatic.Interfaces;
+using Diplomatic.ViewModels;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
 
 namespace Diplomatic.Views
 {
-	[XamlCompilation(XamlCompilationOptions.Compile)]
-	public partial class Result : ContentPage
-	{
-		public Result ()
-		{
-			InitializeComponent ();
-		}
-	}
+    [XamlCompilation(XamlCompilationOptions.Compile)]
+    public partial class Result : ContentPage
+    {
+        public Result()
+        {
+            InitializeComponent();
+        }
+        public async void SaveButtonClicked(object sender, EventArgs e)
+        {
+            using (var webClient = new WebClient())
+            {
+                string Filename = ((ResultViewModel)BindingContext).Filename;
+                byte[] imageBytes = await webClient.DownloadDataTaskAsync(((ResultViewModel)BindingContext).ImageUri);
+                DependencyService.Get<IPicture>().SavePictureToDisk(Filename, imageBytes);
+                await DisplayAlert("Save diploma", "Your diploma has been saved!", "OK");
+            }
+        }
+    }
 }

Diplomatic/Views/Signatures.xaml.cs

@@ -19,9 +19,11 @@ async void NextPage(object sender, SelectedItemChangedEventArgs e)
         {
             Template template = ((SignaturePickerViewModel)BindingContext).SelectedTemplate;
             template.Signature = (Signature)e.SelectedItem;
+            string Filename = template.TemplateName + "_";
             var queryParams = new List<string> { };
             foreach (Field field in template.Fields)
             {
+                Filename += field.Name + "_" + field.Value +"_";
                 queryParams.Add($"{field.Name.ToLower()}={field.Value}");
             }
             queryParams.Add($"signature={template.Signature.Id}");
@@ -30,7 +32,7 @@ async void NextPage(object sender, SelectedItemChangedEventArgs e)
             var endpoint = new Uri(Uri.EscapeUriString(final));
             var next = new Result
             {
-                BindingContext = new ResultViewModel(endpoint)
+                BindingContext = new ResultViewModel(endpoint, Filename)
             };
             await Navigation.PushAsync(next);
         }