Merge pull request #36 from ixian-platform/jaka/onboarding

Ref: onboarding

Author: IxiAngel

Spixi/Pages/Home/OnboardPage.xaml.cs

@@ -36,6 +36,7 @@ private void onNavigating(object sender, WebNavigatingEventArgs e)
             else if (current_url.Contains("ixian:joinbot"))
             {
                 joinBot = true;
+                finishOnboarding();
             }
             else if (current_url.Equals("ixian:error", StringComparison.Ordinal))
             {

Spixi/Pages/Launch/LaunchCreatePage.xaml.cs

@@ -23,6 +23,11 @@ public LaunchCreatePage ()
             loadPage(webView, "intro_new.html");
         }
 
+        private void onLoad()
+        {
+            Utils.sendUiCommand(this, "setVersion", Config.version);
+        }
+
         private void onNavigated(object sender, WebNavigatedEventArgs e)
         {
 
@@ -32,6 +37,10 @@ private void onNavigating(object sender, WebNavigatingEventArgs e)
         {
             string current_url = HttpUtility.UrlDecode(e.Url);
 
+            if (current_url.Equals("ixian:onload", StringComparison.Ordinal))
+            {
+                onLoad();
+            }
             if (current_url.Equals("ixian:back", StringComparison.Ordinal))
             {
                 popPageAsync();
@@ -57,6 +66,10 @@ private void onNavigating(object sender, WebNavigatingEventArgs e)
             {
                 _ = onChangeAvatarAsync(sender, e);
             }
+            else if (current_url.Equals("ixian:restore", StringComparison.Ordinal))
+            {
+                Navigation.PushAsync(new LaunchRestorePage(), Config.defaultXamarinAnimations);
+            }
             else
             {
                 // Otherwise it's just normal navigation

Spixi/Pages/Launch/LaunchPage.xaml.cs

@@ -11,6 +11,7 @@ namespace SPIXI
     [XamlCompilation(XamlCompilationOptions.Compile)]
 	public partial class LaunchPage : SpixiContentPage
 	{
+	    ThemeAppearance selectedAppearance = ThemeAppearance.automatic;
         private bool acceptedTerms = false;
 		public LaunchPage ()
 		{
@@ -22,6 +23,9 @@ public LaunchPage ()
 
         private void onLoad()
         {
+            selectedAppearance = ThemeManager.getActiveAppearance();
+            int activeAppearanceIdx = (int)selectedAppearance;
+            Utils.sendUiCommand(this, "initialAppearance", activeAppearanceIdx.ToString());
             Utils.sendUiCommand(this, "setVersion", Config.version);
             if(!acceptedTerms)
             {
@@ -62,7 +66,18 @@ private void onNavigating(object sender, WebNavigatingEventArgs e)
                     Preferences.Default.Set("language", lang);
                 }
                 loadPage(webView, "intro.html");
+                Utils.sendUiCommand(this, "showOnboardingSection");
             }
+            else if (current_url.StartsWith("ixian:appearance:", StringComparison.Ordinal))
+                {
+                    string appearanceString = current_url.Substring("ixian:appearance:".Length);
+                    selectedAppearance = (ThemeAppearance)Convert.ToInt32(appearanceString);
+
+                    if (ThemeManager.changeAppearance(selectedAppearance))
+                    {
+                        loadPage(webView, "intro.html");
+                    }
+                }
             else
             {
                 // Otherwise it's just normal navigation

Spixi/Pages/Launch/LaunchRestorePage.xaml.cs

@@ -44,7 +44,7 @@ private void onNavigating(object sender, WebNavigatingEventArgs e)
                 {
                     e.Cancel = true;
                     Utils.sendUiCommand(this, "removeLoadingOverlay");
-                    displaySpixiAlert(SpixiLocalization._SL("intro-restore-file-invalidpassword-title"), SpixiLocalization._SL("intro-restore-file-invalidpassword-text"), SpixiLocalization._SL("global-dialog-ok"));
+                    Utils.sendUiCommand(this, "showPasswordError");
                     return;
                 }
 
@@ -109,7 +109,7 @@ private async void onSelectFile()
                 return;
             }
 
-            Utils.sendUiCommand(this, "enableRestore");
+            Utils.sendUiCommand(this, "setUploadedFileName", filepath);
         }
 
         // Attempt to restore the wallet
@@ -173,7 +173,7 @@ private bool restoreAccountFile(string source_path, string pass)
                 if (!ws.verifyWallet(tmpWalletFile, pass))
                 {
                     Directory.Delete(tmpDirectory, true);
-                    displaySpixiAlert(SpixiLocalization._SL("intro-restore-file-invalidpassword-title"), SpixiLocalization._SL("intro-restore-file-invalidpassword-text"), SpixiLocalization._SL("global-dialog-ok"));
+                    Utils.sendUiCommand(this, "showPasswordError");
                     // Remove overlay
                     Utils.sendUiCommand(this, "removeLoadingOverlay");
                     return false;
@@ -217,7 +217,7 @@ private bool restoreWalletFile(string source_path, string pass)
             WalletStorage ws = new WalletStorage(source_path);
             if (!ws.verifyWallet(source_path, pass))
             {
-                displaySpixiAlert(SpixiLocalization._SL("intro-restore-file-invalidpassword-title"), SpixiLocalization._SL("intro-restore-file-invalidpassword-text"), SpixiLocalization._SL("global-dialog-ok"));
+                Utils.sendUiCommand(this, "showPasswordError");
                 // Remove overlay
                 Utils.sendUiCommand(this, "removeLoadingOverlay");
                 return false;

Spixi/Resources/Raw/html/app_details.html

@@ -180,7 +180,7 @@
 
     <div class="new-modal-wrapper" id="removeAppModal" style="display: none;">
         <div class="new-modal-container">
-            <img src="img/trash-icon.png" alt="trash-icon" width="32" height="32" />
+            <i class="fa fa-trash-can modal-trash-icon"></i>
             <div class="new-modal-texts">
                 <span class="label-lg">*SL{apps-remove-title}</span>
                 <span class="body-sm">*SL{apps-remove-description}</span>