From 471ea5e37a49e9ae75a7dc69ffe57d3ab5fffd0d Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Wed, 21 Sep 2016 04:02:40 +0200
Subject: [PATCH 01/59] WIP

---
 BookAStar/BookAStar.Droid/Assets/test.html    |  71 ++++++++++
 .../BookAStar.Droid/BookAStar.Droid.csproj    |   8 +-
 BookAStar/BookAStar.Droid/MainActivity.cs     |  43 ++-----
 BookAStar/BookAStar.Droid/MarkdownEditor.cs   |  66 +++-------
 .../BookAStar.Droid/MarkdownEditor.cshtml     |  43 +++----
 .../BookAStar.Droid/MarkdownViewRenderer.cs   |  94 ++++++++++++++
 .../BookAStar.Droid/MarkdownWebViewClient.cs  |   6 +-
 .../Properties/AssemblyInfo.cs                |   2 +-
 .../Resources/Resource.Designer.cs            |  43 ++++---
 .../Resources/drawable/Icon-anon-48px.png     | Bin 0 -> 1700 bytes
 .../Resources/drawable/Icon-anon-64px.png     | Bin 0 -> 2426 bytes
 .../Resources/drawable/Icon-anon-73px.png     | Bin 0 -> 2516 bytes
 .../Resources/drawable/Icon-anon-org.png      | Bin 0 -> 2719 bytes
 .../Resources/drawable/icon-anon.png          | Bin 0 -> 1031 bytes
 .../Resources/layout/EditEstimate.axml        |   5 +
 BookAStar/BookAStar/App.xaml                  |  20 ++-
 BookAStar/BookAStar/App.xaml.cs               | 121 +++++++++---------
 BookAStar/BookAStar/BookAStar.csproj          |  26 ++--
 BookAStar/BookAStar/Constants.cs              |  34 ++++-
 .../BookAStar/Helpers/AvatarImageSource.cs    |  28 ++++
 .../BookAStar/{ => Helpers}/DataManager.cs    |  11 +-
 BookAStar/BookAStar/Helpers/MainSettings.cs   |   6 -
 BookAStar/BookAStar/Helpers/RemoteEntity.cs   |  95 ++++++++------
 BookAStar/BookAStar/Helpers/RemoteEntityRO.cs |   4 +-
 BookAStar/BookAStar/Interfaces/IMDEditor.cs   |  13 ++
 .../BookAStar/{ => Interfaces}/IPlatform.cs   |   5 +-
 BookAStar/BookAStar/Model/BookQueryData.cs    |   6 -
 .../BookAStar/Model/ClientProviderInfo.cs     |  23 ++++
 BookAStar/BookAStar/Model/Manager.cs          |   9 +-
 BookAStar/BookAStar/Model/Social/Location.cs  |  12 +-
 .../BookAStar/Model/Workflow/Estimate.cs      |  32 ++++-
 BookAStar/BookAStar/Pages/BlogPage.cs         |   2 +-
 .../BookAStar/Pages/BookQueriesPage.xaml      |  66 ++++++----
 .../BookAStar/Pages/BookQueriesPage.xaml.cs   |   8 +-
 BookAStar/BookAStar/Pages/BookQueryPage.xaml  |  40 ++++--
 .../BookAStar/Pages/BookQueryPage.xaml.cs     |  18 ++-
 .../BookAStar/Pages/EditEstimatePage.xaml     |  42 ++++++
 .../BookAStar/Pages/EditEstimatePage.xaml.cs  |  44 +++++++
 BookAStar/BookAStar/Pages/EventDetail.xaml.cs |   2 +-
 .../BookAStar/Pages/MakeAnEstimatePage.xaml   |  10 --
 .../Pages/MakeAnEstimatePage.xaml.cs          |  28 ----
 BookAStar/BookAStar/Pages/QueriesPage.xaml    |   6 -
 BookAStar/BookAStar/Pages/QueriesPage.xaml.cs |  18 ---
 BookAStar/BookAStar/Pages/SearchPage.xaml     |   6 +-
 BookAStar/BookAStar/Pages/SettingsPage.xaml   |  16 ++-
 .../BookAStar/Pages/SettingsPage.xaml.cs      |  12 +-
 .../BookAStar/Properties/AssemblyInfo.cs      |   6 +-
 BookAStar/BookAStar/Views/MarkdownView.cs     |  36 +++---
 BookAStar/BookAStar/icon-anon.png             | Bin 0 -> 1031 bytes
 49 files changed, 742 insertions(+), 444 deletions(-)
 create mode 100644 BookAStar/BookAStar.Droid/Assets/test.html
 create mode 100644 BookAStar/BookAStar.Droid/MarkdownViewRenderer.cs
 create mode 100644 BookAStar/BookAStar.Droid/Resources/drawable/Icon-anon-48px.png
 create mode 100644 BookAStar/BookAStar.Droid/Resources/drawable/Icon-anon-64px.png
 create mode 100644 BookAStar/BookAStar.Droid/Resources/drawable/Icon-anon-73px.png
 create mode 100644 BookAStar/BookAStar.Droid/Resources/drawable/Icon-anon-org.png
 create mode 100644 BookAStar/BookAStar.Droid/Resources/drawable/icon-anon.png
 create mode 100644 BookAStar/BookAStar.Droid/Resources/layout/EditEstimate.axml
 create mode 100644 BookAStar/BookAStar/Helpers/AvatarImageSource.cs
 rename BookAStar/BookAStar/{ => Helpers}/DataManager.cs (74%)
 create mode 100644 BookAStar/BookAStar/Interfaces/IMDEditor.cs
 rename BookAStar/BookAStar/{ => Interfaces}/IPlatform.cs (85%)
 create mode 100644 BookAStar/BookAStar/Model/ClientProviderInfo.cs
 create mode 100644 BookAStar/BookAStar/Pages/EditEstimatePage.xaml
 create mode 100644 BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs
 delete mode 100644 BookAStar/BookAStar/Pages/MakeAnEstimatePage.xaml
 delete mode 100644 BookAStar/BookAStar/Pages/MakeAnEstimatePage.xaml.cs
 delete mode 100644 BookAStar/BookAStar/Pages/QueriesPage.xaml
 delete mode 100644 BookAStar/BookAStar/Pages/QueriesPage.xaml.cs
 create mode 100644 BookAStar/BookAStar/icon-anon.png

diff --git a/BookAStar/BookAStar.Droid/Assets/test.html b/BookAStar/BookAStar.Droid/Assets/test.html
new file mode 100644
index 00000000..1a5fbf10
--- /dev/null
+++ b/BookAStar/BookAStar.Droid/Assets/test.html
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <link rel="stylesheet" href="quill.snow.css" />
+    <style>
+        .standalone-container {
+            margin: 0;
+            width: 100%;
+            height: 100%;
+        }
+        #bubble-container {
+            width:100%;
+           height: 100%;
+        }
+        #bubble-container div.ql-editor {
+            margin-top:0;
+        }
+        .hidden {
+            display: none;
+        }
+    </style>
+
+</head>
+<body>
+    <h1>Title</h1>
+    <div class="standalone-container">
+        <div id="bubble-container"><h1><strong>Hello Estimate!</strong></h1>
+</div>
+    </div>
+    
+    <script type="text/javascript" src="quill.min.js"></script>
+    <script type="text/javascript" src="jquery.js"></script>
+    <script type="text/javascript" src="showdown.js"></script>
+    <script type="text/javascript" src="to-markdown.js"></script>
+    <script type="text/javascript" src="md-helpers.js"></script>
+
+    <script type="text/javascript">
+        var toolbarOptions = [
+  ['bold', 'italic', 'underline', 'strike'],        // toggled buttons
+  ['blockquote', 'code-block'],
+
+  [{ 'header': 1 }, { 'header': 2 }],               // custom button values
+  [{ 'list': 'ordered' }, { 'list': 'bullet' }],
+  [{ 'indent': '-1' }, { 'indent': '+1' }],          // outdent/indent
+  
+  ['clean']                                         // remove formatting button
+        ];
+
+        var quill = new Quill('#bubble-container', {
+            modules: {
+                toolbar: toolbarOptions
+            },
+            placeholder: 'Composez votre texte ...',
+            theme: 'snow'
+        });
+
+      function getMD() {
+          return markdownize($('#bubble-container div.ql-editor').html())
+      }
+      quill.on('text-change', function (delta, oldDelta, source)
+      {
+          if (source === "user") {
+              $.get("file:validate?md=" + encodeURIComponent(getMD()));
+          }
+      });
+    </script>
+
+</body>
+</html>
+
diff --git a/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj b/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj
index e2410b5b..c7b024ce 100644
--- a/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj
+++ b/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj
@@ -88,7 +88,8 @@
       <HintPath>..\..\packages\Xam.Plugin.Media.1.0.1\lib\MonoAndroid10\Media.Plugin.Abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Mono.Android" />
+    <Reference Include="Mono.Android, Version=0.0.0.0, Culture=neutral, PublicKeyToken=84e04ff9cfb79065, processorArchitecture=MSIL" />
+    <Reference Include="Mono.Android.Export, Version=1.0.6099.33544, Culture=neutral, PublicKeyToken=84e04ff9cfb79065, processorArchitecture=MSIL" />
     <Reference Include="Mono.Data.Sqlite" />
     <Reference Include="mscorlib" />
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -203,6 +204,7 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>MarkdownEditor.cshtml</DependentUpon>
     </Compile>
+    <Compile Include="MarkdownViewRenderer.cs" />
     <Compile Include="MarkdownWebViewClient.cs" />
     <Compile Include="OAuth2\YaOAuth2Authenticator.cs" />
     <Compile Include="Resources\Resource.Designer.cs" />
@@ -224,6 +226,9 @@
     <None Include="packages.config" />
     <None Include="Resources\AboutResources.txt" />
     <AndroidAsset Include="Assets\AboutAssets.txt" />
+    <AndroidResource Include="Resources\layout\EditEstimate.axml">
+      <SubType>Designer</SubType>
+    </AndroidResource>
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\icon.png" />
@@ -301,6 +306,7 @@
     <AndroidResource Include="Resources\drawable\nfqrcode.png" />
     <AndroidResource Include="Resources\drawable\visuel_sexion.jpg" />
     <AndroidResource Include="Resources\values\values-21\styles.xml" />
+    <AndroidResource Include="Resources\drawable\icon-anon.png" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Resources\drawable-hdpi\" />
diff --git a/BookAStar/BookAStar.Droid/MainActivity.cs b/BookAStar/BookAStar.Droid/MainActivity.cs
index 11e58483..d1dd5105 100644
--- a/BookAStar/BookAStar.Droid/MainActivity.cs
+++ b/BookAStar/BookAStar.Droid/MainActivity.cs
@@ -27,7 +27,8 @@ using Android.Webkit;
 using Xamarin.Forms;
 using Xamarin.Forms.Platform.Android;
 using Android.Views;
-
+using BookAStar.Helpers;
+using BookAStar.Interfaces;
 
 namespace BookAStar.Droid
 {
@@ -87,11 +88,11 @@ namespace BookAStar.Droid
         {
 
             var accStore = AccountStore.Create(this);
-            var accounts = accStore.FindAccountsForService(MainSettings.ApplicationName);
+            var accounts = accStore.FindAccountsForService(Constants.ApplicationName);
 
             accStore.Delete(
                     accounts.Where(a => a.Username == userName).FirstOrDefault()
-                    , MainSettings.ApplicationName);
+                    , Constants.ApplicationName);
             Toast.MakeText(this,
                 Resource.String.yavscIdentRemoved
                 , ToastLength.Short);
@@ -160,7 +161,7 @@ namespace BookAStar.Droid
                     using (var reader = new StreamReader(response.GetResponseStream()))
                     {
                         responseText = reader.ReadToEnd();
-                        Log.Debug(MainSettings.ApplicationName, responseText);
+                        Log.Debug(Constants.ApplicationName, responseText);
                     }
                 }
             }
@@ -180,7 +181,7 @@ namespace BookAStar.Droid
         {
             return await Task.Run(() => {
                 var manager = AccountStore.Create(this);
-                return manager.FindAccountsForService(MainSettings.ApplicationName);
+                return manager.FindAccountsForService(Constants.ApplicationName);
             });
         }
         YaOAuth2Authenticator auth = new YaOAuth2Authenticator(
@@ -215,7 +216,7 @@ namespace BookAStar.Droid
 
                                // get me
                                // var request = new OAuth2Request("GET", new Uri(Constants.UserInfoUrl), null, eventArgs.Account);
-                               var request = new HttpRequestMessage(HttpMethod.Get, MainSettings.UserInfoUrl);
+                               var request = new HttpRequestMessage(HttpMethod.Get, Constants.UserInfoUrl);
 
                                request.Headers.Authorization =
                                new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", tokens.AccessToken);
@@ -244,7 +245,7 @@ namespace BookAStar.Droid
                                };
                                
                                MainSettings.SaveUser(newuser);
-                               accStore.Save(acc, MainSettings.ApplicationName);
+                               accStore.Save(acc, Constants.ApplicationName);
                            }
                        }
 
@@ -331,34 +332,6 @@ namespace BookAStar.Droid
                 return m.InvokeJson(arg);
             }
         }
-
-        public Xamarin.Forms.View CreateMarkdownView(string markdown, Action<string> update)
-        {
-            var view = new Android.Webkit.WebView(Forms.Context);
-            var viewclient = new MarkdownWebViewClient(update);
-            view.SetWebViewClient(viewclient);
-            var mde = new MarkdownEditor();
-            if (markdown!=null)
-            {
-                var md = new MarkdownDeep.Markdown();
-                mde.Model = md.Transform(markdown);
-            }
-            var html = mde.GenerateString();
-            view.Settings.BuiltInZoomControls = true;
-            view.Settings.JavaScriptEnabled = true;
-            view.Settings.LoadsImagesAutomatically = true;
-            view.Settings.SetAppCacheEnabled(true);
-            view.Settings.AllowContentAccess = true;
-            view.Settings.AllowFileAccess = true;
-            view.Settings.AllowFileAccessFromFileURLs = true;
-            view.Settings.AllowUniversalAccessFromFileURLs = true;
-            view.Settings.BlockNetworkImage = false;
-            view.Settings.BlockNetworkLoads = false;
-            view.LoadDataWithBaseURL("file:///android_asset/",
-                html, "text/html", "utf-8",null);
-            
-            return view.ToView();
-        }
         
     }
 }
diff --git a/BookAStar/BookAStar.Droid/MarkdownEditor.cs b/BookAStar/BookAStar.Droid/MarkdownEditor.cs
index 24f34298..854ebed9 100644
--- a/BookAStar/BookAStar.Droid/MarkdownEditor.cs
+++ b/BookAStar/BookAStar.Droid/MarkdownEditor.cs
@@ -17,7 +17,7 @@ using System.Linq;
 using System.Text;
 
 
-[System.CodeDom.Compiler.GeneratedCodeAttribute("RazorTemplatePreprocessor", "4.1.2.18")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("RazorTemplatePreprocessor", "4.2.0.680")]
 public partial class MarkdownEditor : MarkdownEditorBase
 {
 
@@ -32,32 +32,30 @@ public string Model { get; set; }
 
 public override void Execute()
 {
-WriteLiteral("<!DOCTYPE html>\r\n<html>\r\n<head>\r\n   \r\n    <meta");
+WriteLiteral("<!DOCTYPE html>\r\n<html>\r\n<head>\r\n    <meta");
 
 WriteLiteral(" charset=\"utf-8\"");
 
-WriteLiteral(">\r\n\r\n    <link");
+WriteLiteral(">\r\n    <link");
 
 WriteLiteral(" rel=\"stylesheet\"");
 
 WriteLiteral(" href=\"quill.snow.css\"");
 
 WriteLiteral(@" />
-
     <style>
         .standalone-container {
             margin: 0;
             width: 100%;
+            height: 100%;
         }
-
         #bubble-container {
+            width:100%;
            height: 100%;
         }
-
         #bubble-container div.ql-editor {
             margin-top:3em;
         }
-
         .hidden {
             display: none;
         }
@@ -65,7 +63,6 @@ WriteLiteral(@" />
 
 </head>
 <body>
-
     <div");
 
 WriteLiteral(" class=\"standalone-container\"");
@@ -77,31 +74,13 @@ WriteLiteral(" id=\"bubble-container\"");
 WriteLiteral(">");
 
 
-#line 33 "MarkdownEditor.cshtml"
+#line 28 "MarkdownEditor.cshtml"
                               Write(Html.Write(Model));
 
 
 #line default
 #line hidden
-WriteLiteral("</div>\r\n    </div>\r\n    <form><input");
-
-WriteLiteral(" type=\"hidden\"");
-
-WriteLiteral(" name=\"md\"");
-
-WriteLiteral(" id=\"md\"");
-
-WriteLiteral(" />\r\n    <input");
-
-WriteLiteral(" id=\"btnSubmit\"");
-
-WriteLiteral(" type=\"button\"");
-
-WriteLiteral(" value=\"Valider\"");
-
-WriteLiteral(" class=\"hidden\"");
-
-WriteLiteral(" /></form>\r\n    <script");
+WriteLiteral("</div>\r\n    </div>\r\n    \r\n    <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
@@ -143,7 +122,7 @@ WriteLiteral(@">
   [{ 'header': 1 }, { 'header': 2 }],               // custom button values
   [{ 'list': 'ordered' }, { 'list': 'bullet' }],
   [{ 'indent': '-1' }, { 'indent': '+1' }],          // outdent/indent
-  
+  ['link', 'image'],
   ['clean']                                         // remove formatting button
         ];
 
@@ -151,26 +130,19 @@ WriteLiteral(@">
             modules: {
                 toolbar: toolbarOptions
             },
-    placeholder: 'Composez votre texte ...',
-    theme: 'snow'
-  });
+            placeholder: 'Composez votre texte ...',
+            theme: 'snow'
+        });
 
-  function getMD() {
-      return markdownize($('#bubble-container div.ql-editor').html())
-  }
-  quill.on('text-change', function (delta, oldDelta, source)
-  {
-      if (source === ""user"") {
-          $('#md').val(getMD());
-          $('#btnSubmit').removeClass('hidden');
+      function getMD() {
+          return markdownize($('#bubble-container div.ql-editor').html())
       }
-  });
-  $(document).ready(function () {
-      $('#btnSubmit').on('click', function () {
-          $.get(""file:validate?md="" + encodeURIComponent(getMD()),
-       function (data, stat, jqXHR) { $('#result').html(""Okay"") })
-      })
-  });
+      quill.on('text-change', function (delta, oldDelta, source)
+      {
+          if (source === ""user"") {
+              invokeCSharpAction(getMD());
+          }
+      });
     </script>
 
 </body>
diff --git a/BookAStar/BookAStar.Droid/MarkdownEditor.cshtml b/BookAStar/BookAStar.Droid/MarkdownEditor.cshtml
index 95c8e56e..1b9ccc99 100644
--- a/BookAStar/BookAStar.Droid/MarkdownEditor.cshtml
+++ b/BookAStar/BookAStar.Droid/MarkdownEditor.cshtml
@@ -2,25 +2,21 @@
 <!DOCTYPE html>
 <html>
 <head>
-   
     <meta charset="utf-8">
-
     <link rel="stylesheet" href="quill.snow.css" />
-
     <style>
         .standalone-container {
             margin: 0;
             width: 100%;
+            height: 100%;
         }
-
         #bubble-container {
+            width:100%;
            height: 100%;
         }
-
         #bubble-container div.ql-editor {
             margin-top:3em;
         }
-
         .hidden {
             display: none;
         }
@@ -28,12 +24,10 @@
 
 </head>
 <body>
-
     <div class="standalone-container">
         <div id="bubble-container">@Html.Write(Model)</div>
     </div>
-    <form><input type="hidden" name="md" id="md" />
-    <input id="btnSubmit" type="button" value="Valider" class="hidden" /></form>
+    
     <script type="text/javascript" src="quill.min.js"></script>
     <script type="text/javascript" src="jquery.js"></script>
     <script type="text/javascript" src="showdown.js"></script>
@@ -48,7 +42,7 @@
   [{ 'header': 1 }, { 'header': 2 }],               // custom button values
   [{ 'list': 'ordered' }, { 'list': 'bullet' }],
   [{ 'indent': '-1' }, { 'indent': '+1' }],          // outdent/indent
-  
+  ['link', 'image'],
   ['clean']                                         // remove formatting button
         ];
 
@@ -56,26 +50,19 @@
             modules: {
                 toolbar: toolbarOptions
             },
-    placeholder: 'Composez votre texte ...',
-    theme: 'snow'
-  });
+            placeholder: 'Composez votre texte ...',
+            theme: 'snow'
+        });
 
-  function getMD() {
-      return markdownize($('#bubble-container div.ql-editor').html())
-  }
-  quill.on('text-change', function (delta, oldDelta, source)
-  {
-      if (source === "user") {
-          $('#md').val(getMD());
-          $('#btnSubmit').removeClass('hidden');
+      function getMD() {
+          return markdownize($('#bubble-container div.ql-editor').html())
       }
-  });
-  $(document).ready(function () {
-      $('#btnSubmit').on('click', function () {
-          $.get("file:validate?md=" + encodeURIComponent(getMD()),
-       function (data, stat, jqXHR) { $('#result').html("Okay") })
-      })
-  });
+      quill.on('text-change', function (delta, oldDelta, source)
+      {
+          if (source === "user") {
+              invokeCSharpAction(getMD());
+          }
+      });
     </script>
 
 </body>
diff --git a/BookAStar/BookAStar.Droid/MarkdownViewRenderer.cs b/BookAStar/BookAStar.Droid/MarkdownViewRenderer.cs
new file mode 100644
index 00000000..b315bade
--- /dev/null
+++ b/BookAStar/BookAStar.Droid/MarkdownViewRenderer.cs
@@ -0,0 +1,94 @@
+
+using BookAStar.Views;
+using Android.Webkit;
+using Xamarin.Forms.Platform.Android;
+using BookAStar.Droid;
+using System;
+using Java.Interop;
+
+[assembly: Xamarin.Forms.ExportRenderer(typeof(MarkdownView), typeof(MarkdownViewRenderer))]
+namespace BookAStar.Droid
+{
+    public class JSBridge : Java.Lang.Object
+    {
+        readonly WeakReference<MarkdownViewRenderer> hybridWebViewRenderer;
+
+        public JSBridge(MarkdownViewRenderer hybridRenderer)
+        {
+            hybridWebViewRenderer = new WeakReference<MarkdownViewRenderer>(hybridRenderer);
+        }
+
+        [JavascriptInterface]
+        [Export("invokeAction")]
+        public void InvokeAction(string data)
+        {
+            MarkdownViewRenderer hybridRenderer;
+
+            if (hybridWebViewRenderer != null && hybridWebViewRenderer.TryGetTarget(out hybridRenderer))
+            {
+                hybridRenderer.Element.Markdown=data;
+            }
+        }
+    }
+    public class MarkdownViewRenderer : ViewRenderer<MarkdownView, WebView>
+    {
+        private WebView editorView;
+        private MarkdownEditor editorTemplate = new MarkdownEditor();
+        private MarkdownDeep.Markdown markdown = new MarkdownDeep.Markdown();
+        const string JavaScriptFunction = "function invokeCSharpAction(data){jsBridge.invokeAction(data);}";
+
+        private void SetMDEditorText(string text)
+        {
+            editorTemplate.Model = (text == null) ? null : markdown.Transform(text);
+            var html = editorTemplate.GenerateString();
+            editorView.LoadDataWithBaseURL("file:///android_asset/",
+            html, "text/html", "utf-8", null);
+        }
+
+        protected override void OnElementChanged(ElementChangedEventArgs<MarkdownView> e)
+        {
+            base.OnElementChanged(e);
+            if (Control == null)
+            {
+                editorView = new WebView(Context);
+                editorView.Settings.BuiltInZoomControls = true;
+                editorView.Settings.JavaScriptEnabled = true;
+                editorView.Settings.LoadsImagesAutomatically = true;
+                editorView.Settings.SetAppCacheEnabled(true);
+                editorView.Settings.AllowContentAccess = true;
+                editorView.Settings.AllowFileAccess = true;
+                editorView.Settings.AllowFileAccessFromFileURLs = true;
+                editorView.Settings.AllowUniversalAccessFromFileURLs = true;
+                editorView.Settings.BlockNetworkImage = false;
+                editorView.Settings.BlockNetworkLoads = false;
+                editorView.Settings.DomStorageEnabled = true;
+              //  editorView.SetMinimumHeight(300);
+                SetNativeControl(editorView);
+            }
+            if (e.OldElement != null)
+            {
+                // Unsubscribe
+            }
+            if (e.NewElement != null)
+            {
+                // Subscribe
+                var viewclient = new MarkdownWebViewClient(
+                md => { e.NewElement.Markdown = md; });
+                editorView.SetWebViewClient(viewclient);
+                Control.AddJavascriptInterface(new JSBridge(this), "jsBridge");
+                SetMDEditorText(e.NewElement.Markdown);
+                InjectJS(JavaScriptFunction);
+            }
+        }
+        
+
+        void InjectJS(string script)
+        {
+            if (Control != null)
+            {
+                Control.LoadUrl(string.Format("javascript: {0}", script));
+            }
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/BookAStar/BookAStar.Droid/MarkdownWebViewClient.cs b/BookAStar/BookAStar.Droid/MarkdownWebViewClient.cs
index ef038ed8..c98e4e27 100644
--- a/BookAStar/BookAStar.Droid/MarkdownWebViewClient.cs
+++ b/BookAStar/BookAStar.Droid/MarkdownWebViewClient.cs
@@ -16,6 +16,7 @@ using Android.Content.Res;
 
 namespace BookAStar.Droid
 {
+
     class MarkdownWebViewClient : WebViewClient
     {
         Action<string> update;
@@ -25,7 +26,7 @@ namespace BookAStar.Droid
         }
         private static Activity getActivity ()
         {
-            return (Activity)App.PlateformSpecificInstance;
+            return (Activity)App.PlatformSpecificInstance;
         }
         public string Markdown { get; private set; }
         public override WebResourceResponse ShouldInterceptRequest(WebView view, IWebResourceRequest request)
@@ -34,6 +35,8 @@ namespace BookAStar.Droid
             {
                 if (request.Url.Path=="/android_asset/validate")
                 {
+                    // TODO Better,
+                    // by inspecting the form entries from the view
                     Markdown = request.Url.GetQueryParameter("md");
                     update(Markdown);
                     return new WebResourceResponse("application/json", "utf-8" ,200, "Ok", null, null);
@@ -41,5 +44,6 @@ namespace BookAStar.Droid
             }
             return base.ShouldInterceptRequest(view, request);
         }
+        
     }
 }
\ No newline at end of file
diff --git a/BookAStar/BookAStar.Droid/Properties/AssemblyInfo.cs b/BookAStar/BookAStar.Droid/Properties/AssemblyInfo.cs
index fc15563a..dc2f739a 100644
--- a/BookAStar/BookAStar.Droid/Properties/AssemblyInfo.cs
+++ b/BookAStar/BookAStar.Droid/Properties/AssemblyInfo.cs
@@ -13,7 +13,7 @@ using Android.App;
 [assembly: AssemblyProduct("BookAStar.Droid")]
 [assembly: AssemblyCopyright("Copyright © Paul Albert Schneider 2016")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
+[assembly: AssemblyCulture("fr")]
 [assembly: ComVisible(false)]
 
 // Version information for an assembly consists of the following four values:
diff --git a/BookAStar/BookAStar.Droid/Resources/Resource.Designer.cs b/BookAStar/BookAStar.Droid/Resources/Resource.Designer.cs
index 2c444114..6cf15c7a 100644
--- a/BookAStar/BookAStar.Droid/Resources/Resource.Designer.cs
+++ b/BookAStar/BookAStar.Droid/Resources/Resource.Designer.cs
@@ -3232,64 +3232,67 @@ namespace BookAStar.Droid
 			public const int design_navigation_menu_item = 2130903076;
 			
 			// aapt resource value: 0x7f030025
-			public const int mr_chooser_dialog = 2130903077;
+			public const int EditEstimate = 2130903077;
 			
 			// aapt resource value: 0x7f030026
-			public const int mr_chooser_list_item = 2130903078;
+			public const int mr_chooser_dialog = 2130903078;
 			
 			// aapt resource value: 0x7f030027
-			public const int mr_controller_material_dialog_b = 2130903079;
+			public const int mr_chooser_list_item = 2130903079;
 			
 			// aapt resource value: 0x7f030028
-			public const int mr_controller_volume_item = 2130903080;
+			public const int mr_controller_material_dialog_b = 2130903080;
 			
 			// aapt resource value: 0x7f030029
-			public const int mr_playback_control = 2130903081;
+			public const int mr_controller_volume_item = 2130903081;
 			
 			// aapt resource value: 0x7f03002a
-			public const int mr_volume_control = 2130903082;
+			public const int mr_playback_control = 2130903082;
 			
 			// aapt resource value: 0x7f03002b
-			public const int notification_media_action = 2130903083;
+			public const int mr_volume_control = 2130903083;
 			
 			// aapt resource value: 0x7f03002c
-			public const int notification_media_cancel_action = 2130903084;
+			public const int notification_media_action = 2130903084;
 			
 			// aapt resource value: 0x7f03002d
-			public const int notification_template_big_media = 2130903085;
+			public const int notification_media_cancel_action = 2130903085;
 			
 			// aapt resource value: 0x7f03002e
-			public const int notification_template_big_media_narrow = 2130903086;
+			public const int notification_template_big_media = 2130903086;
 			
 			// aapt resource value: 0x7f03002f
-			public const int notification_template_lines = 2130903087;
+			public const int notification_template_big_media_narrow = 2130903087;
 			
 			// aapt resource value: 0x7f030030
-			public const int notification_template_media = 2130903088;
+			public const int notification_template_lines = 2130903088;
 			
 			// aapt resource value: 0x7f030031
-			public const int notification_template_part_chronometer = 2130903089;
+			public const int notification_template_media = 2130903089;
 			
 			// aapt resource value: 0x7f030032
-			public const int notification_template_part_time = 2130903090;
+			public const int notification_template_part_chronometer = 2130903090;
 			
 			// aapt resource value: 0x7f030033
-			public const int select_dialog_item_material = 2130903091;
+			public const int notification_template_part_time = 2130903091;
 			
 			// aapt resource value: 0x7f030034
-			public const int select_dialog_multichoice_material = 2130903092;
+			public const int select_dialog_item_material = 2130903092;
 			
 			// aapt resource value: 0x7f030035
-			public const int select_dialog_singlechoice_material = 2130903093;
+			public const int select_dialog_multichoice_material = 2130903093;
 			
 			// aapt resource value: 0x7f030036
-			public const int support_simple_spinner_dropdown_item = 2130903094;
+			public const int select_dialog_singlechoice_material = 2130903094;
 			
 			// aapt resource value: 0x7f030037
-			public const int Tabbar = 2130903095;
+			public const int support_simple_spinner_dropdown_item = 2130903095;
 			
 			// aapt resource value: 0x7f030038
-			public const int Toolbar = 2130903096;
+			public const int Tabbar = 2130903096;
+			
+			// aapt resource value: 0x7f030039
+			public const int Toolbar = 2130903097;
 			
 			static Layout()
 			{
diff --git a/BookAStar/BookAStar.Droid/Resources/drawable/Icon-anon-48px.png b/BookAStar/BookAStar.Droid/Resources/drawable/Icon-anon-48px.png
new file mode 100644
index 0000000000000000000000000000000000000000..935b79469adfacbaf2506ac702bad9681d3aa13c
GIT binary patch
literal 1700
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

literal 0
HcmV?d00001

diff --git a/BookAStar/BookAStar.Droid/Resources/drawable/Icon-anon-64px.png b/BookAStar/BookAStar.Droid/Resources/drawable/Icon-anon-64px.png
new file mode 100644
index 0000000000000000000000000000000000000000..801dda7042b12ca966e01af318e2c09254590602
GIT binary patch
literal 2426
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

literal 0
HcmV?d00001

diff --git a/BookAStar/BookAStar.Droid/Resources/drawable/Icon-anon-73px.png b/BookAStar/BookAStar.Droid/Resources/drawable/Icon-anon-73px.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ba761202472003bfee690bedff054f239c8a0d4
GIT binary patch
literal 2516
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

literal 0
HcmV?d00001

diff --git a/BookAStar/BookAStar.Droid/Resources/drawable/Icon-anon-org.png b/BookAStar/BookAStar.Droid/Resources/drawable/Icon-anon-org.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf69e28ccae2f84e5e136b09163203126c3dee8c
GIT binary patch
literal 2719
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
Z>HkfZI?bR6m)rmV002ovPDHLkV1kbpM`i#3

literal 0
HcmV?d00001

diff --git a/BookAStar/BookAStar.Droid/Resources/drawable/icon-anon.png b/BookAStar/BookAStar.Droid/Resources/drawable/icon-anon.png
new file mode 100644
index 0000000000000000000000000000000000000000..38d6db946724a8c9a2bac8cd7d2a08d7e1bacaac
GIT binary patch
literal 1031
zcmV+i1o-=jP)<h;3K|Lk000e1NJLTq001BW0018d1ONa4EMEr)00002VoOIv0RM-N
z%)bBt010qNS#tmY3J3rI3J3vb2*g<c000McNliru;0YA~85}=GfvErh1DHufK~y-)
zg_T=qTvZf?zkknUCUIg~k~C>*YZ{1Bi=>U_!P|?qRLwLcD)yli#Gs-tQVEEt2#O%0
zNCd$f7Fw(LWWh8=TT+Bl+otJD2-Gw}bFq<FJ7zLYbD5d5d^nTL$xO8C<#1U4`uDo+
ze~VIcY@&v0w$Mx!kYbcyNpPJ>JZ@@RIl_LLs3nHW6UL~eiT!-d)?&C;{H@^yV!Vz0
z2f5=d(tOFx>h4y0sk>>0b@bA@nxlnJg1?Ufu*W?XS_RufOKIhYg5`7okMHO>6h9Nc
z5I-J&6`(y>_+jn}_MnQ-*casMDEHn~x8>ai<F@zsz;2EeAm8#Lvr7aobCk(~FOD5m
zCzcPFJmg)|y?wt2&e+70d<+g~W<xL>><;b3lOUr-<&ca}9q+6tW0LhW`xzYOCDK8H
z_GfiaHZQT=$~DcfRbxnV75(!8*e!g@GhrGyzcL(Lml5G9dq8PH1(P~R%8clJ{2YMY
zV1R}&)toLKiQNg6YUB%k!(%5q=(Nuj!y1c#r>SwQAyG1Ci6kE|L>A)+Gi*@>2E{w^
zH&u>GG9~e&Mh-_52b8g%zbpgTl_KCGw>oZPp`?WG0Aygm0a6@O$V6_i2)MuoN98J4
zbQolkvA{lB_>mF9@)9RfML3U2N0QQQAK_2K%;O2}<{SFWVW_7B7b5AnN~Gl0Ub8VI
zMXi}>hN(av8Gb4uh;Y@BChD(m!Fn_L9x$gEQNKcQxo@C=*zJF!q{AesVd81huD#5K
zZ7tii%UZM<AZsV(EwyN4{1j(7p-c7;S+aOQ4N0+%=Xfvv1`pFjJ+b90YC_rwOd6Qs
zmSrl*w8rdI-}}7AR{}oV)g8f1hVw6<A<U$Ry`mgFWD5f}VPGa{fs-H6?SMB&<}iU1
zLNb%TjF_&I2neK^ge086F3<D2znt03)Vj_HAPh;%%9LS{i+Fi)&XeX<BBjyiGZ&Wx
zr7ZT#BW<3U1;edWybYO|NlyJ2(hrg;$a;9~)cv)gWw=Sj>y7*d2+MIcF;h>@S9;&F
zGuzIOI|=jq=(lP)6GNCVL!LA+G1KCQuY6cSWrGiGi}`_m29kk)t{Em!nlnR-ZH2+O
z06{Ku&$+Il*|aNPYJef~Nnz#Oa6_qcU5l-OxuVscjmAAq_2G(;90ClFoMq>(OppJ-
zf&YISm#iv$d-djUgSA-$(v$|Xe<a4T6U>%E{{_x7U>*AxW0e2^002ovPDHLkV1oC>
B*){+G

literal 0
HcmV?d00001

diff --git a/BookAStar/BookAStar.Droid/Resources/layout/EditEstimate.axml b/BookAStar/BookAStar.Droid/Resources/layout/EditEstimate.axml
new file mode 100644
index 00000000..cee4ac19
--- /dev/null
+++ b/BookAStar/BookAStar.Droid/Resources/layout/EditEstimate.axml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/BookAStar/BookAStar/App.xaml b/BookAStar/BookAStar/App.xaml
index a92e358b..92a8dfbe 100644
--- a/BookAStar/BookAStar/App.xaml
+++ b/BookAStar/BookAStar/App.xaml
@@ -5,25 +5,33 @@
   <Application.Resources>
     <ResourceDictionary>
       <OnPlatform x:TypeArguments="Font" Android="Large" iOS="Large" WinPhone="Large" x:Key="HeaderFont" />
-      <OnPlatform x:TypeArguments="Color" Android="White" iOS="White" WinPhone="White" x:Key="PrimaryTextColor" />
+      <OnPlatform x:TypeArguments="Color" Android="Black" iOS="Black" WinPhone="Black" x:Key="PrimaryTextColor" />
+      <OnPlatform x:TypeArguments="Color" Android="Red" iOS="Red" WinPhone="Red" x:Key="EmphasisTextColor" />
       <OnPlatform x:TypeArguments="Font" Android="40" iOS="60" WinPhone="60" x:Key="LargeFontSize" />
       <OnPlatform x:TypeArguments="Font" Android="30" iOS="60" WinPhone="60" x:Key="MediumFontSize" />
       
       <Color x:key="backgroundColor">#30FAFAFA</Color>
+      <Color x:key="oddColor">#207AFAFA</Color>
       <Color x:key="textColor">#FF103010</Color>
       <Color x:key="labelColor">#FF303010</Color>
-      <Style x:Key="labelStyle" TargetType="Label">
-        <Setter Property="TextColor" Value="{DynamicResource labelColor}" />
+      <Style x:Key="BigEntry" TargetType="Entry">
+        <Setter Property="FontSize" Value="{DynamicResource LargeFontSize}" />
         <Setter Property="FontAttributes" Value="Bold" />
-        <Setter Property="FontSize" Value="Large" />
+      </Style>
+      <Style x:Key="labelStyle" TargetType="Label">
+        <Setter Property="TextColor" Value="{DynamicResource EmphasisTextColor}" />
+        <Setter Property="FontAttributes" Value="Bold" />
+        <Setter Property="FontSize" Value="{DynamicResource LargeFontSize}" />
         <Setter Property="VerticalOptions" Value="Start" />
-        <Setter Property="XAlign" Value="Center" />
+        <Setter Property="LineBreakMode" Value="WordWrap" />
+        
       </Style>
       <Style x:Key="entryStyle" TargetType="Entry">
         <Setter Property="HorizontalOptions" Value="FillAndExpand"/>
       </Style>
       <Style x:key="backbroundStyle" TargetType="VisualElement">
-        <Setter Property="BackgoundColor" Value="{DynamicResource backgroundColor}" />
+        <Setter Property="BackgoundColor" Value="{StaticResource backgroundColor}" />
+        <Setter Property="TextColor" Value="{StaticResource textColor}" />
       </Style>
       <Style x:Key="buttonStyle" TargetType="Button">
         <Setter Property="HorizontalOptions" Value="Center" />
diff --git a/BookAStar/BookAStar/App.xaml.cs b/BookAStar/BookAStar/App.xaml.cs
index 15f18aad..4d0b8edd 100644
--- a/BookAStar/BookAStar/App.xaml.cs
+++ b/BookAStar/BookAStar/App.xaml.cs
@@ -1,15 +1,11 @@
-using BookAStar.Model;
-using BookAStar.Model.Auth.Account;
+using BookAStar.Helpers;
+using BookAStar.Interfaces;
+using BookAStar.Model;
+using BookAStar.Model.Workflow;
 using BookAStar.Pages;
 using System;
-using System.Diagnostics;
-using System.Net;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 using Xamarin.Forms;
-using Xamarin.Forms.Xaml;
 /*
 Glyphish icons from
 http://www.glyphish.com/
@@ -22,41 +18,47 @@ namespace BookAStar
 {
     public partial class App : Application // superclass new in 1.3
     {
-        SearchPage searchPage;
-        NavigationPage mp;
-        SettingsPage settingsPage;
-        PinPage pinPage;
         ContentPage deviceInfoPage;
-        BookQueryPage bookQueryPage;
-        BookQueriesPage bookQueriesPage;
-        public static IPlatform PlateformSpecificInstance { get; set; }
+        SearchPage searchPage = new SearchPage
+        {
+            Title = "Trouvez votre artiste",
+            Icon = "glyphish_07_map_marker.png"
+        };
+        NavigationPage mp;
+        SettingsPage settingsPage = new SettingsPage
+            {
+                Title = "Paramètres",
+                Icon = "ic_corp_icon.png"
+            };
+        PinPage pinPage = new PinPage
+        {
+            Title = "Carte",
+            Icon = "glyphish_07_map_marker.png"
+        };
+        BookQueryPage bookQueryPage = new BookQueryPage {
+            Title = "Demande de devis"
+        };
+        BookQueriesPage bookQueriesPage = new BookQueriesPage
+        {
+            Title = "Demandes de devis"
+        };
+
+        EditEstimatePage editEstimate = new EditEstimatePage
+        {
+            Title = "Création d'un devis"
+        };
+        public static IPlatform PlatformSpecificInstance { get; set; }
         public static string AppName { get; set; }
         public static App CurrentApp { get { return Current as App; } }
 
-        public DataManager DataManager { get; set; }
-
+        public DataManager DataManager { get; set; } = new DataManager();
+        
         public App(IPlatform instance)
         {
-            DataManager = new DataManager();
             deviceInfoPage = new DeviceInfoPage(instance.GetDeviceInfo());
-            bookQueriesPage = new BookQueriesPage();
-
-            PlateformSpecificInstance = instance;
-            searchPage = new SearchPage
-            {
-                Title = "Trouvez votre artiste",
-                Icon = "glyphish_07_map_marker.png"
-            };
+            PlatformSpecificInstance = instance;
             mp = new NavigationPage(searchPage);
-            settingsPage = new SettingsPage
-            {
-                Title = "Settings",
-                Icon = "ic_corp_icon.png"
-            };
-
-            var r = this.Resources;
             //var hasLabelStyle = r.ContainsKey("labelStyle");
-
             // var stid = this.StyleId;
             // null var appsstyle = settingsPage.Style;
             // appsstyle.CanCascade = true;
@@ -69,24 +71,16 @@ namespace BookAStar
             mp.ToolbarItems.Add(tiSetts);
             tiSetts.Clicked += (object sender, EventArgs e) =>
             {
-                if (settingsPage.Parent == null)
-                    mp.Navigation.PushAsync(settingsPage);
-                else
-                {
-                    settingsPage.Focus();
-                }
+                ShowPage (settingsPage);
             };
             ToolbarItem tiQueries = new ToolbarItem
             {
                 Text = "Demandes"
             };
 
-
             tiQueries.Clicked += (object sender, EventArgs e) =>
             {
-                if (bookQueriesPage.Parent == null)
-                    mp.Navigation.PushAsync(bookQueriesPage);
-                else bookQueriesPage.Focus();
+                ShowPage (bookQueriesPage);
             };
             mp.ToolbarItems.Add(tiQueries);
             ToolbarItem tiMap = new ToolbarItem
@@ -95,41 +89,46 @@ namespace BookAStar
                 Icon = "glyphish_07_map_marker.png"
             };
             mp.ToolbarItems.Add(tiMap);
-            pinPage = new PinPage
-            {
-                Title = "Carte",
-                Icon = "glyphish_07_map_marker.png"
-            };
             tiMap.Clicked += (object sender, EventArgs e) =>
             {
-                if (pinPage.Parent == null)
-                    mp.Navigation.PushAsync(pinPage);
-                else pinPage.Focus();
-
+                ShowPage(pinPage);
             };
 
+            bookQueriesPage.BindingContext = DataManager.BookQueries;
+
+           
         }
 
         public void ShowDeviceInfo()
         {
-            if (deviceInfoPage.Parent == null)
-                mp.Navigation.PushAsync(deviceInfoPage);
-            else deviceInfoPage.Focus();
+            ShowPage(deviceInfoPage);
         }
 
         public void PostDeviceInfo()
         {
-            var res = PlateformSpecificInstance.InvokeApi(
+            var res = PlatformSpecificInstance.InvokeApi(
                 "gcm/register",
-                PlateformSpecificInstance.GetDeviceInfo());
+                PlatformSpecificInstance.GetDeviceInfo());
         }
 
         public void ShowBookQuery(BookQueryData data)
         {
-            bookQueriesPage.BindingContext = data;
-            mp.Navigation.PushAsync(bookQueriesPage);
+            bookQueryPage.BindingContext = data;
+            ShowPage(bookQueryPage);
         }
 
+        public void EditEstimate(Estimate data)
+        {
+            editEstimate.Estimate = data;
+            ShowPage(editEstimate);
+        }
+
+        private void ShowPage(Page p)
+        {
+            if (p.Parent == null)
+                mp.Navigation.PushAsync(p);
+            else p.Focus();
+        }
         public void CloseWindow()
         {
             mp.Navigation.PopAsync();
diff --git a/BookAStar/BookAStar/BookAStar.csproj b/BookAStar/BookAStar/BookAStar.csproj
index 45bd3104..95e58428 100644
--- a/BookAStar/BookAStar/BookAStar.csproj
+++ b/BookAStar/BookAStar/BookAStar.csproj
@@ -38,8 +38,12 @@
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
     </Compile>
-    <Compile Include="DataManager.cs" />
+    <Compile Include="Constants.cs" />
+    <Compile Include="Helpers\AvatarImageSource.cs" />
+    <Compile Include="Helpers\DataManager.cs" />
     <Compile Include="Helpers\RemoteEntityRO.cs" />
+    <Compile Include="Interfaces\IMDEditor.cs" />
+    <Compile Include="Model\ClientProviderInfo.cs" />
     <Compile Include="Pages\BlogPage.cs" />
     <Compile Include="Pages\BookQueriesPage.xaml.cs">
       <DependentUpon>BookQueriesPage.xaml</DependentUpon>
@@ -53,7 +57,7 @@
     </Compile>
     <Compile Include="Helpers\MainSettings.cs" />
     <Compile Include="Helpers\RemoteEntity.cs" />
-    <Compile Include="IPlatform.cs" />
+    <Compile Include="Interfaces\IPlatform.cs" />
     <Compile Include="Pages\MainPage.xaml.cs">
       <DependentUpon>MainPage.xaml</DependentUpon>
     </Compile>
@@ -96,8 +100,8 @@
     <Compile Include="Model\Auth\Tokens.cs" />
     <Compile Include="Model\Auth\User.cs" />
     <Compile Include="Model\Workflow\Estimate.cs" />
-    <Compile Include="Pages\MakeAnEstimatePage.xaml.cs">
-      <DependentUpon>MakeAnEstimatePage.xaml</DependentUpon>
+    <Compile Include="Pages\EditEstimatePage.xaml.cs">
+      <DependentUpon>EditEstimatePage.xaml</DependentUpon>
     </Compile>
     <Compile Include="Pages\MarkdownEditorPage.xaml.cs">
       <DependentUpon>MarkdownEditorPage.xaml</DependentUpon>
@@ -105,9 +109,6 @@
     <Compile Include="Pages\PinPage.cs" />
     <Compile Include="Views\MarkdownView.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Pages\QueriesPage.xaml.cs">
-      <DependentUpon>QueriesPage.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Pages\SearchPage.xaml.cs">
       <DependentUpon>SearchPage.xaml</DependentUpon>
     </Compile>
@@ -198,12 +199,6 @@
       <Name>Yavsc.Client</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Pages\QueriesPage.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Pages\MarkdownEditorPage.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
@@ -211,7 +206,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Pages\MakeAnEstimatePage.xaml">
+    <EmbeddedResource Include="Pages\EditEstimatePage.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
       <SubType>Designer</SubType>
     </EmbeddedResource>
@@ -222,6 +217,9 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="icon-anon.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <Import Project="..\..\packages\Xamarin.Forms.2.3.0.107\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.0.107\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
diff --git a/BookAStar/BookAStar/Constants.cs b/BookAStar/BookAStar/Constants.cs
index 904f884d..f1c21e1d 100644
--- a/BookAStar/BookAStar/Constants.cs
+++ b/BookAStar/BookAStar/Constants.cs
@@ -3,12 +3,44 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Xamarin.Forms;
 
 namespace BookAStar
 {
     public static class Constants
     {
         public const string ApplicationName = "Booking Star";
-        public const string UserInfoUrl = "http://dev.pschneider.fr/api/me";
+
+        #region Uri
+
+        public const string YavscHomeUrl = "http://dev.pschneider.fr";
+        public static readonly string YavscApiUrl = YavscHomeUrl + "/api";
+        public static readonly string MobileRegistrationUrl = YavscApiUrl + "/gcm/register";
+        public static readonly string UserInfoUrl = YavscApiUrl + "/me";
+        public static readonly string BlogUrl = YavscApiUrl + "/blogs";
+
+        #endregion
+
+        #region Colors & sizes
+
+        public static readonly Thickness PagePadding =
+            new Thickness(5, Device.OnPlatform(20, 20, 20), 5, 5);
+
+        public static readonly Thickness DefaultPadding =
+            new Thickness(5, Device.OnPlatform(20, 20, 20), 3, 3);
+
+        public static readonly Font TitleFont =
+            Font.SystemFontOfSize(Device.OnPlatform(50, 50, 50), FontAttributes.Bold);
+
+        public static readonly Color OddBackgroundColor =
+            Device.OnPlatform(Color.Aqua, Color.Aqua, Color.Aqua);
+
+        public static readonly Color ForegroundColor =
+            Device.OnPlatform(Color.White, Color.White, Color.White);
+
+        public static readonly Color BackgroundColor =
+            Device.OnPlatform(Color.Black, Color.White, Color.White);
+
+        #endregion
     }
 }
diff --git a/BookAStar/BookAStar/Helpers/AvatarImageSource.cs b/BookAStar/BookAStar/Helpers/AvatarImageSource.cs
new file mode 100644
index 00000000..d254ceff
--- /dev/null
+++ b/BookAStar/BookAStar/Helpers/AvatarImageSource.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;
+
+namespace BookAStar
+{
+    [ContentProperty("Source")]
+    public class AvatarImageSourceExtension : IMarkupExtension
+    {
+        public string Source { get; set; }
+
+        public object ProvideValue(IServiceProvider serviceProvider)
+        {
+            
+            // Do your translation lookup here, using whatever method you require
+            
+            if (Source != null)
+            {
+                return ImageSource.FromUri(new Uri(Source));
+            }
+            return ImageSource.FromResource("BookAStar.icon-anon.png");
+        }
+    }
+}
diff --git a/BookAStar/BookAStar/DataManager.cs b/BookAStar/BookAStar/Helpers/DataManager.cs
similarity index 74%
rename from BookAStar/BookAStar/DataManager.cs
rename to BookAStar/BookAStar/Helpers/DataManager.cs
index ffc2d78d..48713bf4 100644
--- a/BookAStar/BookAStar/DataManager.cs
+++ b/BookAStar/BookAStar/Helpers/DataManager.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BookAStar
+namespace BookAStar.Helpers
 {
     using Model;
     using Model.Blog;
@@ -13,9 +13,11 @@ namespace BookAStar
     public class DataManager
     {
         // TODO userinfo estimatetemplate rating service product tag   
-        public RemoteEntity<BookQueryData, long> BookQueries { get; set; }
+        public RemoteEntityRO<BookQueryData, long> BookQueries { get; set; }
         public RemoteEntity<Estimate, long> Estimates { get; set; }
         public RemoteEntity<Blog, long> Blogspot { get; set; }
+        public LocalEntity<ClientProviderInfo,string> Contacts { get; set; }
+
         public static DataManager Current
         {
             get
@@ -23,15 +25,18 @@ namespace BookAStar
                 return App.CurrentApp.DataManager;
             }
         }
+
         public DataManager()
         {
-            BookQueries = new RemoteEntity<BookQueryData, long>("bookquery",
+            BookQueries = new RemoteEntityRO<BookQueryData, long>("bookquery",
                 q => q.Id);
             Estimates = new RemoteEntity<Estimate, long>("estimate",
                 x => x.Id);
             Blogspot = new RemoteEntity<Blog, long>("blog", 
                 x=>x.Id);
+            Contacts = new LocalEntity<ClientProviderInfo, string>(c => c.UserId);
         }
+
         public async Task<BookQueryData> GetBookQuery(long bookQueryId)
         {
             return await BookQueries.Get(bookQueryId);
diff --git a/BookAStar/BookAStar/Helpers/MainSettings.cs b/BookAStar/BookAStar/Helpers/MainSettings.cs
index 68ec1aec..974f33ee 100644
--- a/BookAStar/BookAStar/Helpers/MainSettings.cs
+++ b/BookAStar/BookAStar/Helpers/MainSettings.cs
@@ -204,11 +204,5 @@ namespace BookAStar
                 return environ;
             }
         }
-        public const string YavscHomeUrl = "http://dev.pschneider.fr";
-        public static readonly string YavscApiUrl = "http://dev.pschneider.fr/api";
-        public static readonly string MobileRegistrationUrl = YavscApiUrl + "/gcm/register";
-        public static readonly string UserInfoUrl = YavscApiUrl + "/me";
-        public static readonly string BlogUrl = YavscApiUrl + "/blogs";
-        public const string ApplicationName = "BookAStar";
     }
 }
diff --git a/BookAStar/BookAStar/Helpers/RemoteEntity.cs b/BookAStar/BookAStar/Helpers/RemoteEntity.cs
index 37bf8947..e17a0ac5 100644
--- a/BookAStar/BookAStar/Helpers/RemoteEntity.cs
+++ b/BookAStar/BookAStar/Helpers/RemoteEntity.cs
@@ -9,27 +9,47 @@ using System.Threading.Tasks;
 
 namespace BookAStar
 {
-    public class RemoteEntity<V,K> : ObservableCollection<V>, ICommand where K : IEquatable<K>
+    public class LocalEntity<V, K> : ObservableCollection<V> where K : IEquatable<K>
+    {
+        protected Func<V, K> GetKey { get; set; }
+        public LocalEntity(Func<V, K> getKey) : base()
+        {
+            if (getKey == null) throw new InvalidOperationException();
+            GetKey = getKey;
+        }
+        public virtual void Merge(V item)
+        {
+            var key = GetKey(item);
+            if (this.Any(x => GetKey(x).Equals(key)))
+            {
+                Remove(LocalGet(key));
+            }
+            Add(item);
+        }
+        public V LocalGet(K key)
+        {
+            return this.Single(x => GetKey(x).Equals(key));
+        }
+    }
+
+    public class RemoteEntity<V,K> : LocalEntity<V, K>, ICommand where K : IEquatable<K>
     {
         private string _controller;
         public event EventHandler CanExecuteChanged;
         public bool IsExecuting { get; private set; }
-        private HttpClient client;
+        
         private Uri controllerUri;
-        protected Func<V, K> GetKey { get; set; }
         public bool CanExecute(object parameter)
         {
             return !IsExecuting;
         }
 
-        public RemoteEntity(string controllerName, Func<V,K> getKey):base()
+        public RemoteEntity(string controllerName, Func<V,K> getKey):base(getKey)
         {
-            if (string.IsNullOrWhiteSpace(controllerName) || getKey == null)
+            if (string.IsNullOrWhiteSpace(controllerName))
                 throw new InvalidOperationException();
             _controller = controllerName;
-            GetKey = getKey;
-            client = new HttpClient();
-            controllerUri = new Uri(MainSettings.YavscApiUrl + "/" + _controller);
+            controllerUri = new Uri(Constants.YavscApiUrl + "/" + _controller);
         }
 
         private void BeforeExecute()
@@ -49,38 +69,30 @@ namespace BookAStar
         {
             BeforeExecute();
             // Update credentials 
-            client.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue(
-                "Bearer", MainSettings.CurrentUser.YavscTokens.AccessToken);
-            // Get the whole data
-  
-            var response = await client.GetAsync(controllerUri);
-            if (response.IsSuccessStatusCode)
+            using (HttpClient client = new HttpClient())
             {
-                var content = await response.Content.ReadAsStringAsync();
-                List<V> col  = JsonConvert.DeserializeObject<List<V>>(content);
-                // LocalData.Clear();
-                foreach (var item in col)
+                client.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue(
+                    "Bearer", MainSettings.CurrentUser.YavscTokens.AccessToken);
+                // Get the whole data
+
+                using (var response = await client.GetAsync(controllerUri))
                 {
-                    UpdateOrAdd(item);
+                    if (response.IsSuccessStatusCode)
+                    {
+                        var content = await response.Content.ReadAsStringAsync();
+                        List<V> col = JsonConvert.DeserializeObject<List<V>>(content);
+                        // LocalData.Clear();
+                        foreach (var item in col)
+                        {
+                            Merge(item);
+                        }
+                    }
                 }
             }
-
             AfterExecuting();
         }
-        protected virtual void UpdateOrAdd (V item)
-        {
-            var key = GetKey(item);
-            if (this.Any(x => GetKey(x).Equals(key)))
-            {
-                Remove(LocalGet(key));
-            }
-            Add(item);
-        }
 
-        public V LocalGet(K key)
-        {
-            return this.Single(x => GetKey(x).Equals(key));
-        }
+        
 
         private void AfterExecuting()
         {
@@ -96,13 +108,18 @@ namespace BookAStar
             // Get the whole data
             var uri = new Uri(controllerUri.AbsolutePath+"/"+key.ToString());
 
-            var response = await client.GetAsync(uri);
-            if (response.IsSuccessStatusCode)
+            using (HttpClient client = new HttpClient())
             {
-                var content = await response.Content.ReadAsStringAsync();
-                item = JsonConvert.DeserializeObject<V>(content);
-                // LocalData.Clear();
-                    UpdateOrAdd(item);
+                using (var response = await client.GetAsync(uri))
+                {
+                    if (response.IsSuccessStatusCode)
+                    {
+                        var content = await response.Content.ReadAsStringAsync();
+                        item = JsonConvert.DeserializeObject<V>(content);
+                        // LocalData.Clear();
+                        Merge(item);
+                    }
+                }
             }
 
             AfterExecuting();
diff --git a/BookAStar/BookAStar/Helpers/RemoteEntityRO.cs b/BookAStar/BookAStar/Helpers/RemoteEntityRO.cs
index 9688d23d..27ef8253 100644
--- a/BookAStar/BookAStar/Helpers/RemoteEntityRO.cs
+++ b/BookAStar/BookAStar/Helpers/RemoteEntityRO.cs
@@ -7,14 +7,14 @@ using System.Threading.Tasks;
 
 namespace BookAStar.Helpers
 {
-    class RemoteEntityRO<V,K>: RemoteEntity<V,K> where K: IEquatable<K>
+    public class RemoteEntityRO<V,K>: RemoteEntity<V,K> where K: IEquatable<K>
     {
         public RemoteEntityRO (string controllerName,
             Func<V,K> getKey) : base(controllerName,getKey)
         {
         }
 
-        protected override void UpdateOrAdd(V item)
+        public override void Merge(V item)
         {
             var key = GetKey(item);
             if (this.Any(x => GetKey(x).Equals(key))) { return; }
diff --git a/BookAStar/BookAStar/Interfaces/IMDEditor.cs b/BookAStar/BookAStar/Interfaces/IMDEditor.cs
new file mode 100644
index 00000000..108b1b77
--- /dev/null
+++ b/BookAStar/BookAStar/Interfaces/IMDEditor.cs
@@ -0,0 +1,13 @@
+using System;
+using Xamarin.Forms;
+
+namespace BookAStar.Interfaces
+{
+    public interface IMDEditor
+    {
+        View EditorView { get; }
+        string Text { get; set; }
+        bool Editable { get; set; }
+        Action<string> Edited { get; set; }
+    }
+}
diff --git a/BookAStar/BookAStar/IPlatform.cs b/BookAStar/BookAStar/Interfaces/IPlatform.cs
similarity index 85%
rename from BookAStar/BookAStar/IPlatform.cs
rename to BookAStar/BookAStar/Interfaces/IPlatform.cs
index 2459d997..d2f9f914 100644
--- a/BookAStar/BookAStar/IPlatform.cs
+++ b/BookAStar/BookAStar/Interfaces/IPlatform.cs
@@ -3,14 +3,13 @@ using System;
 using Xamarin.Forms;
 using Yavsc.Models.Identity;
 
-namespace BookAStar
+namespace BookAStar.Interfaces
 {
     public interface IPlatform
 	{
         void OpenWeb (string Uri);
         
         // TODO Better
-
 		string GCMStatusMessage { get; }
 
         bool EnablePushNotifications (bool enable);
@@ -24,8 +23,6 @@ namespace BookAStar
         TAnswer InvokeApi<TAnswer>(string method, object arg);
 
         object InvokeApi(string method, object arg);
-
-        View CreateMarkdownView(string markdown, Action<string> update);
     }
 }
 
diff --git a/BookAStar/BookAStar/Model/BookQueryData.cs b/BookAStar/BookAStar/Model/BookQueryData.cs
index c413dc16..37d43a02 100644
--- a/BookAStar/BookAStar/Model/BookQueryData.cs
+++ b/BookAStar/BookAStar/Model/BookQueryData.cs
@@ -3,12 +3,6 @@ using System;
 
 namespace BookAStar.Model
 {
-    public class ClientProviderInfo
-    {
-        public string UserName { get; set; }
-        public string UserId { get; set;  }
-        public int Rate { get; set; }
-    }
     public class BookQueryData
     {
         public ClientProviderInfo Client { get; set; }
diff --git a/BookAStar/BookAStar/Model/ClientProviderInfo.cs b/BookAStar/BookAStar/Model/ClientProviderInfo.cs
new file mode 100644
index 00000000..3012c13e
--- /dev/null
+++ b/BookAStar/BookAStar/Model/ClientProviderInfo.cs
@@ -0,0 +1,23 @@
+using BookAStar.Model.Social;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BookAStar.Model
+{
+    public class ClientProviderInfo
+    {
+        public string UserName { get; set; }
+        
+        public string Avatar { get; set; }
+        // private string avatar;
+        //  public string Avatar { get { return avatar ?? "icon-anon.png"; }  set { avatar = value; } }
+        public string UserId { get; set; }
+        public int Rate { get; set; }
+        public string EMail { get; set; }
+        public string Phone { get; set; }
+        public Location BillingAddress { get; set; }
+    }
+}
diff --git a/BookAStar/BookAStar/Model/Manager.cs b/BookAStar/BookAStar/Model/Manager.cs
index 0aaf9d23..503b21e7 100644
--- a/BookAStar/BookAStar/Model/Manager.cs
+++ b/BookAStar/BookAStar/Model/Manager.cs
@@ -5,17 +5,14 @@ using System.Collections.ObjectModel;
 using System.Windows.Input;
 
 namespace BookAStar
-{
-
-   
-   
-
-       
+{      
+    [Obsolete("Use Helpers.DataManager")]
     public static class Manager
 	{
 	    static Manager ()
 		{
 		}
+
         public static ICommand RefreshBookQueries;
         // TODO WIP TEST rop this
         private static Location[] _places = new Location[] {
diff --git a/BookAStar/BookAStar/Model/Social/Location.cs b/BookAStar/BookAStar/Model/Social/Location.cs
index 751c11bf..fcc5f368 100644
--- a/BookAStar/BookAStar/Model/Social/Location.cs
+++ b/BookAStar/BookAStar/Model/Social/Location.cs
@@ -27,18 +27,16 @@ namespace BookAStar.Model.Social
     }
 
 
-    public class Location : Position {
-             
+    public class Location : Position
+    {
+
         public long Id { get; set; }
         public string Address { get; set; }
 
     }
 
-    public class  LocalizedEvent : YaEvent
+    public class LocalizedEvent : YaEvent
     {
-       
-
         public Location Location { get; set; }
-
-        }
+    }
 }
\ No newline at end of file
diff --git a/BookAStar/BookAStar/Model/Workflow/Estimate.cs b/BookAStar/BookAStar/Model/Workflow/Estimate.cs
index 0049345e..02d03b97 100644
--- a/BookAStar/BookAStar/Model/Workflow/Estimate.cs
+++ b/BookAStar/BookAStar/Model/Workflow/Estimate.cs
@@ -1,13 +1,17 @@
-using System.Collections.Generic;
+using BookAStar.Helpers;
+using System;
+using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 
 namespace BookAStar.Model.Workflow
 {
     public partial class Estimate
     {
         public long Id { get; set; }
-        
         public long? CommandId { get; set; }
+        public string CommandType { get; set; }
+        // Markdown expected
         public string Description { get; set; }
         public int? Status { get; set; }
         public string Title { get; set; }
@@ -23,7 +27,7 @@ namespace BookAStar.Model.Workflow
 
         public string AttachedGraphicsString
         {
-            get { return string.Join(":", AttachedGraphicList); }
+            get { return AttachedGraphicList==null?null:string.Join(":", AttachedGraphicList); }
             set { AttachedGraphicList = value.Split(':').ToList(); }
         }
         /// <summary>
@@ -36,12 +40,32 @@ namespace BookAStar.Model.Workflow
         public List<string> AttachedFiles { get; set; }
         public string AttachedFilesString
         {
-            get { return string.Join(":", AttachedFiles); }
+            get { return AttachedFiles == null ? null : string.Join(":", AttachedFiles); }
             set { AttachedFiles = value.Split(':').ToList(); }
         }
         
         public string OwnerId { get; set; }
         
         public string ClientId { get; set; }
+        
+        public BookQueryData Query
+        {
+            get
+            {
+                if (CommandId.HasValue)
+                {
+                    return DataManager.Current.BookQueries.LocalGet(CommandId.Value);
+                }
+                return null;
+            }
+        }
+
+        public ClientProviderInfo Client
+        {
+            get
+            {
+                return DataManager.Current.Contacts.LocalGet(ClientId);
+            }
+        }
     }
 }
diff --git a/BookAStar/BookAStar/Pages/BlogPage.cs b/BookAStar/BookAStar/Pages/BlogPage.cs
index d1b34e3b..c19d3f1f 100644
--- a/BookAStar/BookAStar/Pages/BlogPage.cs
+++ b/BookAStar/BookAStar/Pages/BlogPage.cs
@@ -17,7 +17,7 @@ namespace BookAStar.Pages
             _source = new HtmlWebViewSource();
             _sourceTitle = new HtmlWebViewSource();
             _md = new MarkdownDeep.Markdown();
-            _sourceTitle.BaseUrl = _source.BaseUrl = MainSettings.YavscHomeUrl;
+            _sourceTitle.BaseUrl = _source.BaseUrl = Constants.YavscHomeUrl;
             _sourceTitle.Html = "Hello";
             titleLabel = new WebView { Source = _sourceTitle };
             contentView = new WebView { Source = _source };
diff --git a/BookAStar/BookAStar/Pages/BookQueriesPage.xaml b/BookAStar/BookAStar/Pages/BookQueriesPage.xaml
index d2f46536..bda36a88 100644
--- a/BookAStar/BookAStar/Pages/BookQueriesPage.xaml
+++ b/BookAStar/BookAStar/Pages/BookQueriesPage.xaml
@@ -1,40 +1,50 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:local="clr-namespace:BookAStar.Views;assembly=BookAStar"
-             x:Class="BookAStar.Pages.BookQueriesPage">
-  <StackLayout>
+             xmlns:local="clr-namespace:BookAStar;assembly=BookAStar"
+             x:Class="BookAStar.Pages.BookQueriesPage"
+             Padding="{x:Static local:Constants.PagePadding}"
+             BackgroundColor="{x:Static local:Constants.BackgroundColor}"
+             >
+  <ContentPage.Resources>
+    <ResourceDictionary>
 
-  <ListView x:Name="list"
-	 HasUnevenRows="true" ItemTapped="OnViewDetail">
-    <ListView.ItemTemplate>
+      <Style x:Key="labelStyle" TargetType="Label">
+        <Setter Property="TextColor" Value="{DynamicResource EmphasisTextColor}" />
+        <Setter Property="FontAttributes" Value="Bold" />
+        <Setter Property="FontSize" Value="{DynamicResource LargeFontSize}" />
+        <Setter Property="VerticalOptions" Value="Start" />
+        <Setter Property="LineBreakMode" Value="WordWrap" />
+
+      </Style>
+
+    </ResourceDictionary> 
+  </ContentPage.Resources>
+
+  <StackLayout Padding="10,10,10,10">
+
+  <ListView x:Name="list" ItemTapped="OnViewDetail" HasUnevenRows="true" RowHeight="80">
+    <ListView.ItemTemplate HeightRequest="80" VerticalOptions="StartAndExpand">
       <DataTemplate>
         <ViewCell>
           <ViewCell.View>
-            <StackLayout Orientation="Horizontal">
-              <StackLayout Orientation="Vertical">
-                <Label Text="{Binding Title}" FontSize="12"/>
-                <Label Text="{Binding Description}"/>
-                <Label Text="{Binding Comment}"/>
-                <Label Text="{Binding CommandId}"/>
-                
-                <StackLayout Orientation="Horizontal">
-                  
-                  <StackLayout>
-                    <Label Text="Date:" FontAttributes="Italic"/>
-                    <Label Text="{Binding StartDate, StringFormat='{0:jj/MM/yyyy}'}" VerticalOptions="End"/>
-                  </StackLayout>
-                  <StackLayout>
-                    <Label Text="Heure:" FontAttributes="Italic" />
-                    <Label Text="{Binding StartDate, StringFormat='{0:H:mm}'}" VerticalOptions="End"/>
-                  </StackLayout>
-                  <StackLayout>
-                    <Label Text="Lieu:" FontAttributes="Italic"   VerticalOptions="End"/>
-                    <Label Text="{Binding Location.Address}"/>
-                  </StackLayout>
+            <StackLayout Orientation="Horizontal" Padding="10,10,10,10" VerticalOptions="StartAndExpand">
+                <StackLayout Orientation="Vertical" BackgroundColor="{x:Static local:Constants.OddBackgroundColor}"
+                             HeightRequest="80" VerticalOptions="StartAndExpand">
 
+                  <StackLayout Orientation="Vertical" >
+                    <Image Source="{Binding Client.Avatar}" />
+                    <Label Text="{Binding Client.UserName}"
+                      Style="{StaticResource labelStyle}"></Label>
+                  </StackLayout>
+                  
+                  <Label LineBreakMode="WordWrap" Text="{Binding EventDate, StringFormat='{0:dddd d MMMM à HH:mm}'}" FontSize="12" FontFamily="Italic"/>
+                </StackLayout>
+                <StackLayout Orientation="Vertical" VerticalOptions="StartAndExpand">
+                  <Label LineBreakMode="WordWrap" Text="{Binding Location.Address}"/>
+                  <Label Text="{Binding Previsionnal}"/>
+                  <Label Text="{Binding Id}" HorizontalTextAlignment="End"/>
                 </StackLayout>
-              </StackLayout>
             </StackLayout>
           </ViewCell.View>
         </ViewCell>
diff --git a/BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs b/BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs
index c278d4e5..977886bc 100644
--- a/BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs
@@ -15,10 +15,11 @@ namespace BookAStar.Pages
         public BookQueriesPage()
         {
             InitializeComponent();
-            BindingContext = App.CurrentApp.DataManager.BookQueries;
+        }
+        protected override void OnBindingContextChanged()
+        {
             list.ItemsSource = BindingContext as ObservableCollection<BookQueryData>;
-            list.RefreshCommand = BindingContext as ICommand;
-            list.IsPullToRefreshEnabled = true;
+            base.OnBindingContextChanged();
         }
 
         public RemoteEntity<BookQueryData,long> Queries
@@ -40,7 +41,6 @@ namespace BookAStar.Pages
         {
             BookQueryData data = e.Item as BookQueryData;
             App.CurrentApp.ShowBookQuery(data);
-            throw new NotImplementedException();
         }
     }
 }
diff --git a/BookAStar/BookAStar/Pages/BookQueryPage.xaml b/BookAStar/BookAStar/Pages/BookQueryPage.xaml
index 9067855d..0925bce4 100644
--- a/BookAStar/BookAStar/Pages/BookQueryPage.xaml
+++ b/BookAStar/BookAStar/Pages/BookQueryPage.xaml
@@ -1,19 +1,35 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:local="clr-namespace:BookAStar;assembly=BookAStar"
              xmlns:maps="clr-namespace:Xamarin.Forms.Maps;assembly=Xamarin.Forms.Maps.dll"
-             x:Class="BookAStar.Pages.BookQueryPage">
+             x:Class="BookAStar.Pages.BookQueryPage"
+             BackgroundColor="{x:Static local:Constants.BackgroundColor}"
+             Padding="{x:Static local:Constants.PagePadding}"
+             >
+  <ContentPage.Resources>
+    <ResourceDictionary>
+
+      <Style x:Key="labelStyle" TargetType="Label">
+        <Setter Property="TextColor" Value="{DynamicResource EmphasisTextColor}" />
+        <Setter Property="FontAttributes" Value="Bold" />
+        <Setter Property="FontSize" Value="{DynamicResource LargeFontSize}" />
+        <Setter Property="VerticalOptions" Value="Start" />
+        <Setter Property="LineBreakMode" Value="WordWrap" />
+      </Style>
+
+    </ResourceDictionary>
+  </ContentPage.Resources>
+
   <StackLayout x:Name="bookQueryLayout">
-    
-    
-  <Label Text="{Binding Title}" VerticalOptions="Start" HorizontalOptions="Center" />
-   <Label Text="{Binding Description}" VerticalOptions="FillAndExpand" HorizontalOptions="Center" />
-   <Label Text="{Binding CommandId}" VerticalOptions="Center" HorizontalOptions="Center" />
-   <Label Text="{Binding Comment}" VerticalOptions="Center" HorizontalOptions="Center" />
-   <Label Text="{Binding StartDate}" VerticalOptions="Center" HorizontalOptions="Center" />
-   <Label Text="{Binding EndDate}" VerticalOptions="Center" HorizontalOptions="Center" />
-   <Label Text="{Binding Location}" VerticalOptions="Center" HorizontalOptions="Center" />
+    <Label Text="{Binding Client.UserName}" Style="{StaticResource labelStyle}"
+         VerticalOptions="Start" HorizontalOptions="Center" />
+    <Label Text="{Binding Location.Address}" VerticalOptions="FillAndExpand" HorizontalOptions="Center" />
+    <Label Text="{Binding Previsional}" VerticalOptions="Center" HorizontalOptions="Center" />
+
+    <Label Text="{Binding EventDate}" VerticalOptions="Center" HorizontalOptions="Center" />
+    <Label Text="{Binding Location.Address}" VerticalOptions="Center" HorizontalOptions="Center" />
     <maps:Map x:Name="map"></maps:Map>
-   <Button Text="Faire un devis" Clicked="MakeAnEstimate" VerticalOptions="Center" HorizontalOptions="End"/>
-</StackLayout>
+    <Button Text="Faire un devis" Clicked="MakeAnEstimate" VerticalOptions="Center" HorizontalOptions="End"/>
+  </StackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/BookAStar/BookAStar/Pages/BookQueryPage.xaml.cs b/BookAStar/BookAStar/Pages/BookQueryPage.xaml.cs
index 8211b72d..68357877 100644
--- a/BookAStar/BookAStar/Pages/BookQueryPage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/BookQueryPage.xaml.cs
@@ -6,7 +6,9 @@ using Xamarin.Forms.Maps;
 
 namespace BookAStar.Pages
 {
+    using Helpers;
     using Model;
+    using Model.Workflow;
     using System.Threading.Tasks;
 
     public partial class BookQueryPage : ContentPage
@@ -43,8 +45,9 @@ namespace BookAStar.Pages
                 map.MoveToRegion(MapSpan.FromCenterAndRadius(
                     new Position(lat, lon), Distance.FromMeters(100)));
             }
+            
         }
-        public BookQueryPage(BookQueryData bookQuery)
+        public BookQueryPage(BookQueryData bookQuery=null)
         {
             
             InitializeComponent();
@@ -55,9 +58,18 @@ namespace BookAStar.Pages
             
         }
 
-        private void MakeAnEstimate(object sender, EventArgs e)
+        private void MakeAnEstimate(object sender, EventArgs ev)
         {
-            throw new NotImplementedException();
+            DataManager.Current.Contacts.Merge(BookQuery.Client);
+            var e = new Estimate()
+            {
+                ClientId = BookQuery.Client.UserId,
+                CommandId = BookQuery.Id,
+                OwnerId = MainSettings.CurrentUser.Id,
+                Id = 0,
+                Description = "# **Hello Estimate!**"
+            };
+            App.CurrentApp.EditEstimate(e);
         }
         
     }
diff --git a/BookAStar/BookAStar/Pages/EditEstimatePage.xaml b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml
new file mode 100644
index 00000000..7b489cd4
--- /dev/null
+++ b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml
@@ -0,0 +1,42 @@
+<?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="BookAStar.Pages.EditEstimatePage"
+             xmlns:local="clr-namespace:BookAStar.Views;assembly=BookAStar"
+             >
+  <StackLayout Padding="10,10,10,10">
+    
+    <StackLayout Orientation="Horizontal" Padding="10,10,10,10">
+       <Label Text="{Binding Client.UserName}"
+        LineBreakMode="WordWrap"></Label>
+    <Label Text="{Binding Query.Location.Address}"
+         LineBreakMode="WordWrap"  ></Label>
+    <Label Text="{Binding Query.EventDate, StringFormat='{0:dddd d MMMM yyyy à hh:mm}'}"
+         LineBreakMode="WordWrap"  ></Label>
+    </StackLayout>
+    
+    <local:MarkdownView x:Name="mdview" Markdown="{Binding Description}"
+         Edited="OnDescriptionChanged" HorizontalOptions="FillAndExpand"
+                        VerticalOptions="FillAndExpand">
+      
+    </local:MarkdownView>
+
+   <!-- <ListView >
+      <ListView.ItemTemplate>
+        <DataTemplate>
+          <ViewCell>
+            <ViewCell.View>
+              <StackLayout Orientation="Horizontal">
+                <Entry Placeholder="Ligne de facture"></Entry>
+                <Entry Placeholder="Compte"></Entry>
+                <Entry Placeholder="Prix unitaire" ></Entry>
+              </StackLayout>
+            </ViewCell.View>
+          </ViewCell>
+        </DataTemplate>
+      </ListView.ItemTemplate>
+    </ListView> -->
+    <Label Text="Total TTC:"></Label>
+    <Button Text="Valider ce devis"></Button>
+  </StackLayout>
+</ContentPage>
\ No newline at end of file
diff --git a/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs
new file mode 100644
index 00000000..5d4ecb15
--- /dev/null
+++ b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs
@@ -0,0 +1,44 @@
+using BookAStar.Model;
+using BookAStar.Model.Workflow;
+using BookAStar.Views;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using Xamarin.Forms;
+
+namespace BookAStar.Pages
+{
+    public partial class EditEstimatePage : ContentPage
+    {
+        public Estimate Estimate { get { return BindingContext as Estimate;  } set {
+                BindingContext = value;
+            } }
+        public static readonly BindableProperty MarkdownProperty =
+            BindableProperty.Create("Description", typeof(string), typeof(Estimate),
+                null, BindingMode.TwoWay);
+        public static readonly BindableProperty ClientProperty =
+            BindableProperty.Create("Client", typeof(ClientProviderInfo), typeof(Estimate),
+                null, BindingMode.OneWay);
+        public static readonly BindableProperty QueryProperty =
+            BindableProperty.Create("Query", typeof(BookQueryData), typeof(Estimate),
+                null, BindingMode.OneWay);
+
+        public EditEstimatePage()
+        {
+            InitializeComponent();
+        }
+        protected override void OnBindingContextChanged()
+        {
+            base.OnBindingContextChanged();
+            mdview.Markdown = Estimate?.Description;
+        }
+
+        protected void OnDescriptionChanged (object sender, EventArgs e)
+        {
+            Estimate.Description = mdview.Markdown;
+        }
+    }
+}
diff --git a/BookAStar/BookAStar/Pages/EventDetail.xaml.cs b/BookAStar/BookAStar/Pages/EventDetail.xaml.cs
index 9099b96e..70c2d88d 100644
--- a/BookAStar/BookAStar/Pages/EventDetail.xaml.cs
+++ b/BookAStar/BookAStar/Pages/EventDetail.xaml.cs
@@ -15,7 +15,7 @@ namespace BookAStar
                 BindingContext = ev;
                 btn_webpage.Clicked += (object sender, EventArgs e) =>
                 {
-                    App.PlateformSpecificInstance.OpenWeb(ev.EventWebPage);
+                    App.PlatformSpecificInstance.OpenWeb(ev.EventWebPage);
                 };
             }
 
diff --git a/BookAStar/BookAStar/Pages/MakeAnEstimatePage.xaml b/BookAStar/BookAStar/Pages/MakeAnEstimatePage.xaml
deleted file mode 100644
index 0b3b4b8f..00000000
--- a/BookAStar/BookAStar/Pages/MakeAnEstimatePage.xaml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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="BookAStar.Pages.MakeAnEstimatePage"
-             xmlns:local="clr-namespace:BookAStar.Views;assembly=BookAStar"
-             >
-
-    <local:MarkdownView x:Name="mdview" HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand" 
-                        Markdown="hello estimate"></local:MarkdownView>
-</ContentPage>
\ No newline at end of file
diff --git a/BookAStar/BookAStar/Pages/MakeAnEstimatePage.xaml.cs b/BookAStar/BookAStar/Pages/MakeAnEstimatePage.xaml.cs
deleted file mode 100644
index 9d124474..00000000
--- a/BookAStar/BookAStar/Pages/MakeAnEstimatePage.xaml.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using BookAStar.Model.Workflow;
-using BookAStar.Views;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-using Xamarin.Forms;
-
-namespace BookAStar.Pages
-{
-    public partial class MakeAnEstimatePage : ContentPage
-    {
-        public Estimate Estimate { get { return BindingContext as Estimate;  } set {
-                BindingContext = value;
-            } }
-
-        public static readonly BindableProperty MarkdownProperty =
-            BindableProperty.Create("Description", typeof(string), typeof(Estimate),
-                null, BindingMode.TwoWay);
-        
-        public MakeAnEstimatePage(string clientId,long bookQueryId)
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/BookAStar/BookAStar/Pages/QueriesPage.xaml b/BookAStar/BookAStar/Pages/QueriesPage.xaml
deleted file mode 100644
index 19125c42..00000000
--- a/BookAStar/BookAStar/Pages/QueriesPage.xaml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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="BookAStar.QueriesPage">
-  <Label Text="{Binding MainText}" VerticalOptions="Center" HorizontalOptions="Center" />
-</ContentPage>
\ No newline at end of file
diff --git a/BookAStar/BookAStar/Pages/QueriesPage.xaml.cs b/BookAStar/BookAStar/Pages/QueriesPage.xaml.cs
deleted file mode 100644
index a3bbc670..00000000
--- a/BookAStar/BookAStar/Pages/QueriesPage.xaml.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-using Xamarin.Forms;
-
-namespace BookAStar
-{
-    public partial class QueriesPage : ContentPage
-    {
-        public QueriesPage()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/BookAStar/BookAStar/Pages/SearchPage.xaml b/BookAStar/BookAStar/Pages/SearchPage.xaml
index c47a8d5d..7a9cfccb 100644
--- a/BookAStar/BookAStar/Pages/SearchPage.xaml
+++ b/BookAStar/BookAStar/Pages/SearchPage.xaml
@@ -6,10 +6,7 @@
              Padding="10,40,10,10" >
 	<ContentPage.Content>
 	<StackLayout>
-	<StackLayout Orientation="Horizontal">
-	<Label Text="Utiliser ma position" />
-	<Switch x:Name="use_my_pos" HorizontalOptions="End" />
-	</StackLayout>
+
     
 	<StackLayout Orientation="Horizontal">
 	<Editor x:Name="search_phrase" HorizontalOptions="FillAndExpand"/>
@@ -19,7 +16,6 @@
 
 	<ListView x:Name="list" ItemsSource="{x:Static local:Manager.Events}" 
 	 HasUnevenRows="true">
-    s
 				<ListView.ItemTemplate>
 					<DataTemplate>
 					<ViewCell>
diff --git a/BookAStar/BookAStar/Pages/SettingsPage.xaml b/BookAStar/BookAStar/Pages/SettingsPage.xaml
index e0984276..9301f215 100644
--- a/BookAStar/BookAStar/Pages/SettingsPage.xaml
+++ b/BookAStar/BookAStar/Pages/SettingsPage.xaml
@@ -30,9 +30,10 @@ BindingContext="." >
         <ListView.ItemTemplate HeightRequest="60" VerticalOptions="StartAndExpand">
           <DataTemplate>
             <ViewCell>
-                <Grid Padding="0"
+                <Grid Padding="5"
                           ColumnSpacing="10"
-                          RowSpacing="0">
+                          RowSpacing="2">
+                  <Image Source="{Binding Avatar}" HeightRequest="80" />
                   <Label Grid.Column="0" Text="{Binding UserName}" />
                 </Grid>
             </ViewCell>
@@ -42,10 +43,18 @@ BindingContext="." >
 
       </ListView>
       
+  
+  
       <StackLayout Orientation="Horizontal" VerticalOptions="Start">
-        <Label Text="Recevoir les notifications push" StyleClass="Header"/>
+        <Label Text="Recevoir les notifications push" />
         <Switch x:Name="pushstatus" />
       </StackLayout>
+
+  <StackLayout Orientation="Horizontal">
+    <Label Text="Utiliser ma position" />
+    <Switch x:Name="use_my_pos" HorizontalOptions="End" />
+  </StackLayout>
+  
   
   <StackLayout Orientation="Horizontal" VerticalOptions="Start">
     <Label Text="Recevoir les demandes de devis de la part de professionnels uniquement"
@@ -53,6 +62,5 @@ BindingContext="." >
     <Switch x:Name="restrictToPro" />
   </StackLayout>
 
-  <Button x:Name="BtnViewDeviceInfo" Text="Device info" StyleClass="Info"></Button>
 </StackLayout>
 </ContentPage>
diff --git a/BookAStar/BookAStar/Pages/SettingsPage.xaml.cs b/BookAStar/BookAStar/Pages/SettingsPage.xaml.cs
index d1ad3c51..1a47a79b 100644
--- a/BookAStar/BookAStar/Pages/SettingsPage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/SettingsPage.xaml.cs
@@ -33,13 +33,7 @@ namespace BookAStar
             AccountListView.ItemSelected += Accounts_ItemSelected;
            
             pushstatus.Toggled += Pushstatus_Toggled;
-
-            BtnViewDeviceInfo.Clicked += BtnDeviceInfo_Clicked;
-        }
-
-        private void BtnDeviceInfo_Clicked(object sender, EventArgs e)
-        {
-           ((BookAStar.App) App.Current).ShowDeviceInfo();
+            
         }
 
         protected void Pushstatus_Toggled(object sender, ToggledEventArgs e)
@@ -64,7 +58,7 @@ namespace BookAStar
             var doIt = await Confirm("Suppression de l'identification",
                 $"Vous êtes sur le point de supprimer votre identification pour ce compte : {user.UserName}\nContinuer ?");
             if (doIt)
-                App.PlateformSpecificInstance.RevokeAccount(user.UserName);
+                App.PlatformSpecificInstance.RevokeAccount(user.UserName);
         }
 
         async Task<bool> Confirm(string title, string procedure)
@@ -84,7 +78,7 @@ namespace BookAStar
 
         private void AddAccountBtn_Clicked(object sender, EventArgs e)
         {
-            App.PlateformSpecificInstance.AddAccount();
+            App.PlatformSpecificInstance.AddAccount();
         }
 
        
diff --git a/BookAStar/BookAStar/Properties/AssemblyInfo.cs b/BookAStar/BookAStar/Properties/AssemblyInfo.cs
index 076d24fe..dcb0c729 100644
--- a/BookAStar/BookAStar/Properties/AssemblyInfo.cs
+++ b/BookAStar/BookAStar/Properties/AssemblyInfo.cs
@@ -9,11 +9,11 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTitle("BookAStar")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("Paul Schneider")]
 [assembly: AssemblyProduct("BookAStar")]
 [assembly: AssemblyCopyright("Copyright © Paul Albert Schneider 2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
+[assembly: AssemblyTrademark("Yavsc")]
+[assembly: AssemblyCulture("fr")]
 [assembly: NeutralResourcesLanguage("fr")]
 
 // Version information for an assembly consists of the following four values:
diff --git a/BookAStar/BookAStar/Views/MarkdownView.cs b/BookAStar/BookAStar/Views/MarkdownView.cs
index 0ede50ea..b00195ac 100644
--- a/BookAStar/BookAStar/Views/MarkdownView.cs
+++ b/BookAStar/BookAStar/Views/MarkdownView.cs
@@ -1,14 +1,15 @@
-using System;
+using BookAStar.Interfaces;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection.Emit;
 using System.Text;
 
 using Xamarin.Forms;
-          
+
 namespace BookAStar.Views
 {
-    public partial class MarkdownView : ContentView
+    public class MarkdownView : View
     {
         public static readonly BindableProperty MarkdownProperty = BindableProperty.Create(
             "Markdown", typeof(string), typeof(MarkdownView), null, BindingMode.TwoWay
@@ -23,25 +24,20 @@ namespace BookAStar.Views
                 return markdown;
             }
             set {
-                markdown = value;
-                Content = App.PlateformSpecificInstance.CreateMarkdownView(
-                    markdown,
-                    e => {
-                        Markdown = e;
-                        if (Validated != null)
-                            Validated.Invoke(this, new EventArgs());
+                if (markdown != value)
+                    if (Edited != null)
+                    {
+                        markdown = value;
+                        Edited.Invoke(this, new EventArgs());
+                        return;
                     }
-                    );
-
+                
+                markdown = value;
             }
         }
-
-        public MarkdownView() : base()
-        {
-            
-        }
-
-        public event EventHandler Validated;
-
+        
+        public event EventHandler<EventArgs> Edited;
+        
     }
+
 }
diff --git a/BookAStar/BookAStar/icon-anon.png b/BookAStar/BookAStar/icon-anon.png
new file mode 100644
index 0000000000000000000000000000000000000000..38d6db946724a8c9a2bac8cd7d2a08d7e1bacaac
GIT binary patch
literal 1031
zcmV+i1o-=jP)<h;3K|Lk000e1NJLTq001BW0018d1ONa4EMEr)00002VoOIv0RM-N
z%)bBt010qNS#tmY3J3rI3J3vb2*g<c000McNliru;0YA~85}=GfvErh1DHufK~y-)
zg_T=qTvZf?zkknUCUIg~k~C>*YZ{1Bi=>U_!P|?qRLwLcD)yli#Gs-tQVEEt2#O%0
zNCd$f7Fw(LWWh8=TT+Bl+otJD2-Gw}bFq<FJ7zLYbD5d5d^nTL$xO8C<#1U4`uDo+
ze~VIcY@&v0w$Mx!kYbcyNpPJ>JZ@@RIl_LLs3nHW6UL~eiT!-d)?&C;{H@^yV!Vz0
z2f5=d(tOFx>h4y0sk>>0b@bA@nxlnJg1?Ufu*W?XS_RufOKIhYg5`7okMHO>6h9Nc
z5I-J&6`(y>_+jn}_MnQ-*casMDEHn~x8>ai<F@zsz;2EeAm8#Lvr7aobCk(~FOD5m
zCzcPFJmg)|y?wt2&e+70d<+g~W<xL>><;b3lOUr-<&ca}9q+6tW0LhW`xzYOCDK8H
z_GfiaHZQT=$~DcfRbxnV75(!8*e!g@GhrGyzcL(Lml5G9dq8PH1(P~R%8clJ{2YMY
zV1R}&)toLKiQNg6YUB%k!(%5q=(Nuj!y1c#r>SwQAyG1Ci6kE|L>A)+Gi*@>2E{w^
zH&u>GG9~e&Mh-_52b8g%zbpgTl_KCGw>oZPp`?WG0Aygm0a6@O$V6_i2)MuoN98J4
zbQolkvA{lB_>mF9@)9RfML3U2N0QQQAK_2K%;O2}<{SFWVW_7B7b5AnN~Gl0Ub8VI
zMXi}>hN(av8Gb4uh;Y@BChD(m!Fn_L9x$gEQNKcQxo@C=*zJF!q{AesVd81huD#5K
zZ7tii%UZM<AZsV(EwyN4{1j(7p-c7;S+aOQ4N0+%=Xfvv1`pFjJ+b90YC_rwOd6Qs
zmSrl*w8rdI-}}7AR{}oV)g8f1hVw6<A<U$Ry`mgFWD5f}VPGa{fs-H6?SMB&<}iU1
zLNb%TjF_&I2neK^ge086F3<D2znt03)Vj_HAPh;%%9LS{i+Fi)&XeX<BBjyiGZ&Wx
zr7ZT#BW<3U1;edWybYO|NlyJ2(hrg;$a;9~)cv)gWw=Sj>y7*d2+MIcF;h>@S9;&F
zGuzIOI|=jq=(lP)6GNCVL!LA+G1KCQuY6cSWrGiGi}`_m29kk)t{Em!nlnR-ZH2+O
z06{Ku&$+Il*|aNPYJef~Nnz#Oa6_qcU5l-OxuVscjmAAq_2G(;90ClFoMq>(OppJ-
zf&YISm#iv$d-djUgSA-$(v$|Xe<a4T6U>%E{{_x7U>*AxW0e2^002ovPDHLkV1oC>
B*){+G

literal 0
HcmV?d00001


From e217ecfcc314adcd5db9ba4ffcf8b623c258ddb5 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Sun, 25 Sep 2016 00:37:29 +0200
Subject: [PATCH 02/59] @VS update

---
 Yavsc.Client/Yavsc.Client.csproj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Yavsc.Client/Yavsc.Client.csproj b/Yavsc.Client/Yavsc.Client.csproj
index 85cf1cb1..e2655832 100644
--- a/Yavsc.Client/Yavsc.Client.csproj
+++ b/Yavsc.Client/Yavsc.Client.csproj
@@ -25,6 +25,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -33,6 +34,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet />
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="IAccountBalance.cs" />

From d17b73eb771a7a26fa365f1cdf3966acede3efca Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Sun, 25 Sep 2016 00:39:33 +0200
Subject: [PATCH 03/59] @Vs update

---
 BookAStar/BookAStar.Droid/BookAStar.Droid.csproj |  2 ++
 BookAStar/BookAStar.iOS/BookAStar.iOS.csproj     | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj b/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj
index c7b024ce..20085de3 100644
--- a/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj
+++ b/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj
@@ -42,6 +42,7 @@
     <JavaMaximumHeapSize>1100m</JavaMaximumHeapSize>
     <Debugger>Xamarin</Debugger>
     <AndroidEnableMultiDex>False</AndroidEnableMultiDex>
+    <CodeAnalysisRuleSet />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -62,6 +63,7 @@
     <AndroidEnableMultiDex>False</AndroidEnableMultiDex>
     <EnableProguard>False</EnableProguard>
     <DebugSymbols>False</DebugSymbols>
+    <CodeAnalysisRuleSet />
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="DeviceInfo.Plugin, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
diff --git a/BookAStar/BookAStar.iOS/BookAStar.iOS.csproj b/BookAStar/BookAStar.iOS/BookAStar.iOS.csproj
index 1c69864b..ca76670d 100644
--- a/BookAStar/BookAStar.iOS/BookAStar.iOS.csproj
+++ b/BookAStar/BookAStar.iOS/BookAStar.iOS.csproj
@@ -26,6 +26,7 @@
     <MtouchArch>i386, x86_64</MtouchArch>
     <MtouchLink>None</MtouchLink>
     <MtouchDebug>true</MtouchDebug>
+    <CodeAnalysisRuleSet />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
     <DebugType>none</DebugType>
@@ -36,6 +37,7 @@
     <MtouchLink>None</MtouchLink>
     <MtouchArch>i386, x86_64</MtouchArch>
     <ConsolePause>false</ConsolePause>
+    <CodeAnalysisRuleSet />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
     <DebugSymbols>true</DebugSymbols>
@@ -50,6 +52,7 @@
     <CodesignKey>iPhone Developer</CodesignKey>
     <MtouchDebug>true</MtouchDebug>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
+    <CodeAnalysisRuleSet />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
     <DebugType>none</DebugType>
@@ -61,6 +64,7 @@
     <ConsolePause>false</ConsolePause>
     <CodesignKey>iPhone Developer</CodesignKey>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
+    <CodeAnalysisRuleSet />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhone' ">
     <DebugType>none</DebugType>
@@ -74,6 +78,7 @@
     <CodesignProvision>Automatic:AdHoc</CodesignProvision>
     <CodesignKey>iPhone Distribution</CodesignKey>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
+    <CodeAnalysisRuleSet />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|iPhone' ">
     <DebugType>none</DebugType>
@@ -86,6 +91,13 @@
     <CodesignProvision>Automatic:AppStore</CodesignProvision>
     <CodesignKey>iPhone Distribution</CodesignKey>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
+    <CodeAnalysisRuleSet />
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhoneSimulator'">
+    <CodeAnalysisRuleSet />
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'AppStore|iPhoneSimulator'">
+    <CodeAnalysisRuleSet />
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Main.cs" />

From a24b9c4a655b701dc44e56bd1569965a62441c62 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Sun, 25 Sep 2016 00:40:21 +0200
Subject: [PATCH 04/59] cleans unused references

---
 BookAStar/BookAStar.Droid/MainActivity.cs | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/BookAStar/BookAStar.Droid/MainActivity.cs b/BookAStar/BookAStar.Droid/MainActivity.cs
index d1dd5105..9a7601e3 100644
--- a/BookAStar/BookAStar.Droid/MainActivity.cs
+++ b/BookAStar/BookAStar.Droid/MainActivity.cs
@@ -9,7 +9,6 @@ using Android.Gms.Common;
 using Android.Util;
 
 using Xamarin.Auth;
-using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System.Net;
 using System.IO;
@@ -17,16 +16,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Net.Http;
-using System.Text;
 using BookAStar.Model.Auth.Account;
 using BookAStar.Droid.OAuth;
 using Yavsc.Helpers;
 using Yavsc.Models.Identity;
-using static Android.Content.Res.Resources;
-using Android.Webkit;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-using Android.Views;
 using BookAStar.Helpers;
 using BookAStar.Interfaces;
 

From 906f3a217828b5f9073a0e94f1a9bbbe384e7d64 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Sun, 25 Sep 2016 00:40:49 +0200
Subject: [PATCH 05/59] adds the Video button

---
 BookAStar/BookAStar.Droid/MarkdownEditor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BookAStar/BookAStar.Droid/MarkdownEditor.cs b/BookAStar/BookAStar.Droid/MarkdownEditor.cs
index 854ebed9..2dbf1da5 100644
--- a/BookAStar/BookAStar.Droid/MarkdownEditor.cs
+++ b/BookAStar/BookAStar.Droid/MarkdownEditor.cs
@@ -122,7 +122,7 @@ WriteLiteral(@">
   [{ 'header': 1 }, { 'header': 2 }],               // custom button values
   [{ 'list': 'ordered' }, { 'list': 'bullet' }],
   [{ 'indent': '-1' }, { 'indent': '+1' }],          // outdent/indent
-  ['link', 'image'],
+  ['link', 'image', 'video'],
   ['clean']                                         // remove formatting button
         ];
 

From db675279bb9d7d9cf763f6eab2aceb7f50ed4174 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Sun, 25 Sep 2016 00:41:30 +0200
Subject: [PATCH 06/59] Adds the video button

---
 BookAStar/BookAStar.Droid/MarkdownEditor.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BookAStar/BookAStar.Droid/MarkdownEditor.cshtml b/BookAStar/BookAStar.Droid/MarkdownEditor.cshtml
index 1b9ccc99..86e90cf4 100644
--- a/BookAStar/BookAStar.Droid/MarkdownEditor.cshtml
+++ b/BookAStar/BookAStar.Droid/MarkdownEditor.cshtml
@@ -42,7 +42,7 @@
   [{ 'header': 1 }, { 'header': 2 }],               // custom button values
   [{ 'list': 'ordered' }, { 'list': 'bullet' }],
   [{ 'indent': '-1' }, { 'indent': '+1' }],          // outdent/indent
-  ['link', 'image'],
+  ['link', 'image', 'video'],
   ['clean']                                         // remove formatting button
         ];
 

From 87c4a7f282147b28766789221a72c0740be0dba7 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Sun, 25 Sep 2016 00:44:30 +0200
Subject: [PATCH 07/59] Wip theme+estimate

---
 BookAStar/BookAStar/App.xaml                  | 72 +++++++++++------
 BookAStar/BookAStar/App.xaml.cs               | 79 +++++++++++--------
 BookAStar/BookAStar/BookAStar.csproj          | 37 +++++----
 .../BookAStar/Model/Workflow/CommandLine.cs   |  8 +-
 .../BookAStar/Model/Workflow/Estimate.cs      | 28 +++++++
 BookAStar/BookAStar/Pages/BookQueryPage.xaml  | 26 +++---
 .../Pages/CommandLineEditorPage.xaml          | 32 ++++++++
 ....xaml.cs => CommandLineEditorPage.xaml.cs} | 10 +--
 .../BookAStar/Pages/EditEstimatePage.xaml     | 41 ++++------
 .../BookAStar/Pages/EditEstimatePage.xaml.cs  | 19 ++++-
 .../BookAStar/Views/CommandLineEditor.xaml    | 25 ++++++
 .../CommandLineEditor.xaml.cs}                |  7 +-
 12 files changed, 256 insertions(+), 128 deletions(-)
 create mode 100644 BookAStar/BookAStar/Pages/CommandLineEditorPage.xaml
 rename BookAStar/BookAStar/Pages/{MarkdownEditorPage.xaml.cs => CommandLineEditorPage.xaml.cs} (62%)
 create mode 100644 BookAStar/BookAStar/Views/CommandLineEditor.xaml
 rename BookAStar/BookAStar/{Pages/MainPage.xaml.cs => Views/CommandLineEditor.xaml.cs} (63%)

diff --git a/BookAStar/BookAStar/App.xaml b/BookAStar/BookAStar/App.xaml
index 92a8dfbe..a3f0bde3 100644
--- a/BookAStar/BookAStar/App.xaml
+++ b/BookAStar/BookAStar/App.xaml
@@ -4,36 +4,63 @@
              x:Class="BookAStar.App" >
   <Application.Resources>
     <ResourceDictionary>
-      <OnPlatform x:TypeArguments="Font" Android="Large" iOS="Large" WinPhone="Large" x:Key="HeaderFont" />
-      <OnPlatform x:TypeArguments="Color" Android="Black" iOS="Black" WinPhone="Black" x:Key="PrimaryTextColor" />
-      <OnPlatform x:TypeArguments="Color" Android="Red" iOS="Red" WinPhone="Red" x:Key="EmphasisTextColor" />
-      <OnPlatform x:TypeArguments="Font" Android="40" iOS="60" WinPhone="60" x:Key="LargeFontSize" />
-      <OnPlatform x:TypeArguments="Font" Android="30" iOS="60" WinPhone="60" x:Key="MediumFontSize" />
       
-      <Color x:key="backgroundColor">#30FAFAFA</Color>
-      <Color x:key="oddColor">#207AFAFA</Color>
-      <Color x:key="textColor">#FF103010</Color>
-      <Color x:key="labelColor">#FF303010</Color>
-      <Style x:Key="BigEntry" TargetType="Entry">
-        <Setter Property="FontSize" Value="{DynamicResource LargeFontSize}" />
+      <Color x:Key="PageBackgroundColor">#f0f0ff</Color>
+      <Color x:Key="HeadingTextColor">Black</Color>
+      <Color x:Key="NormalTextColor">Blue</Color>
+      <Color x:Key="GroupingTextColor">#5050ff</Color>
+      
+      <OnPlatform x:TypeArguments="Font" Android="Large" iOS="Large" WinPhone="Large" x:Key="HeaderFont" />
+      <OnPlatform x:TypeArguments="Color" Android="Red" iOS="Red" WinPhone="Red" x:Key="EmphasisTextColor" />
+      <OnPlatform x:TypeArguments="Font" Android="60" iOS="60" WinPhone="60" x:Key="LargeFontSize" />
+      <OnPlatform x:TypeArguments="Font" Android="50" iOS="50" WinPhone="50" x:Key="MediumFontSize" />
+      <OnPlatform x:TypeArguments="Font" Android="40" iOS="40" WinPhone="40" x:Key="SmallFontSize" />
+
+
+      <Color x:Key="BackgroundColor">#30FAFAFA</Color>
+      <Color x:Key="OddColor">#207AFAFA</Color>
+      <Color x:Key="TextColor">#FF103010</Color>
+      <Color x:Key="LabelColor">#FF303010</Color>
+      
+      <Style x:Key="LabelPageHeadingStyle" TargetType="Label">
         <Setter Property="FontAttributes" Value="Bold" />
+        <Setter Property="HorizontalOptions" Value="Center" />
+        <Setter Property="TextColor" Value="{StaticResource HeadingTextColor}" />
+        <Setter Property="FontSize" Value="{StaticResource LargeFontSize}" />
       </Style>
-      <Style x:Key="labelStyle" TargetType="Label">
-        <Setter Property="TextColor" Value="{DynamicResource EmphasisTextColor}" />
+      
+      <Style x:Key="InputLabelStyle" TargetType="Label">
+        <Setter Property="FontSize" Value="{StaticResource SmallFontSize}" />
+        <Setter Property="FontAttributes" Value="Italic" />
+        <Setter Property="HorizontalOptions" Value="Center" />
+        <Setter Property="TextColor" Value="{StaticResource GroupingTextColor}" />
+      </Style>
+      
+      <Style x:Key="LabelStyle" TargetType="Label">
+        <Setter Property="TextColor" Value="{StaticResource TextColor}" />
         <Setter Property="FontAttributes" Value="Bold" />
-        <Setter Property="FontSize" Value="{DynamicResource LargeFontSize}" />
+        <Setter Property="FontSize" Value="{StaticResource MediumFontSize}" />
         <Setter Property="VerticalOptions" Value="Start" />
+        <Setter Property="HorizontalOptions" Value="Start" />
         <Setter Property="LineBreakMode" Value="WordWrap" />
-        
       </Style>
-      <Style x:Key="entryStyle" TargetType="Entry">
-        <Setter Property="HorizontalOptions" Value="FillAndExpand"/>
+
+      <Style x:Key="BigLabel"  BasedOn="{StaticResource LabelStyle}" TargetType="Label">
+        <Setter Property="FontSize" Value="Large" />
       </Style>
-      <Style x:key="backbroundStyle" TargetType="VisualElement">
-        <Setter Property="BackgoundColor" Value="{StaticResource backgroundColor}" />
-        <Setter Property="TextColor" Value="{StaticResource textColor}" />
+      
+      <Style x:Key="EntryStyle" TargetType="Entry">
+        <Setter Property="HorizontalOptions" Value="CenterAndExpand"/>
       </Style>
-      <Style x:Key="buttonStyle" TargetType="Button">
+      <Style x:Key="PickerStyle" TargetType="Picker">
+        <Setter Property="HorizontalOptions" Value="CenterAndExpand"/>
+      </Style>
+      <Style x:Key="BigEntry" TargetType="Entry" BasedOn="{StaticResource EntryStyle}">
+        <Setter Property="FontSize" Value="{StaticResource LargeFontSize}" />
+        <Setter Property="FontAttributes" Value="Bold" />
+      </Style>
+      
+      <Style x:Key="ButtonStyle" TargetType="Button">
         <Setter Property="HorizontalOptions" Value="Center" />
         <Setter Property="VerticalOptions" Value="CenterAndExpand" />
         <Setter Property="BorderColor" Value="Lime" />
@@ -42,7 +69,8 @@
         <Setter Property="WidthRequest" Value="200" />
         <Setter Property="TextColor" Value="Teal" />
       </Style>
+      <Style x:Key="PageStyle" TargetType="Page">
+      </Style>
     </ResourceDictionary>
   </Application.Resources>
-
 </Application>
\ No newline at end of file
diff --git a/BookAStar/BookAStar/App.xaml.cs b/BookAStar/BookAStar/App.xaml.cs
index 4d0b8edd..fa13a098 100644
--- a/BookAStar/BookAStar/App.xaml.cs
+++ b/BookAStar/BookAStar/App.xaml.cs
@@ -18,46 +18,56 @@ namespace BookAStar
 {
     public partial class App : Application // superclass new in 1.3
     {
-        ContentPage deviceInfoPage;
         SearchPage searchPage = new SearchPage
         {
             Title = "Trouvez votre artiste",
             Icon = "glyphish_07_map_marker.png"
         };
         NavigationPage mp;
+
         SettingsPage settingsPage = new SettingsPage
             {
                 Title = "Paramètres",
                 Icon = "ic_corp_icon.png"
             };
+
         PinPage pinPage = new PinPage
         {
             Title = "Carte",
             Icon = "glyphish_07_map_marker.png"
         };
-        BookQueryPage bookQueryPage = new BookQueryPage {
-            Title = "Demande de devis"
-        };
-        BookQueriesPage bookQueriesPage = new BookQueriesPage
-        {
-            Title = "Demandes de devis"
-        };
+        
+
+        
+
+        
 
-        EditEstimatePage editEstimate = new EditEstimatePage
-        {
-            Title = "Création d'un devis"
-        };
         public static IPlatform PlatformSpecificInstance { get; set; }
         public static string AppName { get; set; }
         public static App CurrentApp { get { return Current as App; } }
 
         public DataManager DataManager { get; set; } = new DataManager();
-        
+
+        internal void EditCommandLine(CommandLine com)
+        {
+            CommandLineEditorPage editCommandLine = new CommandLineEditorPage
+            {
+                Title = "Edition d'une ligne de facture",
+                BindingContext = com
+            };
+            mp.Navigation.PushAsync(editCommandLine);
+        }
+
         public App(IPlatform instance)
         {
-            deviceInfoPage = new DeviceInfoPage(instance.GetDeviceInfo());
+            InitializeComponent();
+
             PlatformSpecificInstance = instance;
-            mp = new NavigationPage(searchPage);
+            mp = new NavigationPage(searchPage)
+            {
+                BackgroundColor = (Color)Application.Current.Resources["PageBackgroundColor"]
+            };
+            var color = Application.Current.Resources["PageBackgroundColor"];
             //var hasLabelStyle = r.ContainsKey("labelStyle");
             // var stid = this.StyleId;
             // null var appsstyle = settingsPage.Style;
@@ -80,7 +90,12 @@ namespace BookAStar
 
             tiQueries.Clicked += (object sender, EventArgs e) =>
             {
-                ShowPage (bookQueriesPage);
+                BookQueriesPage bookQueriesPage = new BookQueriesPage
+                {
+                    Title = "Demandes de devis"
+                };
+                bookQueriesPage.BindingContext = DataManager.BookQueries;
+                ShowPage(bookQueriesPage);
             };
             mp.ToolbarItems.Add(tiQueries);
             ToolbarItem tiMap = new ToolbarItem
@@ -93,17 +108,9 @@ namespace BookAStar
             {
                 ShowPage(pinPage);
             };
-
-            bookQueriesPage.BindingContext = DataManager.BookQueries;
-
            
         }
 
-        public void ShowDeviceInfo()
-        {
-            ShowPage(deviceInfoPage);
-        }
-
         public void PostDeviceInfo()
         {
             var res = PlatformSpecificInstance.InvokeApi(
@@ -113,25 +120,33 @@ namespace BookAStar
 
         public void ShowBookQuery(BookQueryData data)
         {
+            BookQueryPage bookQueryPage = new BookQueryPage
+            {
+                Title = "Demande de devis"
+            };
             bookQueryPage.BindingContext = data;
             ShowPage(bookQueryPage);
         }
 
         public void EditEstimate(Estimate data)
         {
+            EditEstimatePage editEstimate = new EditEstimatePage
+            {
+                Title = "Création d'un devis"
+            };
             editEstimate.Estimate = data;
             ShowPage(editEstimate);
         }
 
-        private void ShowPage(Page p)
+        // TODO système de persistance de l'état de l'appli
+        private void ShowPage(Page p) 
         {
-            if (p.Parent == null)
-                mp.Navigation.PushAsync(p);
-            else p.Focus();
-        }
-        public void CloseWindow()
-        {
-            mp.Navigation.PopAsync();
+            if (p.Parent!=null)
+            {
+                mp.Navigation.RemovePage(p);
+                p.Parent = null;
+            }
+            mp.Navigation.PushAsync(p);
         }
     }
 }
diff --git a/BookAStar/BookAStar/BookAStar.csproj b/BookAStar/BookAStar/BookAStar.csproj
index 95e58428..e7744bb4 100644
--- a/BookAStar/BookAStar/BookAStar.csproj
+++ b/BookAStar/BookAStar/BookAStar.csproj
@@ -25,6 +25,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -33,6 +34,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet />
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="App.xaml.cs">
@@ -51,16 +53,15 @@
     <Compile Include="Pages\BookQueryPage.xaml.cs">
       <DependentUpon>BookQueryPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Pages\DeviceInfoPage.cs" />
+    <Compile Include="Pages\CommandLineEditorPage.xaml.cs">
+      <DependentUpon>CommandLineEditorPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Pages\EventDetail.xaml.cs">
       <DependentUpon>EventDetail.xaml</DependentUpon>
     </Compile>
     <Compile Include="Helpers\MainSettings.cs" />
     <Compile Include="Helpers\RemoteEntity.cs" />
     <Compile Include="Interfaces\IPlatform.cs" />
-    <Compile Include="Pages\MainPage.xaml.cs">
-      <DependentUpon>MainPage.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Model\Blog\Blog.cs" />
     <Compile Include="Model\Blog\BlogTag.cs" />
     <Compile Include="Model\BookQueryData.cs" />
@@ -103,10 +104,10 @@
     <Compile Include="Pages\EditEstimatePage.xaml.cs">
       <DependentUpon>EditEstimatePage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Pages\MarkdownEditorPage.xaml.cs">
-      <DependentUpon>MarkdownEditorPage.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Pages\PinPage.cs" />
+    <Compile Include="Views\CommandLineEditor.xaml.cs">
+      <DependentUpon>CommandLineEditor.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\MarkdownView.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Pages\SearchPage.xaml.cs">
@@ -118,10 +119,6 @@
     <Compile Include="Model\Tag.cs" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Pages\MainPage.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
     <EmbeddedResource Include="App.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
@@ -199,12 +196,6 @@
       <Name>Yavsc.Client</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Pages\MarkdownEditorPage.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Pages\EditEstimatePage.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
@@ -220,6 +211,18 @@
   <ItemGroup>
     <EmbeddedResource Include="icon-anon.png" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Views\CommandLineEditor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Pages\CommandLineEditorPage.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <Import Project="..\..\packages\Xamarin.Forms.2.3.0.107\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.0.107\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
diff --git a/BookAStar/BookAStar/Model/Workflow/CommandLine.cs b/BookAStar/BookAStar/Model/Workflow/CommandLine.cs
index 89f72c57..65ef4cdd 100644
--- a/BookAStar/BookAStar/Model/Workflow/CommandLine.cs
+++ b/BookAStar/BookAStar/Model/Workflow/CommandLine.cs
@@ -1,12 +1,12 @@
 
+using System;
+
 namespace BookAStar.Model.Workflow
 {
-
     public class CommandLine
     {
-        public long Id { get; set; }
-        public string Comment { get; set; }
-        public BaseProduct Article { get; set; }
+        public string Description { get; set; }
+        public TimeSpan Duration { get; set; }
         public int Count { get; set; }
         public decimal UnitaryCost { get; set; }
     }
diff --git a/BookAStar/BookAStar/Model/Workflow/Estimate.cs b/BookAStar/BookAStar/Model/Workflow/Estimate.cs
index 02d03b97..7e06a982 100644
--- a/BookAStar/BookAStar/Model/Workflow/Estimate.cs
+++ b/BookAStar/BookAStar/Model/Workflow/Estimate.cs
@@ -3,6 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Xamarin.Forms;
 
 namespace BookAStar.Model.Workflow
 {
@@ -67,5 +68,32 @@ namespace BookAStar.Model.Workflow
                 return DataManager.Current.Contacts.LocalGet(ClientId);
             }
         }
+
+        public FormattedString FormattedTotal
+        {
+            get
+            {
+                OnPlatform<Font> lfs = (OnPlatform < Font >) App.Current.Resources["LargeFontSize"];
+                OnPlatform<Color> etc = (OnPlatform<Color>)App.Current.Resources["EmphasisTextColor"];
+                
+                return new FormattedString
+                {
+
+                    Spans = {
+                        new Span { Text = "Total TTC: " },
+                        new Span { Text = Total.ToString(),
+                            ForegroundColor = etc.Android  ,
+                            FontSize = (double) lfs.Android.FontSize },
+                        new Span { Text = "€", FontSize = (double) lfs.Android.FontSize }
+                    }
+                };
+            }
+            set { }
+        }
+        public decimal Total { get
+            {
+                return Bill?.Aggregate((decimal)0, (t, l) => t + l.Count * l.UnitaryCost) ?? (decimal)0;
+            }
+        }
     }
 }
diff --git a/BookAStar/BookAStar/Pages/BookQueryPage.xaml b/BookAStar/BookAStar/Pages/BookQueryPage.xaml
index 0925bce4..e9fc0ed2 100644
--- a/BookAStar/BookAStar/Pages/BookQueryPage.xaml
+++ b/BookAStar/BookAStar/Pages/BookQueryPage.xaml
@@ -9,27 +9,21 @@
              >
   <ContentPage.Resources>
     <ResourceDictionary>
-
-      <Style x:Key="labelStyle" TargetType="Label">
-        <Setter Property="TextColor" Value="{DynamicResource EmphasisTextColor}" />
-        <Setter Property="FontAttributes" Value="Bold" />
-        <Setter Property="FontSize" Value="{DynamicResource LargeFontSize}" />
-        <Setter Property="VerticalOptions" Value="Start" />
-        <Setter Property="LineBreakMode" Value="WordWrap" />
+      <Style TargetType="Label">
+        <Setter Property="Style" Value="{StaticResource LabelStyle}" />
+      </Style>
+      <Style TargetType="Button">
+        <Setter Property="Style" Value="{StaticResource ButtonStyle}" />
       </Style>
-
     </ResourceDictionary>
   </ContentPage.Resources>
 
   <StackLayout x:Name="bookQueryLayout">
-    <Label Text="{Binding Client.UserName}" Style="{StaticResource labelStyle}"
-         VerticalOptions="Start" HorizontalOptions="Center" />
-    <Label Text="{Binding Location.Address}" VerticalOptions="FillAndExpand" HorizontalOptions="Center" />
-    <Label Text="{Binding Previsional}" VerticalOptions="Center" HorizontalOptions="Center" />
-
-    <Label Text="{Binding EventDate}" VerticalOptions="Center" HorizontalOptions="Center" />
-    <Label Text="{Binding Location.Address}" VerticalOptions="Center" HorizontalOptions="Center" />
+    <Label Text="{Binding Client.UserName}"/>
+    <Label Text="{Binding EventDate}"  />
+    <Label Text="{Binding Location.Address}" />
+    <Label Text="{Binding Previsional}" />
     <maps:Map x:Name="map"></maps:Map>
-    <Button Text="Faire un devis" Clicked="MakeAnEstimate" VerticalOptions="Center" HorizontalOptions="End"/>
+    <Button Text="Faire un devis" Clicked="MakeAnEstimate" />
   </StackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/BookAStar/BookAStar/Pages/CommandLineEditorPage.xaml b/BookAStar/BookAStar/Pages/CommandLineEditorPage.xaml
new file mode 100644
index 00000000..2b476be5
--- /dev/null
+++ b/BookAStar/BookAStar/Pages/CommandLineEditorPage.xaml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:local="clr-namespace:BookAStar;assembly=BookAStar"
+             xmlns:views="clr-namespace:BookAStar.Views;assembly=BookAStar"
+             x:Class="BookAStar.Pages.CommandLineEditorPage"
+             Style="{StaticResource PageStyle}">
+  <StackLayout>
+    <Label Text="Description de la ligne de facture" Style="{StaticResource InputLabelStyle}"></Label>
+    <Editor VerticalOptions="FillAndExpand"></Editor>
+    <Label Text="Durée de la prestation" 
+           Style="{StaticResource InputLabelStyle}"></Label>
+    <StackLayout Orientation="Horizontal">
+      <Entry Placeholder="Durée" Keyboard="Numeric" Style="{StaticResource BigEntry}"/>
+      <Picker SelectedIndex="1" Style="{StaticResource PickerStyle}">
+        <Picker.Items>
+          <x:String>Heures</x:String>
+          <x:String>Jours</x:String>
+          <x:String>Minutes</x:String>
+        </Picker.Items>
+      </Picker>
+    </StackLayout>
+    <Label Text="Quantité facturée" Style="{StaticResource InputLabelStyle}"></Label>
+    <Entry Placeholder="Quantité" Text="1" Keyboard="Numeric"  Style="{StaticResource BigEntry}"/>
+    <Label Text="Prix unitaire" Style="{StaticResource InputLabelStyle}"></Label>
+    <StackLayout Orientation="Horizontal">
+      <Entry Placeholder="Prix" Keyboard="Numeric" Style="{StaticResource BigEntry}"></Entry>
+      <Label Text="€" Style="{StaticResource BigLabel}" HorizontalTextAlignment="Start"/>
+    </StackLayout>
+    <Button Text="Valider cette ligne de facture"></Button>
+  </StackLayout>
+</ContentPage>
\ No newline at end of file
diff --git a/BookAStar/BookAStar/Pages/MarkdownEditorPage.xaml.cs b/BookAStar/BookAStar/Pages/CommandLineEditorPage.xaml.cs
similarity index 62%
rename from BookAStar/BookAStar/Pages/MarkdownEditorPage.xaml.cs
rename to BookAStar/BookAStar/Pages/CommandLineEditorPage.xaml.cs
index 082c66ad..53ce3842 100644
--- a/BookAStar/BookAStar/Pages/MarkdownEditorPage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/CommandLineEditorPage.xaml.cs
@@ -8,16 +8,12 @@ using Xamarin.Forms;
 
 namespace BookAStar.Pages
 {
-    public partial class MarkdownEditorPage : ContentPage
+    public partial class CommandLineEditorPage : ContentPage
     {
-        public MarkdownEditorPage()
+        public CommandLineEditorPage()
         {
             InitializeComponent();
-        }
-
-        public void GetText()
-        {
-
+            
         }
     }
 }
diff --git a/BookAStar/BookAStar/Pages/EditEstimatePage.xaml b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml
index 7b489cd4..1dedba98 100644
--- a/BookAStar/BookAStar/Pages/EditEstimatePage.xaml
+++ b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml
@@ -2,41 +2,32 @@
 <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="BookAStar.Pages.EditEstimatePage"
-             xmlns:local="clr-namespace:BookAStar.Views;assembly=BookAStar"
-             >
-  <StackLayout Padding="10,10,10,10">
-    
+             xmlns:views="clr-namespace:BookAStar.Views;assembly=BookAStar"
+             xmlns:local="clr-namespace:BookAStar;assembly=BookAStar">
+  <StackLayout Padding="10,10,10,10" BindingContext="{Binding .}">
     <StackLayout Orientation="Horizontal" Padding="10,10,10,10">
-       <Label Text="{Binding Client.UserName}"
-        LineBreakMode="WordWrap"></Label>
-    <Label Text="{Binding Query.Location.Address}"
-         LineBreakMode="WordWrap"  ></Label>
-    <Label Text="{Binding Query.EventDate, StringFormat='{0:dddd d MMMM yyyy à hh:mm}'}"
-         LineBreakMode="WordWrap"  ></Label>
+      <Label Text="{Binding Client.UserName}" LineBreakMode="WordWrap"></Label>
+      <Label Text="{Binding Query.Location.Address}" LineBreakMode="WordWrap"></Label>
+      <Label Text="{Binding Query.EventDate, StringFormat='{0:dddd d MMMM yyyy à hh:mm}'}" LineBreakMode="WordWrap"></Label>
     </StackLayout>
-    
-    <local:MarkdownView x:Name="mdview" Markdown="{Binding Description}"
-         Edited="OnDescriptionChanged" HorizontalOptions="FillAndExpand"
-                        VerticalOptions="FillAndExpand">
-      
-    </local:MarkdownView>
 
-   <!-- <ListView >
+    <views:MarkdownView x:Name="mdview"
+                        Edited="OnDescriptionChanged" HorizontalOptions="FillAndExpand"
+         HeightRequest="120"  VerticalOptions="FillAndExpand"
+    Markdown="{Binding Description}"></views:MarkdownView>
+
+    <ListView HeightRequest="160">
       <ListView.ItemTemplate>
         <DataTemplate>
           <ViewCell>
-            <ViewCell.View>
-              <StackLayout Orientation="Horizontal">
-                <Entry Placeholder="Ligne de facture"></Entry>
-                <Entry Placeholder="Compte"></Entry>
-                <Entry Placeholder="Prix unitaire" ></Entry>
-              </StackLayout>
+            <ViewCell.View HeightRequest="80">
             </ViewCell.View>
           </ViewCell>
         </DataTemplate>
       </ListView.ItemTemplate>
-    </ListView> -->
-    <Label Text="Total TTC:"></Label>
+    </ListView>
+    <Button Text="Ajouter une ligne de facture" Clicked="OnNewCommanLine"></Button>
+    <Label FormattedText="{Binding FormattedTotal}"/>
     <Button Text="Valider ce devis"></Button>
   </StackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs
index 5d4ecb15..b48bd88c 100644
--- a/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs
@@ -16,7 +16,10 @@ namespace BookAStar.Pages
         public Estimate Estimate { get { return BindingContext as Estimate;  } set {
                 BindingContext = value;
             } }
-        public static readonly BindableProperty MarkdownProperty =
+        public static readonly BindableProperty TotalProperty =
+            BindableProperty.Create("Total", typeof(decimal), typeof(EditEstimatePage),
+               (decimal) 0, BindingMode.OneWay);
+        public static readonly BindableProperty DescriptionProperty =
             BindableProperty.Create("Description", typeof(string), typeof(Estimate),
                 null, BindingMode.TwoWay);
         public static readonly BindableProperty ClientProperty =
@@ -26,19 +29,31 @@ namespace BookAStar.Pages
             BindableProperty.Create("Query", typeof(BookQueryData), typeof(Estimate),
                 null, BindingMode.OneWay);
 
+        
+
         public EditEstimatePage()
         {
             InitializeComponent();
         }
+
         protected override void OnBindingContextChanged()
         {
             base.OnBindingContextChanged();
-            mdview.Markdown = Estimate?.Description;
+            // FIXME Why the Binding don't work?
+            mdview.Markdown = Estimate.Description;
+
         }
 
         protected void OnDescriptionChanged (object sender, EventArgs e)
         {
+            // FIXME Why the Binding don't work?
             Estimate.Description = mdview.Markdown;
         }
+        protected void OnNewCommanLine(object sender, EventArgs e)
+        {
+            var com = new CommandLine();
+            App.CurrentApp.EditCommandLine(com);
+        }
+       
     }
 }
diff --git a/BookAStar/BookAStar/Views/CommandLineEditor.xaml b/BookAStar/BookAStar/Views/CommandLineEditor.xaml
new file mode 100644
index 00000000..17a79010
--- /dev/null
+++ b/BookAStar/BookAStar/Views/CommandLineEditor.xaml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentView xmlns="http://xamarin.com/schemas/2014/forms"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:local="clr-namespace:BookAStar;assembly=BookAStar"
+             x:Class="BookAStar.Views.CommandLineEditor"
+             BackgroundColor="{x:Static local:Constants.BackgroundColor}"
+             >
+    <StackLayout>
+      <Label Text="Description de la ligne de facture"></Label>
+      <Editor ></Editor>
+      <StackLayout Orientation="Horizontal">
+        <Entry Placeholder="Durée de la prestation" Keyboard="Numeric"></Entry>
+        <Picker>
+            <Picker.Items>
+              <x:String>Heures</x:String>
+              <x:String>Jours</x:String>
+              <x:String>Minutes</x:String>
+            </Picker.Items>
+        </Picker>
+      </StackLayout>
+      <Entry Placeholder="Quantité" Text="1"/>
+        <Entry Placeholder="Prix unitaire" ></Entry>
+        <Button Text="Valider cette ligne de facture"></Button>
+    </StackLayout>
+</ContentView>
\ No newline at end of file
diff --git a/BookAStar/BookAStar/Pages/MainPage.xaml.cs b/BookAStar/BookAStar/Views/CommandLineEditor.xaml.cs
similarity index 63%
rename from BookAStar/BookAStar/Pages/MainPage.xaml.cs
rename to BookAStar/BookAStar/Views/CommandLineEditor.xaml.cs
index 318924ab..08443e3a 100644
--- a/BookAStar/BookAStar/Pages/MainPage.xaml.cs
+++ b/BookAStar/BookAStar/Views/CommandLineEditor.xaml.cs
@@ -5,13 +5,14 @@ using System.Text;
 using System.Threading.Tasks;
 using Xamarin.Forms;
 
-namespace App2
+namespace BookAStar.Views 
 {
-    public partial class MainPage : ContentPage
+    public partial class CommandLineEditor : ContentView
     {
-        public MainPage()
+        public CommandLineEditor()
         {
             InitializeComponent();
+
         }
     }
 }

From 3c175f3969048a5135aaf698a685eaf9b86981cd Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Sun, 25 Sep 2016 00:44:42 +0200
Subject: [PATCH 08/59] cleaning

---
 BookAStar/BookAStar/Pages/DeviceInfoPage.cs   | 30 -------------------
 BookAStar/BookAStar/Pages/MainPage.xaml       | 11 -------
 .../BookAStar/Pages/MarkdownEditorPage.xaml   |  9 ------
 3 files changed, 50 deletions(-)
 delete mode 100644 BookAStar/BookAStar/Pages/DeviceInfoPage.cs
 delete mode 100644 BookAStar/BookAStar/Pages/MainPage.xaml
 delete mode 100644 BookAStar/BookAStar/Pages/MarkdownEditorPage.xaml

diff --git a/BookAStar/BookAStar/Pages/DeviceInfoPage.cs b/BookAStar/BookAStar/Pages/DeviceInfoPage.cs
deleted file mode 100644
index 18789cb8..00000000
--- a/BookAStar/BookAStar/Pages/DeviceInfoPage.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using BookAStar.Model.Auth.Account;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-using Xamarin.Forms;
-using Yavsc.Models.Identity;
-
-namespace BookAStar.Pages
-{
-    public class DeviceInfoPage : ContentPage
-    {
-        public DeviceInfoPage(IGCMDeclaration infos)
-        {
-            Content = new StackLayout
-            {
-                Padding = 50,
-                VerticalOptions = LayoutOptions.Center,
-                Children = {
-              new Label{ Text = "Id: " + infos.DeviceId},
-              new Label{ Text = "Model: " + infos.Model},
-              new Label{ Text = "Platform: " + infos.Platform},
-              new Label{ Text = "Version: " + infos.Version},
-                    }
-            };
-      
-        }
-    }
-}
diff --git a/BookAStar/BookAStar/Pages/MainPage.xaml b/BookAStar/BookAStar/Pages/MainPage.xaml
deleted file mode 100644
index 13d5c566..00000000
--- a/BookAStar/BookAStar/Pages/MainPage.xaml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:local="clr-namespace:App2"
-             x:Class="App2.MainPage">
-
-  <Label Text="Welcome to Xamarin Forms!"
-           VerticalOptions="Center"
-           HorizontalOptions="Center" />
-
-</ContentPage>
\ No newline at end of file
diff --git a/BookAStar/BookAStar/Pages/MarkdownEditorPage.xaml b/BookAStar/BookAStar/Pages/MarkdownEditorPage.xaml
deleted file mode 100644
index 755adfc0..00000000
--- a/BookAStar/BookAStar/Pages/MarkdownEditorPage.xaml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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="BookAStar.Pages.MarkdownEditorPage">
-  <Editor VerticalOptions="FillAndExpand" HorizontalOptions="FillAndExpand" 
-                  x:Name="editor"
-                  />
-  <WebView x:Name="webView"></WebView>
-</ContentPage>
\ No newline at end of file

From 1ee8e83013bd907a65940c07c919b5f05b679de2 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Tue, 27 Sep 2016 02:35:45 +0200
Subject: [PATCH 09/59] intergartions XLabs.* WIP MVVM

---
 .../BookAStar.Droid/BookAStar.Droid.csproj    |  210 +-
 BookAStar/BookAStar.Droid/Helpers/Settings.cs |    4 +-
 .../Helpers/SimpleJsonPostMethod.cs           |   26 +-
 BookAStar/BookAStar.Droid/MainActivity.cs     |  111 +-
 BookAStar/BookAStar.Droid/MainApplication.cs  |   63 +
 .../BookAStar.Droid/MarkdownWebViewClient.cs  |   12 -
 .../PluginsHelp/ConnectivityReadme.txt        |   17 -
 .../PluginsHelp/GeolocatorReadme.txt          |   24 -
 .../Resources/Resource.Designer.cs            | 7791 +++++++++++------
 .../drawable/{icon-anon.png => icon_anon.png} |  Bin
 .../Resources/values/strings.xml              |    1 +
 .../Resources/values/styles.xml               |   18 +-
 .../Services/GcmListenerService.cs            |    2 +-
 BookAStar/BookAStar.Droid/app.config          |    8 +
 .../BookAStar.Droid/google-services.json      |   78 +
 BookAStar/BookAStar.Droid/packages.config     |   43 +-
 BookAStar/BookAStar.iOS/AppDelegate.cs        |   51 +-
 BookAStar/BookAStar.iOS/BookAStar.iOS.csproj  |   16 +-
 BookAStar/BookAStar.iOS/app.config            |    4 +
 BookAStar/BookAStar.iOS/packages.config       |    2 +-
 BookAStar/BookAStar/App.xaml                  |   23 +-
 BookAStar/BookAStar/App.xaml.cs               |  258 +-
 BookAStar/BookAStar/BookAStar.csproj          |   58 +-
 BookAStar/BookAStar/Constants.cs              |    7 +-
 BookAStar/BookAStar/Factories/ViewFactory.cs  |   58 +
 .../BookAStar/Helpers/AvatarImageSource.cs    |    4 +-
 BookAStar/BookAStar/Helpers/DataManager.cs    |    2 +-
 .../BookAStar/Helpers/PropertySupport.cs      |   27 +
 BookAStar/BookAStar/Helpers/RemoteEntity.cs   |   56 +-
 BookAStar/BookAStar/Helpers/Settings.cs       |   43 +
 .../BookAStar/Interfaces/IComponentContext.cs |   11 +
 .../BookAStar/Interfaces/IModelViewModel.cs   |   16 +
 .../BookAStar/Interfaces/IViewFactory.cs      |   25 +
 .../BookAStar/Model/ClientProviderInfo.cs     |    8 +
 .../BookAStar/Model/Workflow/Estimate.cs      |    1 +
 .../BookAStar/Pages/BookQueriesPage.xaml.cs   |    8 +-
 BookAStar/BookAStar/Pages/BookQueryPage.xaml  |    6 +-
 .../BookAStar/Pages/BookQueryPage.xaml.cs     |    1 +
 .../BookAStar/Pages/EditEstimatePage.xaml     |   20 +-
 .../BookAStar/Pages/EditEstimatePage.xaml.cs  |    2 +-
 BookAStar/BookAStar/Pages/SettingsPage.xaml   |  107 +-
 .../ViewModels/BookQueriesViewModel.cs        |   22 +
 .../ViewModels/BookQueryViewModel.cs          |   32 +
 .../BookAStar/ViewModels/SettingsViewModel.cs |   11 +
 .../BookAStar/ViewModels/ViewModelBase.cs     |   45 +
 BookAStar/BookAStar/app.config                |    4 +
 BookAStar/BookAStar/packages.config           |   14 +-
 Yavsc.Client/project.json                     |    4 +-
 Yavsc.Client/project.lock.json                |  248 +-
 49 files changed, 6439 insertions(+), 3163 deletions(-)
 create mode 100644 BookAStar/BookAStar.Droid/MainApplication.cs
 delete mode 100644 BookAStar/BookAStar.Droid/PluginsHelp/ConnectivityReadme.txt
 delete mode 100644 BookAStar/BookAStar.Droid/PluginsHelp/GeolocatorReadme.txt
 rename BookAStar/BookAStar.Droid/Resources/drawable/{icon-anon.png => icon_anon.png} (100%)
 create mode 100644 BookAStar/BookAStar.Droid/google-services.json
 create mode 100644 BookAStar/BookAStar/Factories/ViewFactory.cs
 create mode 100644 BookAStar/BookAStar/Helpers/PropertySupport.cs
 create mode 100644 BookAStar/BookAStar/Helpers/Settings.cs
 create mode 100644 BookAStar/BookAStar/Interfaces/IComponentContext.cs
 create mode 100644 BookAStar/BookAStar/Interfaces/IModelViewModel.cs
 create mode 100644 BookAStar/BookAStar/Interfaces/IViewFactory.cs
 create mode 100644 BookAStar/BookAStar/ViewModels/BookQueriesViewModel.cs
 create mode 100644 BookAStar/BookAStar/ViewModels/BookQueryViewModel.cs
 create mode 100644 BookAStar/BookAStar/ViewModels/SettingsViewModel.cs
 create mode 100644 BookAStar/BookAStar/ViewModels/ViewModelBase.cs

diff --git a/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj b/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj
index 20085de3..52765a5e 100644
--- a/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj
+++ b/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj
@@ -66,30 +66,21 @@
     <CodeAnalysisRuleSet />
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DeviceInfo.Plugin, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Xam.Plugin.DeviceInfo.1.0.0.2\lib\MonoAndroid10\DeviceInfo.Plugin.dll</HintPath>
-    </Reference>
-    <Reference Include="DeviceInfo.Plugin.Abstractions, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Xam.Plugin.DeviceInfo.1.0.0.2\lib\MonoAndroid10\DeviceInfo.Plugin.Abstractions.dll</HintPath>
+    <Reference Include="ExifLib, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\ExifLib.PCL.1.0.1\lib\portable-net45+sl50+win+WindowsPhoneApp81+wp80+Xamarin.iOS10+MonoAndroid10+MonoTouch10\ExifLib.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="FormsViewGroup, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.107\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="GoogleMediaFramework">
+      <HintPath>..\..\Components\GoogleMediaFramework-1.0\lib\android\GoogleMediaFramework.dll</HintPath>
+    </Reference>
     <Reference Include="MarkdownDeep, Version=1.5.2.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\MarkdownDeep-av.NET.1.5.2\lib\MonoAndroid10\MarkdownDeep.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Media.Plugin, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xam.Plugin.Media.1.0.1\lib\MonoAndroid10\Media.Plugin.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Media.Plugin.Abstractions, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xam.Plugin.Media.1.0.1\lib\MonoAndroid10\Media.Plugin.Abstractions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Mono.Android, Version=0.0.0.0, Culture=neutral, PublicKeyToken=84e04ff9cfb79065, processorArchitecture=MSIL" />
     <Reference Include="Mono.Android.Export, Version=1.0.6099.33544, Culture=neutral, PublicKeyToken=84e04ff9cfb79065, processorArchitecture=MSIL" />
     <Reference Include="Mono.Data.Sqlite" />
@@ -98,12 +89,71 @@
       <HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Plugin.Settings, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xam.Plugins.Settings.2.1.0\lib\MonoAndroid10\Plugin.Settings.dll</HintPath>
+    <Reference Include="Plugin.Connectivity, Version=2.2.12.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xam.Plugin.Connectivity.2.2.12\lib\MonoAndroid10\Plugin.Connectivity.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Plugin.Settings.Abstractions, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xam.Plugins.Settings.2.1.0\lib\MonoAndroid10\Plugin.Settings.Abstractions.dll</HintPath>
+    <Reference Include="Plugin.Connectivity.Abstractions, Version=2.2.12.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xam.Plugin.Connectivity.2.2.12\lib\MonoAndroid10\Plugin.Connectivity.Abstractions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Plugin.CurrentActivity, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Plugin.CurrentActivity.1.0.1\lib\MonoAndroid10\Plugin.CurrentActivity.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Plugin.DeviceInfo, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xam.Plugin.DeviceInfo.2.0.2\lib\MonoAndroid10\Plugin.DeviceInfo.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Plugin.DeviceInfo.Abstractions, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xam.Plugin.DeviceInfo.2.0.2\lib\MonoAndroid10\Plugin.DeviceInfo.Abstractions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Plugin.Geolocator, Version=3.0.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\MonoAndroid10\Plugin.Geolocator.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Plugin.Geolocator.Abstractions, Version=3.0.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\MonoAndroid10\Plugin.Geolocator.Abstractions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Plugin.Media, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xam.Plugin.Media.2.3.0\lib\MonoAndroid10\Plugin.Media.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Plugin.Media.Abstractions, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xam.Plugin.Media.2.3.0\lib\MonoAndroid10\Plugin.Media.Abstractions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Plugin.Permissions, Version=1.1.6.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Plugin.Permissions.1.1.7\lib\MonoAndroid10\Plugin.Permissions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Plugin.Permissions.Abstractions, Version=1.1.6.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Plugin.Permissions.1.1.7\lib\MonoAndroid10\Plugin.Permissions.Abstractions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Plugin.Settings, Version=2.5.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xam.Plugins.Settings.2.5.1.0\lib\MonoAndroid10\Plugin.Settings.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Plugin.Settings.Abstractions, Version=2.5.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xam.Plugins.Settings.2.5.1.0\lib\MonoAndroid10\Plugin.Settings.Abstractions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SignaturePad, Version=1.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xamarin.Controls.SignaturePad.1.4.0\lib\MonoAndroid\SignaturePad.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SQLite.Net">
+      <HintPath>..\..\packages\SQLite.Net.Core-PCL.3.1.1\lib\portable-win8+net45+wp8+wpa81+MonoAndroid1+MonoTouch1\SQLite.Net.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLite.Net.Async, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\SQLite.Net.Async-PCL.3.1.1\lib\portable-win8+net45+wp8+wpa81+MonoAndroid1+MonoTouch1\SQLite.Net.Async.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SQLite.Net.Platform.XamarinAndroid, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\SQLite.Net-PCL.3.1.1\lib\MonoAndroid\SQLite.Net.Platform.XamarinAndroid.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -152,46 +202,90 @@
       <HintPath>..\..\Components\xamarin.auth-1.2.3.1\lib\android\Xamarin.Auth.Android.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.107\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xamarin.Forms.Maps, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Xamarin.Forms.Maps.2.3.0.107\lib\MonoAndroid10\Xamarin.Forms.Maps.dll</HintPath>
+    <Reference Include="Xamarin.Forms.Labs, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xamarin.Forms.Labs.1.0.1.0\lib\portable-net45+win+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.Labs.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Xamarin.Forms.Maps.Android">
-      <HintPath>..\..\packages\Xamarin.Forms.Maps.2.3.0.107\lib\MonoAndroid10\Xamarin.Forms.Maps.Android.dll</HintPath>
+    <Reference Include="Xamarin.Forms.Maps, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\Visual Studio 2015\Projects\App2\packages\Xamarin.Forms.Maps.2.3.0.107\lib\MonoAndroid10\Xamarin.Forms.Maps.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Maps.Android, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\Visual Studio 2015\Projects\App2\packages\Xamarin.Forms.Maps.2.3.0.107\lib\MonoAndroid10\Xamarin.Forms.Maps.Android.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.107\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform.Android, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.107\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.107\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Xamarin.GooglePlayServices.Ads, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xamarin.GooglePlayServices.Ads.29.0.0.2\lib\MonoAndroid41\Xamarin.GooglePlayServices.Ads.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Xamarin.GooglePlayServices.Analytics">
+      <HintPath>..\..\packages\Xamarin.GooglePlayServices.Analytics.29.0.0.2\lib\MonoAndroid41\Xamarin.GooglePlayServices.Analytics.dll</HintPath>
+    </Reference>
     <Reference Include="Xamarin.GooglePlayServices.Base, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\packages\Xamarin.GooglePlayServices.Base.29.0.0.2\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll</HintPath>
-      <Private>True</Private>
     </Reference>
-    <Reference Include="Xamarin.GooglePlayServices.Basement, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Xamarin.GooglePlayServices.Basement">
       <HintPath>..\..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.2\lib\MonoAndroid41\Xamarin.GooglePlayServices.Basement.dll</HintPath>
-      <Private>True</Private>
     </Reference>
-    <Reference Include="Xamarin.GooglePlayServices.Gcm, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Xamarin.GooglePlayServices.Gcm">
       <HintPath>..\..\packages\Xamarin.GooglePlayServices.Gcm.29.0.0.2\lib\MonoAndroid41\Xamarin.GooglePlayServices.Gcm.dll</HintPath>
-      <Private>True</Private>
     </Reference>
-    <Reference Include="Xamarin.GooglePlayServices.Maps, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Xamarin.GooglePlayServices.Maps">
       <HintPath>..\..\packages\Xamarin.GooglePlayServices.Maps.29.0.0.2\lib\MonoAndroid41\Xamarin.GooglePlayServices.Maps.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.GooglePlayServices.Measurement">
+      <HintPath>..\..\packages\Xamarin.GooglePlayServices.Measurement.29.0.0.2\lib\MonoAndroid41\Xamarin.GooglePlayServices.Measurement.dll</HintPath>
+    </Reference>
+    <Reference Include="XLabs.Caching, Version=2.2.0.38182, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Caching.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Caching.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xamarin.GooglePlayServices.Measurement, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.GooglePlayServices.Measurement.29.0.0.2\lib\MonoAndroid41\Xamarin.GooglePlayServices.Measurement.dll</HintPath>
+    <Reference Include="XLabs.Caching.Sqlite, Version=2.2.0.38187, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Caching.SQLite.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Caching.Sqlite.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="XLabs.Core, Version=2.2.0.38178, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Core.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="XLabs.Forms, Version=2.2.0.38180, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Forms.2.2.0-pre05\lib\monoandroid\XLabs.Forms.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="XLabs.Forms.Droid, Version=2.2.0.38195, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Forms.2.2.0-pre05\lib\monoandroid\XLabs.Forms.Droid.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="XLabs.IOC, Version=2.2.0.38178, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.IoC.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.IOC.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="XLabs.Platform, Version=2.2.0.38179, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Platform.2.2.0-pre05\lib\MonoAndroid\XLabs.Platform.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="XLabs.Platform.Droid, Version=2.2.0.38182, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Platform.2.2.0-pre05\lib\MonoAndroid\XLabs.Platform.Droid.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="XLabs.Serialization, Version=2.2.0.38178, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Serialization.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Serialization.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -201,6 +295,7 @@
     <Compile Include="Helpers\YavscHelpers.cs" />
     <Compile Include="Html.cs" />
     <Compile Include="MainActivity.cs" />
+    <Compile Include="MainApplication.cs" />
     <Compile Include="MarkdownEditor.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -220,12 +315,15 @@
     <None Include="app.config">
       <SubType>Designer</SubType>
     </None>
+    <None Include="google-services.json" />
     <None Include="MarkdownEditor.cshtml">
       <Generator>RazorTemplatePreprocessor</Generator>
       <LastGenOutput>MarkdownEditor.cs</LastGenOutput>
       <SubType>None</SubType>
     </None>
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="Resources\AboutResources.txt" />
     <AndroidAsset Include="Assets\AboutAssets.txt" />
     <AndroidResource Include="Resources\layout\EditEstimate.axml">
@@ -254,6 +352,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <XamarinComponentReference Include="ConnectivityPlugin">
+      <Visible>False</Visible>
+      <Version>1.0.3</Version>
+    </XamarinComponentReference>
     <XamarinComponentReference Include="DeviceInfoPlugin">
       <Visible>False</Visible>
       <Version>1.0.0.2</Version>
@@ -262,6 +364,14 @@
       <Visible>False</Visible>
       <Version>1.0.3</Version>
     </XamarinComponentReference>
+    <XamarinComponentReference Include="GoogleMediaFramework">
+      <Visible>False</Visible>
+      <Version>1.0</Version>
+    </XamarinComponentReference>
+    <XamarinComponentReference Include="googleplayservices">
+      <Visible>False</Visible>
+      <Version>22.0.0.0</Version>
+    </XamarinComponentReference>
     <XamarinComponentReference Include="json.net">
       <Visible>False</Visible>
       <Version>7.0.1</Version>
@@ -274,6 +384,18 @@
       <Visible>False</Visible>
       <Version>1.5.2</Version>
     </XamarinComponentReference>
+    <XamarinComponentReference Include="signature-pad">
+      <Visible>False</Visible>
+      <Version>1.4.0.0</Version>
+    </XamarinComponentReference>
+    <XamarinComponentReference Include="xamandroidsupportv4-18">
+      <Visible>False</Visible>
+      <Version>21.0.3.0</Version>
+    </XamarinComponentReference>
+    <XamarinComponentReference Include="xamandroidsupportv7appcompat">
+      <Visible>False</Visible>
+      <Version>23.1.1.1</Version>
+    </XamarinComponentReference>
     <XamarinComponentReference Include="xamarin.auth">
       <Visible>False</Visible>
       <Version>1.2.3.1</Version>
@@ -295,9 +417,9 @@
     <AndroidAsset Include="Assets\quill.min.js" />
     <AndroidAsset Include="Assets\quill.core.css" />
     <AndroidAsset Include="Assets\quill.bubble.css" />
-    <Content Include="PluginsHelp\ConnectivityReadme.txt" />
-    <Content Include="PluginsHelp\GeolocatorReadme.txt" />
-    <AndroidResource Include="Resources\values\colors.xml" />
+    <AndroidResource Include="Resources\values\colors.xml">
+      <SubType>Designer</SubType>
+    </AndroidResource>
     <AndroidResource Include="Resources\values\dimens.xml" />
     <AndroidResource Include="Resources\values\strings.xml" />
     <AndroidResource Include="Resources\drawable\glyphish_07_map_marker.png" />
@@ -308,7 +430,7 @@
     <AndroidResource Include="Resources\drawable\nfqrcode.png" />
     <AndroidResource Include="Resources\drawable\visuel_sexion.jpg" />
     <AndroidResource Include="Resources\values\values-21\styles.xml" />
-    <AndroidResource Include="Resources\drawable\icon-anon.png" />
+    <AndroidResource Include="Resources\drawable\icon_anon.png" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Resources\drawable-hdpi\" />
@@ -322,11 +444,11 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.2\build\Xamarin.GooglePlayServices.Basement.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.2\build\Xamarin.GooglePlayServices.Basement.targets'))" />
     <Error Condition="!Exists('..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.0.107\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.0.107\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
   </Target>
   <Import Project="..\..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.2\build\Xamarin.GooglePlayServices.Basement.targets" Condition="Exists('..\..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.2\build\Xamarin.GooglePlayServices.Basement.targets')" />
   <Import Project="..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" />
-  <Import Project="..\..\packages\Xamarin.Forms.2.3.0.107\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.0.107\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
+  <Import Project="..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
      Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/BookAStar/BookAStar.Droid/Helpers/Settings.cs b/BookAStar/BookAStar.Droid/Helpers/Settings.cs
index 341fc3c0..ab5b4d87 100644
--- a/BookAStar/BookAStar.Droid/Helpers/Settings.cs
+++ b/BookAStar/BookAStar.Droid/Helpers/Settings.cs
@@ -1,4 +1,4 @@
-/*
+
 // Helpers/Settings.cs This file was automatically added when you installed the Settings Plugin. If you are not using a PCL then comment this file back in to use it.
 using Plugin.Settings;
 using Plugin.Settings.Abstractions;
@@ -41,4 +41,4 @@ namespace BookAStar.Droid.Helpers
     }
 
   }
-}*/
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/BookAStar/BookAStar.Droid/Helpers/SimpleJsonPostMethod.cs b/BookAStar/BookAStar.Droid/Helpers/SimpleJsonPostMethod.cs
index 4cc139e4..7f36b4ea 100644
--- a/BookAStar/BookAStar.Droid/Helpers/SimpleJsonPostMethod.cs
+++ b/BookAStar/BookAStar.Droid/Helpers/SimpleJsonPostMethod.cs
@@ -24,6 +24,7 @@ using System.Json;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using System;
+using System.Diagnostics;
 
 namespace Yavsc.Helpers
 {
@@ -84,18 +85,27 @@ namespace Yavsc.Helpers
 		public async Task<JsonValue> InvokeJson(object query)
 		{
 
-      JsonValue jsonDoc=null;
+           JsonValue jsonDoc=null;
 			using (Stream streamQuery = request.GetRequestStream()) {
 				using (StreamWriter writer = new StreamWriter(streamQuery)) {
 					writer.Write (JsonConvert.SerializeObject(query));
 				}}
-			using (WebResponse response = request.GetResponse ()) {
-				using (Stream stream = response.GetResponseStream ()) {
-                    if (stream.Length>0)
-		      jsonDoc = await Task.Run (() => JsonObject.Load (stream));			
-				}
-				response.Close();
-			}
+            try
+            {
+                using (WebResponse response = request.GetResponse())
+                {
+                    using (Stream stream = response.GetResponseStream())
+                    {
+                        if (stream.Length > 0)
+                            jsonDoc = await Task.Run(() => JsonObject.Load(stream));
+                    }
+                    response.Close();
+                }
+            }
+            catch (WebException ex)
+            {
+                Debug.Print($"Web request failed: {request.ToString()}\n" + ex.ToString());
+            }
 			return jsonDoc;
 		}
 	}
diff --git a/BookAStar/BookAStar.Droid/MainActivity.cs b/BookAStar/BookAStar.Droid/MainActivity.cs
index 9a7601e3..2f049a1a 100644
--- a/BookAStar/BookAStar.Droid/MainActivity.cs
+++ b/BookAStar/BookAStar.Droid/MainActivity.cs
@@ -9,6 +9,13 @@ using Android.Gms.Common;
 using Android.Util;
 
 using Xamarin.Auth;
+using XLabs.Forms;
+using XLabs.Platform.Device;
+using XLabs.Forms.Services;
+using XLabs.Platform.Services.Email;
+using XLabs.Platform.Services.Media;
+using XLabs.Serialization;
+
 using Newtonsoft.Json.Linq;
 using System.Net;
 using System.IO;
@@ -22,17 +29,71 @@ using Yavsc.Helpers;
 using Yavsc.Models.Identity;
 using BookAStar.Helpers;
 using BookAStar.Interfaces;
+using Plugin.DeviceInfo;
+using Android.Speech.Tts;
+using XLabs.Platform.Services;
+using XLabs.Caching.SQLite;
+using SQLite.Net.Platform.XamarinAndroid;
+using SQLite.Net;
+using XLabs.Ioc;
+using XLabs.Platform.Mvvm;
+using XLabs.Caching;
 
 namespace BookAStar.Droid
 {
     [Activity(Name="fr.pschneider.bas.MainActivity", Label = "BookAStar", Icon = "@drawable/icon", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
-    public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity,
-        IPlatform
+    public class MainActivity :
+        XFormsApplicationDroid,
+        // was global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity,
+        IPlatform, IComponentContext
     {
         protected override void OnCreate(Bundle bundle)
         {
-            TabLayoutResource = Resource.Layout.Tabbar;
-            ToolbarResource = Resource.Layout.Toolbar;
+            base.OnCreate(bundle);
+
+           // Window.RequestFeature(Android.Views.WindowFeatures.ActionBar);
+
+            if (Build.VERSION.SdkInt >= BuildVersionCodes.Kitkat)
+            {
+                Android.Webkit.WebView.SetWebContentsDebuggingEnabled(true);
+            }
+
+            // no Resolver.IsSet
+            if (!Resolver.IsSet)
+            {
+                this.SetIoc();
+            }
+            else
+            {
+                var app = Resolver.Resolve<IXFormsApp>() as IXFormsApp<XFormsApplicationDroid>;
+                if (app != null) app.AppContext = this;
+            }
+            global::Xamarin.Forms.Forms.Init(this, bundle);
+            global::Xamarin.FormsMaps.Init(this, bundle);
+
+            Xamarin.Forms.Forms.ViewInitialized += (sender, e) =>
+            {
+                if (!string.IsNullOrWhiteSpace(e.View.StyleId))
+                {
+                    e.NativeView.ContentDescription = e.View.StyleId;
+                }
+            };
+
+            //TabLayoutResource = Resource.Layout.Tabbar;
+            //ToolbarResource = Resource.Layout.Toolbar;
+
+            // Theme.Resources.FinishPreloading();
+            // Theme.ApplyStyle(Resource.Style.MainTheme, false);
+
+            // XmlREader tb = Resources.GetLayout(Resource.Layout.Toolbar);
+            var tb = new Toolbar(this.BaseContext);
+
+            this.SetActionBar(tb);
+            
+            LoadApplication(new BookAStar.App(this));
+            /*
+            // TabLayoutResource = Resource.Layout.Tabbar;
+            // ToolbarResource = Resource.Layout.Toolbar;
             base.OnCreate(bundle);
             global::Xamarin.Forms.Forms.Init(this, bundle);
             global::Xamarin.FormsMaps.Init(this, bundle);
@@ -40,8 +101,36 @@ namespace BookAStar.Droid
             /* var x = typeof(Themes.DarkThemeResources);
              x = typeof(Themes.LightThemeResources);
              x = typeof(Themes.Android.UnderlineEffect); */
+
         }
 
+        private void SetIoc()
+        {
+            var resolverContainer = new SimpleContainer();
+
+            var app = new XFormsAppDroid();
+
+            app.Init(this);
+
+            var documents = app.AppDataDirectory;
+            var pathToDatabase = Path.Combine(documents, "xforms.db");
+
+            resolverContainer.Register<IDevice>(t => AndroidDevice.CurrentDevice)
+                .Register<IDisplay>(t => t.Resolve<IDevice>().Display)
+                .Register<IFontManager>(t => new FontManager(t.Resolve<IDisplay>()))
+                .Register<IEmailService, EmailService>()
+                .Register<IMediaPicker, MediaPicker>()
+                .Register<ITextToSpeechService, XLabs.Platform.Services.TextToSpeechService>()
+                .Register<IDependencyContainer>(resolverContainer)
+                .Register<IXFormsApp>(app)
+                .Register<ISecureStorage>(t => new KeyVaultStorage(t.Resolve<IDevice>().Id.ToCharArray()))
+                .Register<ICacheProvider>(
+                    t => new SQLiteSimpleCache(new SQLitePlatformAndroid(),
+                        new SQLiteConnectionString(pathToDatabase, true), t.Resolve<IJsonSerializer>()));
+
+
+            Resolver.SetResolver(resolverContainer.GetResolver());
+        }
 
         public bool EnablePushNotifications(bool enable)
         {
@@ -290,7 +379,7 @@ namespace BookAStar.Droid
 
         public IGCMDeclaration GetDeviceInfo()
         {
-            var devinfo = DeviceInfo.Plugin.CrossDeviceInfo.Current;
+            var devinfo = CrossDeviceInfo.Current;
             return new GCMDeclaration
             {
                 DeviceId = devinfo.Id,
@@ -325,7 +414,17 @@ namespace BookAStar.Droid
                 return m.InvokeJson(arg);
             }
         }
-        
+
+        public T Resolve<T>()
+        {
+
+            throw new NotImplementedException();
+        }
+
+        public object Resolve(Type t)
+        {
+            throw new NotImplementedException();
+        }
     }
 }
 
diff --git a/BookAStar/BookAStar.Droid/MainApplication.cs b/BookAStar/BookAStar.Droid/MainApplication.cs
new file mode 100644
index 00000000..451205f8
--- /dev/null
+++ b/BookAStar/BookAStar.Droid/MainApplication.cs
@@ -0,0 +1,63 @@
+using System;
+
+using Android.App;
+using Android.OS;
+using Android.Runtime;
+using Plugin.CurrentActivity;
+
+namespace BookAStar.Droid
+{
+	//You can specify additional application information in this attribute
+    [Application]
+    public class MainApplication : Application, Application.IActivityLifecycleCallbacks
+    {
+        public MainApplication(IntPtr handle, JniHandleOwnership transer)
+          :base(handle, transer)
+        {
+        }
+
+        public override void OnCreate()
+        {
+            base.OnCreate();
+            RegisterActivityLifecycleCallbacks(this);
+            //A great place to initialize Xamarin.Insights and Dependency Services!
+        }
+
+        public override void OnTerminate()
+        {
+            base.OnTerminate();
+            UnregisterActivityLifecycleCallbacks(this);
+        }
+
+        public void OnActivityCreated(Activity activity, Bundle savedInstanceState)
+        {
+            CrossCurrentActivity.Current.Activity = activity;
+        }
+
+        public void OnActivityDestroyed(Activity activity)
+        {
+        }
+
+        public void OnActivityPaused(Activity activity)
+        {
+        }
+
+        public void OnActivityResumed(Activity activity)
+        {
+            CrossCurrentActivity.Current.Activity = activity;
+        }
+
+        public void OnActivitySaveInstanceState(Activity activity, Bundle outState)
+        {
+        }
+
+        public void OnActivityStarted(Activity activity)
+        {
+            CrossCurrentActivity.Current.Activity = activity;
+        }
+
+        public void OnActivityStopped(Activity activity)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/BookAStar/BookAStar.Droid/MarkdownWebViewClient.cs b/BookAStar/BookAStar.Droid/MarkdownWebViewClient.cs
index c98e4e27..c2d0fff6 100644
--- a/BookAStar/BookAStar.Droid/MarkdownWebViewClient.cs
+++ b/BookAStar/BookAStar.Droid/MarkdownWebViewClient.cs
@@ -1,18 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
 using Android.App;
-using Android.Content;
-using Android.OS;
-using Android.Runtime;
-using Android.Views;
-using Android.Widget;
 using Android.Webkit;
-using Java.Lang;
-using Java.IO;
-using Android.Content.Res;
 
 namespace BookAStar.Droid
 {
diff --git a/BookAStar/BookAStar.Droid/PluginsHelp/ConnectivityReadme.txt b/BookAStar/BookAStar.Droid/PluginsHelp/ConnectivityReadme.txt
deleted file mode 100644
index c098e9b3..00000000
--- a/BookAStar/BookAStar.Droid/PluginsHelp/ConnectivityReadme.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Connectivity Readme
-Find the most up to date information at: https://github.com/jamesmontemagno/Xamarin.Plugins
-
-**IMPORTANT**
-Android:
-You must request ACCESS_NETWORK_STATE permission to get the network state
-You must request ACCESS_WIFI_STATE to get speeds
-
-iOS:
-Bandwidths is not supported and will always return an empty list.
-
-Windows 8.1 & Windows Phone 8.1 RT:
-RT apps can not perform loopback, so you can not use IsReachable to query the states of a local IP.
-
-Permissions to think about:
-The Private Networks (Client & Server) capability is represented by the Capability name = "privateNetworkClientServer" tag in the app manifest. 
-The Internet (Client & Server) capability is represented by the Capability name = "internetClientServer" tag in the app manifest.
diff --git a/BookAStar/BookAStar.Droid/PluginsHelp/GeolocatorReadme.txt b/BookAStar/BookAStar.Droid/PluginsHelp/GeolocatorReadme.txt
deleted file mode 100644
index b010d551..00000000
--- a/BookAStar/BookAStar.Droid/PluginsHelp/GeolocatorReadme.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-Connectivity Readme
-Find the most up to date information at: https://github.com/jamesmontemagno/Xamarin.Plugins
-
-**IMPORTANT**
-Android:
-You must request ACCESS_COARSE_LOCATION & ACCESS_FINE_LOCATION permission
-
-iOS:
-In iOS 8 you now have to call either RequestWhenInUseAuthorization or RequestAlwaysAuthorization on the location manager. Additionally you need to add either the concisely named NSLocationWhenInUseUsageDescription or NSLocationAlwaysUsageDescription to your Info.plist. 
-See:  http://motzcod.es/post/97662738237/scanning-for-ibeacons-in-ios-8
-
-Windows Phone:
-You must set the ID_CAP_LOCATION permission.
-
-Getting Started:
-
-var locator = CrossGeolocator.Current;
-locator.DesiredAccuracy = 50;
-
-var position = await locator.GetPositionAsync (timeout: 10000);
-
-Console.WriteLine ("Position Status: {0}", position.Timestamp);
-Console.WriteLine ("Position Latitude: {0}", position.Latitude);
-Console.WriteLine ("Position Longitude: {0}", position.Longitude);
\ No newline at end of file
diff --git a/BookAStar/BookAStar.Droid/Resources/Resource.Designer.cs b/BookAStar/BookAStar.Droid/Resources/Resource.Designer.cs
index 6cf15c7a..b2617ce9 100644
--- a/BookAStar/BookAStar.Droid/Resources/Resource.Designer.cs
+++ b/BookAStar/BookAStar.Droid/Resources/Resource.Designer.cs
@@ -26,7 +26,1836 @@ namespace BookAStar.Droid
 		
 		public static void UpdateIdValues()
 		{
+			global::SQLite.Net.Platform.XamarinAndroid.Resource.String.ApplicationName = global::BookAStar.Droid.Resource.String.ApplicationName;
+			global::SQLite.Net.Platform.XamarinAndroid.Resource.String.Hello = global::BookAStar.Droid.Resource.String.Hello;
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.actionBarSize = global::BookAStar.Droid.Resource.Attribute.actionBarSize;
+			global::XLabs.Forms.Droid.Resource.Animation.abc_fade_in = global::BookAStar.Droid.Resource.Animation.abc_fade_in;
+			global::XLabs.Forms.Droid.Resource.Animation.abc_fade_out = global::BookAStar.Droid.Resource.Animation.abc_fade_out;
+			global::XLabs.Forms.Droid.Resource.Animation.abc_grow_fade_in_from_bottom = global::BookAStar.Droid.Resource.Animation.abc_grow_fade_in_from_bottom;
+			global::XLabs.Forms.Droid.Resource.Animation.abc_popup_enter = global::BookAStar.Droid.Resource.Animation.abc_popup_enter;
+			global::XLabs.Forms.Droid.Resource.Animation.abc_popup_exit = global::BookAStar.Droid.Resource.Animation.abc_popup_exit;
+			global::XLabs.Forms.Droid.Resource.Animation.abc_shrink_fade_out_from_bottom = global::BookAStar.Droid.Resource.Animation.abc_shrink_fade_out_from_bottom;
+			global::XLabs.Forms.Droid.Resource.Animation.abc_slide_in_bottom = global::BookAStar.Droid.Resource.Animation.abc_slide_in_bottom;
+			global::XLabs.Forms.Droid.Resource.Animation.abc_slide_in_top = global::BookAStar.Droid.Resource.Animation.abc_slide_in_top;
+			global::XLabs.Forms.Droid.Resource.Animation.abc_slide_out_bottom = global::BookAStar.Droid.Resource.Animation.abc_slide_out_bottom;
+			global::XLabs.Forms.Droid.Resource.Animation.abc_slide_out_top = global::BookAStar.Droid.Resource.Animation.abc_slide_out_top;
+			global::XLabs.Forms.Droid.Resource.Animation.design_bottom_sheet_slide_in = global::BookAStar.Droid.Resource.Animation.design_bottom_sheet_slide_in;
+			global::XLabs.Forms.Droid.Resource.Animation.design_bottom_sheet_slide_out = global::BookAStar.Droid.Resource.Animation.design_bottom_sheet_slide_out;
+			global::XLabs.Forms.Droid.Resource.Animation.design_fab_in = global::BookAStar.Droid.Resource.Animation.design_fab_in;
+			global::XLabs.Forms.Droid.Resource.Animation.design_fab_out = global::BookAStar.Droid.Resource.Animation.design_fab_out;
+			global::XLabs.Forms.Droid.Resource.Animation.design_snackbar_in = global::BookAStar.Droid.Resource.Animation.design_snackbar_in;
+			global::XLabs.Forms.Droid.Resource.Animation.design_snackbar_out = global::BookAStar.Droid.Resource.Animation.design_snackbar_out;
+			global::XLabs.Forms.Droid.Resource.Attribute.MediaRouteControllerWindowBackground = global::BookAStar.Droid.Resource.Attribute.MediaRouteControllerWindowBackground;
+			global::XLabs.Forms.Droid.Resource.Attribute.actionBarDivider = global::BookAStar.Droid.Resource.Attribute.actionBarDivider;
+			global::XLabs.Forms.Droid.Resource.Attribute.actionBarItemBackground = global::BookAStar.Droid.Resource.Attribute.actionBarItemBackground;
+			global::XLabs.Forms.Droid.Resource.Attribute.actionBarPopupTheme = global::BookAStar.Droid.Resource.Attribute.actionBarPopupTheme;
+			global::XLabs.Forms.Droid.Resource.Attribute.actionBarSize = global::BookAStar.Droid.Resource.Attribute.actionBarSize;
+			global::XLabs.Forms.Droid.Resource.Attribute.actionBarSplitStyle = global::BookAStar.Droid.Resource.Attribute.actionBarSplitStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.actionBarStyle = global::BookAStar.Droid.Resource.Attribute.actionBarStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.actionBarTabBarStyle = global::BookAStar.Droid.Resource.Attribute.actionBarTabBarStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.actionBarTabStyle = global::BookAStar.Droid.Resource.Attribute.actionBarTabStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.actionBarTabTextStyle = global::BookAStar.Droid.Resource.Attribute.actionBarTabTextStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.actionBarTheme = global::BookAStar.Droid.Resource.Attribute.actionBarTheme;
+			global::XLabs.Forms.Droid.Resource.Attribute.actionBarWidgetTheme = global::BookAStar.Droid.Resource.Attribute.actionBarWidgetTheme;
+			global::XLabs.Forms.Droid.Resource.Attribute.actionButtonStyle = global::BookAStar.Droid.Resource.Attribute.actionButtonStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.actionDropDownStyle = global::BookAStar.Droid.Resource.Attribute.actionDropDownStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.actionLayout = global::BookAStar.Droid.Resource.Attribute.actionLayout;
+			global::XLabs.Forms.Droid.Resource.Attribute.actionMenuTextAppearance = global::BookAStar.Droid.Resource.Attribute.actionMenuTextAppearance;
+			global::XLabs.Forms.Droid.Resource.Attribute.actionMenuTextColor = global::BookAStar.Droid.Resource.Attribute.actionMenuTextColor;
+			global::XLabs.Forms.Droid.Resource.Attribute.actionModeBackground = global::BookAStar.Droid.Resource.Attribute.actionModeBackground;
+			global::XLabs.Forms.Droid.Resource.Attribute.actionModeCloseButtonStyle = global::BookAStar.Droid.Resource.Attribute.actionModeCloseButtonStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.actionModeCloseDrawable = global::BookAStar.Droid.Resource.Attribute.actionModeCloseDrawable;
+			global::XLabs.Forms.Droid.Resource.Attribute.actionModeCopyDrawable = global::BookAStar.Droid.Resource.Attribute.actionModeCopyDrawable;
+			global::XLabs.Forms.Droid.Resource.Attribute.actionModeCutDrawable = global::BookAStar.Droid.Resource.Attribute.actionModeCutDrawable;
+			global::XLabs.Forms.Droid.Resource.Attribute.actionModeFindDrawable = global::BookAStar.Droid.Resource.Attribute.actionModeFindDrawable;
+			global::XLabs.Forms.Droid.Resource.Attribute.actionModePasteDrawable = global::BookAStar.Droid.Resource.Attribute.actionModePasteDrawable;
+			global::XLabs.Forms.Droid.Resource.Attribute.actionModePopupWindowStyle = global::BookAStar.Droid.Resource.Attribute.actionModePopupWindowStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.actionModeSelectAllDrawable = global::BookAStar.Droid.Resource.Attribute.actionModeSelectAllDrawable;
+			global::XLabs.Forms.Droid.Resource.Attribute.actionModeShareDrawable = global::BookAStar.Droid.Resource.Attribute.actionModeShareDrawable;
+			global::XLabs.Forms.Droid.Resource.Attribute.actionModeSplitBackground = global::BookAStar.Droid.Resource.Attribute.actionModeSplitBackground;
+			global::XLabs.Forms.Droid.Resource.Attribute.actionModeStyle = global::BookAStar.Droid.Resource.Attribute.actionModeStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.actionModeWebSearchDrawable = global::BookAStar.Droid.Resource.Attribute.actionModeWebSearchDrawable;
+			global::XLabs.Forms.Droid.Resource.Attribute.actionOverflowButtonStyle = global::BookAStar.Droid.Resource.Attribute.actionOverflowButtonStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.actionOverflowMenuStyle = global::BookAStar.Droid.Resource.Attribute.actionOverflowMenuStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.actionProviderClass = global::BookAStar.Droid.Resource.Attribute.actionProviderClass;
+			global::XLabs.Forms.Droid.Resource.Attribute.actionViewClass = global::BookAStar.Droid.Resource.Attribute.actionViewClass;
+			global::XLabs.Forms.Droid.Resource.Attribute.activityChooserViewStyle = global::BookAStar.Droid.Resource.Attribute.activityChooserViewStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.alertDialogButtonGroupStyle = global::BookAStar.Droid.Resource.Attribute.alertDialogButtonGroupStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.alertDialogCenterButtons = global::BookAStar.Droid.Resource.Attribute.alertDialogCenterButtons;
+			global::XLabs.Forms.Droid.Resource.Attribute.alertDialogStyle = global::BookAStar.Droid.Resource.Attribute.alertDialogStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.alertDialogTheme = global::BookAStar.Droid.Resource.Attribute.alertDialogTheme;
+			global::XLabs.Forms.Droid.Resource.Attribute.allowStacking = global::BookAStar.Droid.Resource.Attribute.allowStacking;
+			global::XLabs.Forms.Droid.Resource.Attribute.arrowHeadLength = global::BookAStar.Droid.Resource.Attribute.arrowHeadLength;
+			global::XLabs.Forms.Droid.Resource.Attribute.arrowShaftLength = global::BookAStar.Droid.Resource.Attribute.arrowShaftLength;
+			global::XLabs.Forms.Droid.Resource.Attribute.autoCompleteTextViewStyle = global::BookAStar.Droid.Resource.Attribute.autoCompleteTextViewStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.background = global::BookAStar.Droid.Resource.Attribute.background;
+			global::XLabs.Forms.Droid.Resource.Attribute.backgroundSplit = global::BookAStar.Droid.Resource.Attribute.backgroundSplit;
+			global::XLabs.Forms.Droid.Resource.Attribute.backgroundStacked = global::BookAStar.Droid.Resource.Attribute.backgroundStacked;
+			global::XLabs.Forms.Droid.Resource.Attribute.backgroundTint = global::BookAStar.Droid.Resource.Attribute.backgroundTint;
+			global::XLabs.Forms.Droid.Resource.Attribute.backgroundTintMode = global::BookAStar.Droid.Resource.Attribute.backgroundTintMode;
+			global::XLabs.Forms.Droid.Resource.Attribute.barLength = global::BookAStar.Droid.Resource.Attribute.barLength;
+			global::XLabs.Forms.Droid.Resource.Attribute.behavior_hideable = global::BookAStar.Droid.Resource.Attribute.behavior_hideable;
+			global::XLabs.Forms.Droid.Resource.Attribute.behavior_overlapTop = global::BookAStar.Droid.Resource.Attribute.behavior_overlapTop;
+			global::XLabs.Forms.Droid.Resource.Attribute.behavior_peekHeight = global::BookAStar.Droid.Resource.Attribute.behavior_peekHeight;
+			global::XLabs.Forms.Droid.Resource.Attribute.borderWidth = global::BookAStar.Droid.Resource.Attribute.borderWidth;
+			global::XLabs.Forms.Droid.Resource.Attribute.borderlessButtonStyle = global::BookAStar.Droid.Resource.Attribute.borderlessButtonStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.bottomSheetDialogTheme = global::BookAStar.Droid.Resource.Attribute.bottomSheetDialogTheme;
+			global::XLabs.Forms.Droid.Resource.Attribute.bottomSheetStyle = global::BookAStar.Droid.Resource.Attribute.bottomSheetStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.buttonBarButtonStyle = global::BookAStar.Droid.Resource.Attribute.buttonBarButtonStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.buttonBarNegativeButtonStyle = global::BookAStar.Droid.Resource.Attribute.buttonBarNegativeButtonStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.buttonBarNeutralButtonStyle = global::BookAStar.Droid.Resource.Attribute.buttonBarNeutralButtonStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.buttonBarPositiveButtonStyle = global::BookAStar.Droid.Resource.Attribute.buttonBarPositiveButtonStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.buttonBarStyle = global::BookAStar.Droid.Resource.Attribute.buttonBarStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.buttonPanelSideLayout = global::BookAStar.Droid.Resource.Attribute.buttonPanelSideLayout;
+			global::XLabs.Forms.Droid.Resource.Attribute.buttonStyle = global::BookAStar.Droid.Resource.Attribute.buttonStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.buttonStyleSmall = global::BookAStar.Droid.Resource.Attribute.buttonStyleSmall;
+			global::XLabs.Forms.Droid.Resource.Attribute.buttonTint = global::BookAStar.Droid.Resource.Attribute.buttonTint;
+			global::XLabs.Forms.Droid.Resource.Attribute.buttonTintMode = global::BookAStar.Droid.Resource.Attribute.buttonTintMode;
+			global::XLabs.Forms.Droid.Resource.Attribute.cardBackgroundColor = global::BookAStar.Droid.Resource.Attribute.cardBackgroundColor;
+			global::XLabs.Forms.Droid.Resource.Attribute.cardCornerRadius = global::BookAStar.Droid.Resource.Attribute.cardCornerRadius;
+			global::XLabs.Forms.Droid.Resource.Attribute.cardElevation = global::BookAStar.Droid.Resource.Attribute.cardElevation;
+			global::XLabs.Forms.Droid.Resource.Attribute.cardMaxElevation = global::BookAStar.Droid.Resource.Attribute.cardMaxElevation;
+			global::XLabs.Forms.Droid.Resource.Attribute.cardPreventCornerOverlap = global::BookAStar.Droid.Resource.Attribute.cardPreventCornerOverlap;
+			global::XLabs.Forms.Droid.Resource.Attribute.cardUseCompatPadding = global::BookAStar.Droid.Resource.Attribute.cardUseCompatPadding;
+			global::XLabs.Forms.Droid.Resource.Attribute.checkboxStyle = global::BookAStar.Droid.Resource.Attribute.checkboxStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.checkedTextViewStyle = global::BookAStar.Droid.Resource.Attribute.checkedTextViewStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.closeIcon = global::BookAStar.Droid.Resource.Attribute.closeIcon;
+			global::XLabs.Forms.Droid.Resource.Attribute.closeItemLayout = global::BookAStar.Droid.Resource.Attribute.closeItemLayout;
+			global::XLabs.Forms.Droid.Resource.Attribute.collapseContentDescription = global::BookAStar.Droid.Resource.Attribute.collapseContentDescription;
+			global::XLabs.Forms.Droid.Resource.Attribute.collapseIcon = global::BookAStar.Droid.Resource.Attribute.collapseIcon;
+			global::XLabs.Forms.Droid.Resource.Attribute.collapsedTitleGravity = global::BookAStar.Droid.Resource.Attribute.collapsedTitleGravity;
+			global::XLabs.Forms.Droid.Resource.Attribute.collapsedTitleTextAppearance = global::BookAStar.Droid.Resource.Attribute.collapsedTitleTextAppearance;
+			global::XLabs.Forms.Droid.Resource.Attribute.color = global::BookAStar.Droid.Resource.Attribute.color;
+			global::XLabs.Forms.Droid.Resource.Attribute.colorAccent = global::BookAStar.Droid.Resource.Attribute.colorAccent;
+			global::XLabs.Forms.Droid.Resource.Attribute.colorButtonNormal = global::BookAStar.Droid.Resource.Attribute.colorButtonNormal;
+			global::XLabs.Forms.Droid.Resource.Attribute.colorControlActivated = global::BookAStar.Droid.Resource.Attribute.colorControlActivated;
+			global::XLabs.Forms.Droid.Resource.Attribute.colorControlHighlight = global::BookAStar.Droid.Resource.Attribute.colorControlHighlight;
+			global::XLabs.Forms.Droid.Resource.Attribute.colorControlNormal = global::BookAStar.Droid.Resource.Attribute.colorControlNormal;
+			global::XLabs.Forms.Droid.Resource.Attribute.colorPrimary = global::BookAStar.Droid.Resource.Attribute.colorPrimary;
+			global::XLabs.Forms.Droid.Resource.Attribute.colorPrimaryDark = global::BookAStar.Droid.Resource.Attribute.colorPrimaryDark;
+			global::XLabs.Forms.Droid.Resource.Attribute.colorSwitchThumbNormal = global::BookAStar.Droid.Resource.Attribute.colorSwitchThumbNormal;
+			global::XLabs.Forms.Droid.Resource.Attribute.commitIcon = global::BookAStar.Droid.Resource.Attribute.commitIcon;
+			global::XLabs.Forms.Droid.Resource.Attribute.contentInsetEnd = global::BookAStar.Droid.Resource.Attribute.contentInsetEnd;
+			global::XLabs.Forms.Droid.Resource.Attribute.contentInsetLeft = global::BookAStar.Droid.Resource.Attribute.contentInsetLeft;
+			global::XLabs.Forms.Droid.Resource.Attribute.contentInsetRight = global::BookAStar.Droid.Resource.Attribute.contentInsetRight;
+			global::XLabs.Forms.Droid.Resource.Attribute.contentInsetStart = global::BookAStar.Droid.Resource.Attribute.contentInsetStart;
+			global::XLabs.Forms.Droid.Resource.Attribute.contentPadding = global::BookAStar.Droid.Resource.Attribute.contentPadding;
+			global::XLabs.Forms.Droid.Resource.Attribute.contentPaddingBottom = global::BookAStar.Droid.Resource.Attribute.contentPaddingBottom;
+			global::XLabs.Forms.Droid.Resource.Attribute.contentPaddingLeft = global::BookAStar.Droid.Resource.Attribute.contentPaddingLeft;
+			global::XLabs.Forms.Droid.Resource.Attribute.contentPaddingRight = global::BookAStar.Droid.Resource.Attribute.contentPaddingRight;
+			global::XLabs.Forms.Droid.Resource.Attribute.contentPaddingTop = global::BookAStar.Droid.Resource.Attribute.contentPaddingTop;
+			global::XLabs.Forms.Droid.Resource.Attribute.contentScrim = global::BookAStar.Droid.Resource.Attribute.contentScrim;
+			global::XLabs.Forms.Droid.Resource.Attribute.controlBackground = global::BookAStar.Droid.Resource.Attribute.controlBackground;
+			global::XLabs.Forms.Droid.Resource.Attribute.counterEnabled = global::BookAStar.Droid.Resource.Attribute.counterEnabled;
+			global::XLabs.Forms.Droid.Resource.Attribute.counterMaxLength = global::BookAStar.Droid.Resource.Attribute.counterMaxLength;
+			global::XLabs.Forms.Droid.Resource.Attribute.counterOverflowTextAppearance = global::BookAStar.Droid.Resource.Attribute.counterOverflowTextAppearance;
+			global::XLabs.Forms.Droid.Resource.Attribute.counterTextAppearance = global::BookAStar.Droid.Resource.Attribute.counterTextAppearance;
+			global::XLabs.Forms.Droid.Resource.Attribute.customNavigationLayout = global::BookAStar.Droid.Resource.Attribute.customNavigationLayout;
+			global::XLabs.Forms.Droid.Resource.Attribute.defaultQueryHint = global::BookAStar.Droid.Resource.Attribute.defaultQueryHint;
+			global::XLabs.Forms.Droid.Resource.Attribute.dialogPreferredPadding = global::BookAStar.Droid.Resource.Attribute.dialogPreferredPadding;
+			global::XLabs.Forms.Droid.Resource.Attribute.dialogTheme = global::BookAStar.Droid.Resource.Attribute.dialogTheme;
+			global::XLabs.Forms.Droid.Resource.Attribute.displayOptions = global::BookAStar.Droid.Resource.Attribute.displayOptions;
+			global::XLabs.Forms.Droid.Resource.Attribute.divider = global::BookAStar.Droid.Resource.Attribute.divider;
+			global::XLabs.Forms.Droid.Resource.Attribute.dividerHorizontal = global::BookAStar.Droid.Resource.Attribute.dividerHorizontal;
+			global::XLabs.Forms.Droid.Resource.Attribute.dividerPadding = global::BookAStar.Droid.Resource.Attribute.dividerPadding;
+			global::XLabs.Forms.Droid.Resource.Attribute.dividerVertical = global::BookAStar.Droid.Resource.Attribute.dividerVertical;
+			global::XLabs.Forms.Droid.Resource.Attribute.drawableSize = global::BookAStar.Droid.Resource.Attribute.drawableSize;
+			global::XLabs.Forms.Droid.Resource.Attribute.drawerArrowStyle = global::BookAStar.Droid.Resource.Attribute.drawerArrowStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.dropDownListViewStyle = global::BookAStar.Droid.Resource.Attribute.dropDownListViewStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.dropdownListPreferredItemHeight = global::BookAStar.Droid.Resource.Attribute.dropdownListPreferredItemHeight;
+			global::XLabs.Forms.Droid.Resource.Attribute.editTextBackground = global::BookAStar.Droid.Resource.Attribute.editTextBackground;
+			global::XLabs.Forms.Droid.Resource.Attribute.editTextColor = global::BookAStar.Droid.Resource.Attribute.editTextColor;
+			global::XLabs.Forms.Droid.Resource.Attribute.editTextStyle = global::BookAStar.Droid.Resource.Attribute.editTextStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.elevation = global::BookAStar.Droid.Resource.Attribute.elevation;
+			global::XLabs.Forms.Droid.Resource.Attribute.errorEnabled = global::BookAStar.Droid.Resource.Attribute.errorEnabled;
+			global::XLabs.Forms.Droid.Resource.Attribute.errorTextAppearance = global::BookAStar.Droid.Resource.Attribute.errorTextAppearance;
+			global::XLabs.Forms.Droid.Resource.Attribute.expandActivityOverflowButtonDrawable = global::BookAStar.Droid.Resource.Attribute.expandActivityOverflowButtonDrawable;
+			global::XLabs.Forms.Droid.Resource.Attribute.expanded = global::BookAStar.Droid.Resource.Attribute.expanded;
+			global::XLabs.Forms.Droid.Resource.Attribute.expandedTitleGravity = global::BookAStar.Droid.Resource.Attribute.expandedTitleGravity;
+			global::XLabs.Forms.Droid.Resource.Attribute.expandedTitleMargin = global::BookAStar.Droid.Resource.Attribute.expandedTitleMargin;
+			global::XLabs.Forms.Droid.Resource.Attribute.expandedTitleMarginBottom = global::BookAStar.Droid.Resource.Attribute.expandedTitleMarginBottom;
+			global::XLabs.Forms.Droid.Resource.Attribute.expandedTitleMarginEnd = global::BookAStar.Droid.Resource.Attribute.expandedTitleMarginEnd;
+			global::XLabs.Forms.Droid.Resource.Attribute.expandedTitleMarginStart = global::BookAStar.Droid.Resource.Attribute.expandedTitleMarginStart;
+			global::XLabs.Forms.Droid.Resource.Attribute.expandedTitleMarginTop = global::BookAStar.Droid.Resource.Attribute.expandedTitleMarginTop;
+			global::XLabs.Forms.Droid.Resource.Attribute.expandedTitleTextAppearance = global::BookAStar.Droid.Resource.Attribute.expandedTitleTextAppearance;
+			global::XLabs.Forms.Droid.Resource.Attribute.externalRouteEnabledDrawable = global::BookAStar.Droid.Resource.Attribute.externalRouteEnabledDrawable;
+			global::XLabs.Forms.Droid.Resource.Attribute.fabSize = global::BookAStar.Droid.Resource.Attribute.fabSize;
+			global::XLabs.Forms.Droid.Resource.Attribute.foregroundInsidePadding = global::BookAStar.Droid.Resource.Attribute.foregroundInsidePadding;
+			global::XLabs.Forms.Droid.Resource.Attribute.gapBetweenBars = global::BookAStar.Droid.Resource.Attribute.gapBetweenBars;
+			global::XLabs.Forms.Droid.Resource.Attribute.goIcon = global::BookAStar.Droid.Resource.Attribute.goIcon;
+			global::XLabs.Forms.Droid.Resource.Attribute.headerLayout = global::BookAStar.Droid.Resource.Attribute.headerLayout;
+			global::XLabs.Forms.Droid.Resource.Attribute.height = global::BookAStar.Droid.Resource.Attribute.height;
+			global::XLabs.Forms.Droid.Resource.Attribute.hideOnContentScroll = global::BookAStar.Droid.Resource.Attribute.hideOnContentScroll;
+			global::XLabs.Forms.Droid.Resource.Attribute.hintAnimationEnabled = global::BookAStar.Droid.Resource.Attribute.hintAnimationEnabled;
+			global::XLabs.Forms.Droid.Resource.Attribute.hintEnabled = global::BookAStar.Droid.Resource.Attribute.hintEnabled;
+			global::XLabs.Forms.Droid.Resource.Attribute.hintTextAppearance = global::BookAStar.Droid.Resource.Attribute.hintTextAppearance;
+			global::XLabs.Forms.Droid.Resource.Attribute.homeAsUpIndicator = global::BookAStar.Droid.Resource.Attribute.homeAsUpIndicator;
+			global::XLabs.Forms.Droid.Resource.Attribute.homeLayout = global::BookAStar.Droid.Resource.Attribute.homeLayout;
+			global::XLabs.Forms.Droid.Resource.Attribute.icon = global::BookAStar.Droid.Resource.Attribute.icon;
+			global::XLabs.Forms.Droid.Resource.Attribute.iconifiedByDefault = global::BookAStar.Droid.Resource.Attribute.iconifiedByDefault;
+			global::XLabs.Forms.Droid.Resource.Attribute.imageButtonStyle = global::BookAStar.Droid.Resource.Attribute.imageButtonStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.indeterminateProgressStyle = global::BookAStar.Droid.Resource.Attribute.indeterminateProgressStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.initialActivityCount = global::BookAStar.Droid.Resource.Attribute.initialActivityCount;
+			global::XLabs.Forms.Droid.Resource.Attribute.insetForeground = global::BookAStar.Droid.Resource.Attribute.insetForeground;
+			global::XLabs.Forms.Droid.Resource.Attribute.isLightTheme = global::BookAStar.Droid.Resource.Attribute.isLightTheme;
+			global::XLabs.Forms.Droid.Resource.Attribute.itemBackground = global::BookAStar.Droid.Resource.Attribute.itemBackground;
+			global::XLabs.Forms.Droid.Resource.Attribute.itemIconTint = global::BookAStar.Droid.Resource.Attribute.itemIconTint;
+			global::XLabs.Forms.Droid.Resource.Attribute.itemPadding = global::BookAStar.Droid.Resource.Attribute.itemPadding;
+			global::XLabs.Forms.Droid.Resource.Attribute.itemTextAppearance = global::BookAStar.Droid.Resource.Attribute.itemTextAppearance;
+			global::XLabs.Forms.Droid.Resource.Attribute.itemTextColor = global::BookAStar.Droid.Resource.Attribute.itemTextColor;
+			global::XLabs.Forms.Droid.Resource.Attribute.keylines = global::BookAStar.Droid.Resource.Attribute.keylines;
+			global::XLabs.Forms.Droid.Resource.Attribute.layout = global::BookAStar.Droid.Resource.Attribute.layout;
+			global::XLabs.Forms.Droid.Resource.Attribute.layoutManager = global::BookAStar.Droid.Resource.Attribute.layoutManager;
+			global::XLabs.Forms.Droid.Resource.Attribute.layout_anchor = global::BookAStar.Droid.Resource.Attribute.layout_anchor;
+			global::XLabs.Forms.Droid.Resource.Attribute.layout_anchorGravity = global::BookAStar.Droid.Resource.Attribute.layout_anchorGravity;
+			global::XLabs.Forms.Droid.Resource.Attribute.layout_behavior = global::BookAStar.Droid.Resource.Attribute.layout_behavior;
+			global::XLabs.Forms.Droid.Resource.Attribute.layout_collapseMode = global::BookAStar.Droid.Resource.Attribute.layout_collapseMode;
+			global::XLabs.Forms.Droid.Resource.Attribute.layout_collapseParallaxMultiplier = global::BookAStar.Droid.Resource.Attribute.layout_collapseParallaxMultiplier;
+			global::XLabs.Forms.Droid.Resource.Attribute.layout_keyline = global::BookAStar.Droid.Resource.Attribute.layout_keyline;
+			global::XLabs.Forms.Droid.Resource.Attribute.layout_scrollFlags = global::BookAStar.Droid.Resource.Attribute.layout_scrollFlags;
+			global::XLabs.Forms.Droid.Resource.Attribute.layout_scrollInterpolator = global::BookAStar.Droid.Resource.Attribute.layout_scrollInterpolator;
+			global::XLabs.Forms.Droid.Resource.Attribute.listChoiceBackgroundIndicator = global::BookAStar.Droid.Resource.Attribute.listChoiceBackgroundIndicator;
+			global::XLabs.Forms.Droid.Resource.Attribute.listDividerAlertDialog = global::BookAStar.Droid.Resource.Attribute.listDividerAlertDialog;
+			global::XLabs.Forms.Droid.Resource.Attribute.listItemLayout = global::BookAStar.Droid.Resource.Attribute.listItemLayout;
+			global::XLabs.Forms.Droid.Resource.Attribute.listLayout = global::BookAStar.Droid.Resource.Attribute.listLayout;
+			global::XLabs.Forms.Droid.Resource.Attribute.listPopupWindowStyle = global::BookAStar.Droid.Resource.Attribute.listPopupWindowStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.listPreferredItemHeight = global::BookAStar.Droid.Resource.Attribute.listPreferredItemHeight;
+			global::XLabs.Forms.Droid.Resource.Attribute.listPreferredItemHeightLarge = global::BookAStar.Droid.Resource.Attribute.listPreferredItemHeightLarge;
+			global::XLabs.Forms.Droid.Resource.Attribute.listPreferredItemHeightSmall = global::BookAStar.Droid.Resource.Attribute.listPreferredItemHeightSmall;
+			global::XLabs.Forms.Droid.Resource.Attribute.listPreferredItemPaddingLeft = global::BookAStar.Droid.Resource.Attribute.listPreferredItemPaddingLeft;
+			global::XLabs.Forms.Droid.Resource.Attribute.listPreferredItemPaddingRight = global::BookAStar.Droid.Resource.Attribute.listPreferredItemPaddingRight;
+			global::XLabs.Forms.Droid.Resource.Attribute.logo = global::BookAStar.Droid.Resource.Attribute.logo;
+			global::XLabs.Forms.Droid.Resource.Attribute.logoDescription = global::BookAStar.Droid.Resource.Attribute.logoDescription;
+			global::XLabs.Forms.Droid.Resource.Attribute.maxActionInlineWidth = global::BookAStar.Droid.Resource.Attribute.maxActionInlineWidth;
+			global::XLabs.Forms.Droid.Resource.Attribute.maxButtonHeight = global::BookAStar.Droid.Resource.Attribute.maxButtonHeight;
+			global::XLabs.Forms.Droid.Resource.Attribute.measureWithLargestChild = global::BookAStar.Droid.Resource.Attribute.measureWithLargestChild;
+			global::XLabs.Forms.Droid.Resource.Attribute.mediaRouteAudioTrackDrawable = global::BookAStar.Droid.Resource.Attribute.mediaRouteAudioTrackDrawable;
+			global::XLabs.Forms.Droid.Resource.Attribute.mediaRouteBluetoothIconDrawable = global::BookAStar.Droid.Resource.Attribute.mediaRouteBluetoothIconDrawable;
+			global::XLabs.Forms.Droid.Resource.Attribute.mediaRouteButtonStyle = global::BookAStar.Droid.Resource.Attribute.mediaRouteButtonStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.mediaRouteCastDrawable = global::BookAStar.Droid.Resource.Attribute.mediaRouteCastDrawable;
+			global::XLabs.Forms.Droid.Resource.Attribute.mediaRouteChooserPrimaryTextStyle = global::BookAStar.Droid.Resource.Attribute.mediaRouteChooserPrimaryTextStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.mediaRouteChooserSecondaryTextStyle = global::BookAStar.Droid.Resource.Attribute.mediaRouteChooserSecondaryTextStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.mediaRouteCloseDrawable = global::BookAStar.Droid.Resource.Attribute.mediaRouteCloseDrawable;
+			global::XLabs.Forms.Droid.Resource.Attribute.mediaRouteCollapseGroupDrawable = global::BookAStar.Droid.Resource.Attribute.mediaRouteCollapseGroupDrawable;
+			global::XLabs.Forms.Droid.Resource.Attribute.mediaRouteConnectingDrawable = global::BookAStar.Droid.Resource.Attribute.mediaRouteConnectingDrawable;
+			global::XLabs.Forms.Droid.Resource.Attribute.mediaRouteControllerPrimaryTextStyle = global::BookAStar.Droid.Resource.Attribute.mediaRouteControllerPrimaryTextStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.mediaRouteControllerSecondaryTextStyle = global::BookAStar.Droid.Resource.Attribute.mediaRouteControllerSecondaryTextStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.mediaRouteControllerTitleTextStyle = global::BookAStar.Droid.Resource.Attribute.mediaRouteControllerTitleTextStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.mediaRouteDefaultIconDrawable = global::BookAStar.Droid.Resource.Attribute.mediaRouteDefaultIconDrawable;
+			global::XLabs.Forms.Droid.Resource.Attribute.mediaRouteExpandGroupDrawable = global::BookAStar.Droid.Resource.Attribute.mediaRouteExpandGroupDrawable;
+			global::XLabs.Forms.Droid.Resource.Attribute.mediaRouteOffDrawable = global::BookAStar.Droid.Resource.Attribute.mediaRouteOffDrawable;
+			global::XLabs.Forms.Droid.Resource.Attribute.mediaRouteOnDrawable = global::BookAStar.Droid.Resource.Attribute.mediaRouteOnDrawable;
+			global::XLabs.Forms.Droid.Resource.Attribute.mediaRoutePauseDrawable = global::BookAStar.Droid.Resource.Attribute.mediaRoutePauseDrawable;
+			global::XLabs.Forms.Droid.Resource.Attribute.mediaRoutePlayDrawable = global::BookAStar.Droid.Resource.Attribute.mediaRoutePlayDrawable;
+			global::XLabs.Forms.Droid.Resource.Attribute.mediaRouteSpeakerGroupIconDrawable = global::BookAStar.Droid.Resource.Attribute.mediaRouteSpeakerGroupIconDrawable;
+			global::XLabs.Forms.Droid.Resource.Attribute.mediaRouteSpeakerIconDrawable = global::BookAStar.Droid.Resource.Attribute.mediaRouteSpeakerIconDrawable;
+			global::XLabs.Forms.Droid.Resource.Attribute.mediaRouteTvIconDrawable = global::BookAStar.Droid.Resource.Attribute.mediaRouteTvIconDrawable;
+			global::XLabs.Forms.Droid.Resource.Attribute.menu = global::BookAStar.Droid.Resource.Attribute.menu;
+			global::XLabs.Forms.Droid.Resource.Attribute.multiChoiceItemLayout = global::BookAStar.Droid.Resource.Attribute.multiChoiceItemLayout;
+			global::XLabs.Forms.Droid.Resource.Attribute.navigationContentDescription = global::BookAStar.Droid.Resource.Attribute.navigationContentDescription;
+			global::XLabs.Forms.Droid.Resource.Attribute.navigationIcon = global::BookAStar.Droid.Resource.Attribute.navigationIcon;
+			global::XLabs.Forms.Droid.Resource.Attribute.navigationMode = global::BookAStar.Droid.Resource.Attribute.navigationMode;
+			global::XLabs.Forms.Droid.Resource.Attribute.overlapAnchor = global::BookAStar.Droid.Resource.Attribute.overlapAnchor;
+			global::XLabs.Forms.Droid.Resource.Attribute.paddingEnd = global::BookAStar.Droid.Resource.Attribute.paddingEnd;
+			global::XLabs.Forms.Droid.Resource.Attribute.paddingStart = global::BookAStar.Droid.Resource.Attribute.paddingStart;
+			global::XLabs.Forms.Droid.Resource.Attribute.panelBackground = global::BookAStar.Droid.Resource.Attribute.panelBackground;
+			global::XLabs.Forms.Droid.Resource.Attribute.panelMenuListTheme = global::BookAStar.Droid.Resource.Attribute.panelMenuListTheme;
+			global::XLabs.Forms.Droid.Resource.Attribute.panelMenuListWidth = global::BookAStar.Droid.Resource.Attribute.panelMenuListWidth;
+			global::XLabs.Forms.Droid.Resource.Attribute.popupMenuStyle = global::BookAStar.Droid.Resource.Attribute.popupMenuStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.popupTheme = global::BookAStar.Droid.Resource.Attribute.popupTheme;
+			global::XLabs.Forms.Droid.Resource.Attribute.popupWindowStyle = global::BookAStar.Droid.Resource.Attribute.popupWindowStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.preserveIconSpacing = global::BookAStar.Droid.Resource.Attribute.preserveIconSpacing;
+			global::XLabs.Forms.Droid.Resource.Attribute.pressedTranslationZ = global::BookAStar.Droid.Resource.Attribute.pressedTranslationZ;
+			global::XLabs.Forms.Droid.Resource.Attribute.progressBarPadding = global::BookAStar.Droid.Resource.Attribute.progressBarPadding;
+			global::XLabs.Forms.Droid.Resource.Attribute.progressBarStyle = global::BookAStar.Droid.Resource.Attribute.progressBarStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.queryBackground = global::BookAStar.Droid.Resource.Attribute.queryBackground;
+			global::XLabs.Forms.Droid.Resource.Attribute.queryHint = global::BookAStar.Droid.Resource.Attribute.queryHint;
+			global::XLabs.Forms.Droid.Resource.Attribute.radioButtonStyle = global::BookAStar.Droid.Resource.Attribute.radioButtonStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.ratingBarStyle = global::BookAStar.Droid.Resource.Attribute.ratingBarStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.ratingBarStyleIndicator = global::BookAStar.Droid.Resource.Attribute.ratingBarStyleIndicator;
+			global::XLabs.Forms.Droid.Resource.Attribute.ratingBarStyleSmall = global::BookAStar.Droid.Resource.Attribute.ratingBarStyleSmall;
+			global::XLabs.Forms.Droid.Resource.Attribute.reverseLayout = global::BookAStar.Droid.Resource.Attribute.reverseLayout;
+			global::XLabs.Forms.Droid.Resource.Attribute.rippleColor = global::BookAStar.Droid.Resource.Attribute.rippleColor;
+			global::XLabs.Forms.Droid.Resource.Attribute.searchHintIcon = global::BookAStar.Droid.Resource.Attribute.searchHintIcon;
+			global::XLabs.Forms.Droid.Resource.Attribute.searchIcon = global::BookAStar.Droid.Resource.Attribute.searchIcon;
+			global::XLabs.Forms.Droid.Resource.Attribute.searchViewStyle = global::BookAStar.Droid.Resource.Attribute.searchViewStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.seekBarStyle = global::BookAStar.Droid.Resource.Attribute.seekBarStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.selectableItemBackground = global::BookAStar.Droid.Resource.Attribute.selectableItemBackground;
+			global::XLabs.Forms.Droid.Resource.Attribute.selectableItemBackgroundBorderless = global::BookAStar.Droid.Resource.Attribute.selectableItemBackgroundBorderless;
+			global::XLabs.Forms.Droid.Resource.Attribute.showAsAction = global::BookAStar.Droid.Resource.Attribute.showAsAction;
+			global::XLabs.Forms.Droid.Resource.Attribute.showDividers = global::BookAStar.Droid.Resource.Attribute.showDividers;
+			global::XLabs.Forms.Droid.Resource.Attribute.showText = global::BookAStar.Droid.Resource.Attribute.showText;
+			global::XLabs.Forms.Droid.Resource.Attribute.singleChoiceItemLayout = global::BookAStar.Droid.Resource.Attribute.singleChoiceItemLayout;
+			global::XLabs.Forms.Droid.Resource.Attribute.spanCount = global::BookAStar.Droid.Resource.Attribute.spanCount;
+			global::XLabs.Forms.Droid.Resource.Attribute.spinBars = global::BookAStar.Droid.Resource.Attribute.spinBars;
+			global::XLabs.Forms.Droid.Resource.Attribute.spinnerDropDownItemStyle = global::BookAStar.Droid.Resource.Attribute.spinnerDropDownItemStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.spinnerStyle = global::BookAStar.Droid.Resource.Attribute.spinnerStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.splitTrack = global::BookAStar.Droid.Resource.Attribute.splitTrack;
+			global::XLabs.Forms.Droid.Resource.Attribute.srcCompat = global::BookAStar.Droid.Resource.Attribute.srcCompat;
+			global::XLabs.Forms.Droid.Resource.Attribute.stackFromEnd = global::BookAStar.Droid.Resource.Attribute.stackFromEnd;
+			global::XLabs.Forms.Droid.Resource.Attribute.state_above_anchor = global::BookAStar.Droid.Resource.Attribute.state_above_anchor;
+			global::XLabs.Forms.Droid.Resource.Attribute.statusBarBackground = global::BookAStar.Droid.Resource.Attribute.statusBarBackground;
+			global::XLabs.Forms.Droid.Resource.Attribute.statusBarScrim = global::BookAStar.Droid.Resource.Attribute.statusBarScrim;
+			global::XLabs.Forms.Droid.Resource.Attribute.submitBackground = global::BookAStar.Droid.Resource.Attribute.submitBackground;
+			global::XLabs.Forms.Droid.Resource.Attribute.subtitle = global::BookAStar.Droid.Resource.Attribute.subtitle;
+			global::XLabs.Forms.Droid.Resource.Attribute.subtitleTextAppearance = global::BookAStar.Droid.Resource.Attribute.subtitleTextAppearance;
+			global::XLabs.Forms.Droid.Resource.Attribute.subtitleTextColor = global::BookAStar.Droid.Resource.Attribute.subtitleTextColor;
+			global::XLabs.Forms.Droid.Resource.Attribute.subtitleTextStyle = global::BookAStar.Droid.Resource.Attribute.subtitleTextStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.suggestionRowLayout = global::BookAStar.Droid.Resource.Attribute.suggestionRowLayout;
+			global::XLabs.Forms.Droid.Resource.Attribute.switchMinWidth = global::BookAStar.Droid.Resource.Attribute.switchMinWidth;
+			global::XLabs.Forms.Droid.Resource.Attribute.switchPadding = global::BookAStar.Droid.Resource.Attribute.switchPadding;
+			global::XLabs.Forms.Droid.Resource.Attribute.switchStyle = global::BookAStar.Droid.Resource.Attribute.switchStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.switchTextAppearance = global::BookAStar.Droid.Resource.Attribute.switchTextAppearance;
+			global::XLabs.Forms.Droid.Resource.Attribute.tabBackground = global::BookAStar.Droid.Resource.Attribute.tabBackground;
+			global::XLabs.Forms.Droid.Resource.Attribute.tabContentStart = global::BookAStar.Droid.Resource.Attribute.tabContentStart;
+			global::XLabs.Forms.Droid.Resource.Attribute.tabGravity = global::BookAStar.Droid.Resource.Attribute.tabGravity;
+			global::XLabs.Forms.Droid.Resource.Attribute.tabIndicatorColor = global::BookAStar.Droid.Resource.Attribute.tabIndicatorColor;
+			global::XLabs.Forms.Droid.Resource.Attribute.tabIndicatorHeight = global::BookAStar.Droid.Resource.Attribute.tabIndicatorHeight;
+			global::XLabs.Forms.Droid.Resource.Attribute.tabMaxWidth = global::BookAStar.Droid.Resource.Attribute.tabMaxWidth;
+			global::XLabs.Forms.Droid.Resource.Attribute.tabMinWidth = global::BookAStar.Droid.Resource.Attribute.tabMinWidth;
+			global::XLabs.Forms.Droid.Resource.Attribute.tabMode = global::BookAStar.Droid.Resource.Attribute.tabMode;
+			global::XLabs.Forms.Droid.Resource.Attribute.tabPadding = global::BookAStar.Droid.Resource.Attribute.tabPadding;
+			global::XLabs.Forms.Droid.Resource.Attribute.tabPaddingBottom = global::BookAStar.Droid.Resource.Attribute.tabPaddingBottom;
+			global::XLabs.Forms.Droid.Resource.Attribute.tabPaddingEnd = global::BookAStar.Droid.Resource.Attribute.tabPaddingEnd;
+			global::XLabs.Forms.Droid.Resource.Attribute.tabPaddingStart = global::BookAStar.Droid.Resource.Attribute.tabPaddingStart;
+			global::XLabs.Forms.Droid.Resource.Attribute.tabPaddingTop = global::BookAStar.Droid.Resource.Attribute.tabPaddingTop;
+			global::XLabs.Forms.Droid.Resource.Attribute.tabSelectedTextColor = global::BookAStar.Droid.Resource.Attribute.tabSelectedTextColor;
+			global::XLabs.Forms.Droid.Resource.Attribute.tabTextAppearance = global::BookAStar.Droid.Resource.Attribute.tabTextAppearance;
+			global::XLabs.Forms.Droid.Resource.Attribute.tabTextColor = global::BookAStar.Droid.Resource.Attribute.tabTextColor;
+			global::XLabs.Forms.Droid.Resource.Attribute.textAllCaps = global::BookAStar.Droid.Resource.Attribute.textAllCaps;
+			global::XLabs.Forms.Droid.Resource.Attribute.textAppearanceLargePopupMenu = global::BookAStar.Droid.Resource.Attribute.textAppearanceLargePopupMenu;
+			global::XLabs.Forms.Droid.Resource.Attribute.textAppearanceListItem = global::BookAStar.Droid.Resource.Attribute.textAppearanceListItem;
+			global::XLabs.Forms.Droid.Resource.Attribute.textAppearanceListItemSmall = global::BookAStar.Droid.Resource.Attribute.textAppearanceListItemSmall;
+			global::XLabs.Forms.Droid.Resource.Attribute.textAppearanceSearchResultSubtitle = global::BookAStar.Droid.Resource.Attribute.textAppearanceSearchResultSubtitle;
+			global::XLabs.Forms.Droid.Resource.Attribute.textAppearanceSearchResultTitle = global::BookAStar.Droid.Resource.Attribute.textAppearanceSearchResultTitle;
+			global::XLabs.Forms.Droid.Resource.Attribute.textAppearanceSmallPopupMenu = global::BookAStar.Droid.Resource.Attribute.textAppearanceSmallPopupMenu;
+			global::XLabs.Forms.Droid.Resource.Attribute.textColorAlertDialogListItem = global::BookAStar.Droid.Resource.Attribute.textColorAlertDialogListItem;
+			global::XLabs.Forms.Droid.Resource.Attribute.textColorError = global::BookAStar.Droid.Resource.Attribute.textColorError;
+			global::XLabs.Forms.Droid.Resource.Attribute.textColorSearchUrl = global::BookAStar.Droid.Resource.Attribute.textColorSearchUrl;
+			global::XLabs.Forms.Droid.Resource.Attribute.theme = global::BookAStar.Droid.Resource.Attribute.theme;
+			global::XLabs.Forms.Droid.Resource.Attribute.thickness = global::BookAStar.Droid.Resource.Attribute.thickness;
+			global::XLabs.Forms.Droid.Resource.Attribute.thumbTextPadding = global::BookAStar.Droid.Resource.Attribute.thumbTextPadding;
+			global::XLabs.Forms.Droid.Resource.Attribute.title = global::BookAStar.Droid.Resource.Attribute.title;
+			global::XLabs.Forms.Droid.Resource.Attribute.titleEnabled = global::BookAStar.Droid.Resource.Attribute.titleEnabled;
+			global::XLabs.Forms.Droid.Resource.Attribute.titleMarginBottom = global::BookAStar.Droid.Resource.Attribute.titleMarginBottom;
+			global::XLabs.Forms.Droid.Resource.Attribute.titleMarginEnd = global::BookAStar.Droid.Resource.Attribute.titleMarginEnd;
+			global::XLabs.Forms.Droid.Resource.Attribute.titleMarginStart = global::BookAStar.Droid.Resource.Attribute.titleMarginStart;
+			global::XLabs.Forms.Droid.Resource.Attribute.titleMarginTop = global::BookAStar.Droid.Resource.Attribute.titleMarginTop;
+			global::XLabs.Forms.Droid.Resource.Attribute.titleMargins = global::BookAStar.Droid.Resource.Attribute.titleMargins;
+			global::XLabs.Forms.Droid.Resource.Attribute.titleTextAppearance = global::BookAStar.Droid.Resource.Attribute.titleTextAppearance;
+			global::XLabs.Forms.Droid.Resource.Attribute.titleTextColor = global::BookAStar.Droid.Resource.Attribute.titleTextColor;
+			global::XLabs.Forms.Droid.Resource.Attribute.titleTextStyle = global::BookAStar.Droid.Resource.Attribute.titleTextStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.toolbarId = global::BookAStar.Droid.Resource.Attribute.toolbarId;
+			global::XLabs.Forms.Droid.Resource.Attribute.toolbarNavigationButtonStyle = global::BookAStar.Droid.Resource.Attribute.toolbarNavigationButtonStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.toolbarStyle = global::BookAStar.Droid.Resource.Attribute.toolbarStyle;
+			global::XLabs.Forms.Droid.Resource.Attribute.track = global::BookAStar.Droid.Resource.Attribute.track;
+			global::XLabs.Forms.Droid.Resource.Attribute.useCompatPadding = global::BookAStar.Droid.Resource.Attribute.useCompatPadding;
+			global::XLabs.Forms.Droid.Resource.Attribute.voiceIcon = global::BookAStar.Droid.Resource.Attribute.voiceIcon;
+			global::XLabs.Forms.Droid.Resource.Attribute.windowActionBar = global::BookAStar.Droid.Resource.Attribute.windowActionBar;
+			global::XLabs.Forms.Droid.Resource.Attribute.windowActionBarOverlay = global::BookAStar.Droid.Resource.Attribute.windowActionBarOverlay;
+			global::XLabs.Forms.Droid.Resource.Attribute.windowActionModeOverlay = global::BookAStar.Droid.Resource.Attribute.windowActionModeOverlay;
+			global::XLabs.Forms.Droid.Resource.Attribute.windowFixedHeightMajor = global::BookAStar.Droid.Resource.Attribute.windowFixedHeightMajor;
+			global::XLabs.Forms.Droid.Resource.Attribute.windowFixedHeightMinor = global::BookAStar.Droid.Resource.Attribute.windowFixedHeightMinor;
+			global::XLabs.Forms.Droid.Resource.Attribute.windowFixedWidthMajor = global::BookAStar.Droid.Resource.Attribute.windowFixedWidthMajor;
+			global::XLabs.Forms.Droid.Resource.Attribute.windowFixedWidthMinor = global::BookAStar.Droid.Resource.Attribute.windowFixedWidthMinor;
+			global::XLabs.Forms.Droid.Resource.Attribute.windowMinWidthMajor = global::BookAStar.Droid.Resource.Attribute.windowMinWidthMajor;
+			global::XLabs.Forms.Droid.Resource.Attribute.windowMinWidthMinor = global::BookAStar.Droid.Resource.Attribute.windowMinWidthMinor;
+			global::XLabs.Forms.Droid.Resource.Attribute.windowNoTitle = global::BookAStar.Droid.Resource.Attribute.windowNoTitle;
+			global::XLabs.Forms.Droid.Resource.Boolean.abc_action_bar_embed_tabs = global::BookAStar.Droid.Resource.Boolean.abc_action_bar_embed_tabs;
+			global::XLabs.Forms.Droid.Resource.Boolean.abc_action_bar_embed_tabs_pre_jb = global::BookAStar.Droid.Resource.Boolean.abc_action_bar_embed_tabs_pre_jb;
+			global::XLabs.Forms.Droid.Resource.Boolean.abc_action_bar_expanded_action_views_exclusive = global::BookAStar.Droid.Resource.Boolean.abc_action_bar_expanded_action_views_exclusive;
+			global::XLabs.Forms.Droid.Resource.Boolean.abc_allow_stacked_button_bar = global::BookAStar.Droid.Resource.Boolean.abc_allow_stacked_button_bar;
+			global::XLabs.Forms.Droid.Resource.Boolean.abc_config_actionMenuItemAllCaps = global::BookAStar.Droid.Resource.Boolean.abc_config_actionMenuItemAllCaps;
+			global::XLabs.Forms.Droid.Resource.Boolean.abc_config_allowActionMenuItemTextWithIcon = global::BookAStar.Droid.Resource.Boolean.abc_config_allowActionMenuItemTextWithIcon;
+			global::XLabs.Forms.Droid.Resource.Boolean.abc_config_closeDialogWhenTouchOutside = global::BookAStar.Droid.Resource.Boolean.abc_config_closeDialogWhenTouchOutside;
+			global::XLabs.Forms.Droid.Resource.Boolean.abc_config_showMenuShortcutsWhenKeyboardPresent = global::BookAStar.Droid.Resource.Boolean.abc_config_showMenuShortcutsWhenKeyboardPresent;
+			global::XLabs.Forms.Droid.Resource.Color.abc_background_cache_hint_selector_material_dark = global::BookAStar.Droid.Resource.Color.abc_background_cache_hint_selector_material_dark;
+			global::XLabs.Forms.Droid.Resource.Color.abc_background_cache_hint_selector_material_light = global::BookAStar.Droid.Resource.Color.abc_background_cache_hint_selector_material_light;
+			global::XLabs.Forms.Droid.Resource.Color.abc_color_highlight_material = global::BookAStar.Droid.Resource.Color.abc_color_highlight_material;
+			global::XLabs.Forms.Droid.Resource.Color.abc_input_method_navigation_guard = global::BookAStar.Droid.Resource.Color.abc_input_method_navigation_guard;
+			global::XLabs.Forms.Droid.Resource.Color.abc_primary_text_disable_only_material_dark = global::BookAStar.Droid.Resource.Color.abc_primary_text_disable_only_material_dark;
+			global::XLabs.Forms.Droid.Resource.Color.abc_primary_text_disable_only_material_light = global::BookAStar.Droid.Resource.Color.abc_primary_text_disable_only_material_light;
+			global::XLabs.Forms.Droid.Resource.Color.abc_primary_text_material_dark = global::BookAStar.Droid.Resource.Color.abc_primary_text_material_dark;
+			global::XLabs.Forms.Droid.Resource.Color.abc_primary_text_material_light = global::BookAStar.Droid.Resource.Color.abc_primary_text_material_light;
+			global::XLabs.Forms.Droid.Resource.Color.abc_search_url_text = global::BookAStar.Droid.Resource.Color.abc_search_url_text;
+			global::XLabs.Forms.Droid.Resource.Color.abc_search_url_text_normal = global::BookAStar.Droid.Resource.Color.abc_search_url_text_normal;
+			global::XLabs.Forms.Droid.Resource.Color.abc_search_url_text_pressed = global::BookAStar.Droid.Resource.Color.abc_search_url_text_pressed;
+			global::XLabs.Forms.Droid.Resource.Color.abc_search_url_text_selected = global::BookAStar.Droid.Resource.Color.abc_search_url_text_selected;
+			global::XLabs.Forms.Droid.Resource.Color.abc_secondary_text_material_dark = global::BookAStar.Droid.Resource.Color.abc_secondary_text_material_dark;
+			global::XLabs.Forms.Droid.Resource.Color.abc_secondary_text_material_light = global::BookAStar.Droid.Resource.Color.abc_secondary_text_material_light;
+			global::XLabs.Forms.Droid.Resource.Color.accent_material_dark = global::BookAStar.Droid.Resource.Color.accent_material_dark;
+			global::XLabs.Forms.Droid.Resource.Color.accent_material_light = global::BookAStar.Droid.Resource.Color.accent_material_light;
+			global::XLabs.Forms.Droid.Resource.Color.background_floating_material_dark = global::BookAStar.Droid.Resource.Color.background_floating_material_dark;
+			global::XLabs.Forms.Droid.Resource.Color.background_floating_material_light = global::BookAStar.Droid.Resource.Color.background_floating_material_light;
+			global::XLabs.Forms.Droid.Resource.Color.background_material_dark = global::BookAStar.Droid.Resource.Color.background_material_dark;
+			global::XLabs.Forms.Droid.Resource.Color.background_material_light = global::BookAStar.Droid.Resource.Color.background_material_light;
+			global::XLabs.Forms.Droid.Resource.Color.bright_foreground_disabled_material_dark = global::BookAStar.Droid.Resource.Color.bright_foreground_disabled_material_dark;
+			global::XLabs.Forms.Droid.Resource.Color.bright_foreground_disabled_material_light = global::BookAStar.Droid.Resource.Color.bright_foreground_disabled_material_light;
+			global::XLabs.Forms.Droid.Resource.Color.bright_foreground_inverse_material_dark = global::BookAStar.Droid.Resource.Color.bright_foreground_inverse_material_dark;
+			global::XLabs.Forms.Droid.Resource.Color.bright_foreground_inverse_material_light = global::BookAStar.Droid.Resource.Color.bright_foreground_inverse_material_light;
+			global::XLabs.Forms.Droid.Resource.Color.bright_foreground_material_dark = global::BookAStar.Droid.Resource.Color.bright_foreground_material_dark;
+			global::XLabs.Forms.Droid.Resource.Color.bright_foreground_material_light = global::BookAStar.Droid.Resource.Color.bright_foreground_material_light;
+			global::XLabs.Forms.Droid.Resource.Color.button_material_dark = global::BookAStar.Droid.Resource.Color.button_material_dark;
+			global::XLabs.Forms.Droid.Resource.Color.button_material_light = global::BookAStar.Droid.Resource.Color.button_material_light;
+			global::XLabs.Forms.Droid.Resource.Color.calendar_active_month_bg = global::BookAStar.Droid.Resource.Color.calendar_active_month_bg;
+			global::XLabs.Forms.Droid.Resource.Color.calendar_bg = global::BookAStar.Droid.Resource.Color.calendar_bg;
+			global::XLabs.Forms.Droid.Resource.Color.calendar_divider = global::BookAStar.Droid.Resource.Color.calendar_divider;
+			global::XLabs.Forms.Droid.Resource.Color.calendar_highlighted_day_bg = global::BookAStar.Droid.Resource.Color.calendar_highlighted_day_bg;
+			global::XLabs.Forms.Droid.Resource.Color.calendar_inactive_month_bg = global::BookAStar.Droid.Resource.Color.calendar_inactive_month_bg;
+			global::XLabs.Forms.Droid.Resource.Color.calendar_selected_day_bg = global::BookAStar.Droid.Resource.Color.calendar_selected_day_bg;
+			global::XLabs.Forms.Droid.Resource.Color.calendar_selected_range_bg = global::BookAStar.Droid.Resource.Color.calendar_selected_range_bg;
+			global::XLabs.Forms.Droid.Resource.Color.calendar_text_active = global::BookAStar.Droid.Resource.Color.calendar_text_active;
+			global::XLabs.Forms.Droid.Resource.Color.calendar_text_inactive = global::BookAStar.Droid.Resource.Color.calendar_text_inactive;
+			global::XLabs.Forms.Droid.Resource.Color.calendar_text_selected = global::BookAStar.Droid.Resource.Color.calendar_text_selected;
+			global::XLabs.Forms.Droid.Resource.Color.calendar_text_selector = global::BookAStar.Droid.Resource.Color.calendar_text_selector;
+			global::XLabs.Forms.Droid.Resource.Color.calendar_text_unselectable = global::BookAStar.Droid.Resource.Color.calendar_text_unselectable;
+			global::XLabs.Forms.Droid.Resource.Color.cardview_dark_background = global::BookAStar.Droid.Resource.Color.cardview_dark_background;
+			global::XLabs.Forms.Droid.Resource.Color.cardview_light_background = global::BookAStar.Droid.Resource.Color.cardview_light_background;
+			global::XLabs.Forms.Droid.Resource.Color.cardview_shadow_end_color = global::BookAStar.Droid.Resource.Color.cardview_shadow_end_color;
+			global::XLabs.Forms.Droid.Resource.Color.cardview_shadow_start_color = global::BookAStar.Droid.Resource.Color.cardview_shadow_start_color;
+			global::XLabs.Forms.Droid.Resource.Color.design_fab_shadow_end_color = global::BookAStar.Droid.Resource.Color.design_fab_shadow_end_color;
+			global::XLabs.Forms.Droid.Resource.Color.design_fab_shadow_mid_color = global::BookAStar.Droid.Resource.Color.design_fab_shadow_mid_color;
+			global::XLabs.Forms.Droid.Resource.Color.design_fab_shadow_start_color = global::BookAStar.Droid.Resource.Color.design_fab_shadow_start_color;
+			global::XLabs.Forms.Droid.Resource.Color.design_fab_stroke_end_inner_color = global::BookAStar.Droid.Resource.Color.design_fab_stroke_end_inner_color;
+			global::XLabs.Forms.Droid.Resource.Color.design_fab_stroke_end_outer_color = global::BookAStar.Droid.Resource.Color.design_fab_stroke_end_outer_color;
+			global::XLabs.Forms.Droid.Resource.Color.design_fab_stroke_top_inner_color = global::BookAStar.Droid.Resource.Color.design_fab_stroke_top_inner_color;
+			global::XLabs.Forms.Droid.Resource.Color.design_fab_stroke_top_outer_color = global::BookAStar.Droid.Resource.Color.design_fab_stroke_top_outer_color;
+			global::XLabs.Forms.Droid.Resource.Color.design_snackbar_background_color = global::BookAStar.Droid.Resource.Color.design_snackbar_background_color;
+			global::XLabs.Forms.Droid.Resource.Color.design_textinput_error_color_dark = global::BookAStar.Droid.Resource.Color.design_textinput_error_color_dark;
+			global::XLabs.Forms.Droid.Resource.Color.design_textinput_error_color_light = global::BookAStar.Droid.Resource.Color.design_textinput_error_color_light;
+			global::XLabs.Forms.Droid.Resource.Color.dim_foreground_disabled_material_dark = global::BookAStar.Droid.Resource.Color.dim_foreground_disabled_material_dark;
+			global::XLabs.Forms.Droid.Resource.Color.dim_foreground_disabled_material_light = global::BookAStar.Droid.Resource.Color.dim_foreground_disabled_material_light;
+			global::XLabs.Forms.Droid.Resource.Color.dim_foreground_material_dark = global::BookAStar.Droid.Resource.Color.dim_foreground_material_dark;
+			global::XLabs.Forms.Droid.Resource.Color.dim_foreground_material_light = global::BookAStar.Droid.Resource.Color.dim_foreground_material_light;
+			global::XLabs.Forms.Droid.Resource.Color.foreground_material_dark = global::BookAStar.Droid.Resource.Color.foreground_material_dark;
+			global::XLabs.Forms.Droid.Resource.Color.foreground_material_light = global::BookAStar.Droid.Resource.Color.foreground_material_light;
+			global::XLabs.Forms.Droid.Resource.Color.highlighted_text_material_dark = global::BookAStar.Droid.Resource.Color.highlighted_text_material_dark;
+			global::XLabs.Forms.Droid.Resource.Color.highlighted_text_material_light = global::BookAStar.Droid.Resource.Color.highlighted_text_material_light;
+			global::XLabs.Forms.Droid.Resource.Color.hint_foreground_material_dark = global::BookAStar.Droid.Resource.Color.hint_foreground_material_dark;
+			global::XLabs.Forms.Droid.Resource.Color.hint_foreground_material_light = global::BookAStar.Droid.Resource.Color.hint_foreground_material_light;
+			global::XLabs.Forms.Droid.Resource.Color.material_blue_grey_800 = global::BookAStar.Droid.Resource.Color.material_blue_grey_800;
+			global::XLabs.Forms.Droid.Resource.Color.material_blue_grey_900 = global::BookAStar.Droid.Resource.Color.material_blue_grey_900;
+			global::XLabs.Forms.Droid.Resource.Color.material_blue_grey_950 = global::BookAStar.Droid.Resource.Color.material_blue_grey_950;
+			global::XLabs.Forms.Droid.Resource.Color.material_deep_teal_200 = global::BookAStar.Droid.Resource.Color.material_deep_teal_200;
+			global::XLabs.Forms.Droid.Resource.Color.material_deep_teal_500 = global::BookAStar.Droid.Resource.Color.material_deep_teal_500;
+			global::XLabs.Forms.Droid.Resource.Color.material_grey_100 = global::BookAStar.Droid.Resource.Color.material_grey_100;
+			global::XLabs.Forms.Droid.Resource.Color.material_grey_300 = global::BookAStar.Droid.Resource.Color.material_grey_300;
+			global::XLabs.Forms.Droid.Resource.Color.material_grey_50 = global::BookAStar.Droid.Resource.Color.material_grey_50;
+			global::XLabs.Forms.Droid.Resource.Color.material_grey_600 = global::BookAStar.Droid.Resource.Color.material_grey_600;
+			global::XLabs.Forms.Droid.Resource.Color.material_grey_800 = global::BookAStar.Droid.Resource.Color.material_grey_800;
+			global::XLabs.Forms.Droid.Resource.Color.material_grey_850 = global::BookAStar.Droid.Resource.Color.material_grey_850;
+			global::XLabs.Forms.Droid.Resource.Color.material_grey_900 = global::BookAStar.Droid.Resource.Color.material_grey_900;
+			global::XLabs.Forms.Droid.Resource.Color.primary_dark_material_dark = global::BookAStar.Droid.Resource.Color.primary_dark_material_dark;
+			global::XLabs.Forms.Droid.Resource.Color.primary_dark_material_light = global::BookAStar.Droid.Resource.Color.primary_dark_material_light;
+			global::XLabs.Forms.Droid.Resource.Color.primary_material_dark = global::BookAStar.Droid.Resource.Color.primary_material_dark;
+			global::XLabs.Forms.Droid.Resource.Color.primary_material_light = global::BookAStar.Droid.Resource.Color.primary_material_light;
+			global::XLabs.Forms.Droid.Resource.Color.primary_text_default_material_dark = global::BookAStar.Droid.Resource.Color.primary_text_default_material_dark;
+			global::XLabs.Forms.Droid.Resource.Color.primary_text_default_material_light = global::BookAStar.Droid.Resource.Color.primary_text_default_material_light;
+			global::XLabs.Forms.Droid.Resource.Color.primary_text_disabled_material_dark = global::BookAStar.Droid.Resource.Color.primary_text_disabled_material_dark;
+			global::XLabs.Forms.Droid.Resource.Color.primary_text_disabled_material_light = global::BookAStar.Droid.Resource.Color.primary_text_disabled_material_light;
+			global::XLabs.Forms.Droid.Resource.Color.ripple_material_dark = global::BookAStar.Droid.Resource.Color.ripple_material_dark;
+			global::XLabs.Forms.Droid.Resource.Color.ripple_material_light = global::BookAStar.Droid.Resource.Color.ripple_material_light;
+			global::XLabs.Forms.Droid.Resource.Color.secondary_text_default_material_dark = global::BookAStar.Droid.Resource.Color.secondary_text_default_material_dark;
+			global::XLabs.Forms.Droid.Resource.Color.secondary_text_default_material_light = global::BookAStar.Droid.Resource.Color.secondary_text_default_material_light;
+			global::XLabs.Forms.Droid.Resource.Color.secondary_text_disabled_material_dark = global::BookAStar.Droid.Resource.Color.secondary_text_disabled_material_dark;
+			global::XLabs.Forms.Droid.Resource.Color.secondary_text_disabled_material_light = global::BookAStar.Droid.Resource.Color.secondary_text_disabled_material_light;
+			global::XLabs.Forms.Droid.Resource.Color.switch_thumb_disabled_material_dark = global::BookAStar.Droid.Resource.Color.switch_thumb_disabled_material_dark;
+			global::XLabs.Forms.Droid.Resource.Color.switch_thumb_disabled_material_light = global::BookAStar.Droid.Resource.Color.switch_thumb_disabled_material_light;
+			global::XLabs.Forms.Droid.Resource.Color.switch_thumb_material_dark = global::BookAStar.Droid.Resource.Color.switch_thumb_material_dark;
+			global::XLabs.Forms.Droid.Resource.Color.switch_thumb_material_light = global::BookAStar.Droid.Resource.Color.switch_thumb_material_light;
+			global::XLabs.Forms.Droid.Resource.Color.switch_thumb_normal_material_dark = global::BookAStar.Droid.Resource.Color.switch_thumb_normal_material_dark;
+			global::XLabs.Forms.Droid.Resource.Color.switch_thumb_normal_material_light = global::BookAStar.Droid.Resource.Color.switch_thumb_normal_material_light;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_action_bar_content_inset_material = global::BookAStar.Droid.Resource.Dimension.abc_action_bar_content_inset_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_action_bar_default_height_material = global::BookAStar.Droid.Resource.Dimension.abc_action_bar_default_height_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_action_bar_default_padding_end_material = global::BookAStar.Droid.Resource.Dimension.abc_action_bar_default_padding_end_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_action_bar_default_padding_start_material = global::BookAStar.Droid.Resource.Dimension.abc_action_bar_default_padding_start_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_action_bar_icon_vertical_padding_material = global::BookAStar.Droid.Resource.Dimension.abc_action_bar_icon_vertical_padding_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_action_bar_overflow_padding_end_material = global::BookAStar.Droid.Resource.Dimension.abc_action_bar_overflow_padding_end_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_action_bar_overflow_padding_start_material = global::BookAStar.Droid.Resource.Dimension.abc_action_bar_overflow_padding_start_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_action_bar_progress_bar_size = global::BookAStar.Droid.Resource.Dimension.abc_action_bar_progress_bar_size;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_action_bar_stacked_max_height = global::BookAStar.Droid.Resource.Dimension.abc_action_bar_stacked_max_height;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_action_bar_stacked_tab_max_width = global::BookAStar.Droid.Resource.Dimension.abc_action_bar_stacked_tab_max_width;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_action_bar_subtitle_bottom_margin_material = global::BookAStar.Droid.Resource.Dimension.abc_action_bar_subtitle_bottom_margin_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_action_bar_subtitle_top_margin_material = global::BookAStar.Droid.Resource.Dimension.abc_action_bar_subtitle_top_margin_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_action_button_min_height_material = global::BookAStar.Droid.Resource.Dimension.abc_action_button_min_height_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_action_button_min_width_material = global::BookAStar.Droid.Resource.Dimension.abc_action_button_min_width_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_action_button_min_width_overflow_material = global::BookAStar.Droid.Resource.Dimension.abc_action_button_min_width_overflow_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_alert_dialog_button_bar_height = global::BookAStar.Droid.Resource.Dimension.abc_alert_dialog_button_bar_height;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_button_inset_horizontal_material = global::BookAStar.Droid.Resource.Dimension.abc_button_inset_horizontal_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_button_inset_vertical_material = global::BookAStar.Droid.Resource.Dimension.abc_button_inset_vertical_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_button_padding_horizontal_material = global::BookAStar.Droid.Resource.Dimension.abc_button_padding_horizontal_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_button_padding_vertical_material = global::BookAStar.Droid.Resource.Dimension.abc_button_padding_vertical_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_config_prefDialogWidth = global::BookAStar.Droid.Resource.Dimension.abc_config_prefDialogWidth;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_control_corner_material = global::BookAStar.Droid.Resource.Dimension.abc_control_corner_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_control_inset_material = global::BookAStar.Droid.Resource.Dimension.abc_control_inset_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_control_padding_material = global::BookAStar.Droid.Resource.Dimension.abc_control_padding_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_dialog_fixed_height_major = global::BookAStar.Droid.Resource.Dimension.abc_dialog_fixed_height_major;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_dialog_fixed_height_minor = global::BookAStar.Droid.Resource.Dimension.abc_dialog_fixed_height_minor;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_dialog_fixed_width_major = global::BookAStar.Droid.Resource.Dimension.abc_dialog_fixed_width_major;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_dialog_fixed_width_minor = global::BookAStar.Droid.Resource.Dimension.abc_dialog_fixed_width_minor;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_dialog_list_padding_vertical_material = global::BookAStar.Droid.Resource.Dimension.abc_dialog_list_padding_vertical_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_dialog_min_width_major = global::BookAStar.Droid.Resource.Dimension.abc_dialog_min_width_major;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_dialog_min_width_minor = global::BookAStar.Droid.Resource.Dimension.abc_dialog_min_width_minor;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_dialog_padding_material = global::BookAStar.Droid.Resource.Dimension.abc_dialog_padding_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_dialog_padding_top_material = global::BookAStar.Droid.Resource.Dimension.abc_dialog_padding_top_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_disabled_alpha_material_dark = global::BookAStar.Droid.Resource.Dimension.abc_disabled_alpha_material_dark;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_disabled_alpha_material_light = global::BookAStar.Droid.Resource.Dimension.abc_disabled_alpha_material_light;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_dropdownitem_icon_width = global::BookAStar.Droid.Resource.Dimension.abc_dropdownitem_icon_width;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_dropdownitem_text_padding_left = global::BookAStar.Droid.Resource.Dimension.abc_dropdownitem_text_padding_left;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_dropdownitem_text_padding_right = global::BookAStar.Droid.Resource.Dimension.abc_dropdownitem_text_padding_right;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_edit_text_inset_bottom_material = global::BookAStar.Droid.Resource.Dimension.abc_edit_text_inset_bottom_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_edit_text_inset_horizontal_material = global::BookAStar.Droid.Resource.Dimension.abc_edit_text_inset_horizontal_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_edit_text_inset_top_material = global::BookAStar.Droid.Resource.Dimension.abc_edit_text_inset_top_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_floating_window_z = global::BookAStar.Droid.Resource.Dimension.abc_floating_window_z;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_list_item_padding_horizontal_material = global::BookAStar.Droid.Resource.Dimension.abc_list_item_padding_horizontal_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_panel_menu_list_width = global::BookAStar.Droid.Resource.Dimension.abc_panel_menu_list_width;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_search_view_preferred_width = global::BookAStar.Droid.Resource.Dimension.abc_search_view_preferred_width;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_search_view_text_min_width = global::BookAStar.Droid.Resource.Dimension.abc_search_view_text_min_width;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_seekbar_track_background_height_material = global::BookAStar.Droid.Resource.Dimension.abc_seekbar_track_background_height_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_seekbar_track_progress_height_material = global::BookAStar.Droid.Resource.Dimension.abc_seekbar_track_progress_height_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_select_dialog_padding_start_material = global::BookAStar.Droid.Resource.Dimension.abc_select_dialog_padding_start_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_switch_padding = global::BookAStar.Droid.Resource.Dimension.abc_switch_padding;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_text_size_body_1_material = global::BookAStar.Droid.Resource.Dimension.abc_text_size_body_1_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_text_size_body_2_material = global::BookAStar.Droid.Resource.Dimension.abc_text_size_body_2_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_text_size_button_material = global::BookAStar.Droid.Resource.Dimension.abc_text_size_button_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_text_size_caption_material = global::BookAStar.Droid.Resource.Dimension.abc_text_size_caption_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_text_size_display_1_material = global::BookAStar.Droid.Resource.Dimension.abc_text_size_display_1_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_text_size_display_2_material = global::BookAStar.Droid.Resource.Dimension.abc_text_size_display_2_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_text_size_display_3_material = global::BookAStar.Droid.Resource.Dimension.abc_text_size_display_3_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_text_size_display_4_material = global::BookAStar.Droid.Resource.Dimension.abc_text_size_display_4_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_text_size_headline_material = global::BookAStar.Droid.Resource.Dimension.abc_text_size_headline_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_text_size_large_material = global::BookAStar.Droid.Resource.Dimension.abc_text_size_large_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_text_size_medium_material = global::BookAStar.Droid.Resource.Dimension.abc_text_size_medium_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_text_size_menu_material = global::BookAStar.Droid.Resource.Dimension.abc_text_size_menu_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_text_size_small_material = global::BookAStar.Droid.Resource.Dimension.abc_text_size_small_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_text_size_subhead_material = global::BookAStar.Droid.Resource.Dimension.abc_text_size_subhead_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_text_size_subtitle_material_toolbar = global::BookAStar.Droid.Resource.Dimension.abc_text_size_subtitle_material_toolbar;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_text_size_title_material = global::BookAStar.Droid.Resource.Dimension.abc_text_size_title_material;
+			global::XLabs.Forms.Droid.Resource.Dimension.abc_text_size_title_material_toolbar = global::BookAStar.Droid.Resource.Dimension.abc_text_size_title_material_toolbar;
+			global::XLabs.Forms.Droid.Resource.Dimension.calendar_day_headers_paddingbottom = global::BookAStar.Droid.Resource.Dimension.calendar_day_headers_paddingbottom;
+			global::XLabs.Forms.Droid.Resource.Dimension.calendar_month_title_bottommargin = global::BookAStar.Droid.Resource.Dimension.calendar_month_title_bottommargin;
+			global::XLabs.Forms.Droid.Resource.Dimension.calendar_month_topmargin = global::BookAStar.Droid.Resource.Dimension.calendar_month_topmargin;
+			global::XLabs.Forms.Droid.Resource.Dimension.calendar_text_medium = global::BookAStar.Droid.Resource.Dimension.calendar_text_medium;
+			global::XLabs.Forms.Droid.Resource.Dimension.calendar_text_small = global::BookAStar.Droid.Resource.Dimension.calendar_text_small;
+			global::XLabs.Forms.Droid.Resource.Dimension.cardview_compat_inset_shadow = global::BookAStar.Droid.Resource.Dimension.cardview_compat_inset_shadow;
+			global::XLabs.Forms.Droid.Resource.Dimension.cardview_default_elevation = global::BookAStar.Droid.Resource.Dimension.cardview_default_elevation;
+			global::XLabs.Forms.Droid.Resource.Dimension.cardview_default_radius = global::BookAStar.Droid.Resource.Dimension.cardview_default_radius;
+			global::XLabs.Forms.Droid.Resource.Dimension.design_appbar_elevation = global::BookAStar.Droid.Resource.Dimension.design_appbar_elevation;
+			global::XLabs.Forms.Droid.Resource.Dimension.design_bottom_sheet_modal_elevation = global::BookAStar.Droid.Resource.Dimension.design_bottom_sheet_modal_elevation;
+			global::XLabs.Forms.Droid.Resource.Dimension.design_bottom_sheet_modal_peek_height = global::BookAStar.Droid.Resource.Dimension.design_bottom_sheet_modal_peek_height;
+			global::XLabs.Forms.Droid.Resource.Dimension.design_fab_border_width = global::BookAStar.Droid.Resource.Dimension.design_fab_border_width;
+			global::XLabs.Forms.Droid.Resource.Dimension.design_fab_elevation = global::BookAStar.Droid.Resource.Dimension.design_fab_elevation;
+			global::XLabs.Forms.Droid.Resource.Dimension.design_fab_image_size = global::BookAStar.Droid.Resource.Dimension.design_fab_image_size;
+			global::XLabs.Forms.Droid.Resource.Dimension.design_fab_size_mini = global::BookAStar.Droid.Resource.Dimension.design_fab_size_mini;
+			global::XLabs.Forms.Droid.Resource.Dimension.design_fab_size_normal = global::BookAStar.Droid.Resource.Dimension.design_fab_size_normal;
+			global::XLabs.Forms.Droid.Resource.Dimension.design_fab_translation_z_pressed = global::BookAStar.Droid.Resource.Dimension.design_fab_translation_z_pressed;
+			global::XLabs.Forms.Droid.Resource.Dimension.design_navigation_elevation = global::BookAStar.Droid.Resource.Dimension.design_navigation_elevation;
+			global::XLabs.Forms.Droid.Resource.Dimension.design_navigation_icon_padding = global::BookAStar.Droid.Resource.Dimension.design_navigation_icon_padding;
+			global::XLabs.Forms.Droid.Resource.Dimension.design_navigation_icon_size = global::BookAStar.Droid.Resource.Dimension.design_navigation_icon_size;
+			global::XLabs.Forms.Droid.Resource.Dimension.design_navigation_max_width = global::BookAStar.Droid.Resource.Dimension.design_navigation_max_width;
+			global::XLabs.Forms.Droid.Resource.Dimension.design_navigation_padding_bottom = global::BookAStar.Droid.Resource.Dimension.design_navigation_padding_bottom;
+			global::XLabs.Forms.Droid.Resource.Dimension.design_navigation_separator_vertical_padding = global::BookAStar.Droid.Resource.Dimension.design_navigation_separator_vertical_padding;
+			global::XLabs.Forms.Droid.Resource.Dimension.design_snackbar_action_inline_max_width = global::BookAStar.Droid.Resource.Dimension.design_snackbar_action_inline_max_width;
+			global::XLabs.Forms.Droid.Resource.Dimension.design_snackbar_background_corner_radius = global::BookAStar.Droid.Resource.Dimension.design_snackbar_background_corner_radius;
+			global::XLabs.Forms.Droid.Resource.Dimension.design_snackbar_elevation = global::BookAStar.Droid.Resource.Dimension.design_snackbar_elevation;
+			global::XLabs.Forms.Droid.Resource.Dimension.design_snackbar_extra_spacing_horizontal = global::BookAStar.Droid.Resource.Dimension.design_snackbar_extra_spacing_horizontal;
+			global::XLabs.Forms.Droid.Resource.Dimension.design_snackbar_max_width = global::BookAStar.Droid.Resource.Dimension.design_snackbar_max_width;
+			global::XLabs.Forms.Droid.Resource.Dimension.design_snackbar_min_width = global::BookAStar.Droid.Resource.Dimension.design_snackbar_min_width;
+			global::XLabs.Forms.Droid.Resource.Dimension.design_snackbar_padding_horizontal = global::BookAStar.Droid.Resource.Dimension.design_snackbar_padding_horizontal;
+			global::XLabs.Forms.Droid.Resource.Dimension.design_snackbar_padding_vertical = global::BookAStar.Droid.Resource.Dimension.design_snackbar_padding_vertical;
+			global::XLabs.Forms.Droid.Resource.Dimension.design_snackbar_padding_vertical_2lines = global::BookAStar.Droid.Resource.Dimension.design_snackbar_padding_vertical_2lines;
+			global::XLabs.Forms.Droid.Resource.Dimension.design_snackbar_text_size = global::BookAStar.Droid.Resource.Dimension.design_snackbar_text_size;
+			global::XLabs.Forms.Droid.Resource.Dimension.design_tab_max_width = global::BookAStar.Droid.Resource.Dimension.design_tab_max_width;
+			global::XLabs.Forms.Droid.Resource.Dimension.design_tab_scrollable_min_width = global::BookAStar.Droid.Resource.Dimension.design_tab_scrollable_min_width;
+			global::XLabs.Forms.Droid.Resource.Dimension.design_tab_text_size = global::BookAStar.Droid.Resource.Dimension.design_tab_text_size;
+			global::XLabs.Forms.Droid.Resource.Dimension.design_tab_text_size_2line = global::BookAStar.Droid.Resource.Dimension.design_tab_text_size_2line;
+			global::XLabs.Forms.Droid.Resource.Dimension.disabled_alpha_material_dark = global::BookAStar.Droid.Resource.Dimension.disabled_alpha_material_dark;
+			global::XLabs.Forms.Droid.Resource.Dimension.disabled_alpha_material_light = global::BookAStar.Droid.Resource.Dimension.disabled_alpha_material_light;
+			global::XLabs.Forms.Droid.Resource.Dimension.highlight_alpha_material_colored = global::BookAStar.Droid.Resource.Dimension.highlight_alpha_material_colored;
+			global::XLabs.Forms.Droid.Resource.Dimension.highlight_alpha_material_dark = global::BookAStar.Droid.Resource.Dimension.highlight_alpha_material_dark;
+			global::XLabs.Forms.Droid.Resource.Dimension.highlight_alpha_material_light = global::BookAStar.Droid.Resource.Dimension.highlight_alpha_material_light;
+			global::XLabs.Forms.Droid.Resource.Dimension.item_touch_helper_max_drag_scroll_per_frame = global::BookAStar.Droid.Resource.Dimension.item_touch_helper_max_drag_scroll_per_frame;
+			global::XLabs.Forms.Droid.Resource.Dimension.item_touch_helper_swipe_escape_max_velocity = global::BookAStar.Droid.Resource.Dimension.item_touch_helper_swipe_escape_max_velocity;
+			global::XLabs.Forms.Droid.Resource.Dimension.item_touch_helper_swipe_escape_velocity = global::BookAStar.Droid.Resource.Dimension.item_touch_helper_swipe_escape_velocity;
+			global::XLabs.Forms.Droid.Resource.Dimension.mr_controller_volume_group_list_item_height = global::BookAStar.Droid.Resource.Dimension.mr_controller_volume_group_list_item_height;
+			global::XLabs.Forms.Droid.Resource.Dimension.mr_controller_volume_group_list_item_icon_size = global::BookAStar.Droid.Resource.Dimension.mr_controller_volume_group_list_item_icon_size;
+			global::XLabs.Forms.Droid.Resource.Dimension.mr_controller_volume_group_list_max_height = global::BookAStar.Droid.Resource.Dimension.mr_controller_volume_group_list_max_height;
+			global::XLabs.Forms.Droid.Resource.Dimension.mr_controller_volume_group_list_padding_top = global::BookAStar.Droid.Resource.Dimension.mr_controller_volume_group_list_padding_top;
+			global::XLabs.Forms.Droid.Resource.Dimension.mr_dialog_fixed_width_major = global::BookAStar.Droid.Resource.Dimension.mr_dialog_fixed_width_major;
+			global::XLabs.Forms.Droid.Resource.Dimension.mr_dialog_fixed_width_minor = global::BookAStar.Droid.Resource.Dimension.mr_dialog_fixed_width_minor;
+			global::XLabs.Forms.Droid.Resource.Dimension.notification_large_icon_height = global::BookAStar.Droid.Resource.Dimension.notification_large_icon_height;
+			global::XLabs.Forms.Droid.Resource.Dimension.notification_large_icon_width = global::BookAStar.Droid.Resource.Dimension.notification_large_icon_width;
+			global::XLabs.Forms.Droid.Resource.Dimension.notification_subtext_size = global::BookAStar.Droid.Resource.Dimension.notification_subtext_size;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_ab_share_pack_mtrl_alpha = global::BookAStar.Droid.Resource.Drawable.abc_ab_share_pack_mtrl_alpha;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_action_bar_item_background_material = global::BookAStar.Droid.Resource.Drawable.abc_action_bar_item_background_material;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_btn_borderless_material = global::BookAStar.Droid.Resource.Drawable.abc_btn_borderless_material;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_btn_check_material = global::BookAStar.Droid.Resource.Drawable.abc_btn_check_material;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_btn_check_to_on_mtrl_000 = global::BookAStar.Droid.Resource.Drawable.abc_btn_check_to_on_mtrl_000;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_btn_check_to_on_mtrl_015 = global::BookAStar.Droid.Resource.Drawable.abc_btn_check_to_on_mtrl_015;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_btn_colored_material = global::BookAStar.Droid.Resource.Drawable.abc_btn_colored_material;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_btn_default_mtrl_shape = global::BookAStar.Droid.Resource.Drawable.abc_btn_default_mtrl_shape;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_btn_radio_material = global::BookAStar.Droid.Resource.Drawable.abc_btn_radio_material;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_btn_radio_to_on_mtrl_000 = global::BookAStar.Droid.Resource.Drawable.abc_btn_radio_to_on_mtrl_000;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_btn_radio_to_on_mtrl_015 = global::BookAStar.Droid.Resource.Drawable.abc_btn_radio_to_on_mtrl_015;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_btn_rating_star_off_mtrl_alpha = global::BookAStar.Droid.Resource.Drawable.abc_btn_rating_star_off_mtrl_alpha;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_btn_rating_star_on_mtrl_alpha = global::BookAStar.Droid.Resource.Drawable.abc_btn_rating_star_on_mtrl_alpha;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_btn_switch_to_on_mtrl_00001 = global::BookAStar.Droid.Resource.Drawable.abc_btn_switch_to_on_mtrl_00001;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_btn_switch_to_on_mtrl_00012 = global::BookAStar.Droid.Resource.Drawable.abc_btn_switch_to_on_mtrl_00012;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_cab_background_internal_bg = global::BookAStar.Droid.Resource.Drawable.abc_cab_background_internal_bg;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_cab_background_top_material = global::BookAStar.Droid.Resource.Drawable.abc_cab_background_top_material;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_cab_background_top_mtrl_alpha = global::BookAStar.Droid.Resource.Drawable.abc_cab_background_top_mtrl_alpha;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_control_background_material = global::BookAStar.Droid.Resource.Drawable.abc_control_background_material;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_dialog_material_background_dark = global::BookAStar.Droid.Resource.Drawable.abc_dialog_material_background_dark;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_dialog_material_background_light = global::BookAStar.Droid.Resource.Drawable.abc_dialog_material_background_light;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_edit_text_material = global::BookAStar.Droid.Resource.Drawable.abc_edit_text_material;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_ic_ab_back_mtrl_am_alpha = global::BookAStar.Droid.Resource.Drawable.abc_ic_ab_back_mtrl_am_alpha;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_ic_clear_mtrl_alpha = global::BookAStar.Droid.Resource.Drawable.abc_ic_clear_mtrl_alpha;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_ic_commit_search_api_mtrl_alpha = global::BookAStar.Droid.Resource.Drawable.abc_ic_commit_search_api_mtrl_alpha;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_ic_go_search_api_mtrl_alpha = global::BookAStar.Droid.Resource.Drawable.abc_ic_go_search_api_mtrl_alpha;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_ic_menu_copy_mtrl_am_alpha = global::BookAStar.Droid.Resource.Drawable.abc_ic_menu_copy_mtrl_am_alpha;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_ic_menu_cut_mtrl_alpha = global::BookAStar.Droid.Resource.Drawable.abc_ic_menu_cut_mtrl_alpha;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_ic_menu_moreoverflow_mtrl_alpha = global::BookAStar.Droid.Resource.Drawable.abc_ic_menu_moreoverflow_mtrl_alpha;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_ic_menu_paste_mtrl_am_alpha = global::BookAStar.Droid.Resource.Drawable.abc_ic_menu_paste_mtrl_am_alpha;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_ic_menu_selectall_mtrl_alpha = global::BookAStar.Droid.Resource.Drawable.abc_ic_menu_selectall_mtrl_alpha;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_ic_menu_share_mtrl_alpha = global::BookAStar.Droid.Resource.Drawable.abc_ic_menu_share_mtrl_alpha;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_ic_search_api_mtrl_alpha = global::BookAStar.Droid.Resource.Drawable.abc_ic_search_api_mtrl_alpha;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_ic_star_black_16dp = global::BookAStar.Droid.Resource.Drawable.abc_ic_star_black_16dp;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_ic_star_black_36dp = global::BookAStar.Droid.Resource.Drawable.abc_ic_star_black_36dp;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_ic_star_half_black_16dp = global::BookAStar.Droid.Resource.Drawable.abc_ic_star_half_black_16dp;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_ic_star_half_black_36dp = global::BookAStar.Droid.Resource.Drawable.abc_ic_star_half_black_36dp;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_ic_voice_search_api_mtrl_alpha = global::BookAStar.Droid.Resource.Drawable.abc_ic_voice_search_api_mtrl_alpha;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_item_background_holo_dark = global::BookAStar.Droid.Resource.Drawable.abc_item_background_holo_dark;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_item_background_holo_light = global::BookAStar.Droid.Resource.Drawable.abc_item_background_holo_light;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_list_divider_mtrl_alpha = global::BookAStar.Droid.Resource.Drawable.abc_list_divider_mtrl_alpha;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_list_focused_holo = global::BookAStar.Droid.Resource.Drawable.abc_list_focused_holo;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_list_longpressed_holo = global::BookAStar.Droid.Resource.Drawable.abc_list_longpressed_holo;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_list_pressed_holo_dark = global::BookAStar.Droid.Resource.Drawable.abc_list_pressed_holo_dark;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_list_pressed_holo_light = global::BookAStar.Droid.Resource.Drawable.abc_list_pressed_holo_light;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_list_selector_background_transition_holo_dark = global::BookAStar.Droid.Resource.Drawable.abc_list_selector_background_transition_holo_dark;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_list_selector_background_transition_holo_light = global::BookAStar.Droid.Resource.Drawable.abc_list_selector_background_transition_holo_light;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_list_selector_disabled_holo_dark = global::BookAStar.Droid.Resource.Drawable.abc_list_selector_disabled_holo_dark;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_list_selector_disabled_holo_light = global::BookAStar.Droid.Resource.Drawable.abc_list_selector_disabled_holo_light;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_list_selector_holo_dark = global::BookAStar.Droid.Resource.Drawable.abc_list_selector_holo_dark;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_list_selector_holo_light = global::BookAStar.Droid.Resource.Drawable.abc_list_selector_holo_light;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_menu_hardkey_panel_mtrl_mult = global::BookAStar.Droid.Resource.Drawable.abc_menu_hardkey_panel_mtrl_mult;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_popup_background_mtrl_mult = global::BookAStar.Droid.Resource.Drawable.abc_popup_background_mtrl_mult;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_ratingbar_full_material = global::BookAStar.Droid.Resource.Drawable.abc_ratingbar_full_material;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_ratingbar_indicator_material = global::BookAStar.Droid.Resource.Drawable.abc_ratingbar_indicator_material;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_ratingbar_small_material = global::BookAStar.Droid.Resource.Drawable.abc_ratingbar_small_material;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_scrubber_control_off_mtrl_alpha = global::BookAStar.Droid.Resource.Drawable.abc_scrubber_control_off_mtrl_alpha;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_scrubber_control_to_pressed_mtrl_000 = global::BookAStar.Droid.Resource.Drawable.abc_scrubber_control_to_pressed_mtrl_000;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_scrubber_control_to_pressed_mtrl_005 = global::BookAStar.Droid.Resource.Drawable.abc_scrubber_control_to_pressed_mtrl_005;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_scrubber_primary_mtrl_alpha = global::BookAStar.Droid.Resource.Drawable.abc_scrubber_primary_mtrl_alpha;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_scrubber_track_mtrl_alpha = global::BookAStar.Droid.Resource.Drawable.abc_scrubber_track_mtrl_alpha;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_seekbar_thumb_material = global::BookAStar.Droid.Resource.Drawable.abc_seekbar_thumb_material;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_seekbar_track_material = global::BookAStar.Droid.Resource.Drawable.abc_seekbar_track_material;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_spinner_mtrl_am_alpha = global::BookAStar.Droid.Resource.Drawable.abc_spinner_mtrl_am_alpha;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_spinner_textfield_background_material = global::BookAStar.Droid.Resource.Drawable.abc_spinner_textfield_background_material;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_switch_thumb_material = global::BookAStar.Droid.Resource.Drawable.abc_switch_thumb_material;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_switch_track_mtrl_alpha = global::BookAStar.Droid.Resource.Drawable.abc_switch_track_mtrl_alpha;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_tab_indicator_material = global::BookAStar.Droid.Resource.Drawable.abc_tab_indicator_material;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_tab_indicator_mtrl_alpha = global::BookAStar.Droid.Resource.Drawable.abc_tab_indicator_mtrl_alpha;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_text_cursor_material = global::BookAStar.Droid.Resource.Drawable.abc_text_cursor_material;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_textfield_activated_mtrl_alpha = global::BookAStar.Droid.Resource.Drawable.abc_textfield_activated_mtrl_alpha;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_textfield_default_mtrl_alpha = global::BookAStar.Droid.Resource.Drawable.abc_textfield_default_mtrl_alpha;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_textfield_search_activated_mtrl_alpha = global::BookAStar.Droid.Resource.Drawable.abc_textfield_search_activated_mtrl_alpha;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_textfield_search_default_mtrl_alpha = global::BookAStar.Droid.Resource.Drawable.abc_textfield_search_default_mtrl_alpha;
+			global::XLabs.Forms.Droid.Resource.Drawable.abc_textfield_search_material = global::BookAStar.Droid.Resource.Drawable.abc_textfield_search_material;
+			global::XLabs.Forms.Droid.Resource.Drawable.ad16 = global::BookAStar.Droid.Resource.Drawable.ad16;
+			global::XLabs.Forms.Droid.Resource.Drawable.calendar_bg_selector = global::BookAStar.Droid.Resource.Drawable.calendar_bg_selector;
+			global::XLabs.Forms.Droid.Resource.Drawable.design_fab_background = global::BookAStar.Droid.Resource.Drawable.design_fab_background;
+			global::XLabs.Forms.Droid.Resource.Drawable.design_snackbar_background = global::BookAStar.Droid.Resource.Drawable.design_snackbar_background;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_audiotrack = global::BookAStar.Droid.Resource.Drawable.ic_audiotrack;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_audiotrack_light = global::BookAStar.Droid.Resource.Drawable.ic_audiotrack_light;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_bluetooth_grey = global::BookAStar.Droid.Resource.Drawable.ic_bluetooth_grey;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_bluetooth_white = global::BookAStar.Droid.Resource.Drawable.ic_bluetooth_white;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_cast_dark = global::BookAStar.Droid.Resource.Drawable.ic_cast_dark;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_cast_disabled_light = global::BookAStar.Droid.Resource.Drawable.ic_cast_disabled_light;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_cast_grey = global::BookAStar.Droid.Resource.Drawable.ic_cast_grey;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_cast_light = global::BookAStar.Droid.Resource.Drawable.ic_cast_light;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_cast_off_light = global::BookAStar.Droid.Resource.Drawable.ic_cast_off_light;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_cast_on_0_light = global::BookAStar.Droid.Resource.Drawable.ic_cast_on_0_light;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_cast_on_1_light = global::BookAStar.Droid.Resource.Drawable.ic_cast_on_1_light;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_cast_on_2_light = global::BookAStar.Droid.Resource.Drawable.ic_cast_on_2_light;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_cast_on_light = global::BookAStar.Droid.Resource.Drawable.ic_cast_on_light;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_cast_white = global::BookAStar.Droid.Resource.Drawable.ic_cast_white;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_close_dark = global::BookAStar.Droid.Resource.Drawable.ic_close_dark;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_close_light = global::BookAStar.Droid.Resource.Drawable.ic_close_light;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_collapse = global::BookAStar.Droid.Resource.Drawable.ic_collapse;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_collapse_00000 = global::BookAStar.Droid.Resource.Drawable.ic_collapse_00000;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_collapse_00001 = global::BookAStar.Droid.Resource.Drawable.ic_collapse_00001;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_collapse_00002 = global::BookAStar.Droid.Resource.Drawable.ic_collapse_00002;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_collapse_00003 = global::BookAStar.Droid.Resource.Drawable.ic_collapse_00003;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_collapse_00004 = global::BookAStar.Droid.Resource.Drawable.ic_collapse_00004;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_collapse_00005 = global::BookAStar.Droid.Resource.Drawable.ic_collapse_00005;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_collapse_00006 = global::BookAStar.Droid.Resource.Drawable.ic_collapse_00006;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_collapse_00007 = global::BookAStar.Droid.Resource.Drawable.ic_collapse_00007;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_collapse_00008 = global::BookAStar.Droid.Resource.Drawable.ic_collapse_00008;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_collapse_00009 = global::BookAStar.Droid.Resource.Drawable.ic_collapse_00009;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_collapse_00010 = global::BookAStar.Droid.Resource.Drawable.ic_collapse_00010;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_collapse_00011 = global::BookAStar.Droid.Resource.Drawable.ic_collapse_00011;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_collapse_00012 = global::BookAStar.Droid.Resource.Drawable.ic_collapse_00012;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_collapse_00013 = global::BookAStar.Droid.Resource.Drawable.ic_collapse_00013;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_collapse_00014 = global::BookAStar.Droid.Resource.Drawable.ic_collapse_00014;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_collapse_00015 = global::BookAStar.Droid.Resource.Drawable.ic_collapse_00015;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_expand = global::BookAStar.Droid.Resource.Drawable.ic_expand;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_expand_00000 = global::BookAStar.Droid.Resource.Drawable.ic_expand_00000;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_expand_00001 = global::BookAStar.Droid.Resource.Drawable.ic_expand_00001;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_expand_00002 = global::BookAStar.Droid.Resource.Drawable.ic_expand_00002;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_expand_00003 = global::BookAStar.Droid.Resource.Drawable.ic_expand_00003;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_expand_00004 = global::BookAStar.Droid.Resource.Drawable.ic_expand_00004;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_expand_00005 = global::BookAStar.Droid.Resource.Drawable.ic_expand_00005;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_expand_00006 = global::BookAStar.Droid.Resource.Drawable.ic_expand_00006;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_expand_00007 = global::BookAStar.Droid.Resource.Drawable.ic_expand_00007;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_expand_00008 = global::BookAStar.Droid.Resource.Drawable.ic_expand_00008;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_expand_00009 = global::BookAStar.Droid.Resource.Drawable.ic_expand_00009;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_expand_00010 = global::BookAStar.Droid.Resource.Drawable.ic_expand_00010;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_expand_00011 = global::BookAStar.Droid.Resource.Drawable.ic_expand_00011;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_expand_00012 = global::BookAStar.Droid.Resource.Drawable.ic_expand_00012;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_expand_00013 = global::BookAStar.Droid.Resource.Drawable.ic_expand_00013;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_expand_00014 = global::BookAStar.Droid.Resource.Drawable.ic_expand_00014;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_expand_00015 = global::BookAStar.Droid.Resource.Drawable.ic_expand_00015;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_media_pause = global::BookAStar.Droid.Resource.Drawable.ic_media_pause;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_media_play = global::BookAStar.Droid.Resource.Drawable.ic_media_play;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_media_route_disabled_mono_dark = global::BookAStar.Droid.Resource.Drawable.ic_media_route_disabled_mono_dark;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_media_route_off_mono_dark = global::BookAStar.Droid.Resource.Drawable.ic_media_route_off_mono_dark;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_media_route_on_0_mono_dark = global::BookAStar.Droid.Resource.Drawable.ic_media_route_on_0_mono_dark;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_media_route_on_1_mono_dark = global::BookAStar.Droid.Resource.Drawable.ic_media_route_on_1_mono_dark;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_media_route_on_2_mono_dark = global::BookAStar.Droid.Resource.Drawable.ic_media_route_on_2_mono_dark;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_media_route_on_mono_dark = global::BookAStar.Droid.Resource.Drawable.ic_media_route_on_mono_dark;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_pause_dark = global::BookAStar.Droid.Resource.Drawable.ic_pause_dark;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_pause_light = global::BookAStar.Droid.Resource.Drawable.ic_pause_light;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_play_dark = global::BookAStar.Droid.Resource.Drawable.ic_play_dark;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_play_light = global::BookAStar.Droid.Resource.Drawable.ic_play_light;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_speaker_dark = global::BookAStar.Droid.Resource.Drawable.ic_speaker_dark;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_speaker_group_dark = global::BookAStar.Droid.Resource.Drawable.ic_speaker_group_dark;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_speaker_group_light = global::BookAStar.Droid.Resource.Drawable.ic_speaker_group_light;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_speaker_light = global::BookAStar.Droid.Resource.Drawable.ic_speaker_light;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_tv_dark = global::BookAStar.Droid.Resource.Drawable.ic_tv_dark;
+			global::XLabs.Forms.Droid.Resource.Drawable.ic_tv_light = global::BookAStar.Droid.Resource.Drawable.ic_tv_light;
+			global::XLabs.Forms.Droid.Resource.Drawable.mr_dialog_material_background_dark = global::BookAStar.Droid.Resource.Drawable.mr_dialog_material_background_dark;
+			global::XLabs.Forms.Droid.Resource.Drawable.mr_dialog_material_background_light = global::BookAStar.Droid.Resource.Drawable.mr_dialog_material_background_light;
+			global::XLabs.Forms.Droid.Resource.Drawable.mr_ic_audiotrack_light = global::BookAStar.Droid.Resource.Drawable.mr_ic_audiotrack_light;
+			global::XLabs.Forms.Droid.Resource.Drawable.mr_ic_cast_dark = global::BookAStar.Droid.Resource.Drawable.mr_ic_cast_dark;
+			global::XLabs.Forms.Droid.Resource.Drawable.mr_ic_cast_light = global::BookAStar.Droid.Resource.Drawable.mr_ic_cast_light;
+			global::XLabs.Forms.Droid.Resource.Drawable.mr_ic_close_dark = global::BookAStar.Droid.Resource.Drawable.mr_ic_close_dark;
+			global::XLabs.Forms.Droid.Resource.Drawable.mr_ic_close_light = global::BookAStar.Droid.Resource.Drawable.mr_ic_close_light;
+			global::XLabs.Forms.Droid.Resource.Drawable.mr_ic_media_route_connecting_mono_dark = global::BookAStar.Droid.Resource.Drawable.mr_ic_media_route_connecting_mono_dark;
+			global::XLabs.Forms.Droid.Resource.Drawable.mr_ic_media_route_connecting_mono_light = global::BookAStar.Droid.Resource.Drawable.mr_ic_media_route_connecting_mono_light;
+			global::XLabs.Forms.Droid.Resource.Drawable.mr_ic_media_route_mono_dark = global::BookAStar.Droid.Resource.Drawable.mr_ic_media_route_mono_dark;
+			global::XLabs.Forms.Droid.Resource.Drawable.mr_ic_media_route_mono_light = global::BookAStar.Droid.Resource.Drawable.mr_ic_media_route_mono_light;
+			global::XLabs.Forms.Droid.Resource.Drawable.mr_ic_pause_dark = global::BookAStar.Droid.Resource.Drawable.mr_ic_pause_dark;
+			global::XLabs.Forms.Droid.Resource.Drawable.mr_ic_pause_light = global::BookAStar.Droid.Resource.Drawable.mr_ic_pause_light;
+			global::XLabs.Forms.Droid.Resource.Drawable.mr_ic_play_dark = global::BookAStar.Droid.Resource.Drawable.mr_ic_play_dark;
+			global::XLabs.Forms.Droid.Resource.Drawable.mr_ic_play_light = global::BookAStar.Droid.Resource.Drawable.mr_ic_play_light;
+			global::XLabs.Forms.Droid.Resource.Drawable.notification_template_icon_bg = global::BookAStar.Droid.Resource.Drawable.notification_template_icon_bg;
+			global::XLabs.Forms.Droid.Resource.Id.action0 = global::BookAStar.Droid.Resource.Id.action0;
+			global::XLabs.Forms.Droid.Resource.Id.action_bar = global::BookAStar.Droid.Resource.Id.action_bar;
+			global::XLabs.Forms.Droid.Resource.Id.action_bar_activity_content = global::BookAStar.Droid.Resource.Id.action_bar_activity_content;
+			global::XLabs.Forms.Droid.Resource.Id.action_bar_container = global::BookAStar.Droid.Resource.Id.action_bar_container;
+			global::XLabs.Forms.Droid.Resource.Id.action_bar_root = global::BookAStar.Droid.Resource.Id.action_bar_root;
+			global::XLabs.Forms.Droid.Resource.Id.action_bar_spinner = global::BookAStar.Droid.Resource.Id.action_bar_spinner;
+			global::XLabs.Forms.Droid.Resource.Id.action_bar_subtitle = global::BookAStar.Droid.Resource.Id.action_bar_subtitle;
+			global::XLabs.Forms.Droid.Resource.Id.action_bar_title = global::BookAStar.Droid.Resource.Id.action_bar_title;
+			global::XLabs.Forms.Droid.Resource.Id.action_context_bar = global::BookAStar.Droid.Resource.Id.action_context_bar;
+			global::XLabs.Forms.Droid.Resource.Id.action_divider = global::BookAStar.Droid.Resource.Id.action_divider;
+			global::XLabs.Forms.Droid.Resource.Id.action_menu_divider = global::BookAStar.Droid.Resource.Id.action_menu_divider;
+			global::XLabs.Forms.Droid.Resource.Id.action_menu_presenter = global::BookAStar.Droid.Resource.Id.action_menu_presenter;
+			global::XLabs.Forms.Droid.Resource.Id.action_mode_bar = global::BookAStar.Droid.Resource.Id.action_mode_bar;
+			global::XLabs.Forms.Droid.Resource.Id.action_mode_bar_stub = global::BookAStar.Droid.Resource.Id.action_mode_bar_stub;
+			global::XLabs.Forms.Droid.Resource.Id.action_mode_close_button = global::BookAStar.Droid.Resource.Id.action_mode_close_button;
+			global::XLabs.Forms.Droid.Resource.Id.activity_chooser_view_content = global::BookAStar.Droid.Resource.Id.activity_chooser_view_content;
+			global::XLabs.Forms.Droid.Resource.Id.alertTitle = global::BookAStar.Droid.Resource.Id.alertTitle;
+			global::XLabs.Forms.Droid.Resource.Id.always = global::BookAStar.Droid.Resource.Id.always;
+			global::XLabs.Forms.Droid.Resource.Id.beginning = global::BookAStar.Droid.Resource.Id.beginning;
+			global::XLabs.Forms.Droid.Resource.Id.bottom = global::BookAStar.Droid.Resource.Id.bottom;
+			global::XLabs.Forms.Droid.Resource.Id.buttonPanel = global::BookAStar.Droid.Resource.Id.buttonPanel;
+			global::XLabs.Forms.Droid.Resource.Id.calendar_grid = global::BookAStar.Droid.Resource.Id.calendar_grid;
+			global::XLabs.Forms.Droid.Resource.Id.calendar_view = global::BookAStar.Droid.Resource.Id.calendar_view;
+			global::XLabs.Forms.Droid.Resource.Id.calendarr_pager = global::BookAStar.Droid.Resource.Id.calendarr_pager;
+			global::XLabs.Forms.Droid.Resource.Id.cancel_action = global::BookAStar.Droid.Resource.Id.cancel_action;
+			global::XLabs.Forms.Droid.Resource.Id.center = global::BookAStar.Droid.Resource.Id.center;
+			global::XLabs.Forms.Droid.Resource.Id.center_horizontal = global::BookAStar.Droid.Resource.Id.center_horizontal;
+			global::XLabs.Forms.Droid.Resource.Id.center_vertical = global::BookAStar.Droid.Resource.Id.center_vertical;
+			global::XLabs.Forms.Droid.Resource.Id.checkbox = global::BookAStar.Droid.Resource.Id.checkbox;
+			global::XLabs.Forms.Droid.Resource.Id.chronometer = global::BookAStar.Droid.Resource.Id.chronometer;
+			global::XLabs.Forms.Droid.Resource.Id.clip_horizontal = global::BookAStar.Droid.Resource.Id.clip_horizontal;
+			global::XLabs.Forms.Droid.Resource.Id.clip_vertical = global::BookAStar.Droid.Resource.Id.clip_vertical;
+			global::XLabs.Forms.Droid.Resource.Id.collapseActionView = global::BookAStar.Droid.Resource.Id.collapseActionView;
+			global::XLabs.Forms.Droid.Resource.Id.contentPanel = global::BookAStar.Droid.Resource.Id.contentPanel;
+			global::XLabs.Forms.Droid.Resource.Id.custom = global::BookAStar.Droid.Resource.Id.custom;
+			global::XLabs.Forms.Droid.Resource.Id.customPanel = global::BookAStar.Droid.Resource.Id.customPanel;
+			global::XLabs.Forms.Droid.Resource.Id.decor_content_parent = global::BookAStar.Droid.Resource.Id.decor_content_parent;
+			global::XLabs.Forms.Droid.Resource.Id.default_activity_button = global::BookAStar.Droid.Resource.Id.default_activity_button;
+			global::XLabs.Forms.Droid.Resource.Id.design_bottom_sheet = global::BookAStar.Droid.Resource.Id.design_bottom_sheet;
+			global::XLabs.Forms.Droid.Resource.Id.design_menu_item_action_area = global::BookAStar.Droid.Resource.Id.design_menu_item_action_area;
+			global::XLabs.Forms.Droid.Resource.Id.design_menu_item_action_area_stub = global::BookAStar.Droid.Resource.Id.design_menu_item_action_area_stub;
+			global::XLabs.Forms.Droid.Resource.Id.design_menu_item_text = global::BookAStar.Droid.Resource.Id.design_menu_item_text;
+			global::XLabs.Forms.Droid.Resource.Id.design_navigation_view = global::BookAStar.Droid.Resource.Id.design_navigation_view;
+			global::XLabs.Forms.Droid.Resource.Id.disableHome = global::BookAStar.Droid.Resource.Id.disableHome;
+			global::XLabs.Forms.Droid.Resource.Id.edit_query = global::BookAStar.Droid.Resource.Id.edit_query;
+			global::XLabs.Forms.Droid.Resource.Id.end = global::BookAStar.Droid.Resource.Id.end;
+			global::XLabs.Forms.Droid.Resource.Id.end_padder = global::BookAStar.Droid.Resource.Id.end_padder;
+			global::XLabs.Forms.Droid.Resource.Id.enterAlways = global::BookAStar.Droid.Resource.Id.enterAlways;
+			global::XLabs.Forms.Droid.Resource.Id.enterAlwaysCollapsed = global::BookAStar.Droid.Resource.Id.enterAlwaysCollapsed;
+			global::XLabs.Forms.Droid.Resource.Id.exitUntilCollapsed = global::BookAStar.Droid.Resource.Id.exitUntilCollapsed;
+			global::XLabs.Forms.Droid.Resource.Id.expand_activities_button = global::BookAStar.Droid.Resource.Id.expand_activities_button;
+			global::XLabs.Forms.Droid.Resource.Id.expanded_menu = global::BookAStar.Droid.Resource.Id.expanded_menu;
+			global::XLabs.Forms.Droid.Resource.Id.fill = global::BookAStar.Droid.Resource.Id.fill;
+			global::XLabs.Forms.Droid.Resource.Id.fill_horizontal = global::BookAStar.Droid.Resource.Id.fill_horizontal;
+			global::XLabs.Forms.Droid.Resource.Id.fill_vertical = global::BookAStar.Droid.Resource.Id.fill_vertical;
+			global::XLabs.Forms.Droid.Resource.Id.@fixed = global::BookAStar.Droid.Resource.Id.@fixed;
+			global::XLabs.Forms.Droid.Resource.Id.home = global::BookAStar.Droid.Resource.Id.home;
+			global::XLabs.Forms.Droid.Resource.Id.homeAsUp = global::BookAStar.Droid.Resource.Id.homeAsUp;
+			global::XLabs.Forms.Droid.Resource.Id.icon = global::BookAStar.Droid.Resource.Id.icon;
+			global::XLabs.Forms.Droid.Resource.Id.ifRoom = global::BookAStar.Droid.Resource.Id.ifRoom;
+			global::XLabs.Forms.Droid.Resource.Id.image = global::BookAStar.Droid.Resource.Id.image;
+			global::XLabs.Forms.Droid.Resource.Id.info = global::BookAStar.Droid.Resource.Id.info;
+			global::XLabs.Forms.Droid.Resource.Id.item_touch_helper_previous_elevation = global::BookAStar.Droid.Resource.Id.item_touch_helper_previous_elevation;
+			global::XLabs.Forms.Droid.Resource.Id.left = global::BookAStar.Droid.Resource.Id.left;
+			global::XLabs.Forms.Droid.Resource.Id.left_arrow = global::BookAStar.Droid.Resource.Id.left_arrow;
+			global::XLabs.Forms.Droid.Resource.Id.line1 = global::BookAStar.Droid.Resource.Id.line1;
+			global::XLabs.Forms.Droid.Resource.Id.line3 = global::BookAStar.Droid.Resource.Id.line3;
+			global::XLabs.Forms.Droid.Resource.Id.listMode = global::BookAStar.Droid.Resource.Id.listMode;
+			global::XLabs.Forms.Droid.Resource.Id.list_item = global::BookAStar.Droid.Resource.Id.list_item;
+			global::XLabs.Forms.Droid.Resource.Id.media_actions = global::BookAStar.Droid.Resource.Id.media_actions;
+			global::XLabs.Forms.Droid.Resource.Id.middle = global::BookAStar.Droid.Resource.Id.middle;
+			global::XLabs.Forms.Droid.Resource.Id.mini = global::BookAStar.Droid.Resource.Id.mini;
+			global::XLabs.Forms.Droid.Resource.Id.mr_art = global::BookAStar.Droid.Resource.Id.mr_art;
+			global::XLabs.Forms.Droid.Resource.Id.mr_chooser_list = global::BookAStar.Droid.Resource.Id.mr_chooser_list;
+			global::XLabs.Forms.Droid.Resource.Id.mr_chooser_route_desc = global::BookAStar.Droid.Resource.Id.mr_chooser_route_desc;
+			global::XLabs.Forms.Droid.Resource.Id.mr_chooser_route_icon = global::BookAStar.Droid.Resource.Id.mr_chooser_route_icon;
+			global::XLabs.Forms.Droid.Resource.Id.mr_chooser_route_name = global::BookAStar.Droid.Resource.Id.mr_chooser_route_name;
+			global::XLabs.Forms.Droid.Resource.Id.mr_close = global::BookAStar.Droid.Resource.Id.mr_close;
+			global::XLabs.Forms.Droid.Resource.Id.mr_control_divider = global::BookAStar.Droid.Resource.Id.mr_control_divider;
+			global::XLabs.Forms.Droid.Resource.Id.mr_control_play_pause = global::BookAStar.Droid.Resource.Id.mr_control_play_pause;
+			global::XLabs.Forms.Droid.Resource.Id.mr_control_subtitle = global::BookAStar.Droid.Resource.Id.mr_control_subtitle;
+			global::XLabs.Forms.Droid.Resource.Id.mr_control_title = global::BookAStar.Droid.Resource.Id.mr_control_title;
+			global::XLabs.Forms.Droid.Resource.Id.mr_control_title_container = global::BookAStar.Droid.Resource.Id.mr_control_title_container;
+			global::XLabs.Forms.Droid.Resource.Id.mr_custom_control = global::BookAStar.Droid.Resource.Id.mr_custom_control;
+			global::XLabs.Forms.Droid.Resource.Id.mr_default_control = global::BookAStar.Droid.Resource.Id.mr_default_control;
+			global::XLabs.Forms.Droid.Resource.Id.mr_dialog_area = global::BookAStar.Droid.Resource.Id.mr_dialog_area;
+			global::XLabs.Forms.Droid.Resource.Id.mr_expandable_area = global::BookAStar.Droid.Resource.Id.mr_expandable_area;
+			global::XLabs.Forms.Droid.Resource.Id.mr_group_expand_collapse = global::BookAStar.Droid.Resource.Id.mr_group_expand_collapse;
+			global::XLabs.Forms.Droid.Resource.Id.mr_media_main_control = global::BookAStar.Droid.Resource.Id.mr_media_main_control;
+			global::XLabs.Forms.Droid.Resource.Id.mr_name = global::BookAStar.Droid.Resource.Id.mr_name;
+			global::XLabs.Forms.Droid.Resource.Id.mr_playback_control = global::BookAStar.Droid.Resource.Id.mr_playback_control;
+			global::XLabs.Forms.Droid.Resource.Id.mr_title_bar = global::BookAStar.Droid.Resource.Id.mr_title_bar;
+			global::XLabs.Forms.Droid.Resource.Id.mr_volume_control = global::BookAStar.Droid.Resource.Id.mr_volume_control;
+			global::XLabs.Forms.Droid.Resource.Id.mr_volume_group_list = global::BookAStar.Droid.Resource.Id.mr_volume_group_list;
+			global::XLabs.Forms.Droid.Resource.Id.mr_volume_item_icon = global::BookAStar.Droid.Resource.Id.mr_volume_item_icon;
+			global::XLabs.Forms.Droid.Resource.Id.mr_volume_slider = global::BookAStar.Droid.Resource.Id.mr_volume_slider;
+			global::XLabs.Forms.Droid.Resource.Id.multiply = global::BookAStar.Droid.Resource.Id.multiply;
+			global::XLabs.Forms.Droid.Resource.Id.navigation_header_container = global::BookAStar.Droid.Resource.Id.navigation_header_container;
+			global::XLabs.Forms.Droid.Resource.Id.never = global::BookAStar.Droid.Resource.Id.never;
+			global::XLabs.Forms.Droid.Resource.Id.none = global::BookAStar.Droid.Resource.Id.none;
+			global::XLabs.Forms.Droid.Resource.Id.normal = global::BookAStar.Droid.Resource.Id.normal;
+			global::XLabs.Forms.Droid.Resource.Id.parallax = global::BookAStar.Droid.Resource.Id.parallax;
+			global::XLabs.Forms.Droid.Resource.Id.parentPanel = global::BookAStar.Droid.Resource.Id.parentPanel;
+			global::XLabs.Forms.Droid.Resource.Id.pin = global::BookAStar.Droid.Resource.Id.pin;
+			global::XLabs.Forms.Droid.Resource.Id.progress_circular = global::BookAStar.Droid.Resource.Id.progress_circular;
+			global::XLabs.Forms.Droid.Resource.Id.progress_horizontal = global::BookAStar.Droid.Resource.Id.progress_horizontal;
+			global::XLabs.Forms.Droid.Resource.Id.radio = global::BookAStar.Droid.Resource.Id.radio;
+			global::XLabs.Forms.Droid.Resource.Id.right = global::BookAStar.Droid.Resource.Id.right;
+			global::XLabs.Forms.Droid.Resource.Id.right_arrow = global::BookAStar.Droid.Resource.Id.right_arrow;
+			global::XLabs.Forms.Droid.Resource.Id.screen = global::BookAStar.Droid.Resource.Id.screen;
+			global::XLabs.Forms.Droid.Resource.Id.scroll = global::BookAStar.Droid.Resource.Id.scroll;
+			global::XLabs.Forms.Droid.Resource.Id.scrollIndicatorDown = global::BookAStar.Droid.Resource.Id.scrollIndicatorDown;
+			global::XLabs.Forms.Droid.Resource.Id.scrollIndicatorUp = global::BookAStar.Droid.Resource.Id.scrollIndicatorUp;
+			global::XLabs.Forms.Droid.Resource.Id.scrollView = global::BookAStar.Droid.Resource.Id.scrollView;
+			global::XLabs.Forms.Droid.Resource.Id.scrollable = global::BookAStar.Droid.Resource.Id.scrollable;
+			global::XLabs.Forms.Droid.Resource.Id.search_badge = global::BookAStar.Droid.Resource.Id.search_badge;
+			global::XLabs.Forms.Droid.Resource.Id.search_bar = global::BookAStar.Droid.Resource.Id.search_bar;
+			global::XLabs.Forms.Droid.Resource.Id.search_button = global::BookAStar.Droid.Resource.Id.search_button;
+			global::XLabs.Forms.Droid.Resource.Id.search_close_btn = global::BookAStar.Droid.Resource.Id.search_close_btn;
+			global::XLabs.Forms.Droid.Resource.Id.search_edit_frame = global::BookAStar.Droid.Resource.Id.search_edit_frame;
+			global::XLabs.Forms.Droid.Resource.Id.search_go_btn = global::BookAStar.Droid.Resource.Id.search_go_btn;
+			global::XLabs.Forms.Droid.Resource.Id.search_mag_icon = global::BookAStar.Droid.Resource.Id.search_mag_icon;
+			global::XLabs.Forms.Droid.Resource.Id.search_plate = global::BookAStar.Droid.Resource.Id.search_plate;
+			global::XLabs.Forms.Droid.Resource.Id.search_src_text = global::BookAStar.Droid.Resource.Id.search_src_text;
+			global::XLabs.Forms.Droid.Resource.Id.search_voice_btn = global::BookAStar.Droid.Resource.Id.search_voice_btn;
+			global::XLabs.Forms.Droid.Resource.Id.select_dialog_listview = global::BookAStar.Droid.Resource.Id.select_dialog_listview;
+			global::XLabs.Forms.Droid.Resource.Id.shortcut = global::BookAStar.Droid.Resource.Id.shortcut;
+			global::XLabs.Forms.Droid.Resource.Id.showCustom = global::BookAStar.Droid.Resource.Id.showCustom;
+			global::XLabs.Forms.Droid.Resource.Id.showHome = global::BookAStar.Droid.Resource.Id.showHome;
+			global::XLabs.Forms.Droid.Resource.Id.showTitle = global::BookAStar.Droid.Resource.Id.showTitle;
+			global::XLabs.Forms.Droid.Resource.Id.snackbar_action = global::BookAStar.Droid.Resource.Id.snackbar_action;
+			global::XLabs.Forms.Droid.Resource.Id.snackbar_text = global::BookAStar.Droid.Resource.Id.snackbar_text;
+			global::XLabs.Forms.Droid.Resource.Id.snap = global::BookAStar.Droid.Resource.Id.snap;
+			global::XLabs.Forms.Droid.Resource.Id.spacer = global::BookAStar.Droid.Resource.Id.spacer;
+			global::XLabs.Forms.Droid.Resource.Id.split_action_bar = global::BookAStar.Droid.Resource.Id.split_action_bar;
+			global::XLabs.Forms.Droid.Resource.Id.src_atop = global::BookAStar.Droid.Resource.Id.src_atop;
+			global::XLabs.Forms.Droid.Resource.Id.src_in = global::BookAStar.Droid.Resource.Id.src_in;
+			global::XLabs.Forms.Droid.Resource.Id.src_over = global::BookAStar.Droid.Resource.Id.src_over;
+			global::XLabs.Forms.Droid.Resource.Id.start = global::BookAStar.Droid.Resource.Id.start;
+			global::XLabs.Forms.Droid.Resource.Id.status_bar_latest_event_content = global::BookAStar.Droid.Resource.Id.status_bar_latest_event_content;
+			global::XLabs.Forms.Droid.Resource.Id.submit_area = global::BookAStar.Droid.Resource.Id.submit_area;
+			global::XLabs.Forms.Droid.Resource.Id.tabMode = global::BookAStar.Droid.Resource.Id.tabMode;
+			global::XLabs.Forms.Droid.Resource.Id.text = global::BookAStar.Droid.Resource.Id.text;
+			global::XLabs.Forms.Droid.Resource.Id.text2 = global::BookAStar.Droid.Resource.Id.text2;
+			global::XLabs.Forms.Droid.Resource.Id.textSpacerNoButtons = global::BookAStar.Droid.Resource.Id.textSpacerNoButtons;
+			global::XLabs.Forms.Droid.Resource.Id.time = global::BookAStar.Droid.Resource.Id.time;
+			global::XLabs.Forms.Droid.Resource.Id.title = global::BookAStar.Droid.Resource.Id.title;
+			global::XLabs.Forms.Droid.Resource.Id.title_template = global::BookAStar.Droid.Resource.Id.title_template;
+			global::XLabs.Forms.Droid.Resource.Id.top = global::BookAStar.Droid.Resource.Id.top;
+			global::XLabs.Forms.Droid.Resource.Id.topPanel = global::BookAStar.Droid.Resource.Id.topPanel;
+			global::XLabs.Forms.Droid.Resource.Id.touch_outside = global::BookAStar.Droid.Resource.Id.touch_outside;
+			global::XLabs.Forms.Droid.Resource.Id.up = global::BookAStar.Droid.Resource.Id.up;
+			global::XLabs.Forms.Droid.Resource.Id.useLogo = global::BookAStar.Droid.Resource.Id.useLogo;
+			global::XLabs.Forms.Droid.Resource.Id.view_offset_helper = global::BookAStar.Droid.Resource.Id.view_offset_helper;
+			global::XLabs.Forms.Droid.Resource.Id.volume_item_container = global::BookAStar.Droid.Resource.Id.volume_item_container;
+			global::XLabs.Forms.Droid.Resource.Id.withText = global::BookAStar.Droid.Resource.Id.withText;
+			global::XLabs.Forms.Droid.Resource.Id.wrap_content = global::BookAStar.Droid.Resource.Id.wrap_content;
+			global::XLabs.Forms.Droid.Resource.Integer.abc_config_activityDefaultDur = global::BookAStar.Droid.Resource.Integer.abc_config_activityDefaultDur;
+			global::XLabs.Forms.Droid.Resource.Integer.abc_config_activityShortDur = global::BookAStar.Droid.Resource.Integer.abc_config_activityShortDur;
+			global::XLabs.Forms.Droid.Resource.Integer.abc_max_action_buttons = global::BookAStar.Droid.Resource.Integer.abc_max_action_buttons;
+			global::XLabs.Forms.Droid.Resource.Integer.bottom_sheet_slide_duration = global::BookAStar.Droid.Resource.Integer.bottom_sheet_slide_duration;
+			global::XLabs.Forms.Droid.Resource.Integer.cancel_button_image_alpha = global::BookAStar.Droid.Resource.Integer.cancel_button_image_alpha;
+			global::XLabs.Forms.Droid.Resource.Integer.design_snackbar_text_max_lines = global::BookAStar.Droid.Resource.Integer.design_snackbar_text_max_lines;
+			global::XLabs.Forms.Droid.Resource.Integer.mr_controller_volume_group_list_animation_duration_ms = global::BookAStar.Droid.Resource.Integer.mr_controller_volume_group_list_animation_duration_ms;
+			global::XLabs.Forms.Droid.Resource.Integer.mr_controller_volume_group_list_fade_in_duration_ms = global::BookAStar.Droid.Resource.Integer.mr_controller_volume_group_list_fade_in_duration_ms;
+			global::XLabs.Forms.Droid.Resource.Integer.mr_controller_volume_group_list_fade_out_duration_ms = global::BookAStar.Droid.Resource.Integer.mr_controller_volume_group_list_fade_out_duration_ms;
+			global::XLabs.Forms.Droid.Resource.Integer.status_bar_notification_info_maxnum = global::BookAStar.Droid.Resource.Integer.status_bar_notification_info_maxnum;
+			global::XLabs.Forms.Droid.Resource.Interpolator.mr_fast_out_slow_in = global::BookAStar.Droid.Resource.Interpolator.mr_fast_out_slow_in;
+			global::XLabs.Forms.Droid.Resource.Interpolator.mr_linear_out_slow_in = global::BookAStar.Droid.Resource.Interpolator.mr_linear_out_slow_in;
+			global::XLabs.Forms.Droid.Resource.Layout.abc_action_bar_title_item = global::BookAStar.Droid.Resource.Layout.abc_action_bar_title_item;
+			global::XLabs.Forms.Droid.Resource.Layout.abc_action_bar_up_container = global::BookAStar.Droid.Resource.Layout.abc_action_bar_up_container;
+			global::XLabs.Forms.Droid.Resource.Layout.abc_action_bar_view_list_nav_layout = global::BookAStar.Droid.Resource.Layout.abc_action_bar_view_list_nav_layout;
+			global::XLabs.Forms.Droid.Resource.Layout.abc_action_menu_item_layout = global::BookAStar.Droid.Resource.Layout.abc_action_menu_item_layout;
+			global::XLabs.Forms.Droid.Resource.Layout.abc_action_menu_layout = global::BookAStar.Droid.Resource.Layout.abc_action_menu_layout;
+			global::XLabs.Forms.Droid.Resource.Layout.abc_action_mode_bar = global::BookAStar.Droid.Resource.Layout.abc_action_mode_bar;
+			global::XLabs.Forms.Droid.Resource.Layout.abc_action_mode_close_item_material = global::BookAStar.Droid.Resource.Layout.abc_action_mode_close_item_material;
+			global::XLabs.Forms.Droid.Resource.Layout.abc_activity_chooser_view = global::BookAStar.Droid.Resource.Layout.abc_activity_chooser_view;
+			global::XLabs.Forms.Droid.Resource.Layout.abc_activity_chooser_view_list_item = global::BookAStar.Droid.Resource.Layout.abc_activity_chooser_view_list_item;
+			global::XLabs.Forms.Droid.Resource.Layout.abc_alert_dialog_button_bar_material = global::BookAStar.Droid.Resource.Layout.abc_alert_dialog_button_bar_material;
+			global::XLabs.Forms.Droid.Resource.Layout.abc_alert_dialog_material = global::BookAStar.Droid.Resource.Layout.abc_alert_dialog_material;
+			global::XLabs.Forms.Droid.Resource.Layout.abc_dialog_title_material = global::BookAStar.Droid.Resource.Layout.abc_dialog_title_material;
+			global::XLabs.Forms.Droid.Resource.Layout.abc_expanded_menu_layout = global::BookAStar.Droid.Resource.Layout.abc_expanded_menu_layout;
+			global::XLabs.Forms.Droid.Resource.Layout.abc_list_menu_item_checkbox = global::BookAStar.Droid.Resource.Layout.abc_list_menu_item_checkbox;
+			global::XLabs.Forms.Droid.Resource.Layout.abc_list_menu_item_icon = global::BookAStar.Droid.Resource.Layout.abc_list_menu_item_icon;
+			global::XLabs.Forms.Droid.Resource.Layout.abc_list_menu_item_layout = global::BookAStar.Droid.Resource.Layout.abc_list_menu_item_layout;
+			global::XLabs.Forms.Droid.Resource.Layout.abc_list_menu_item_radio = global::BookAStar.Droid.Resource.Layout.abc_list_menu_item_radio;
+			global::XLabs.Forms.Droid.Resource.Layout.abc_popup_menu_item_layout = global::BookAStar.Droid.Resource.Layout.abc_popup_menu_item_layout;
+			global::XLabs.Forms.Droid.Resource.Layout.abc_screen_content_include = global::BookAStar.Droid.Resource.Layout.abc_screen_content_include;
+			global::XLabs.Forms.Droid.Resource.Layout.abc_screen_simple = global::BookAStar.Droid.Resource.Layout.abc_screen_simple;
+			global::XLabs.Forms.Droid.Resource.Layout.abc_screen_simple_overlay_action_mode = global::BookAStar.Droid.Resource.Layout.abc_screen_simple_overlay_action_mode;
+			global::XLabs.Forms.Droid.Resource.Layout.abc_screen_toolbar = global::BookAStar.Droid.Resource.Layout.abc_screen_toolbar;
+			global::XLabs.Forms.Droid.Resource.Layout.abc_search_dropdown_item_icons_2line = global::BookAStar.Droid.Resource.Layout.abc_search_dropdown_item_icons_2line;
+			global::XLabs.Forms.Droid.Resource.Layout.abc_search_view = global::BookAStar.Droid.Resource.Layout.abc_search_view;
+			global::XLabs.Forms.Droid.Resource.Layout.abc_select_dialog_material = global::BookAStar.Droid.Resource.Layout.abc_select_dialog_material;
+			global::XLabs.Forms.Droid.Resource.Layout.calendar_pager = global::BookAStar.Droid.Resource.Layout.calendar_pager;
+			global::XLabs.Forms.Droid.Resource.Layout.calendar_pager_layout = global::BookAStar.Droid.Resource.Layout.calendar_pager_layout;
+			global::XLabs.Forms.Droid.Resource.Layout.calendar_picker = global::BookAStar.Droid.Resource.Layout.calendar_picker;
+			global::XLabs.Forms.Droid.Resource.Layout.design_bottom_sheet_dialog = global::BookAStar.Droid.Resource.Layout.design_bottom_sheet_dialog;
+			global::XLabs.Forms.Droid.Resource.Layout.design_layout_snackbar = global::BookAStar.Droid.Resource.Layout.design_layout_snackbar;
+			global::XLabs.Forms.Droid.Resource.Layout.design_layout_snackbar_include = global::BookAStar.Droid.Resource.Layout.design_layout_snackbar_include;
+			global::XLabs.Forms.Droid.Resource.Layout.design_layout_tab_icon = global::BookAStar.Droid.Resource.Layout.design_layout_tab_icon;
+			global::XLabs.Forms.Droid.Resource.Layout.design_layout_tab_text = global::BookAStar.Droid.Resource.Layout.design_layout_tab_text;
+			global::XLabs.Forms.Droid.Resource.Layout.design_menu_item_action_area = global::BookAStar.Droid.Resource.Layout.design_menu_item_action_area;
+			global::XLabs.Forms.Droid.Resource.Layout.design_navigation_item = global::BookAStar.Droid.Resource.Layout.design_navigation_item;
+			global::XLabs.Forms.Droid.Resource.Layout.design_navigation_item_header = global::BookAStar.Droid.Resource.Layout.design_navigation_item_header;
+			global::XLabs.Forms.Droid.Resource.Layout.design_navigation_item_separator = global::BookAStar.Droid.Resource.Layout.design_navigation_item_separator;
+			global::XLabs.Forms.Droid.Resource.Layout.design_navigation_item_subheader = global::BookAStar.Droid.Resource.Layout.design_navigation_item_subheader;
+			global::XLabs.Forms.Droid.Resource.Layout.design_navigation_menu = global::BookAStar.Droid.Resource.Layout.design_navigation_menu;
+			global::XLabs.Forms.Droid.Resource.Layout.design_navigation_menu_item = global::BookAStar.Droid.Resource.Layout.design_navigation_menu_item;
+			global::XLabs.Forms.Droid.Resource.Layout.dialog = global::BookAStar.Droid.Resource.Layout.dialog;
+			global::XLabs.Forms.Droid.Resource.Layout.month = global::BookAStar.Droid.Resource.Layout.month;
+			global::XLabs.Forms.Droid.Resource.Layout.mr_chooser_dialog = global::BookAStar.Droid.Resource.Layout.mr_chooser_dialog;
+			global::XLabs.Forms.Droid.Resource.Layout.mr_chooser_list_item = global::BookAStar.Droid.Resource.Layout.mr_chooser_list_item;
+			global::XLabs.Forms.Droid.Resource.Layout.mr_controller_material_dialog_b = global::BookAStar.Droid.Resource.Layout.mr_controller_material_dialog_b;
+			global::XLabs.Forms.Droid.Resource.Layout.mr_controller_volume_item = global::BookAStar.Droid.Resource.Layout.mr_controller_volume_item;
+			global::XLabs.Forms.Droid.Resource.Layout.mr_playback_control = global::BookAStar.Droid.Resource.Layout.mr_playback_control;
+			global::XLabs.Forms.Droid.Resource.Layout.mr_volume_control = global::BookAStar.Droid.Resource.Layout.mr_volume_control;
+			global::XLabs.Forms.Droid.Resource.Layout.notification_media_action = global::BookAStar.Droid.Resource.Layout.notification_media_action;
+			global::XLabs.Forms.Droid.Resource.Layout.notification_media_cancel_action = global::BookAStar.Droid.Resource.Layout.notification_media_cancel_action;
+			global::XLabs.Forms.Droid.Resource.Layout.notification_template_big_media = global::BookAStar.Droid.Resource.Layout.notification_template_big_media;
+			global::XLabs.Forms.Droid.Resource.Layout.notification_template_big_media_narrow = global::BookAStar.Droid.Resource.Layout.notification_template_big_media_narrow;
+			global::XLabs.Forms.Droid.Resource.Layout.notification_template_lines = global::BookAStar.Droid.Resource.Layout.notification_template_lines;
+			global::XLabs.Forms.Droid.Resource.Layout.notification_template_media = global::BookAStar.Droid.Resource.Layout.notification_template_media;
+			global::XLabs.Forms.Droid.Resource.Layout.notification_template_part_chronometer = global::BookAStar.Droid.Resource.Layout.notification_template_part_chronometer;
+			global::XLabs.Forms.Droid.Resource.Layout.notification_template_part_time = global::BookAStar.Droid.Resource.Layout.notification_template_part_time;
+			global::XLabs.Forms.Droid.Resource.Layout.select_dialog_item_material = global::BookAStar.Droid.Resource.Layout.select_dialog_item_material;
+			global::XLabs.Forms.Droid.Resource.Layout.select_dialog_multichoice_material = global::BookAStar.Droid.Resource.Layout.select_dialog_multichoice_material;
+			global::XLabs.Forms.Droid.Resource.Layout.select_dialog_singlechoice_material = global::BookAStar.Droid.Resource.Layout.select_dialog_singlechoice_material;
+			global::XLabs.Forms.Droid.Resource.Layout.support_simple_spinner_dropdown_item = global::BookAStar.Droid.Resource.Layout.support_simple_spinner_dropdown_item;
+			global::XLabs.Forms.Droid.Resource.Layout.week = global::BookAStar.Droid.Resource.Layout.week;
+			global::XLabs.Forms.Droid.Resource.String.ApplicationName = global::BookAStar.Droid.Resource.String.ApplicationName;
+			global::XLabs.Forms.Droid.Resource.String.Hello = global::BookAStar.Droid.Resource.String.Hello;
+			global::XLabs.Forms.Droid.Resource.String.abc_action_bar_home_description = global::BookAStar.Droid.Resource.String.abc_action_bar_home_description;
+			global::XLabs.Forms.Droid.Resource.String.abc_action_bar_home_description_format = global::BookAStar.Droid.Resource.String.abc_action_bar_home_description_format;
+			global::XLabs.Forms.Droid.Resource.String.abc_action_bar_home_subtitle_description_format = global::BookAStar.Droid.Resource.String.abc_action_bar_home_subtitle_description_format;
+			global::XLabs.Forms.Droid.Resource.String.abc_action_bar_up_description = global::BookAStar.Droid.Resource.String.abc_action_bar_up_description;
+			global::XLabs.Forms.Droid.Resource.String.abc_action_menu_overflow_description = global::BookAStar.Droid.Resource.String.abc_action_menu_overflow_description;
+			global::XLabs.Forms.Droid.Resource.String.abc_action_mode_done = global::BookAStar.Droid.Resource.String.abc_action_mode_done;
+			global::XLabs.Forms.Droid.Resource.String.abc_activity_chooser_view_see_all = global::BookAStar.Droid.Resource.String.abc_activity_chooser_view_see_all;
+			global::XLabs.Forms.Droid.Resource.String.abc_activitychooserview_choose_application = global::BookAStar.Droid.Resource.String.abc_activitychooserview_choose_application;
+			global::XLabs.Forms.Droid.Resource.String.abc_capital_off = global::BookAStar.Droid.Resource.String.abc_capital_off;
+			global::XLabs.Forms.Droid.Resource.String.abc_capital_on = global::BookAStar.Droid.Resource.String.abc_capital_on;
+			global::XLabs.Forms.Droid.Resource.String.abc_search_hint = global::BookAStar.Droid.Resource.String.abc_search_hint;
+			global::XLabs.Forms.Droid.Resource.String.abc_searchview_description_clear = global::BookAStar.Droid.Resource.String.abc_searchview_description_clear;
+			global::XLabs.Forms.Droid.Resource.String.abc_searchview_description_query = global::BookAStar.Droid.Resource.String.abc_searchview_description_query;
+			global::XLabs.Forms.Droid.Resource.String.abc_searchview_description_search = global::BookAStar.Droid.Resource.String.abc_searchview_description_search;
+			global::XLabs.Forms.Droid.Resource.String.abc_searchview_description_submit = global::BookAStar.Droid.Resource.String.abc_searchview_description_submit;
+			global::XLabs.Forms.Droid.Resource.String.abc_searchview_description_voice = global::BookAStar.Droid.Resource.String.abc_searchview_description_voice;
+			global::XLabs.Forms.Droid.Resource.String.abc_shareactionprovider_share_with = global::BookAStar.Droid.Resource.String.abc_shareactionprovider_share_with;
+			global::XLabs.Forms.Droid.Resource.String.abc_shareactionprovider_share_with_application = global::BookAStar.Droid.Resource.String.abc_shareactionprovider_share_with_application;
+			global::XLabs.Forms.Droid.Resource.String.abc_toolbar_collapse_description = global::BookAStar.Droid.Resource.String.abc_toolbar_collapse_description;
+			global::XLabs.Forms.Droid.Resource.String.appbar_scrolling_view_behavior = global::BookAStar.Droid.Resource.String.appbar_scrolling_view_behavior;
+			global::XLabs.Forms.Droid.Resource.String.bottom_sheet_behavior = global::BookAStar.Droid.Resource.String.bottom_sheet_behavior;
+			global::XLabs.Forms.Droid.Resource.String.character_counter_pattern = global::BookAStar.Droid.Resource.String.character_counter_pattern;
+			global::XLabs.Forms.Droid.Resource.String.day_name_format = global::BookAStar.Droid.Resource.String.day_name_format;
+			global::XLabs.Forms.Droid.Resource.String.full_date_format = global::BookAStar.Droid.Resource.String.full_date_format;
+			global::XLabs.Forms.Droid.Resource.String.invalid_date = global::BookAStar.Droid.Resource.String.invalid_date;
+			global::XLabs.Forms.Droid.Resource.String.library_name = global::BookAStar.Droid.Resource.String.library_name;
+			global::XLabs.Forms.Droid.Resource.String.month_name_format = global::BookAStar.Droid.Resource.String.month_name_format;
+			global::XLabs.Forms.Droid.Resource.String.mr_button_content_description = global::BookAStar.Droid.Resource.String.mr_button_content_description;
+			global::XLabs.Forms.Droid.Resource.String.mr_chooser_searching = global::BookAStar.Droid.Resource.String.mr_chooser_searching;
+			global::XLabs.Forms.Droid.Resource.String.mr_chooser_title = global::BookAStar.Droid.Resource.String.mr_chooser_title;
+			global::XLabs.Forms.Droid.Resource.String.mr_controller_casting_screen = global::BookAStar.Droid.Resource.String.mr_controller_casting_screen;
+			global::XLabs.Forms.Droid.Resource.String.mr_controller_close_description = global::BookAStar.Droid.Resource.String.mr_controller_close_description;
+			global::XLabs.Forms.Droid.Resource.String.mr_controller_collapse_group = global::BookAStar.Droid.Resource.String.mr_controller_collapse_group;
+			global::XLabs.Forms.Droid.Resource.String.mr_controller_disconnect = global::BookAStar.Droid.Resource.String.mr_controller_disconnect;
+			global::XLabs.Forms.Droid.Resource.String.mr_controller_expand_group = global::BookAStar.Droid.Resource.String.mr_controller_expand_group;
+			global::XLabs.Forms.Droid.Resource.String.mr_controller_no_info_available = global::BookAStar.Droid.Resource.String.mr_controller_no_info_available;
+			global::XLabs.Forms.Droid.Resource.String.mr_controller_no_media_selected = global::BookAStar.Droid.Resource.String.mr_controller_no_media_selected;
+			global::XLabs.Forms.Droid.Resource.String.mr_controller_pause = global::BookAStar.Droid.Resource.String.mr_controller_pause;
+			global::XLabs.Forms.Droid.Resource.String.mr_controller_play = global::BookAStar.Droid.Resource.String.mr_controller_play;
+			global::XLabs.Forms.Droid.Resource.String.mr_controller_stop = global::BookAStar.Droid.Resource.String.mr_controller_stop;
+			global::XLabs.Forms.Droid.Resource.String.mr_system_route_name = global::BookAStar.Droid.Resource.String.mr_system_route_name;
+			global::XLabs.Forms.Droid.Resource.String.mr_user_route_category_name = global::BookAStar.Droid.Resource.String.mr_user_route_category_name;
+			global::XLabs.Forms.Droid.Resource.String.status_bar_notification_info_overflow = global::BookAStar.Droid.Resource.String.status_bar_notification_info_overflow;
+			global::XLabs.Forms.Droid.Resource.Style.AlertDialog_AppCompat = global::BookAStar.Droid.Resource.Style.AlertDialog_AppCompat;
+			global::XLabs.Forms.Droid.Resource.Style.AlertDialog_AppCompat_Light = global::BookAStar.Droid.Resource.Style.AlertDialog_AppCompat_Light;
+			global::XLabs.Forms.Droid.Resource.Style.Animation_AppCompat_Dialog = global::BookAStar.Droid.Resource.Style.Animation_AppCompat_Dialog;
+			global::XLabs.Forms.Droid.Resource.Style.Animation_AppCompat_DropDownUp = global::BookAStar.Droid.Resource.Style.Animation_AppCompat_DropDownUp;
+			global::XLabs.Forms.Droid.Resource.Style.Animation_Design_BottomSheetDialog = global::BookAStar.Droid.Resource.Style.Animation_Design_BottomSheetDialog;
+			global::XLabs.Forms.Droid.Resource.Style.Base_AlertDialog_AppCompat = global::BookAStar.Droid.Resource.Style.Base_AlertDialog_AppCompat;
+			global::XLabs.Forms.Droid.Resource.Style.Base_AlertDialog_AppCompat_Light = global::BookAStar.Droid.Resource.Style.Base_AlertDialog_AppCompat_Light;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Animation_AppCompat_Dialog = global::BookAStar.Droid.Resource.Style.Base_Animation_AppCompat_Dialog;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Animation_AppCompat_DropDownUp = global::BookAStar.Droid.Resource.Style.Base_Animation_AppCompat_DropDownUp;
+			global::XLabs.Forms.Droid.Resource.Style.Base_CardView = global::BookAStar.Droid.Resource.Style.Base_CardView;
+			global::XLabs.Forms.Droid.Resource.Style.Base_DialogWindowTitle_AppCompat = global::BookAStar.Droid.Resource.Style.Base_DialogWindowTitle_AppCompat;
+			global::XLabs.Forms.Droid.Resource.Style.Base_DialogWindowTitleBackground_AppCompat = global::BookAStar.Droid.Resource.Style.Base_DialogWindowTitleBackground_AppCompat;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_Body1 = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_Body1;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_Body2 = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_Body2;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_Button = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_Button;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_Caption = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_Caption;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_Display1 = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_Display1;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_Display2 = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_Display2;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_Display3 = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_Display3;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_Display4 = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_Display4;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_Headline = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_Headline;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_Inverse = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_Inverse;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_Large = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_Large;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_Large_Inverse = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_Large_Inverse;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_Medium = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_Medium;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_Medium_Inverse = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_Medium_Inverse;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_Menu = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_Menu;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_SearchResult = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_SearchResult;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_SearchResult_Subtitle = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_SearchResult_Subtitle;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_SearchResult_Title = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_SearchResult_Title;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_Small = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_Small;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_Small_Inverse = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_Small_Inverse;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_Subhead = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_Subhead;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_Subhead_Inverse = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_Subhead_Inverse;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_Title = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_Title;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_Title_Inverse = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_Title_Inverse;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_Widget_ActionBar_Menu = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_Widget_ActionBar_Menu;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_Widget_ActionBar_Title = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_Widget_ActionBar_Title;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_Widget_ActionMode_Title = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_Widget_ActionMode_Title;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_Widget_Button = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_Widget_Button;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_Widget_Button_Inverse = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_Widget_Button_Inverse;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_Widget_DropDownItem = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_Widget_DropDownItem;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_Widget_PopupMenu_Large = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_Widget_PopupMenu_Large;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_Widget_PopupMenu_Small = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_Widget_PopupMenu_Small;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_Widget_Switch = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_Widget_Switch;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle;
+			global::XLabs.Forms.Droid.Resource.Style.Base_TextAppearance_Widget_AppCompat_Toolbar_Title = global::BookAStar.Droid.Resource.Style.Base_TextAppearance_Widget_AppCompat_Toolbar_Title;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Theme_AppCompat = global::BookAStar.Droid.Resource.Style.Base_Theme_AppCompat;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Theme_AppCompat_CompactMenu = global::BookAStar.Droid.Resource.Style.Base_Theme_AppCompat_CompactMenu;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Theme_AppCompat_Dialog = global::BookAStar.Droid.Resource.Style.Base_Theme_AppCompat_Dialog;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Theme_AppCompat_Dialog_Alert = global::BookAStar.Droid.Resource.Style.Base_Theme_AppCompat_Dialog_Alert;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Theme_AppCompat_Dialog_FixedSize = global::BookAStar.Droid.Resource.Style.Base_Theme_AppCompat_Dialog_FixedSize;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Theme_AppCompat_Dialog_MinWidth = global::BookAStar.Droid.Resource.Style.Base_Theme_AppCompat_Dialog_MinWidth;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Theme_AppCompat_DialogWhenLarge = global::BookAStar.Droid.Resource.Style.Base_Theme_AppCompat_DialogWhenLarge;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Theme_AppCompat_Light = global::BookAStar.Droid.Resource.Style.Base_Theme_AppCompat_Light;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Theme_AppCompat_Light_DarkActionBar = global::BookAStar.Droid.Resource.Style.Base_Theme_AppCompat_Light_DarkActionBar;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Theme_AppCompat_Light_Dialog = global::BookAStar.Droid.Resource.Style.Base_Theme_AppCompat_Light_Dialog;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Theme_AppCompat_Light_Dialog_Alert = global::BookAStar.Droid.Resource.Style.Base_Theme_AppCompat_Light_Dialog_Alert;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Theme_AppCompat_Light_Dialog_FixedSize = global::BookAStar.Droid.Resource.Style.Base_Theme_AppCompat_Light_Dialog_FixedSize;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Theme_AppCompat_Light_Dialog_MinWidth = global::BookAStar.Droid.Resource.Style.Base_Theme_AppCompat_Light_Dialog_MinWidth;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Theme_AppCompat_Light_DialogWhenLarge = global::BookAStar.Droid.Resource.Style.Base_Theme_AppCompat_Light_DialogWhenLarge;
+			global::XLabs.Forms.Droid.Resource.Style.Base_ThemeOverlay_AppCompat = global::BookAStar.Droid.Resource.Style.Base_ThemeOverlay_AppCompat;
+			global::XLabs.Forms.Droid.Resource.Style.Base_ThemeOverlay_AppCompat_ActionBar = global::BookAStar.Droid.Resource.Style.Base_ThemeOverlay_AppCompat_ActionBar;
+			global::XLabs.Forms.Droid.Resource.Style.Base_ThemeOverlay_AppCompat_Dark = global::BookAStar.Droid.Resource.Style.Base_ThemeOverlay_AppCompat_Dark;
+			global::XLabs.Forms.Droid.Resource.Style.Base_ThemeOverlay_AppCompat_Dark_ActionBar = global::BookAStar.Droid.Resource.Style.Base_ThemeOverlay_AppCompat_Dark_ActionBar;
+			global::XLabs.Forms.Droid.Resource.Style.Base_ThemeOverlay_AppCompat_Light = global::BookAStar.Droid.Resource.Style.Base_ThemeOverlay_AppCompat_Light;
+			global::XLabs.Forms.Droid.Resource.Style.Base_V11_Theme_AppCompat_Dialog = global::BookAStar.Droid.Resource.Style.Base_V11_Theme_AppCompat_Dialog;
+			global::XLabs.Forms.Droid.Resource.Style.Base_V11_Theme_AppCompat_Light_Dialog = global::BookAStar.Droid.Resource.Style.Base_V11_Theme_AppCompat_Light_Dialog;
+			global::XLabs.Forms.Droid.Resource.Style.Base_V12_Widget_AppCompat_AutoCompleteTextView = global::BookAStar.Droid.Resource.Style.Base_V12_Widget_AppCompat_AutoCompleteTextView;
+			global::XLabs.Forms.Droid.Resource.Style.Base_V12_Widget_AppCompat_EditText = global::BookAStar.Droid.Resource.Style.Base_V12_Widget_AppCompat_EditText;
+			global::XLabs.Forms.Droid.Resource.Style.Base_V21_Theme_AppCompat = global::BookAStar.Droid.Resource.Style.Base_V21_Theme_AppCompat;
+			global::XLabs.Forms.Droid.Resource.Style.Base_V21_Theme_AppCompat_Dialog = global::BookAStar.Droid.Resource.Style.Base_V21_Theme_AppCompat_Dialog;
+			global::XLabs.Forms.Droid.Resource.Style.Base_V21_Theme_AppCompat_Light = global::BookAStar.Droid.Resource.Style.Base_V21_Theme_AppCompat_Light;
+			global::XLabs.Forms.Droid.Resource.Style.Base_V21_Theme_AppCompat_Light_Dialog = global::BookAStar.Droid.Resource.Style.Base_V21_Theme_AppCompat_Light_Dialog;
+			global::XLabs.Forms.Droid.Resource.Style.Base_V22_Theme_AppCompat = global::BookAStar.Droid.Resource.Style.Base_V22_Theme_AppCompat;
+			global::XLabs.Forms.Droid.Resource.Style.Base_V22_Theme_AppCompat_Light = global::BookAStar.Droid.Resource.Style.Base_V22_Theme_AppCompat_Light;
+			global::XLabs.Forms.Droid.Resource.Style.Base_V23_Theme_AppCompat = global::BookAStar.Droid.Resource.Style.Base_V23_Theme_AppCompat;
+			global::XLabs.Forms.Droid.Resource.Style.Base_V23_Theme_AppCompat_Light = global::BookAStar.Droid.Resource.Style.Base_V23_Theme_AppCompat_Light;
+			global::XLabs.Forms.Droid.Resource.Style.Base_V7_Theme_AppCompat = global::BookAStar.Droid.Resource.Style.Base_V7_Theme_AppCompat;
+			global::XLabs.Forms.Droid.Resource.Style.Base_V7_Theme_AppCompat_Dialog = global::BookAStar.Droid.Resource.Style.Base_V7_Theme_AppCompat_Dialog;
+			global::XLabs.Forms.Droid.Resource.Style.Base_V7_Theme_AppCompat_Light = global::BookAStar.Droid.Resource.Style.Base_V7_Theme_AppCompat_Light;
+			global::XLabs.Forms.Droid.Resource.Style.Base_V7_Theme_AppCompat_Light_Dialog = global::BookAStar.Droid.Resource.Style.Base_V7_Theme_AppCompat_Light_Dialog;
+			global::XLabs.Forms.Droid.Resource.Style.Base_V7_Widget_AppCompat_AutoCompleteTextView = global::BookAStar.Droid.Resource.Style.Base_V7_Widget_AppCompat_AutoCompleteTextView;
+			global::XLabs.Forms.Droid.Resource.Style.Base_V7_Widget_AppCompat_EditText = global::BookAStar.Droid.Resource.Style.Base_V7_Widget_AppCompat_EditText;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_ActionBar = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_ActionBar;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_ActionBar_Solid = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_ActionBar_Solid;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_ActionBar_TabBar = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_ActionBar_TabBar;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_ActionBar_TabText = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_ActionBar_TabText;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_ActionBar_TabView = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_ActionBar_TabView;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_ActionButton = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_ActionButton;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_ActionButton_CloseMode = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_ActionButton_CloseMode;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_ActionButton_Overflow = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_ActionButton_Overflow;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_ActionMode = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_ActionMode;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_ActivityChooserView = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_ActivityChooserView;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_AutoCompleteTextView = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_AutoCompleteTextView;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_Button = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_Button;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_Button_Borderless = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_Button_Borderless;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_Button_Borderless_Colored = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_Button_Borderless_Colored;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_Button_ButtonBar_AlertDialog = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_Button_ButtonBar_AlertDialog;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_Button_Colored = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_Button_Colored;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_Button_Small = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_Button_Small;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_ButtonBar = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_ButtonBar;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_ButtonBar_AlertDialog = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_ButtonBar_AlertDialog;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_CompoundButton_CheckBox = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_CompoundButton_CheckBox;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_CompoundButton_RadioButton = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_CompoundButton_RadioButton;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_CompoundButton_Switch = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_CompoundButton_Switch;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_DrawerArrowToggle = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_DrawerArrowToggle;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_DrawerArrowToggle_Common = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_DrawerArrowToggle_Common;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_DropDownItem_Spinner = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_DropDownItem_Spinner;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_EditText = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_EditText;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_ImageButton = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_ImageButton;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_Light_ActionBar = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_Light_ActionBar;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_Light_ActionBar_Solid = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_Light_ActionBar_Solid;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_Light_ActionBar_TabBar = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_Light_ActionBar_TabBar;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_Light_ActionBar_TabText = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_Light_ActionBar_TabText;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_Light_ActionBar_TabView = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_Light_ActionBar_TabView;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_Light_PopupMenu = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_Light_PopupMenu;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_Light_PopupMenu_Overflow = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_Light_PopupMenu_Overflow;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_ListPopupWindow = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_ListPopupWindow;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_ListView = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_ListView;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_ListView_DropDown = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_ListView_DropDown;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_ListView_Menu = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_ListView_Menu;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_PopupMenu = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_PopupMenu;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_PopupMenu_Overflow = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_PopupMenu_Overflow;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_PopupWindow = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_PopupWindow;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_ProgressBar = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_ProgressBar;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_ProgressBar_Horizontal = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_ProgressBar_Horizontal;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_RatingBar = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_RatingBar;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_RatingBar_Indicator = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_RatingBar_Indicator;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_RatingBar_Small = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_RatingBar_Small;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_SearchView = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_SearchView;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_SearchView_ActionBar = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_SearchView_ActionBar;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_SeekBar = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_SeekBar;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_Spinner = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_Spinner;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_Spinner_Underlined = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_Spinner_Underlined;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_TextView_SpinnerItem = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_TextView_SpinnerItem;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_Toolbar = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_Toolbar;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_AppCompat_Toolbar_Button_Navigation = global::BookAStar.Droid.Resource.Style.Base_Widget_AppCompat_Toolbar_Button_Navigation;
+			global::XLabs.Forms.Droid.Resource.Style.Base_Widget_Design_TabLayout = global::BookAStar.Droid.Resource.Style.Base_Widget_Design_TabLayout;
+			global::XLabs.Forms.Droid.Resource.Style.CalendarCell = global::BookAStar.Droid.Resource.Style.CalendarCell;
+			global::XLabs.Forms.Droid.Resource.Style.CalendarCell_CalendarDate = global::BookAStar.Droid.Resource.Style.CalendarCell_CalendarDate;
+			global::XLabs.Forms.Droid.Resource.Style.CalendarCell_DayHeader = global::BookAStar.Droid.Resource.Style.CalendarCell_DayHeader;
+			global::XLabs.Forms.Droid.Resource.Style.CalendarTitle = global::BookAStar.Droid.Resource.Style.CalendarTitle;
+			global::XLabs.Forms.Droid.Resource.Style.CardView = global::BookAStar.Droid.Resource.Style.CardView;
+			global::XLabs.Forms.Droid.Resource.Style.CardView_Dark = global::BookAStar.Droid.Resource.Style.CardView_Dark;
+			global::XLabs.Forms.Droid.Resource.Style.CardView_Light = global::BookAStar.Droid.Resource.Style.CardView_Light;
+			global::XLabs.Forms.Droid.Resource.Style.Platform_AppCompat = global::BookAStar.Droid.Resource.Style.Platform_AppCompat;
+			global::XLabs.Forms.Droid.Resource.Style.Platform_AppCompat_Light = global::BookAStar.Droid.Resource.Style.Platform_AppCompat_Light;
+			global::XLabs.Forms.Droid.Resource.Style.Platform_ThemeOverlay_AppCompat = global::BookAStar.Droid.Resource.Style.Platform_ThemeOverlay_AppCompat;
+			global::XLabs.Forms.Droid.Resource.Style.Platform_ThemeOverlay_AppCompat_Dark = global::BookAStar.Droid.Resource.Style.Platform_ThemeOverlay_AppCompat_Dark;
+			global::XLabs.Forms.Droid.Resource.Style.Platform_ThemeOverlay_AppCompat_Light = global::BookAStar.Droid.Resource.Style.Platform_ThemeOverlay_AppCompat_Light;
+			global::XLabs.Forms.Droid.Resource.Style.Platform_V11_AppCompat = global::BookAStar.Droid.Resource.Style.Platform_V11_AppCompat;
+			global::XLabs.Forms.Droid.Resource.Style.Platform_V11_AppCompat_Light = global::BookAStar.Droid.Resource.Style.Platform_V11_AppCompat_Light;
+			global::XLabs.Forms.Droid.Resource.Style.Platform_V14_AppCompat = global::BookAStar.Droid.Resource.Style.Platform_V14_AppCompat;
+			global::XLabs.Forms.Droid.Resource.Style.Platform_V14_AppCompat_Light = global::BookAStar.Droid.Resource.Style.Platform_V14_AppCompat_Light;
+			global::XLabs.Forms.Droid.Resource.Style.Platform_Widget_AppCompat_Spinner = global::BookAStar.Droid.Resource.Style.Platform_Widget_AppCompat_Spinner;
+			global::XLabs.Forms.Droid.Resource.Style.RtlOverlay_DialogWindowTitle_AppCompat = global::BookAStar.Droid.Resource.Style.RtlOverlay_DialogWindowTitle_AppCompat;
+			global::XLabs.Forms.Droid.Resource.Style.RtlOverlay_Widget_AppCompat_ActionBar_TitleItem = global::BookAStar.Droid.Resource.Style.RtlOverlay_Widget_AppCompat_ActionBar_TitleItem;
+			global::XLabs.Forms.Droid.Resource.Style.RtlOverlay_Widget_AppCompat_DialogTitle_Icon = global::BookAStar.Droid.Resource.Style.RtlOverlay_Widget_AppCompat_DialogTitle_Icon;
+			global::XLabs.Forms.Droid.Resource.Style.RtlOverlay_Widget_AppCompat_PopupMenuItem = global::BookAStar.Droid.Resource.Style.RtlOverlay_Widget_AppCompat_PopupMenuItem;
+			global::XLabs.Forms.Droid.Resource.Style.RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup = global::BookAStar.Droid.Resource.Style.RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup;
+			global::XLabs.Forms.Droid.Resource.Style.RtlOverlay_Widget_AppCompat_PopupMenuItem_Text = global::BookAStar.Droid.Resource.Style.RtlOverlay_Widget_AppCompat_PopupMenuItem_Text;
+			global::XLabs.Forms.Droid.Resource.Style.RtlOverlay_Widget_AppCompat_Search_DropDown = global::BookAStar.Droid.Resource.Style.RtlOverlay_Widget_AppCompat_Search_DropDown;
+			global::XLabs.Forms.Droid.Resource.Style.RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 = global::BookAStar.Droid.Resource.Style.RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1;
+			global::XLabs.Forms.Droid.Resource.Style.RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 = global::BookAStar.Droid.Resource.Style.RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2;
+			global::XLabs.Forms.Droid.Resource.Style.RtlOverlay_Widget_AppCompat_Search_DropDown_Query = global::BookAStar.Droid.Resource.Style.RtlOverlay_Widget_AppCompat_Search_DropDown_Query;
+			global::XLabs.Forms.Droid.Resource.Style.RtlOverlay_Widget_AppCompat_Search_DropDown_Text = global::BookAStar.Droid.Resource.Style.RtlOverlay_Widget_AppCompat_Search_DropDown_Text;
+			global::XLabs.Forms.Droid.Resource.Style.RtlOverlay_Widget_AppCompat_SearchView_MagIcon = global::BookAStar.Droid.Resource.Style.RtlOverlay_Widget_AppCompat_SearchView_MagIcon;
+			global::XLabs.Forms.Droid.Resource.Style.RtlUnderlay_Widget_AppCompat_ActionButton = global::BookAStar.Droid.Resource.Style.RtlUnderlay_Widget_AppCompat_ActionButton;
+			global::XLabs.Forms.Droid.Resource.Style.RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = global::BookAStar.Droid.Resource.Style.RtlUnderlay_Widget_AppCompat_ActionButton_Overflow;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Body1 = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Body1;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Body2 = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Body2;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Button = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Button;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Caption = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Caption;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Display1 = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Display1;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Display2 = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Display2;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Display3 = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Display3;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Display4 = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Display4;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Headline = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Headline;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Inverse = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Inverse;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Large = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Large;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Large_Inverse = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Large_Inverse;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Light_SearchResult_Subtitle = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Light_SearchResult_Subtitle;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Light_SearchResult_Title = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Light_SearchResult_Title;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Light_Widget_PopupMenu_Large;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Light_Widget_PopupMenu_Small;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Medium = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Medium;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Medium_Inverse = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Medium_Inverse;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Menu = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Menu;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_SearchResult_Subtitle = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_SearchResult_Subtitle;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_SearchResult_Title = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_SearchResult_Title;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Small = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Small;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Small_Inverse = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Small_Inverse;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Subhead = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Subhead;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Subhead_Inverse = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Subhead_Inverse;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Title = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Title;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Title_Inverse = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Title_Inverse;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Widget_ActionBar_Menu = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Widget_ActionBar_Menu;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Widget_ActionBar_Subtitle = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Widget_ActionBar_Subtitle;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Widget_ActionBar_Title = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Widget_ActionBar_Title;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Widget_ActionMode_Subtitle = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Widget_ActionMode_Subtitle;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Widget_ActionMode_Title = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Widget_ActionMode_Title;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Widget_Button = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Widget_Button;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Widget_Button_Inverse = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Widget_Button_Inverse;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Widget_DropDownItem = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Widget_DropDownItem;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Widget_PopupMenu_Large = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Widget_PopupMenu_Large;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Widget_PopupMenu_Small = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Widget_PopupMenu_Small;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Widget_Switch = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Widget_Switch;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_AppCompat_Widget_TextView_SpinnerItem = global::BookAStar.Droid.Resource.Style.TextAppearance_AppCompat_Widget_TextView_SpinnerItem;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_Design_CollapsingToolbar_Expanded = global::BookAStar.Droid.Resource.Style.TextAppearance_Design_CollapsingToolbar_Expanded;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_Design_Counter = global::BookAStar.Droid.Resource.Style.TextAppearance_Design_Counter;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_Design_Counter_Overflow = global::BookAStar.Droid.Resource.Style.TextAppearance_Design_Counter_Overflow;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_Design_Error = global::BookAStar.Droid.Resource.Style.TextAppearance_Design_Error;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_Design_Hint = global::BookAStar.Droid.Resource.Style.TextAppearance_Design_Hint;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_Design_Snackbar_Message = global::BookAStar.Droid.Resource.Style.TextAppearance_Design_Snackbar_Message;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_Design_Tab = global::BookAStar.Droid.Resource.Style.TextAppearance_Design_Tab;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_StatusBar_EventContent = global::BookAStar.Droid.Resource.Style.TextAppearance_StatusBar_EventContent;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_StatusBar_EventContent_Info = global::BookAStar.Droid.Resource.Style.TextAppearance_StatusBar_EventContent_Info;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_StatusBar_EventContent_Line2 = global::BookAStar.Droid.Resource.Style.TextAppearance_StatusBar_EventContent_Line2;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_StatusBar_EventContent_Time = global::BookAStar.Droid.Resource.Style.TextAppearance_StatusBar_EventContent_Time;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_StatusBar_EventContent_Title = global::BookAStar.Droid.Resource.Style.TextAppearance_StatusBar_EventContent_Title;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_Widget_AppCompat_ExpandedMenu_Item = global::BookAStar.Droid.Resource.Style.TextAppearance_Widget_AppCompat_ExpandedMenu_Item;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_Widget_AppCompat_Toolbar_Subtitle = global::BookAStar.Droid.Resource.Style.TextAppearance_Widget_AppCompat_Toolbar_Subtitle;
+			global::XLabs.Forms.Droid.Resource.Style.TextAppearance_Widget_AppCompat_Toolbar_Title = global::BookAStar.Droid.Resource.Style.TextAppearance_Widget_AppCompat_Toolbar_Title;
+			global::XLabs.Forms.Droid.Resource.Style.Theme_AppCompat = global::BookAStar.Droid.Resource.Style.Theme_AppCompat;
+			global::XLabs.Forms.Droid.Resource.Style.Theme_AppCompat_CompactMenu = global::BookAStar.Droid.Resource.Style.Theme_AppCompat_CompactMenu;
+			global::XLabs.Forms.Droid.Resource.Style.Theme_AppCompat_DayNight = global::BookAStar.Droid.Resource.Style.Theme_AppCompat_DayNight;
+			global::XLabs.Forms.Droid.Resource.Style.Theme_AppCompat_DayNight_DarkActionBar = global::BookAStar.Droid.Resource.Style.Theme_AppCompat_DayNight_DarkActionBar;
+			global::XLabs.Forms.Droid.Resource.Style.Theme_AppCompat_DayNight_Dialog = global::BookAStar.Droid.Resource.Style.Theme_AppCompat_DayNight_Dialog;
+			global::XLabs.Forms.Droid.Resource.Style.Theme_AppCompat_DayNight_Dialog_Alert = global::BookAStar.Droid.Resource.Style.Theme_AppCompat_DayNight_Dialog_Alert;
+			global::XLabs.Forms.Droid.Resource.Style.Theme_AppCompat_DayNight_Dialog_MinWidth = global::BookAStar.Droid.Resource.Style.Theme_AppCompat_DayNight_Dialog_MinWidth;
+			global::XLabs.Forms.Droid.Resource.Style.Theme_AppCompat_DayNight_DialogWhenLarge = global::BookAStar.Droid.Resource.Style.Theme_AppCompat_DayNight_DialogWhenLarge;
+			global::XLabs.Forms.Droid.Resource.Style.Theme_AppCompat_DayNight_NoActionBar = global::BookAStar.Droid.Resource.Style.Theme_AppCompat_DayNight_NoActionBar;
+			global::XLabs.Forms.Droid.Resource.Style.Theme_AppCompat_Dialog = global::BookAStar.Droid.Resource.Style.Theme_AppCompat_Dialog;
+			global::XLabs.Forms.Droid.Resource.Style.Theme_AppCompat_Dialog_Alert = global::BookAStar.Droid.Resource.Style.Theme_AppCompat_Dialog_Alert;
+			global::XLabs.Forms.Droid.Resource.Style.Theme_AppCompat_Dialog_MinWidth = global::BookAStar.Droid.Resource.Style.Theme_AppCompat_Dialog_MinWidth;
+			global::XLabs.Forms.Droid.Resource.Style.Theme_AppCompat_DialogWhenLarge = global::BookAStar.Droid.Resource.Style.Theme_AppCompat_DialogWhenLarge;
+			global::XLabs.Forms.Droid.Resource.Style.Theme_AppCompat_Light = global::BookAStar.Droid.Resource.Style.Theme_AppCompat_Light;
+			global::XLabs.Forms.Droid.Resource.Style.Theme_AppCompat_Light_DarkActionBar = global::BookAStar.Droid.Resource.Style.Theme_AppCompat_Light_DarkActionBar;
+			global::XLabs.Forms.Droid.Resource.Style.Theme_AppCompat_Light_Dialog = global::BookAStar.Droid.Resource.Style.Theme_AppCompat_Light_Dialog;
+			global::XLabs.Forms.Droid.Resource.Style.Theme_AppCompat_Light_Dialog_Alert = global::BookAStar.Droid.Resource.Style.Theme_AppCompat_Light_Dialog_Alert;
+			global::XLabs.Forms.Droid.Resource.Style.Theme_AppCompat_Light_Dialog_MinWidth = global::BookAStar.Droid.Resource.Style.Theme_AppCompat_Light_Dialog_MinWidth;
+			global::XLabs.Forms.Droid.Resource.Style.Theme_AppCompat_Light_DialogWhenLarge = global::BookAStar.Droid.Resource.Style.Theme_AppCompat_Light_DialogWhenLarge;
+			global::XLabs.Forms.Droid.Resource.Style.Theme_AppCompat_Light_NoActionBar = global::BookAStar.Droid.Resource.Style.Theme_AppCompat_Light_NoActionBar;
+			global::XLabs.Forms.Droid.Resource.Style.Theme_AppCompat_NoActionBar = global::BookAStar.Droid.Resource.Style.Theme_AppCompat_NoActionBar;
+			global::XLabs.Forms.Droid.Resource.Style.Theme_Design = global::BookAStar.Droid.Resource.Style.Theme_Design;
+			global::XLabs.Forms.Droid.Resource.Style.Theme_Design_BottomSheetDialog = global::BookAStar.Droid.Resource.Style.Theme_Design_BottomSheetDialog;
+			global::XLabs.Forms.Droid.Resource.Style.Theme_Design_Light = global::BookAStar.Droid.Resource.Style.Theme_Design_Light;
+			global::XLabs.Forms.Droid.Resource.Style.Theme_Design_Light_BottomSheetDialog = global::BookAStar.Droid.Resource.Style.Theme_Design_Light_BottomSheetDialog;
+			global::XLabs.Forms.Droid.Resource.Style.Theme_Design_Light_NoActionBar = global::BookAStar.Droid.Resource.Style.Theme_Design_Light_NoActionBar;
+			global::XLabs.Forms.Droid.Resource.Style.Theme_Design_NoActionBar = global::BookAStar.Droid.Resource.Style.Theme_Design_NoActionBar;
+			global::XLabs.Forms.Droid.Resource.Style.Theme_MediaRouter = global::BookAStar.Droid.Resource.Style.Theme_MediaRouter;
+			global::XLabs.Forms.Droid.Resource.Style.Theme_MediaRouter_Light = global::BookAStar.Droid.Resource.Style.Theme_MediaRouter_Light;
+			global::XLabs.Forms.Droid.Resource.Style.Theme_MediaRouter_Light_DarkControlPanel = global::BookAStar.Droid.Resource.Style.Theme_MediaRouter_Light_DarkControlPanel;
+			global::XLabs.Forms.Droid.Resource.Style.Theme_MediaRouter_LightControlPanel = global::BookAStar.Droid.Resource.Style.Theme_MediaRouter_LightControlPanel;
+			global::XLabs.Forms.Droid.Resource.Style.ThemeOverlay_AppCompat = global::BookAStar.Droid.Resource.Style.ThemeOverlay_AppCompat;
+			global::XLabs.Forms.Droid.Resource.Style.ThemeOverlay_AppCompat_ActionBar = global::BookAStar.Droid.Resource.Style.ThemeOverlay_AppCompat_ActionBar;
+			global::XLabs.Forms.Droid.Resource.Style.ThemeOverlay_AppCompat_Dark = global::BookAStar.Droid.Resource.Style.ThemeOverlay_AppCompat_Dark;
+			global::XLabs.Forms.Droid.Resource.Style.ThemeOverlay_AppCompat_Dark_ActionBar = global::BookAStar.Droid.Resource.Style.ThemeOverlay_AppCompat_Dark_ActionBar;
+			global::XLabs.Forms.Droid.Resource.Style.ThemeOverlay_AppCompat_Light = global::BookAStar.Droid.Resource.Style.ThemeOverlay_AppCompat_Light;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_ActionBar = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_ActionBar;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_ActionBar_Solid = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_ActionBar_Solid;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_ActionBar_TabBar = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_ActionBar_TabBar;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_ActionBar_TabText = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_ActionBar_TabText;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_ActionBar_TabView = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_ActionBar_TabView;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_ActionButton = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_ActionButton;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_ActionButton_CloseMode = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_ActionButton_CloseMode;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_ActionButton_Overflow = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_ActionButton_Overflow;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_ActionMode = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_ActionMode;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_ActivityChooserView = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_ActivityChooserView;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_AutoCompleteTextView = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_AutoCompleteTextView;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_Button = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_Button;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_Button_Borderless = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_Button_Borderless;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_Button_Borderless_Colored = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_Button_Borderless_Colored;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_Button_ButtonBar_AlertDialog = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_Button_ButtonBar_AlertDialog;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_Button_Colored = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_Button_Colored;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_Button_Small = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_Button_Small;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_ButtonBar = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_ButtonBar;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_ButtonBar_AlertDialog = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_ButtonBar_AlertDialog;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_CompoundButton_CheckBox = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_CompoundButton_CheckBox;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_CompoundButton_RadioButton = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_CompoundButton_RadioButton;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_CompoundButton_Switch = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_CompoundButton_Switch;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_DrawerArrowToggle = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_DrawerArrowToggle;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_DropDownItem_Spinner = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_DropDownItem_Spinner;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_EditText = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_EditText;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_ImageButton = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_ImageButton;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_Light_ActionBar = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_Light_ActionBar;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_Light_ActionBar_Solid = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_Light_ActionBar_Solid;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_Light_ActionBar_Solid_Inverse = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_Light_ActionBar_Solid_Inverse;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_Light_ActionBar_TabBar = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_Light_ActionBar_TabBar;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_Light_ActionBar_TabBar_Inverse = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_Light_ActionBar_TabBar_Inverse;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_Light_ActionBar_TabText = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_Light_ActionBar_TabText;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_Light_ActionBar_TabText_Inverse = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_Light_ActionBar_TabText_Inverse;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_Light_ActionBar_TabView = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_Light_ActionBar_TabView;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_Light_ActionBar_TabView_Inverse = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_Light_ActionBar_TabView_Inverse;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_Light_ActionButton = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_Light_ActionButton;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_Light_ActionButton_CloseMode = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_Light_ActionButton_CloseMode;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_Light_ActionButton_Overflow = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_Light_ActionButton_Overflow;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_Light_ActionMode_Inverse = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_Light_ActionMode_Inverse;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_Light_ActivityChooserView = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_Light_ActivityChooserView;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_Light_AutoCompleteTextView = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_Light_AutoCompleteTextView;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_Light_DropDownItem_Spinner = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_Light_DropDownItem_Spinner;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_Light_ListPopupWindow = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_Light_ListPopupWindow;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_Light_ListView_DropDown = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_Light_ListView_DropDown;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_Light_PopupMenu = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_Light_PopupMenu;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_Light_PopupMenu_Overflow = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_Light_PopupMenu_Overflow;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_Light_SearchView = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_Light_SearchView;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_Light_Spinner_DropDown_ActionBar = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_Light_Spinner_DropDown_ActionBar;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_ListPopupWindow = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_ListPopupWindow;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_ListView = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_ListView;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_ListView_DropDown = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_ListView_DropDown;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_ListView_Menu = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_ListView_Menu;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_PopupMenu = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_PopupMenu;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_PopupMenu_Overflow = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_PopupMenu_Overflow;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_PopupWindow = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_PopupWindow;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_ProgressBar = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_ProgressBar;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_ProgressBar_Horizontal = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_ProgressBar_Horizontal;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_RatingBar = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_RatingBar;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_RatingBar_Indicator = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_RatingBar_Indicator;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_RatingBar_Small = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_RatingBar_Small;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_SearchView = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_SearchView;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_SearchView_ActionBar = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_SearchView_ActionBar;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_SeekBar = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_SeekBar;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_Spinner = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_Spinner;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_Spinner_DropDown = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_Spinner_DropDown;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_Spinner_DropDown_ActionBar = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_Spinner_DropDown_ActionBar;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_Spinner_Underlined = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_Spinner_Underlined;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_TextView_SpinnerItem = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_TextView_SpinnerItem;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_Toolbar = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_Toolbar;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_AppCompat_Toolbar_Button_Navigation = global::BookAStar.Droid.Resource.Style.Widget_AppCompat_Toolbar_Button_Navigation;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_Design_AppBarLayout = global::BookAStar.Droid.Resource.Style.Widget_Design_AppBarLayout;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_Design_BottomSheet_Modal = global::BookAStar.Droid.Resource.Style.Widget_Design_BottomSheet_Modal;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_Design_CollapsingToolbar = global::BookAStar.Droid.Resource.Style.Widget_Design_CollapsingToolbar;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_Design_CoordinatorLayout = global::BookAStar.Droid.Resource.Style.Widget_Design_CoordinatorLayout;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_Design_FloatingActionButton = global::BookAStar.Droid.Resource.Style.Widget_Design_FloatingActionButton;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_Design_NavigationView = global::BookAStar.Droid.Resource.Style.Widget_Design_NavigationView;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_Design_ScrimInsetsFrameLayout = global::BookAStar.Droid.Resource.Style.Widget_Design_ScrimInsetsFrameLayout;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_Design_Snackbar = global::BookAStar.Droid.Resource.Style.Widget_Design_Snackbar;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_Design_TabLayout = global::BookAStar.Droid.Resource.Style.Widget_Design_TabLayout;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_Design_TextInputLayout = global::BookAStar.Droid.Resource.Style.Widget_Design_TextInputLayout;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_MediaRouter_ChooserText = global::BookAStar.Droid.Resource.Style.Widget_MediaRouter_ChooserText;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_MediaRouter_ChooserText_Primary = global::BookAStar.Droid.Resource.Style.Widget_MediaRouter_ChooserText_Primary;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_MediaRouter_ChooserText_Primary_Dark = global::BookAStar.Droid.Resource.Style.Widget_MediaRouter_ChooserText_Primary_Dark;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_MediaRouter_ChooserText_Primary_Light = global::BookAStar.Droid.Resource.Style.Widget_MediaRouter_ChooserText_Primary_Light;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_MediaRouter_ChooserText_Secondary = global::BookAStar.Droid.Resource.Style.Widget_MediaRouter_ChooserText_Secondary;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_MediaRouter_ChooserText_Secondary_Dark = global::BookAStar.Droid.Resource.Style.Widget_MediaRouter_ChooserText_Secondary_Dark;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_MediaRouter_ChooserText_Secondary_Light = global::BookAStar.Droid.Resource.Style.Widget_MediaRouter_ChooserText_Secondary_Light;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_MediaRouter_ControllerText = global::BookAStar.Droid.Resource.Style.Widget_MediaRouter_ControllerText;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_MediaRouter_ControllerText_Primary = global::BookAStar.Droid.Resource.Style.Widget_MediaRouter_ControllerText_Primary;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_MediaRouter_ControllerText_Primary_Dark = global::BookAStar.Droid.Resource.Style.Widget_MediaRouter_ControllerText_Primary_Dark;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_MediaRouter_ControllerText_Primary_Light = global::BookAStar.Droid.Resource.Style.Widget_MediaRouter_ControllerText_Primary_Light;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_MediaRouter_ControllerText_Secondary = global::BookAStar.Droid.Resource.Style.Widget_MediaRouter_ControllerText_Secondary;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_MediaRouter_ControllerText_Secondary_Dark = global::BookAStar.Droid.Resource.Style.Widget_MediaRouter_ControllerText_Secondary_Dark;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_MediaRouter_ControllerText_Secondary_Light = global::BookAStar.Droid.Resource.Style.Widget_MediaRouter_ControllerText_Secondary_Light;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_MediaRouter_ControllerText_Title = global::BookAStar.Droid.Resource.Style.Widget_MediaRouter_ControllerText_Title;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_MediaRouter_ControllerText_Title_Dark = global::BookAStar.Droid.Resource.Style.Widget_MediaRouter_ControllerText_Title_Dark;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_MediaRouter_ControllerText_Title_Light = global::BookAStar.Droid.Resource.Style.Widget_MediaRouter_ControllerText_Title_Light;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_MediaRouter_Light_MediaRouteButton = global::BookAStar.Droid.Resource.Style.Widget_MediaRouter_Light_MediaRouteButton;
+			global::XLabs.Forms.Droid.Resource.Style.Widget_MediaRouter_MediaRouteButton = global::BookAStar.Droid.Resource.Style.Widget_MediaRouter_MediaRouteButton;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionBar = global::BookAStar.Droid.Resource.Styleable.ActionBar;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionBar_background = global::BookAStar.Droid.Resource.Styleable.ActionBar_background;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionBar_backgroundSplit = global::BookAStar.Droid.Resource.Styleable.ActionBar_backgroundSplit;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionBar_backgroundStacked = global::BookAStar.Droid.Resource.Styleable.ActionBar_backgroundStacked;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionBar_contentInsetEnd = global::BookAStar.Droid.Resource.Styleable.ActionBar_contentInsetEnd;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionBar_contentInsetLeft = global::BookAStar.Droid.Resource.Styleable.ActionBar_contentInsetLeft;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionBar_contentInsetRight = global::BookAStar.Droid.Resource.Styleable.ActionBar_contentInsetRight;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionBar_contentInsetStart = global::BookAStar.Droid.Resource.Styleable.ActionBar_contentInsetStart;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionBar_customNavigationLayout = global::BookAStar.Droid.Resource.Styleable.ActionBar_customNavigationLayout;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionBar_displayOptions = global::BookAStar.Droid.Resource.Styleable.ActionBar_displayOptions;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionBar_divider = global::BookAStar.Droid.Resource.Styleable.ActionBar_divider;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionBar_elevation = global::BookAStar.Droid.Resource.Styleable.ActionBar_elevation;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionBar_height = global::BookAStar.Droid.Resource.Styleable.ActionBar_height;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionBar_hideOnContentScroll = global::BookAStar.Droid.Resource.Styleable.ActionBar_hideOnContentScroll;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionBar_homeAsUpIndicator = global::BookAStar.Droid.Resource.Styleable.ActionBar_homeAsUpIndicator;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionBar_homeLayout = global::BookAStar.Droid.Resource.Styleable.ActionBar_homeLayout;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionBar_icon = global::BookAStar.Droid.Resource.Styleable.ActionBar_icon;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionBar_indeterminateProgressStyle = global::BookAStar.Droid.Resource.Styleable.ActionBar_indeterminateProgressStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionBar_itemPadding = global::BookAStar.Droid.Resource.Styleable.ActionBar_itemPadding;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionBar_logo = global::BookAStar.Droid.Resource.Styleable.ActionBar_logo;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionBar_navigationMode = global::BookAStar.Droid.Resource.Styleable.ActionBar_navigationMode;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionBar_popupTheme = global::BookAStar.Droid.Resource.Styleable.ActionBar_popupTheme;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionBar_progressBarPadding = global::BookAStar.Droid.Resource.Styleable.ActionBar_progressBarPadding;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionBar_progressBarStyle = global::BookAStar.Droid.Resource.Styleable.ActionBar_progressBarStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionBar_subtitle = global::BookAStar.Droid.Resource.Styleable.ActionBar_subtitle;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionBar_subtitleTextStyle = global::BookAStar.Droid.Resource.Styleable.ActionBar_subtitleTextStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionBar_title = global::BookAStar.Droid.Resource.Styleable.ActionBar_title;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionBar_titleTextStyle = global::BookAStar.Droid.Resource.Styleable.ActionBar_titleTextStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionBarLayout = global::BookAStar.Droid.Resource.Styleable.ActionBarLayout;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionBarLayout_android_layout_gravity = global::BookAStar.Droid.Resource.Styleable.ActionBarLayout_android_layout_gravity;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionMenuItemView = global::BookAStar.Droid.Resource.Styleable.ActionMenuItemView;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionMenuItemView_android_minWidth = global::BookAStar.Droid.Resource.Styleable.ActionMenuItemView_android_minWidth;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionMenuView = global::BookAStar.Droid.Resource.Styleable.ActionMenuView;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionMode = global::BookAStar.Droid.Resource.Styleable.ActionMode;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionMode_background = global::BookAStar.Droid.Resource.Styleable.ActionMode_background;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionMode_backgroundSplit = global::BookAStar.Droid.Resource.Styleable.ActionMode_backgroundSplit;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionMode_closeItemLayout = global::BookAStar.Droid.Resource.Styleable.ActionMode_closeItemLayout;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionMode_height = global::BookAStar.Droid.Resource.Styleable.ActionMode_height;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionMode_subtitleTextStyle = global::BookAStar.Droid.Resource.Styleable.ActionMode_subtitleTextStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActionMode_titleTextStyle = global::BookAStar.Droid.Resource.Styleable.ActionMode_titleTextStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActivityChooserView = global::BookAStar.Droid.Resource.Styleable.ActivityChooserView;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActivityChooserView_expandActivityOverflowButtonDrawable = global::BookAStar.Droid.Resource.Styleable.ActivityChooserView_expandActivityOverflowButtonDrawable;
+			global::XLabs.Forms.Droid.Resource.Styleable.ActivityChooserView_initialActivityCount = global::BookAStar.Droid.Resource.Styleable.ActivityChooserView_initialActivityCount;
+			global::XLabs.Forms.Droid.Resource.Styleable.AlertDialog = global::BookAStar.Droid.Resource.Styleable.AlertDialog;
+			global::XLabs.Forms.Droid.Resource.Styleable.AlertDialog_android_layout = global::BookAStar.Droid.Resource.Styleable.AlertDialog_android_layout;
+			global::XLabs.Forms.Droid.Resource.Styleable.AlertDialog_buttonPanelSideLayout = global::BookAStar.Droid.Resource.Styleable.AlertDialog_buttonPanelSideLayout;
+			global::XLabs.Forms.Droid.Resource.Styleable.AlertDialog_listItemLayout = global::BookAStar.Droid.Resource.Styleable.AlertDialog_listItemLayout;
+			global::XLabs.Forms.Droid.Resource.Styleable.AlertDialog_listLayout = global::BookAStar.Droid.Resource.Styleable.AlertDialog_listLayout;
+			global::XLabs.Forms.Droid.Resource.Styleable.AlertDialog_multiChoiceItemLayout = global::BookAStar.Droid.Resource.Styleable.AlertDialog_multiChoiceItemLayout;
+			global::XLabs.Forms.Droid.Resource.Styleable.AlertDialog_singleChoiceItemLayout = global::BookAStar.Droid.Resource.Styleable.AlertDialog_singleChoiceItemLayout;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppBarLayout = global::BookAStar.Droid.Resource.Styleable.AppBarLayout;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppBarLayout_android_background = global::BookAStar.Droid.Resource.Styleable.AppBarLayout_android_background;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppBarLayout_elevation = global::BookAStar.Droid.Resource.Styleable.AppBarLayout_elevation;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppBarLayout_expanded = global::BookAStar.Droid.Resource.Styleable.AppBarLayout_expanded;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppBarLayout_LayoutParams = global::BookAStar.Droid.Resource.Styleable.AppBarLayout_LayoutParams;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppBarLayout_LayoutParams_layout_scrollFlags = global::BookAStar.Droid.Resource.Styleable.AppBarLayout_LayoutParams_layout_scrollFlags;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppBarLayout_LayoutParams_layout_scrollInterpolator = global::BookAStar.Droid.Resource.Styleable.AppBarLayout_LayoutParams_layout_scrollInterpolator;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatImageView = global::BookAStar.Droid.Resource.Styleable.AppCompatImageView;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatImageView_android_src = global::BookAStar.Droid.Resource.Styleable.AppCompatImageView_android_src;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatImageView_srcCompat = global::BookAStar.Droid.Resource.Styleable.AppCompatImageView_srcCompat;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTextView = global::BookAStar.Droid.Resource.Styleable.AppCompatTextView;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTextView_android_textAppearance = global::BookAStar.Droid.Resource.Styleable.AppCompatTextView_android_textAppearance;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTextView_textAllCaps = global::BookAStar.Droid.Resource.Styleable.AppCompatTextView_textAllCaps;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_actionBarDivider = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_actionBarDivider;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_actionBarItemBackground = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_actionBarItemBackground;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_actionBarPopupTheme = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_actionBarPopupTheme;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_actionBarSize = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_actionBarSize;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_actionBarSplitStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_actionBarSplitStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_actionBarStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_actionBarStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_actionBarTabBarStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_actionBarTabBarStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_actionBarTabStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_actionBarTabStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_actionBarTabTextStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_actionBarTabTextStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_actionBarTheme = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_actionBarTheme;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_actionBarWidgetTheme = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_actionBarWidgetTheme;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_actionButtonStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_actionButtonStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_actionDropDownStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_actionDropDownStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_actionMenuTextAppearance = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_actionMenuTextAppearance;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_actionMenuTextColor = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_actionMenuTextColor;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_actionModeBackground = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_actionModeBackground;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_actionModeCloseButtonStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_actionModeCloseButtonStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_actionModeCloseDrawable = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_actionModeCloseDrawable;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_actionModeCopyDrawable = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_actionModeCopyDrawable;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_actionModeCutDrawable = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_actionModeCutDrawable;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_actionModeFindDrawable = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_actionModeFindDrawable;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_actionModePasteDrawable = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_actionModePasteDrawable;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_actionModePopupWindowStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_actionModePopupWindowStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_actionModeSelectAllDrawable = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_actionModeSelectAllDrawable;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_actionModeShareDrawable = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_actionModeShareDrawable;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_actionModeSplitBackground = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_actionModeSplitBackground;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_actionModeStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_actionModeStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_actionModeWebSearchDrawable = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_actionModeWebSearchDrawable;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_actionOverflowButtonStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_actionOverflowButtonStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_actionOverflowMenuStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_actionOverflowMenuStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_activityChooserViewStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_activityChooserViewStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_alertDialogButtonGroupStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_alertDialogButtonGroupStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_alertDialogCenterButtons = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_alertDialogCenterButtons;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_alertDialogStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_alertDialogStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_alertDialogTheme = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_alertDialogTheme;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_android_windowAnimationStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_android_windowAnimationStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_android_windowIsFloating = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_android_windowIsFloating;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_autoCompleteTextViewStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_autoCompleteTextViewStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_borderlessButtonStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_borderlessButtonStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_buttonBarButtonStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_buttonBarButtonStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_buttonBarNegativeButtonStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_buttonBarNegativeButtonStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_buttonBarNeutralButtonStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_buttonBarNeutralButtonStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_buttonBarPositiveButtonStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_buttonBarPositiveButtonStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_buttonBarStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_buttonBarStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_buttonStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_buttonStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_buttonStyleSmall = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_buttonStyleSmall;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_checkboxStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_checkboxStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_checkedTextViewStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_checkedTextViewStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_colorAccent = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_colorAccent;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_colorButtonNormal = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_colorButtonNormal;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_colorControlActivated = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_colorControlActivated;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_colorControlHighlight = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_colorControlHighlight;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_colorControlNormal = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_colorControlNormal;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_colorPrimary = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_colorPrimary;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_colorPrimaryDark = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_colorPrimaryDark;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_colorSwitchThumbNormal = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_colorSwitchThumbNormal;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_controlBackground = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_controlBackground;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_dialogPreferredPadding = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_dialogPreferredPadding;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_dialogTheme = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_dialogTheme;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_dividerHorizontal = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_dividerHorizontal;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_dividerVertical = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_dividerVertical;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_dropDownListViewStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_dropDownListViewStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_dropdownListPreferredItemHeight = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_dropdownListPreferredItemHeight;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_editTextBackground = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_editTextBackground;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_editTextColor = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_editTextColor;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_editTextStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_editTextStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_homeAsUpIndicator = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_homeAsUpIndicator;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_imageButtonStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_imageButtonStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_listChoiceBackgroundIndicator = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_listChoiceBackgroundIndicator;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_listDividerAlertDialog = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_listDividerAlertDialog;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_listPopupWindowStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_listPopupWindowStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_listPreferredItemHeight = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_listPreferredItemHeight;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_listPreferredItemHeightLarge = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_listPreferredItemHeightLarge;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_listPreferredItemHeightSmall = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_listPreferredItemHeightSmall;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_listPreferredItemPaddingLeft = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_listPreferredItemPaddingLeft;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_listPreferredItemPaddingRight = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_listPreferredItemPaddingRight;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_panelBackground = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_panelBackground;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_panelMenuListTheme = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_panelMenuListTheme;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_panelMenuListWidth = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_panelMenuListWidth;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_popupMenuStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_popupMenuStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_popupWindowStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_popupWindowStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_radioButtonStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_radioButtonStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_ratingBarStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_ratingBarStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_ratingBarStyleIndicator = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_ratingBarStyleIndicator;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_ratingBarStyleSmall = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_ratingBarStyleSmall;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_searchViewStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_searchViewStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_seekBarStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_seekBarStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_selectableItemBackground = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_selectableItemBackground;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_selectableItemBackgroundBorderless = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_selectableItemBackgroundBorderless;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_spinnerDropDownItemStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_spinnerDropDownItemStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_spinnerStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_spinnerStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_switchStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_switchStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_textAppearanceLargePopupMenu = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_textAppearanceLargePopupMenu;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_textAppearanceListItem = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_textAppearanceListItem;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_textAppearanceListItemSmall = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_textAppearanceListItemSmall;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_textAppearanceSearchResultSubtitle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_textAppearanceSearchResultSubtitle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_textAppearanceSearchResultTitle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_textAppearanceSearchResultTitle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_textAppearanceSmallPopupMenu = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_textAppearanceSmallPopupMenu;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_textColorAlertDialogListItem = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_textColorAlertDialogListItem;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_textColorSearchUrl = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_textColorSearchUrl;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_toolbarNavigationButtonStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_toolbarNavigationButtonStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_toolbarStyle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_toolbarStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_windowActionBar = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_windowActionBar;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_windowActionBarOverlay = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_windowActionBarOverlay;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_windowActionModeOverlay = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_windowActionModeOverlay;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_windowFixedHeightMajor = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_windowFixedHeightMajor;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_windowFixedHeightMinor = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_windowFixedHeightMinor;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_windowFixedWidthMajor = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_windowFixedWidthMajor;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_windowFixedWidthMinor = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_windowFixedWidthMinor;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_windowMinWidthMajor = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_windowMinWidthMajor;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_windowMinWidthMinor = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_windowMinWidthMinor;
+			global::XLabs.Forms.Droid.Resource.Styleable.AppCompatTheme_windowNoTitle = global::BookAStar.Droid.Resource.Styleable.AppCompatTheme_windowNoTitle;
+			global::XLabs.Forms.Droid.Resource.Styleable.BottomSheetBehavior_Params = global::BookAStar.Droid.Resource.Styleable.BottomSheetBehavior_Params;
+			global::XLabs.Forms.Droid.Resource.Styleable.BottomSheetBehavior_Params_behavior_hideable = global::BookAStar.Droid.Resource.Styleable.BottomSheetBehavior_Params_behavior_hideable;
+			global::XLabs.Forms.Droid.Resource.Styleable.BottomSheetBehavior_Params_behavior_peekHeight = global::BookAStar.Droid.Resource.Styleable.BottomSheetBehavior_Params_behavior_peekHeight;
+			global::XLabs.Forms.Droid.Resource.Styleable.ButtonBarLayout = global::BookAStar.Droid.Resource.Styleable.ButtonBarLayout;
+			global::XLabs.Forms.Droid.Resource.Styleable.ButtonBarLayout_allowStacking = global::BookAStar.Droid.Resource.Styleable.ButtonBarLayout_allowStacking;
+			global::XLabs.Forms.Droid.Resource.Styleable.CardView = global::BookAStar.Droid.Resource.Styleable.CardView;
+			global::XLabs.Forms.Droid.Resource.Styleable.CardView_android_minHeight = global::BookAStar.Droid.Resource.Styleable.CardView_android_minHeight;
+			global::XLabs.Forms.Droid.Resource.Styleable.CardView_android_minWidth = global::BookAStar.Droid.Resource.Styleable.CardView_android_minWidth;
+			global::XLabs.Forms.Droid.Resource.Styleable.CardView_cardBackgroundColor = global::BookAStar.Droid.Resource.Styleable.CardView_cardBackgroundColor;
+			global::XLabs.Forms.Droid.Resource.Styleable.CardView_cardCornerRadius = global::BookAStar.Droid.Resource.Styleable.CardView_cardCornerRadius;
+			global::XLabs.Forms.Droid.Resource.Styleable.CardView_cardElevation = global::BookAStar.Droid.Resource.Styleable.CardView_cardElevation;
+			global::XLabs.Forms.Droid.Resource.Styleable.CardView_cardMaxElevation = global::BookAStar.Droid.Resource.Styleable.CardView_cardMaxElevation;
+			global::XLabs.Forms.Droid.Resource.Styleable.CardView_cardPreventCornerOverlap = global::BookAStar.Droid.Resource.Styleable.CardView_cardPreventCornerOverlap;
+			global::XLabs.Forms.Droid.Resource.Styleable.CardView_cardUseCompatPadding = global::BookAStar.Droid.Resource.Styleable.CardView_cardUseCompatPadding;
+			global::XLabs.Forms.Droid.Resource.Styleable.CardView_contentPadding = global::BookAStar.Droid.Resource.Styleable.CardView_contentPadding;
+			global::XLabs.Forms.Droid.Resource.Styleable.CardView_contentPaddingBottom = global::BookAStar.Droid.Resource.Styleable.CardView_contentPaddingBottom;
+			global::XLabs.Forms.Droid.Resource.Styleable.CardView_contentPaddingLeft = global::BookAStar.Droid.Resource.Styleable.CardView_contentPaddingLeft;
+			global::XLabs.Forms.Droid.Resource.Styleable.CardView_contentPaddingRight = global::BookAStar.Droid.Resource.Styleable.CardView_contentPaddingRight;
+			global::XLabs.Forms.Droid.Resource.Styleable.CardView_contentPaddingTop = global::BookAStar.Droid.Resource.Styleable.CardView_contentPaddingTop;
+			global::XLabs.Forms.Droid.Resource.Styleable.CollapsingAppBarLayout_LayoutParams = global::BookAStar.Droid.Resource.Styleable.CollapsingAppBarLayout_LayoutParams;
+			global::XLabs.Forms.Droid.Resource.Styleable.CollapsingAppBarLayout_LayoutParams_layout_collapseMode = global::BookAStar.Droid.Resource.Styleable.CollapsingAppBarLayout_LayoutParams_layout_collapseMode;
+			global::XLabs.Forms.Droid.Resource.Styleable.CollapsingAppBarLayout_LayoutParams_layout_collapseParallaxMultiplier = global::BookAStar.Droid.Resource.Styleable.CollapsingAppBarLayout_LayoutParams_layout_collapseParallaxMultiplier;
+			global::XLabs.Forms.Droid.Resource.Styleable.CollapsingToolbarLayout = global::BookAStar.Droid.Resource.Styleable.CollapsingToolbarLayout;
+			global::XLabs.Forms.Droid.Resource.Styleable.CollapsingToolbarLayout_collapsedTitleGravity = global::BookAStar.Droid.Resource.Styleable.CollapsingToolbarLayout_collapsedTitleGravity;
+			global::XLabs.Forms.Droid.Resource.Styleable.CollapsingToolbarLayout_collapsedTitleTextAppearance = global::BookAStar.Droid.Resource.Styleable.CollapsingToolbarLayout_collapsedTitleTextAppearance;
+			global::XLabs.Forms.Droid.Resource.Styleable.CollapsingToolbarLayout_contentScrim = global::BookAStar.Droid.Resource.Styleable.CollapsingToolbarLayout_contentScrim;
+			global::XLabs.Forms.Droid.Resource.Styleable.CollapsingToolbarLayout_expandedTitleGravity = global::BookAStar.Droid.Resource.Styleable.CollapsingToolbarLayout_expandedTitleGravity;
+			global::XLabs.Forms.Droid.Resource.Styleable.CollapsingToolbarLayout_expandedTitleMargin = global::BookAStar.Droid.Resource.Styleable.CollapsingToolbarLayout_expandedTitleMargin;
+			global::XLabs.Forms.Droid.Resource.Styleable.CollapsingToolbarLayout_expandedTitleMarginBottom = global::BookAStar.Droid.Resource.Styleable.CollapsingToolbarLayout_expandedTitleMarginBottom;
+			global::XLabs.Forms.Droid.Resource.Styleable.CollapsingToolbarLayout_expandedTitleMarginEnd = global::BookAStar.Droid.Resource.Styleable.CollapsingToolbarLayout_expandedTitleMarginEnd;
+			global::XLabs.Forms.Droid.Resource.Styleable.CollapsingToolbarLayout_expandedTitleMarginStart = global::BookAStar.Droid.Resource.Styleable.CollapsingToolbarLayout_expandedTitleMarginStart;
+			global::XLabs.Forms.Droid.Resource.Styleable.CollapsingToolbarLayout_expandedTitleMarginTop = global::BookAStar.Droid.Resource.Styleable.CollapsingToolbarLayout_expandedTitleMarginTop;
+			global::XLabs.Forms.Droid.Resource.Styleable.CollapsingToolbarLayout_expandedTitleTextAppearance = global::BookAStar.Droid.Resource.Styleable.CollapsingToolbarLayout_expandedTitleTextAppearance;
+			global::XLabs.Forms.Droid.Resource.Styleable.CollapsingToolbarLayout_statusBarScrim = global::BookAStar.Droid.Resource.Styleable.CollapsingToolbarLayout_statusBarScrim;
+			global::XLabs.Forms.Droid.Resource.Styleable.CollapsingToolbarLayout_title = global::BookAStar.Droid.Resource.Styleable.CollapsingToolbarLayout_title;
+			global::XLabs.Forms.Droid.Resource.Styleable.CollapsingToolbarLayout_titleEnabled = global::BookAStar.Droid.Resource.Styleable.CollapsingToolbarLayout_titleEnabled;
+			global::XLabs.Forms.Droid.Resource.Styleable.CollapsingToolbarLayout_toolbarId = global::BookAStar.Droid.Resource.Styleable.CollapsingToolbarLayout_toolbarId;
+			global::XLabs.Forms.Droid.Resource.Styleable.CompoundButton = global::BookAStar.Droid.Resource.Styleable.CompoundButton;
+			global::XLabs.Forms.Droid.Resource.Styleable.CompoundButton_android_button = global::BookAStar.Droid.Resource.Styleable.CompoundButton_android_button;
+			global::XLabs.Forms.Droid.Resource.Styleable.CompoundButton_buttonTint = global::BookAStar.Droid.Resource.Styleable.CompoundButton_buttonTint;
+			global::XLabs.Forms.Droid.Resource.Styleable.CompoundButton_buttonTintMode = global::BookAStar.Droid.Resource.Styleable.CompoundButton_buttonTintMode;
+			global::XLabs.Forms.Droid.Resource.Styleable.CoordinatorLayout = global::BookAStar.Droid.Resource.Styleable.CoordinatorLayout;
+			global::XLabs.Forms.Droid.Resource.Styleable.CoordinatorLayout_keylines = global::BookAStar.Droid.Resource.Styleable.CoordinatorLayout_keylines;
+			global::XLabs.Forms.Droid.Resource.Styleable.CoordinatorLayout_statusBarBackground = global::BookAStar.Droid.Resource.Styleable.CoordinatorLayout_statusBarBackground;
+			global::XLabs.Forms.Droid.Resource.Styleable.CoordinatorLayout_LayoutParams = global::BookAStar.Droid.Resource.Styleable.CoordinatorLayout_LayoutParams;
+			global::XLabs.Forms.Droid.Resource.Styleable.CoordinatorLayout_LayoutParams_android_layout_gravity = global::BookAStar.Droid.Resource.Styleable.CoordinatorLayout_LayoutParams_android_layout_gravity;
+			global::XLabs.Forms.Droid.Resource.Styleable.CoordinatorLayout_LayoutParams_layout_anchor = global::BookAStar.Droid.Resource.Styleable.CoordinatorLayout_LayoutParams_layout_anchor;
+			global::XLabs.Forms.Droid.Resource.Styleable.CoordinatorLayout_LayoutParams_layout_anchorGravity = global::BookAStar.Droid.Resource.Styleable.CoordinatorLayout_LayoutParams_layout_anchorGravity;
+			global::XLabs.Forms.Droid.Resource.Styleable.CoordinatorLayout_LayoutParams_layout_behavior = global::BookAStar.Droid.Resource.Styleable.CoordinatorLayout_LayoutParams_layout_behavior;
+			global::XLabs.Forms.Droid.Resource.Styleable.CoordinatorLayout_LayoutParams_layout_keyline = global::BookAStar.Droid.Resource.Styleable.CoordinatorLayout_LayoutParams_layout_keyline;
+			global::XLabs.Forms.Droid.Resource.Styleable.DesignTheme = global::BookAStar.Droid.Resource.Styleable.DesignTheme;
+			global::XLabs.Forms.Droid.Resource.Styleable.DesignTheme_bottomSheetDialogTheme = global::BookAStar.Droid.Resource.Styleable.DesignTheme_bottomSheetDialogTheme;
+			global::XLabs.Forms.Droid.Resource.Styleable.DesignTheme_bottomSheetStyle = global::BookAStar.Droid.Resource.Styleable.DesignTheme_bottomSheetStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.DesignTheme_textColorError = global::BookAStar.Droid.Resource.Styleable.DesignTheme_textColorError;
+			global::XLabs.Forms.Droid.Resource.Styleable.DrawerArrowToggle = global::BookAStar.Droid.Resource.Styleable.DrawerArrowToggle;
+			global::XLabs.Forms.Droid.Resource.Styleable.DrawerArrowToggle_arrowHeadLength = global::BookAStar.Droid.Resource.Styleable.DrawerArrowToggle_arrowHeadLength;
+			global::XLabs.Forms.Droid.Resource.Styleable.DrawerArrowToggle_arrowShaftLength = global::BookAStar.Droid.Resource.Styleable.DrawerArrowToggle_arrowShaftLength;
+			global::XLabs.Forms.Droid.Resource.Styleable.DrawerArrowToggle_barLength = global::BookAStar.Droid.Resource.Styleable.DrawerArrowToggle_barLength;
+			global::XLabs.Forms.Droid.Resource.Styleable.DrawerArrowToggle_color = global::BookAStar.Droid.Resource.Styleable.DrawerArrowToggle_color;
+			global::XLabs.Forms.Droid.Resource.Styleable.DrawerArrowToggle_drawableSize = global::BookAStar.Droid.Resource.Styleable.DrawerArrowToggle_drawableSize;
+			global::XLabs.Forms.Droid.Resource.Styleable.DrawerArrowToggle_gapBetweenBars = global::BookAStar.Droid.Resource.Styleable.DrawerArrowToggle_gapBetweenBars;
+			global::XLabs.Forms.Droid.Resource.Styleable.DrawerArrowToggle_spinBars = global::BookAStar.Droid.Resource.Styleable.DrawerArrowToggle_spinBars;
+			global::XLabs.Forms.Droid.Resource.Styleable.DrawerArrowToggle_thickness = global::BookAStar.Droid.Resource.Styleable.DrawerArrowToggle_thickness;
+			global::XLabs.Forms.Droid.Resource.Styleable.FloatingActionButton = global::BookAStar.Droid.Resource.Styleable.FloatingActionButton;
+			global::XLabs.Forms.Droid.Resource.Styleable.FloatingActionButton_backgroundTint = global::BookAStar.Droid.Resource.Styleable.FloatingActionButton_backgroundTint;
+			global::XLabs.Forms.Droid.Resource.Styleable.FloatingActionButton_backgroundTintMode = global::BookAStar.Droid.Resource.Styleable.FloatingActionButton_backgroundTintMode;
+			global::XLabs.Forms.Droid.Resource.Styleable.FloatingActionButton_borderWidth = global::BookAStar.Droid.Resource.Styleable.FloatingActionButton_borderWidth;
+			global::XLabs.Forms.Droid.Resource.Styleable.FloatingActionButton_elevation = global::BookAStar.Droid.Resource.Styleable.FloatingActionButton_elevation;
+			global::XLabs.Forms.Droid.Resource.Styleable.FloatingActionButton_fabSize = global::BookAStar.Droid.Resource.Styleable.FloatingActionButton_fabSize;
+			global::XLabs.Forms.Droid.Resource.Styleable.FloatingActionButton_pressedTranslationZ = global::BookAStar.Droid.Resource.Styleable.FloatingActionButton_pressedTranslationZ;
+			global::XLabs.Forms.Droid.Resource.Styleable.FloatingActionButton_rippleColor = global::BookAStar.Droid.Resource.Styleable.FloatingActionButton_rippleColor;
+			global::XLabs.Forms.Droid.Resource.Styleable.FloatingActionButton_useCompatPadding = global::BookAStar.Droid.Resource.Styleable.FloatingActionButton_useCompatPadding;
+			global::XLabs.Forms.Droid.Resource.Styleable.ForegroundLinearLayout = global::BookAStar.Droid.Resource.Styleable.ForegroundLinearLayout;
+			global::XLabs.Forms.Droid.Resource.Styleable.ForegroundLinearLayout_android_foreground = global::BookAStar.Droid.Resource.Styleable.ForegroundLinearLayout_android_foreground;
+			global::XLabs.Forms.Droid.Resource.Styleable.ForegroundLinearLayout_android_foregroundGravity = global::BookAStar.Droid.Resource.Styleable.ForegroundLinearLayout_android_foregroundGravity;
+			global::XLabs.Forms.Droid.Resource.Styleable.ForegroundLinearLayout_foregroundInsidePadding = global::BookAStar.Droid.Resource.Styleable.ForegroundLinearLayout_foregroundInsidePadding;
+			global::XLabs.Forms.Droid.Resource.Styleable.LinearLayoutCompat = global::BookAStar.Droid.Resource.Styleable.LinearLayoutCompat;
+			global::XLabs.Forms.Droid.Resource.Styleable.LinearLayoutCompat_android_baselineAligned = global::BookAStar.Droid.Resource.Styleable.LinearLayoutCompat_android_baselineAligned;
+			global::XLabs.Forms.Droid.Resource.Styleable.LinearLayoutCompat_android_baselineAlignedChildIndex = global::BookAStar.Droid.Resource.Styleable.LinearLayoutCompat_android_baselineAlignedChildIndex;
+			global::XLabs.Forms.Droid.Resource.Styleable.LinearLayoutCompat_android_gravity = global::BookAStar.Droid.Resource.Styleable.LinearLayoutCompat_android_gravity;
+			global::XLabs.Forms.Droid.Resource.Styleable.LinearLayoutCompat_android_orientation = global::BookAStar.Droid.Resource.Styleable.LinearLayoutCompat_android_orientation;
+			global::XLabs.Forms.Droid.Resource.Styleable.LinearLayoutCompat_android_weightSum = global::BookAStar.Droid.Resource.Styleable.LinearLayoutCompat_android_weightSum;
+			global::XLabs.Forms.Droid.Resource.Styleable.LinearLayoutCompat_divider = global::BookAStar.Droid.Resource.Styleable.LinearLayoutCompat_divider;
+			global::XLabs.Forms.Droid.Resource.Styleable.LinearLayoutCompat_dividerPadding = global::BookAStar.Droid.Resource.Styleable.LinearLayoutCompat_dividerPadding;
+			global::XLabs.Forms.Droid.Resource.Styleable.LinearLayoutCompat_measureWithLargestChild = global::BookAStar.Droid.Resource.Styleable.LinearLayoutCompat_measureWithLargestChild;
+			global::XLabs.Forms.Droid.Resource.Styleable.LinearLayoutCompat_showDividers = global::BookAStar.Droid.Resource.Styleable.LinearLayoutCompat_showDividers;
+			global::XLabs.Forms.Droid.Resource.Styleable.LinearLayoutCompat_Layout = global::BookAStar.Droid.Resource.Styleable.LinearLayoutCompat_Layout;
+			global::XLabs.Forms.Droid.Resource.Styleable.LinearLayoutCompat_Layout_android_layout_gravity = global::BookAStar.Droid.Resource.Styleable.LinearLayoutCompat_Layout_android_layout_gravity;
+			global::XLabs.Forms.Droid.Resource.Styleable.LinearLayoutCompat_Layout_android_layout_height = global::BookAStar.Droid.Resource.Styleable.LinearLayoutCompat_Layout_android_layout_height;
+			global::XLabs.Forms.Droid.Resource.Styleable.LinearLayoutCompat_Layout_android_layout_weight = global::BookAStar.Droid.Resource.Styleable.LinearLayoutCompat_Layout_android_layout_weight;
+			global::XLabs.Forms.Droid.Resource.Styleable.LinearLayoutCompat_Layout_android_layout_width = global::BookAStar.Droid.Resource.Styleable.LinearLayoutCompat_Layout_android_layout_width;
+			global::XLabs.Forms.Droid.Resource.Styleable.ListPopupWindow = global::BookAStar.Droid.Resource.Styleable.ListPopupWindow;
+			global::XLabs.Forms.Droid.Resource.Styleable.ListPopupWindow_android_dropDownHorizontalOffset = global::BookAStar.Droid.Resource.Styleable.ListPopupWindow_android_dropDownHorizontalOffset;
+			global::XLabs.Forms.Droid.Resource.Styleable.ListPopupWindow_android_dropDownVerticalOffset = global::BookAStar.Droid.Resource.Styleable.ListPopupWindow_android_dropDownVerticalOffset;
+			global::XLabs.Forms.Droid.Resource.Styleable.MediaRouteButton = global::BookAStar.Droid.Resource.Styleable.MediaRouteButton;
+			global::XLabs.Forms.Droid.Resource.Styleable.MediaRouteButton_android_minHeight = global::BookAStar.Droid.Resource.Styleable.MediaRouteButton_android_minHeight;
+			global::XLabs.Forms.Droid.Resource.Styleable.MediaRouteButton_android_minWidth = global::BookAStar.Droid.Resource.Styleable.MediaRouteButton_android_minWidth;
+			global::XLabs.Forms.Droid.Resource.Styleable.MediaRouteButton_externalRouteEnabledDrawable = global::BookAStar.Droid.Resource.Styleable.MediaRouteButton_externalRouteEnabledDrawable;
+			global::XLabs.Forms.Droid.Resource.Styleable.MenuGroup = global::BookAStar.Droid.Resource.Styleable.MenuGroup;
+			global::XLabs.Forms.Droid.Resource.Styleable.MenuGroup_android_checkableBehavior = global::BookAStar.Droid.Resource.Styleable.MenuGroup_android_checkableBehavior;
+			global::XLabs.Forms.Droid.Resource.Styleable.MenuGroup_android_enabled = global::BookAStar.Droid.Resource.Styleable.MenuGroup_android_enabled;
+			global::XLabs.Forms.Droid.Resource.Styleable.MenuGroup_android_id = global::BookAStar.Droid.Resource.Styleable.MenuGroup_android_id;
+			global::XLabs.Forms.Droid.Resource.Styleable.MenuGroup_android_menuCategory = global::BookAStar.Droid.Resource.Styleable.MenuGroup_android_menuCategory;
+			global::XLabs.Forms.Droid.Resource.Styleable.MenuGroup_android_orderInCategory = global::BookAStar.Droid.Resource.Styleable.MenuGroup_android_orderInCategory;
+			global::XLabs.Forms.Droid.Resource.Styleable.MenuGroup_android_visible = global::BookAStar.Droid.Resource.Styleable.MenuGroup_android_visible;
+			global::XLabs.Forms.Droid.Resource.Styleable.MenuItem = global::BookAStar.Droid.Resource.Styleable.MenuItem;
+			global::XLabs.Forms.Droid.Resource.Styleable.MenuItem_actionLayout = global::BookAStar.Droid.Resource.Styleable.MenuItem_actionLayout;
+			global::XLabs.Forms.Droid.Resource.Styleable.MenuItem_actionProviderClass = global::BookAStar.Droid.Resource.Styleable.MenuItem_actionProviderClass;
+			global::XLabs.Forms.Droid.Resource.Styleable.MenuItem_actionViewClass = global::BookAStar.Droid.Resource.Styleable.MenuItem_actionViewClass;
+			global::XLabs.Forms.Droid.Resource.Styleable.MenuItem_android_alphabeticShortcut = global::BookAStar.Droid.Resource.Styleable.MenuItem_android_alphabeticShortcut;
+			global::XLabs.Forms.Droid.Resource.Styleable.MenuItem_android_checkable = global::BookAStar.Droid.Resource.Styleable.MenuItem_android_checkable;
+			global::XLabs.Forms.Droid.Resource.Styleable.MenuItem_android_checked = global::BookAStar.Droid.Resource.Styleable.MenuItem_android_checked;
+			global::XLabs.Forms.Droid.Resource.Styleable.MenuItem_android_enabled = global::BookAStar.Droid.Resource.Styleable.MenuItem_android_enabled;
+			global::XLabs.Forms.Droid.Resource.Styleable.MenuItem_android_icon = global::BookAStar.Droid.Resource.Styleable.MenuItem_android_icon;
+			global::XLabs.Forms.Droid.Resource.Styleable.MenuItem_android_id = global::BookAStar.Droid.Resource.Styleable.MenuItem_android_id;
+			global::XLabs.Forms.Droid.Resource.Styleable.MenuItem_android_menuCategory = global::BookAStar.Droid.Resource.Styleable.MenuItem_android_menuCategory;
+			global::XLabs.Forms.Droid.Resource.Styleable.MenuItem_android_numericShortcut = global::BookAStar.Droid.Resource.Styleable.MenuItem_android_numericShortcut;
+			global::XLabs.Forms.Droid.Resource.Styleable.MenuItem_android_onClick = global::BookAStar.Droid.Resource.Styleable.MenuItem_android_onClick;
+			global::XLabs.Forms.Droid.Resource.Styleable.MenuItem_android_orderInCategory = global::BookAStar.Droid.Resource.Styleable.MenuItem_android_orderInCategory;
+			global::XLabs.Forms.Droid.Resource.Styleable.MenuItem_android_title = global::BookAStar.Droid.Resource.Styleable.MenuItem_android_title;
+			global::XLabs.Forms.Droid.Resource.Styleable.MenuItem_android_titleCondensed = global::BookAStar.Droid.Resource.Styleable.MenuItem_android_titleCondensed;
+			global::XLabs.Forms.Droid.Resource.Styleable.MenuItem_android_visible = global::BookAStar.Droid.Resource.Styleable.MenuItem_android_visible;
+			global::XLabs.Forms.Droid.Resource.Styleable.MenuItem_showAsAction = global::BookAStar.Droid.Resource.Styleable.MenuItem_showAsAction;
+			global::XLabs.Forms.Droid.Resource.Styleable.MenuView = global::BookAStar.Droid.Resource.Styleable.MenuView;
+			global::XLabs.Forms.Droid.Resource.Styleable.MenuView_android_headerBackground = global::BookAStar.Droid.Resource.Styleable.MenuView_android_headerBackground;
+			global::XLabs.Forms.Droid.Resource.Styleable.MenuView_android_horizontalDivider = global::BookAStar.Droid.Resource.Styleable.MenuView_android_horizontalDivider;
+			global::XLabs.Forms.Droid.Resource.Styleable.MenuView_android_itemBackground = global::BookAStar.Droid.Resource.Styleable.MenuView_android_itemBackground;
+			global::XLabs.Forms.Droid.Resource.Styleable.MenuView_android_itemIconDisabledAlpha = global::BookAStar.Droid.Resource.Styleable.MenuView_android_itemIconDisabledAlpha;
+			global::XLabs.Forms.Droid.Resource.Styleable.MenuView_android_itemTextAppearance = global::BookAStar.Droid.Resource.Styleable.MenuView_android_itemTextAppearance;
+			global::XLabs.Forms.Droid.Resource.Styleable.MenuView_android_verticalDivider = global::BookAStar.Droid.Resource.Styleable.MenuView_android_verticalDivider;
+			global::XLabs.Forms.Droid.Resource.Styleable.MenuView_android_windowAnimationStyle = global::BookAStar.Droid.Resource.Styleable.MenuView_android_windowAnimationStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.MenuView_preserveIconSpacing = global::BookAStar.Droid.Resource.Styleable.MenuView_preserveIconSpacing;
+			global::XLabs.Forms.Droid.Resource.Styleable.NavigationView = global::BookAStar.Droid.Resource.Styleable.NavigationView;
+			global::XLabs.Forms.Droid.Resource.Styleable.NavigationView_android_background = global::BookAStar.Droid.Resource.Styleable.NavigationView_android_background;
+			global::XLabs.Forms.Droid.Resource.Styleable.NavigationView_android_fitsSystemWindows = global::BookAStar.Droid.Resource.Styleable.NavigationView_android_fitsSystemWindows;
+			global::XLabs.Forms.Droid.Resource.Styleable.NavigationView_android_maxWidth = global::BookAStar.Droid.Resource.Styleable.NavigationView_android_maxWidth;
+			global::XLabs.Forms.Droid.Resource.Styleable.NavigationView_elevation = global::BookAStar.Droid.Resource.Styleable.NavigationView_elevation;
+			global::XLabs.Forms.Droid.Resource.Styleable.NavigationView_headerLayout = global::BookAStar.Droid.Resource.Styleable.NavigationView_headerLayout;
+			global::XLabs.Forms.Droid.Resource.Styleable.NavigationView_itemBackground = global::BookAStar.Droid.Resource.Styleable.NavigationView_itemBackground;
+			global::XLabs.Forms.Droid.Resource.Styleable.NavigationView_itemIconTint = global::BookAStar.Droid.Resource.Styleable.NavigationView_itemIconTint;
+			global::XLabs.Forms.Droid.Resource.Styleable.NavigationView_itemTextAppearance = global::BookAStar.Droid.Resource.Styleable.NavigationView_itemTextAppearance;
+			global::XLabs.Forms.Droid.Resource.Styleable.NavigationView_itemTextColor = global::BookAStar.Droid.Resource.Styleable.NavigationView_itemTextColor;
+			global::XLabs.Forms.Droid.Resource.Styleable.NavigationView_menu = global::BookAStar.Droid.Resource.Styleable.NavigationView_menu;
+			global::XLabs.Forms.Droid.Resource.Styleable.PopupWindow = global::BookAStar.Droid.Resource.Styleable.PopupWindow;
+			global::XLabs.Forms.Droid.Resource.Styleable.PopupWindow_android_popupBackground = global::BookAStar.Droid.Resource.Styleable.PopupWindow_android_popupBackground;
+			global::XLabs.Forms.Droid.Resource.Styleable.PopupWindow_overlapAnchor = global::BookAStar.Droid.Resource.Styleable.PopupWindow_overlapAnchor;
+			global::XLabs.Forms.Droid.Resource.Styleable.PopupWindowBackgroundState = global::BookAStar.Droid.Resource.Styleable.PopupWindowBackgroundState;
+			global::XLabs.Forms.Droid.Resource.Styleable.PopupWindowBackgroundState_state_above_anchor = global::BookAStar.Droid.Resource.Styleable.PopupWindowBackgroundState_state_above_anchor;
+			global::XLabs.Forms.Droid.Resource.Styleable.RecyclerView = global::BookAStar.Droid.Resource.Styleable.RecyclerView;
+			global::XLabs.Forms.Droid.Resource.Styleable.RecyclerView_android_orientation = global::BookAStar.Droid.Resource.Styleable.RecyclerView_android_orientation;
+			global::XLabs.Forms.Droid.Resource.Styleable.RecyclerView_layoutManager = global::BookAStar.Droid.Resource.Styleable.RecyclerView_layoutManager;
+			global::XLabs.Forms.Droid.Resource.Styleable.RecyclerView_reverseLayout = global::BookAStar.Droid.Resource.Styleable.RecyclerView_reverseLayout;
+			global::XLabs.Forms.Droid.Resource.Styleable.RecyclerView_spanCount = global::BookAStar.Droid.Resource.Styleable.RecyclerView_spanCount;
+			global::XLabs.Forms.Droid.Resource.Styleable.RecyclerView_stackFromEnd = global::BookAStar.Droid.Resource.Styleable.RecyclerView_stackFromEnd;
+			global::XLabs.Forms.Droid.Resource.Styleable.ScrimInsetsFrameLayout = global::BookAStar.Droid.Resource.Styleable.ScrimInsetsFrameLayout;
+			global::XLabs.Forms.Droid.Resource.Styleable.ScrimInsetsFrameLayout_insetForeground = global::BookAStar.Droid.Resource.Styleable.ScrimInsetsFrameLayout_insetForeground;
+			global::XLabs.Forms.Droid.Resource.Styleable.ScrollingViewBehavior_Params = global::BookAStar.Droid.Resource.Styleable.ScrollingViewBehavior_Params;
+			global::XLabs.Forms.Droid.Resource.Styleable.ScrollingViewBehavior_Params_behavior_overlapTop = global::BookAStar.Droid.Resource.Styleable.ScrollingViewBehavior_Params_behavior_overlapTop;
+			global::XLabs.Forms.Droid.Resource.Styleable.SearchView = global::BookAStar.Droid.Resource.Styleable.SearchView;
+			global::XLabs.Forms.Droid.Resource.Styleable.SearchView_android_focusable = global::BookAStar.Droid.Resource.Styleable.SearchView_android_focusable;
+			global::XLabs.Forms.Droid.Resource.Styleable.SearchView_android_imeOptions = global::BookAStar.Droid.Resource.Styleable.SearchView_android_imeOptions;
+			global::XLabs.Forms.Droid.Resource.Styleable.SearchView_android_inputType = global::BookAStar.Droid.Resource.Styleable.SearchView_android_inputType;
+			global::XLabs.Forms.Droid.Resource.Styleable.SearchView_android_maxWidth = global::BookAStar.Droid.Resource.Styleable.SearchView_android_maxWidth;
+			global::XLabs.Forms.Droid.Resource.Styleable.SearchView_closeIcon = global::BookAStar.Droid.Resource.Styleable.SearchView_closeIcon;
+			global::XLabs.Forms.Droid.Resource.Styleable.SearchView_commitIcon = global::BookAStar.Droid.Resource.Styleable.SearchView_commitIcon;
+			global::XLabs.Forms.Droid.Resource.Styleable.SearchView_defaultQueryHint = global::BookAStar.Droid.Resource.Styleable.SearchView_defaultQueryHint;
+			global::XLabs.Forms.Droid.Resource.Styleable.SearchView_goIcon = global::BookAStar.Droid.Resource.Styleable.SearchView_goIcon;
+			global::XLabs.Forms.Droid.Resource.Styleable.SearchView_iconifiedByDefault = global::BookAStar.Droid.Resource.Styleable.SearchView_iconifiedByDefault;
+			global::XLabs.Forms.Droid.Resource.Styleable.SearchView_layout = global::BookAStar.Droid.Resource.Styleable.SearchView_layout;
+			global::XLabs.Forms.Droid.Resource.Styleable.SearchView_queryBackground = global::BookAStar.Droid.Resource.Styleable.SearchView_queryBackground;
+			global::XLabs.Forms.Droid.Resource.Styleable.SearchView_queryHint = global::BookAStar.Droid.Resource.Styleable.SearchView_queryHint;
+			global::XLabs.Forms.Droid.Resource.Styleable.SearchView_searchHintIcon = global::BookAStar.Droid.Resource.Styleable.SearchView_searchHintIcon;
+			global::XLabs.Forms.Droid.Resource.Styleable.SearchView_searchIcon = global::BookAStar.Droid.Resource.Styleable.SearchView_searchIcon;
+			global::XLabs.Forms.Droid.Resource.Styleable.SearchView_submitBackground = global::BookAStar.Droid.Resource.Styleable.SearchView_submitBackground;
+			global::XLabs.Forms.Droid.Resource.Styleable.SearchView_suggestionRowLayout = global::BookAStar.Droid.Resource.Styleable.SearchView_suggestionRowLayout;
+			global::XLabs.Forms.Droid.Resource.Styleable.SearchView_voiceIcon = global::BookAStar.Droid.Resource.Styleable.SearchView_voiceIcon;
+			global::XLabs.Forms.Droid.Resource.Styleable.SnackbarLayout = global::BookAStar.Droid.Resource.Styleable.SnackbarLayout;
+			global::XLabs.Forms.Droid.Resource.Styleable.SnackbarLayout_android_maxWidth = global::BookAStar.Droid.Resource.Styleable.SnackbarLayout_android_maxWidth;
+			global::XLabs.Forms.Droid.Resource.Styleable.SnackbarLayout_elevation = global::BookAStar.Droid.Resource.Styleable.SnackbarLayout_elevation;
+			global::XLabs.Forms.Droid.Resource.Styleable.SnackbarLayout_maxActionInlineWidth = global::BookAStar.Droid.Resource.Styleable.SnackbarLayout_maxActionInlineWidth;
+			global::XLabs.Forms.Droid.Resource.Styleable.Spinner = global::BookAStar.Droid.Resource.Styleable.Spinner;
+			global::XLabs.Forms.Droid.Resource.Styleable.Spinner_android_dropDownWidth = global::BookAStar.Droid.Resource.Styleable.Spinner_android_dropDownWidth;
+			global::XLabs.Forms.Droid.Resource.Styleable.Spinner_android_entries = global::BookAStar.Droid.Resource.Styleable.Spinner_android_entries;
+			global::XLabs.Forms.Droid.Resource.Styleable.Spinner_android_popupBackground = global::BookAStar.Droid.Resource.Styleable.Spinner_android_popupBackground;
+			global::XLabs.Forms.Droid.Resource.Styleable.Spinner_android_prompt = global::BookAStar.Droid.Resource.Styleable.Spinner_android_prompt;
+			global::XLabs.Forms.Droid.Resource.Styleable.Spinner_popupTheme = global::BookAStar.Droid.Resource.Styleable.Spinner_popupTheme;
+			global::XLabs.Forms.Droid.Resource.Styleable.SwitchCompat = global::BookAStar.Droid.Resource.Styleable.SwitchCompat;
+			global::XLabs.Forms.Droid.Resource.Styleable.SwitchCompat_android_textOff = global::BookAStar.Droid.Resource.Styleable.SwitchCompat_android_textOff;
+			global::XLabs.Forms.Droid.Resource.Styleable.SwitchCompat_android_textOn = global::BookAStar.Droid.Resource.Styleable.SwitchCompat_android_textOn;
+			global::XLabs.Forms.Droid.Resource.Styleable.SwitchCompat_android_thumb = global::BookAStar.Droid.Resource.Styleable.SwitchCompat_android_thumb;
+			global::XLabs.Forms.Droid.Resource.Styleable.SwitchCompat_showText = global::BookAStar.Droid.Resource.Styleable.SwitchCompat_showText;
+			global::XLabs.Forms.Droid.Resource.Styleable.SwitchCompat_splitTrack = global::BookAStar.Droid.Resource.Styleable.SwitchCompat_splitTrack;
+			global::XLabs.Forms.Droid.Resource.Styleable.SwitchCompat_switchMinWidth = global::BookAStar.Droid.Resource.Styleable.SwitchCompat_switchMinWidth;
+			global::XLabs.Forms.Droid.Resource.Styleable.SwitchCompat_switchPadding = global::BookAStar.Droid.Resource.Styleable.SwitchCompat_switchPadding;
+			global::XLabs.Forms.Droid.Resource.Styleable.SwitchCompat_switchTextAppearance = global::BookAStar.Droid.Resource.Styleable.SwitchCompat_switchTextAppearance;
+			global::XLabs.Forms.Droid.Resource.Styleable.SwitchCompat_thumbTextPadding = global::BookAStar.Droid.Resource.Styleable.SwitchCompat_thumbTextPadding;
+			global::XLabs.Forms.Droid.Resource.Styleable.SwitchCompat_track = global::BookAStar.Droid.Resource.Styleable.SwitchCompat_track;
+			global::XLabs.Forms.Droid.Resource.Styleable.TabItem = global::BookAStar.Droid.Resource.Styleable.TabItem;
+			global::XLabs.Forms.Droid.Resource.Styleable.TabItem_android_icon = global::BookAStar.Droid.Resource.Styleable.TabItem_android_icon;
+			global::XLabs.Forms.Droid.Resource.Styleable.TabItem_android_layout = global::BookAStar.Droid.Resource.Styleable.TabItem_android_layout;
+			global::XLabs.Forms.Droid.Resource.Styleable.TabItem_android_text = global::BookAStar.Droid.Resource.Styleable.TabItem_android_text;
+			global::XLabs.Forms.Droid.Resource.Styleable.TabLayout = global::BookAStar.Droid.Resource.Styleable.TabLayout;
+			global::XLabs.Forms.Droid.Resource.Styleable.TabLayout_tabBackground = global::BookAStar.Droid.Resource.Styleable.TabLayout_tabBackground;
+			global::XLabs.Forms.Droid.Resource.Styleable.TabLayout_tabContentStart = global::BookAStar.Droid.Resource.Styleable.TabLayout_tabContentStart;
+			global::XLabs.Forms.Droid.Resource.Styleable.TabLayout_tabGravity = global::BookAStar.Droid.Resource.Styleable.TabLayout_tabGravity;
+			global::XLabs.Forms.Droid.Resource.Styleable.TabLayout_tabIndicatorColor = global::BookAStar.Droid.Resource.Styleable.TabLayout_tabIndicatorColor;
+			global::XLabs.Forms.Droid.Resource.Styleable.TabLayout_tabIndicatorHeight = global::BookAStar.Droid.Resource.Styleable.TabLayout_tabIndicatorHeight;
+			global::XLabs.Forms.Droid.Resource.Styleable.TabLayout_tabMaxWidth = global::BookAStar.Droid.Resource.Styleable.TabLayout_tabMaxWidth;
+			global::XLabs.Forms.Droid.Resource.Styleable.TabLayout_tabMinWidth = global::BookAStar.Droid.Resource.Styleable.TabLayout_tabMinWidth;
+			global::XLabs.Forms.Droid.Resource.Styleable.TabLayout_tabMode = global::BookAStar.Droid.Resource.Styleable.TabLayout_tabMode;
+			global::XLabs.Forms.Droid.Resource.Styleable.TabLayout_tabPadding = global::BookAStar.Droid.Resource.Styleable.TabLayout_tabPadding;
+			global::XLabs.Forms.Droid.Resource.Styleable.TabLayout_tabPaddingBottom = global::BookAStar.Droid.Resource.Styleable.TabLayout_tabPaddingBottom;
+			global::XLabs.Forms.Droid.Resource.Styleable.TabLayout_tabPaddingEnd = global::BookAStar.Droid.Resource.Styleable.TabLayout_tabPaddingEnd;
+			global::XLabs.Forms.Droid.Resource.Styleable.TabLayout_tabPaddingStart = global::BookAStar.Droid.Resource.Styleable.TabLayout_tabPaddingStart;
+			global::XLabs.Forms.Droid.Resource.Styleable.TabLayout_tabPaddingTop = global::BookAStar.Droid.Resource.Styleable.TabLayout_tabPaddingTop;
+			global::XLabs.Forms.Droid.Resource.Styleable.TabLayout_tabSelectedTextColor = global::BookAStar.Droid.Resource.Styleable.TabLayout_tabSelectedTextColor;
+			global::XLabs.Forms.Droid.Resource.Styleable.TabLayout_tabTextAppearance = global::BookAStar.Droid.Resource.Styleable.TabLayout_tabTextAppearance;
+			global::XLabs.Forms.Droid.Resource.Styleable.TabLayout_tabTextColor = global::BookAStar.Droid.Resource.Styleable.TabLayout_tabTextColor;
+			global::XLabs.Forms.Droid.Resource.Styleable.TextAppearance = global::BookAStar.Droid.Resource.Styleable.TextAppearance;
+			global::XLabs.Forms.Droid.Resource.Styleable.TextAppearance_android_shadowColor = global::BookAStar.Droid.Resource.Styleable.TextAppearance_android_shadowColor;
+			global::XLabs.Forms.Droid.Resource.Styleable.TextAppearance_android_shadowDx = global::BookAStar.Droid.Resource.Styleable.TextAppearance_android_shadowDx;
+			global::XLabs.Forms.Droid.Resource.Styleable.TextAppearance_android_shadowDy = global::BookAStar.Droid.Resource.Styleable.TextAppearance_android_shadowDy;
+			global::XLabs.Forms.Droid.Resource.Styleable.TextAppearance_android_shadowRadius = global::BookAStar.Droid.Resource.Styleable.TextAppearance_android_shadowRadius;
+			global::XLabs.Forms.Droid.Resource.Styleable.TextAppearance_android_textColor = global::BookAStar.Droid.Resource.Styleable.TextAppearance_android_textColor;
+			global::XLabs.Forms.Droid.Resource.Styleable.TextAppearance_android_textSize = global::BookAStar.Droid.Resource.Styleable.TextAppearance_android_textSize;
+			global::XLabs.Forms.Droid.Resource.Styleable.TextAppearance_android_textStyle = global::BookAStar.Droid.Resource.Styleable.TextAppearance_android_textStyle;
+			global::XLabs.Forms.Droid.Resource.Styleable.TextAppearance_android_typeface = global::BookAStar.Droid.Resource.Styleable.TextAppearance_android_typeface;
+			global::XLabs.Forms.Droid.Resource.Styleable.TextAppearance_textAllCaps = global::BookAStar.Droid.Resource.Styleable.TextAppearance_textAllCaps;
+			global::XLabs.Forms.Droid.Resource.Styleable.TextInputLayout = global::BookAStar.Droid.Resource.Styleable.TextInputLayout;
+			global::XLabs.Forms.Droid.Resource.Styleable.TextInputLayout_android_hint = global::BookAStar.Droid.Resource.Styleable.TextInputLayout_android_hint;
+			global::XLabs.Forms.Droid.Resource.Styleable.TextInputLayout_android_textColorHint = global::BookAStar.Droid.Resource.Styleable.TextInputLayout_android_textColorHint;
+			global::XLabs.Forms.Droid.Resource.Styleable.TextInputLayout_counterEnabled = global::BookAStar.Droid.Resource.Styleable.TextInputLayout_counterEnabled;
+			global::XLabs.Forms.Droid.Resource.Styleable.TextInputLayout_counterMaxLength = global::BookAStar.Droid.Resource.Styleable.TextInputLayout_counterMaxLength;
+			global::XLabs.Forms.Droid.Resource.Styleable.TextInputLayout_counterOverflowTextAppearance = global::BookAStar.Droid.Resource.Styleable.TextInputLayout_counterOverflowTextAppearance;
+			global::XLabs.Forms.Droid.Resource.Styleable.TextInputLayout_counterTextAppearance = global::BookAStar.Droid.Resource.Styleable.TextInputLayout_counterTextAppearance;
+			global::XLabs.Forms.Droid.Resource.Styleable.TextInputLayout_errorEnabled = global::BookAStar.Droid.Resource.Styleable.TextInputLayout_errorEnabled;
+			global::XLabs.Forms.Droid.Resource.Styleable.TextInputLayout_errorTextAppearance = global::BookAStar.Droid.Resource.Styleable.TextInputLayout_errorTextAppearance;
+			global::XLabs.Forms.Droid.Resource.Styleable.TextInputLayout_hintAnimationEnabled = global::BookAStar.Droid.Resource.Styleable.TextInputLayout_hintAnimationEnabled;
+			global::XLabs.Forms.Droid.Resource.Styleable.TextInputLayout_hintEnabled = global::BookAStar.Droid.Resource.Styleable.TextInputLayout_hintEnabled;
+			global::XLabs.Forms.Droid.Resource.Styleable.TextInputLayout_hintTextAppearance = global::BookAStar.Droid.Resource.Styleable.TextInputLayout_hintTextAppearance;
+			global::XLabs.Forms.Droid.Resource.Styleable.Toolbar = global::BookAStar.Droid.Resource.Styleable.Toolbar;
+			global::XLabs.Forms.Droid.Resource.Styleable.Toolbar_android_gravity = global::BookAStar.Droid.Resource.Styleable.Toolbar_android_gravity;
+			global::XLabs.Forms.Droid.Resource.Styleable.Toolbar_android_minHeight = global::BookAStar.Droid.Resource.Styleable.Toolbar_android_minHeight;
+			global::XLabs.Forms.Droid.Resource.Styleable.Toolbar_collapseContentDescription = global::BookAStar.Droid.Resource.Styleable.Toolbar_collapseContentDescription;
+			global::XLabs.Forms.Droid.Resource.Styleable.Toolbar_collapseIcon = global::BookAStar.Droid.Resource.Styleable.Toolbar_collapseIcon;
+			global::XLabs.Forms.Droid.Resource.Styleable.Toolbar_contentInsetEnd = global::BookAStar.Droid.Resource.Styleable.Toolbar_contentInsetEnd;
+			global::XLabs.Forms.Droid.Resource.Styleable.Toolbar_contentInsetLeft = global::BookAStar.Droid.Resource.Styleable.Toolbar_contentInsetLeft;
+			global::XLabs.Forms.Droid.Resource.Styleable.Toolbar_contentInsetRight = global::BookAStar.Droid.Resource.Styleable.Toolbar_contentInsetRight;
+			global::XLabs.Forms.Droid.Resource.Styleable.Toolbar_contentInsetStart = global::BookAStar.Droid.Resource.Styleable.Toolbar_contentInsetStart;
+			global::XLabs.Forms.Droid.Resource.Styleable.Toolbar_logo = global::BookAStar.Droid.Resource.Styleable.Toolbar_logo;
+			global::XLabs.Forms.Droid.Resource.Styleable.Toolbar_logoDescription = global::BookAStar.Droid.Resource.Styleable.Toolbar_logoDescription;
+			global::XLabs.Forms.Droid.Resource.Styleable.Toolbar_maxButtonHeight = global::BookAStar.Droid.Resource.Styleable.Toolbar_maxButtonHeight;
+			global::XLabs.Forms.Droid.Resource.Styleable.Toolbar_navigationContentDescription = global::BookAStar.Droid.Resource.Styleable.Toolbar_navigationContentDescription;
+			global::XLabs.Forms.Droid.Resource.Styleable.Toolbar_navigationIcon = global::BookAStar.Droid.Resource.Styleable.Toolbar_navigationIcon;
+			global::XLabs.Forms.Droid.Resource.Styleable.Toolbar_popupTheme = global::BookAStar.Droid.Resource.Styleable.Toolbar_popupTheme;
+			global::XLabs.Forms.Droid.Resource.Styleable.Toolbar_subtitle = global::BookAStar.Droid.Resource.Styleable.Toolbar_subtitle;
+			global::XLabs.Forms.Droid.Resource.Styleable.Toolbar_subtitleTextAppearance = global::BookAStar.Droid.Resource.Styleable.Toolbar_subtitleTextAppearance;
+			global::XLabs.Forms.Droid.Resource.Styleable.Toolbar_subtitleTextColor = global::BookAStar.Droid.Resource.Styleable.Toolbar_subtitleTextColor;
+			global::XLabs.Forms.Droid.Resource.Styleable.Toolbar_title = global::BookAStar.Droid.Resource.Styleable.Toolbar_title;
+			global::XLabs.Forms.Droid.Resource.Styleable.Toolbar_titleMarginBottom = global::BookAStar.Droid.Resource.Styleable.Toolbar_titleMarginBottom;
+			global::XLabs.Forms.Droid.Resource.Styleable.Toolbar_titleMarginEnd = global::BookAStar.Droid.Resource.Styleable.Toolbar_titleMarginEnd;
+			global::XLabs.Forms.Droid.Resource.Styleable.Toolbar_titleMarginStart = global::BookAStar.Droid.Resource.Styleable.Toolbar_titleMarginStart;
+			global::XLabs.Forms.Droid.Resource.Styleable.Toolbar_titleMarginTop = global::BookAStar.Droid.Resource.Styleable.Toolbar_titleMarginTop;
+			global::XLabs.Forms.Droid.Resource.Styleable.Toolbar_titleMargins = global::BookAStar.Droid.Resource.Styleable.Toolbar_titleMargins;
+			global::XLabs.Forms.Droid.Resource.Styleable.Toolbar_titleTextAppearance = global::BookAStar.Droid.Resource.Styleable.Toolbar_titleTextAppearance;
+			global::XLabs.Forms.Droid.Resource.Styleable.Toolbar_titleTextColor = global::BookAStar.Droid.Resource.Styleable.Toolbar_titleTextColor;
+			global::XLabs.Forms.Droid.Resource.Styleable.View = global::BookAStar.Droid.Resource.Styleable.View;
+			global::XLabs.Forms.Droid.Resource.Styleable.View_android_focusable = global::BookAStar.Droid.Resource.Styleable.View_android_focusable;
+			global::XLabs.Forms.Droid.Resource.Styleable.View_android_theme = global::BookAStar.Droid.Resource.Styleable.View_android_theme;
+			global::XLabs.Forms.Droid.Resource.Styleable.View_paddingEnd = global::BookAStar.Droid.Resource.Styleable.View_paddingEnd;
+			global::XLabs.Forms.Droid.Resource.Styleable.View_paddingStart = global::BookAStar.Droid.Resource.Styleable.View_paddingStart;
+			global::XLabs.Forms.Droid.Resource.Styleable.View_theme = global::BookAStar.Droid.Resource.Styleable.View_theme;
+			global::XLabs.Forms.Droid.Resource.Styleable.ViewBackgroundHelper = global::BookAStar.Droid.Resource.Styleable.ViewBackgroundHelper;
+			global::XLabs.Forms.Droid.Resource.Styleable.ViewBackgroundHelper_android_background = global::BookAStar.Droid.Resource.Styleable.ViewBackgroundHelper_android_background;
+			global::XLabs.Forms.Droid.Resource.Styleable.ViewBackgroundHelper_backgroundTint = global::BookAStar.Droid.Resource.Styleable.ViewBackgroundHelper_backgroundTint;
+			global::XLabs.Forms.Droid.Resource.Styleable.ViewBackgroundHelper_backgroundTintMode = global::BookAStar.Droid.Resource.Styleable.ViewBackgroundHelper_backgroundTintMode;
+			global::XLabs.Forms.Droid.Resource.Styleable.ViewStubCompat = global::BookAStar.Droid.Resource.Styleable.ViewStubCompat;
+			global::XLabs.Forms.Droid.Resource.Styleable.ViewStubCompat_android_id = global::BookAStar.Droid.Resource.Styleable.ViewStubCompat_android_id;
+			global::XLabs.Forms.Droid.Resource.Styleable.ViewStubCompat_android_inflatedId = global::BookAStar.Droid.Resource.Styleable.ViewStubCompat_android_inflatedId;
+			global::XLabs.Forms.Droid.Resource.Styleable.ViewStubCompat_android_layout = global::BookAStar.Droid.Resource.Styleable.ViewStubCompat_android_layout;
+			global::XLabs.Platform.Resource.String.ApplicationName = global::BookAStar.Droid.Resource.String.ApplicationName;
+			global::XLabs.Platform.Resource.String.Hello = global::BookAStar.Droid.Resource.String.Hello;
 		}
 		
 		public partial class Animation
@@ -93,8 +1922,8 @@ namespace BookAStar.Droid
 		public partial class Array
 		{
 			
-			// aapt resource value: 0x7f0d0000
-			public const int androidcolors = 2131558400;
+			// aapt resource value: 0x7f0e0000
+			public const int androidcolors = 2131623936;
 			
 			static Array()
 			{
@@ -109,209 +1938,218 @@ namespace BookAStar.Droid
 		public partial class Attribute
 		{
 			
-			// aapt resource value: 0x7f01001b
-			public const int MediaRouteControllerWindowBackground = 2130771995;
-			
-			// aapt resource value: 0x7f010078
-			public const int actionBarDivider = 2130772088;
-			
-			// aapt resource value: 0x7f010079
-			public const int actionBarItemBackground = 2130772089;
-			
-			// aapt resource value: 0x7f010072
-			public const int actionBarPopupTheme = 2130772082;
-			
-			// aapt resource value: 0x7f010077
-			public const int actionBarSize = 2130772087;
-			
-			// aapt resource value: 0x7f010074
-			public const int actionBarSplitStyle = 2130772084;
-			
-			// aapt resource value: 0x7f010073
-			public const int actionBarStyle = 2130772083;
-			
-			// aapt resource value: 0x7f01006e
-			public const int actionBarTabBarStyle = 2130772078;
-			
-			// aapt resource value: 0x7f01006d
-			public const int actionBarTabStyle = 2130772077;
-			
-			// aapt resource value: 0x7f01006f
-			public const int actionBarTabTextStyle = 2130772079;
-			
-			// aapt resource value: 0x7f010075
-			public const int actionBarTheme = 2130772085;
-			
-			// aapt resource value: 0x7f010076
-			public const int actionBarWidgetTheme = 2130772086;
-			
-			// aapt resource value: 0x7f010092
-			public const int actionButtonStyle = 2130772114;
-			
-			// aapt resource value: 0x7f01008e
-			public const int actionDropDownStyle = 2130772110;
-			
-			// aapt resource value: 0x7f0100e0
-			public const int actionLayout = 2130772192;
-			
-			// aapt resource value: 0x7f01007a
-			public const int actionMenuTextAppearance = 2130772090;
+			// aapt resource value: 0x7f01001e
+			public const int MediaRouteControllerWindowBackground = 2130771998;
 			
 			// aapt resource value: 0x7f01007b
-			public const int actionMenuTextColor = 2130772091;
-			
-			// aapt resource value: 0x7f01007e
-			public const int actionModeBackground = 2130772094;
-			
-			// aapt resource value: 0x7f01007d
-			public const int actionModeCloseButtonStyle = 2130772093;
-			
-			// aapt resource value: 0x7f010080
-			public const int actionModeCloseDrawable = 2130772096;
-			
-			// aapt resource value: 0x7f010082
-			public const int actionModeCopyDrawable = 2130772098;
-			
-			// aapt resource value: 0x7f010081
-			public const int actionModeCutDrawable = 2130772097;
-			
-			// aapt resource value: 0x7f010086
-			public const int actionModeFindDrawable = 2130772102;
-			
-			// aapt resource value: 0x7f010083
-			public const int actionModePasteDrawable = 2130772099;
-			
-			// aapt resource value: 0x7f010088
-			public const int actionModePopupWindowStyle = 2130772104;
-			
-			// aapt resource value: 0x7f010084
-			public const int actionModeSelectAllDrawable = 2130772100;
-			
-			// aapt resource value: 0x7f010085
-			public const int actionModeShareDrawable = 2130772101;
-			
-			// aapt resource value: 0x7f01007f
-			public const int actionModeSplitBackground = 2130772095;
+			public const int actionBarDivider = 2130772091;
 			
 			// aapt resource value: 0x7f01007c
-			public const int actionModeStyle = 2130772092;
+			public const int actionBarItemBackground = 2130772092;
 			
-			// aapt resource value: 0x7f010087
-			public const int actionModeWebSearchDrawable = 2130772103;
+			// aapt resource value: 0x7f010075
+			public const int actionBarPopupTheme = 2130772085;
 			
-			// aapt resource value: 0x7f010070
-			public const int actionOverflowButtonStyle = 2130772080;
+			// aapt resource value: 0x7f01007a
+			public const int actionBarSize = 2130772090;
+			
+			// aapt resource value: 0x7f010077
+			public const int actionBarSplitStyle = 2130772087;
+			
+			// aapt resource value: 0x7f010076
+			public const int actionBarStyle = 2130772086;
 			
 			// aapt resource value: 0x7f010071
-			public const int actionOverflowMenuStyle = 2130772081;
+			public const int actionBarTabBarStyle = 2130772081;
 			
-			// aapt resource value: 0x7f0100e2
-			public const int actionProviderClass = 2130772194;
+			// aapt resource value: 0x7f010070
+			public const int actionBarTabStyle = 2130772080;
 			
-			// aapt resource value: 0x7f0100e1
-			public const int actionViewClass = 2130772193;
+			// aapt resource value: 0x7f010072
+			public const int actionBarTabTextStyle = 2130772082;
 			
-			// aapt resource value: 0x7f01009a
-			public const int activityChooserViewStyle = 2130772122;
+			// aapt resource value: 0x7f010078
+			public const int actionBarTheme = 2130772088;
 			
-			// aapt resource value: 0x7f0100bd
-			public const int alertDialogButtonGroupStyle = 2130772157;
+			// aapt resource value: 0x7f010079
+			public const int actionBarWidgetTheme = 2130772089;
 			
-			// aapt resource value: 0x7f0100be
-			public const int alertDialogCenterButtons = 2130772158;
+			// aapt resource value: 0x7f010095
+			public const int actionButtonStyle = 2130772117;
 			
-			// aapt resource value: 0x7f0100bc
-			public const int alertDialogStyle = 2130772156;
+			// aapt resource value: 0x7f010091
+			public const int actionDropDownStyle = 2130772113;
+			
+			// aapt resource value: 0x7f0100e3
+			public const int actionLayout = 2130772195;
+			
+			// aapt resource value: 0x7f01007d
+			public const int actionMenuTextAppearance = 2130772093;
+			
+			// aapt resource value: 0x7f01007e
+			public const int actionMenuTextColor = 2130772094;
+			
+			// aapt resource value: 0x7f010081
+			public const int actionModeBackground = 2130772097;
+			
+			// aapt resource value: 0x7f010080
+			public const int actionModeCloseButtonStyle = 2130772096;
+			
+			// aapt resource value: 0x7f010083
+			public const int actionModeCloseDrawable = 2130772099;
+			
+			// aapt resource value: 0x7f010085
+			public const int actionModeCopyDrawable = 2130772101;
+			
+			// aapt resource value: 0x7f010084
+			public const int actionModeCutDrawable = 2130772100;
+			
+			// aapt resource value: 0x7f010089
+			public const int actionModeFindDrawable = 2130772105;
+			
+			// aapt resource value: 0x7f010086
+			public const int actionModePasteDrawable = 2130772102;
+			
+			// aapt resource value: 0x7f01008b
+			public const int actionModePopupWindowStyle = 2130772107;
+			
+			// aapt resource value: 0x7f010087
+			public const int actionModeSelectAllDrawable = 2130772103;
+			
+			// aapt resource value: 0x7f010088
+			public const int actionModeShareDrawable = 2130772104;
+			
+			// aapt resource value: 0x7f010082
+			public const int actionModeSplitBackground = 2130772098;
+			
+			// aapt resource value: 0x7f01007f
+			public const int actionModeStyle = 2130772095;
+			
+			// aapt resource value: 0x7f01008a
+			public const int actionModeWebSearchDrawable = 2130772106;
+			
+			// aapt resource value: 0x7f010073
+			public const int actionOverflowButtonStyle = 2130772083;
+			
+			// aapt resource value: 0x7f010074
+			public const int actionOverflowMenuStyle = 2130772084;
+			
+			// aapt resource value: 0x7f0100e5
+			public const int actionProviderClass = 2130772197;
+			
+			// aapt resource value: 0x7f0100e4
+			public const int actionViewClass = 2130772196;
+			
+			// aapt resource value: 0x7f01009d
+			public const int activityChooserViewStyle = 2130772125;
+			
+			// aapt resource value: 0x7f010017
+			public const int adSize = 2130771991;
+			
+			// aapt resource value: 0x7f010018
+			public const int adSizes = 2130771992;
+			
+			// aapt resource value: 0x7f010019
+			public const int adUnitId = 2130771993;
+			
+			// aapt resource value: 0x7f0100c0
+			public const int alertDialogButtonGroupStyle = 2130772160;
+			
+			// aapt resource value: 0x7f0100c1
+			public const int alertDialogCenterButtons = 2130772161;
 			
 			// aapt resource value: 0x7f0100bf
-			public const int alertDialogTheme = 2130772159;
+			public const int alertDialogStyle = 2130772159;
 			
-			// aapt resource value: 0x7f0100d1
-			public const int allowStacking = 2130772177;
+			// aapt resource value: 0x7f0100c2
+			public const int alertDialogTheme = 2130772162;
+			
+			// aapt resource value: 0x7f0100d4
+			public const int allowStacking = 2130772180;
 			
 			// aapt resource value: 0x7f010010
 			public const int ambientEnabled = 2130771984;
 			
-			// aapt resource value: 0x7f0100d8
-			public const int arrowHeadLength = 2130772184;
+			// aapt resource value: 0x7f0100db
+			public const int arrowHeadLength = 2130772187;
 			
-			// aapt resource value: 0x7f0100d9
-			public const int arrowShaftLength = 2130772185;
+			// aapt resource value: 0x7f0100dc
+			public const int arrowShaftLength = 2130772188;
 			
-			// aapt resource value: 0x7f0100c4
-			public const int autoCompleteTextViewStyle = 2130772164;
+			// aapt resource value: 0x7f0100c7
+			public const int autoCompleteTextViewStyle = 2130772167;
 			
-			// aapt resource value: 0x7f010049
-			public const int background = 2130772041;
+			// aapt resource value: 0x7f01004c
+			public const int background = 2130772044;
 			
-			// aapt resource value: 0x7f01004b
-			public const int backgroundSplit = 2130772043;
+			// aapt resource value: 0x7f01004e
+			public const int backgroundSplit = 2130772046;
 			
-			// aapt resource value: 0x7f01004a
-			public const int backgroundStacked = 2130772042;
+			// aapt resource value: 0x7f01004d
+			public const int backgroundStacked = 2130772045;
 			
-			// aapt resource value: 0x7f01010c
-			public const int backgroundTint = 2130772236;
+			// aapt resource value: 0x7f01010f
+			public const int backgroundTint = 2130772239;
 			
-			// aapt resource value: 0x7f01010d
-			public const int backgroundTintMode = 2130772237;
+			// aapt resource value: 0x7f010110
+			public const int backgroundTintMode = 2130772240;
 			
-			// aapt resource value: 0x7f0100da
-			public const int barLength = 2130772186;
+			// aapt resource value: 0x7f0100dd
+			public const int barLength = 2130772189;
 			
-			// aapt resource value: 0x7f010112
-			public const int behavior_hideable = 2130772242;
+			// aapt resource value: 0x7f010115
+			public const int behavior_hideable = 2130772245;
 			
-			// aapt resource value: 0x7f010138
-			public const int behavior_overlapTop = 2130772280;
+			// aapt resource value: 0x7f01013b
+			public const int behavior_overlapTop = 2130772283;
 			
-			// aapt resource value: 0x7f010111
-			public const int behavior_peekHeight = 2130772241;
+			// aapt resource value: 0x7f010114
+			public const int behavior_peekHeight = 2130772244;
 			
-			// aapt resource value: 0x7f01012e
-			public const int borderWidth = 2130772270;
+			// aapt resource value: 0x7f010131
+			public const int borderWidth = 2130772273;
+			
+			// aapt resource value: 0x7f01009a
+			public const int borderlessButtonStyle = 2130772122;
+			
+			// aapt resource value: 0x7f01012b
+			public const int bottomSheetDialogTheme = 2130772267;
+			
+			// aapt resource value: 0x7f01012c
+			public const int bottomSheetStyle = 2130772268;
 			
 			// aapt resource value: 0x7f010097
-			public const int borderlessButtonStyle = 2130772119;
+			public const int buttonBarButtonStyle = 2130772119;
 			
-			// aapt resource value: 0x7f010128
-			public const int bottomSheetDialogTheme = 2130772264;
+			// aapt resource value: 0x7f0100c5
+			public const int buttonBarNegativeButtonStyle = 2130772165;
 			
-			// aapt resource value: 0x7f010129
-			public const int bottomSheetStyle = 2130772265;
+			// aapt resource value: 0x7f0100c6
+			public const int buttonBarNeutralButtonStyle = 2130772166;
 			
-			// aapt resource value: 0x7f010094
-			public const int buttonBarButtonStyle = 2130772116;
+			// aapt resource value: 0x7f0100c4
+			public const int buttonBarPositiveButtonStyle = 2130772164;
 			
-			// aapt resource value: 0x7f0100c2
-			public const int buttonBarNegativeButtonStyle = 2130772162;
+			// aapt resource value: 0x7f010096
+			public const int buttonBarStyle = 2130772118;
 			
-			// aapt resource value: 0x7f0100c3
-			public const int buttonBarNeutralButtonStyle = 2130772163;
-			
-			// aapt resource value: 0x7f0100c1
-			public const int buttonBarPositiveButtonStyle = 2130772161;
-			
-			// aapt resource value: 0x7f010093
-			public const int buttonBarStyle = 2130772115;
-			
-			// aapt resource value: 0x7f01005c
-			public const int buttonPanelSideLayout = 2130772060;
+			// aapt resource value: 0x7f01005f
+			public const int buttonPanelSideLayout = 2130772063;
 			
 			// aapt resource value: 0x7f010014
 			public const int buttonSize = 2130771988;
 			
-			// aapt resource value: 0x7f0100c5
-			public const int buttonStyle = 2130772165;
+			// aapt resource value: 0x7f0100c8
+			public const int buttonStyle = 2130772168;
 			
-			// aapt resource value: 0x7f0100c6
-			public const int buttonStyleSmall = 2130772166;
+			// aapt resource value: 0x7f0100c9
+			public const int buttonStyleSmall = 2130772169;
 			
-			// aapt resource value: 0x7f0100d2
-			public const int buttonTint = 2130772178;
+			// aapt resource value: 0x7f0100d5
+			public const int buttonTint = 2130772181;
 			
-			// aapt resource value: 0x7f0100d3
-			public const int buttonTintMode = 2130772179;
+			// aapt resource value: 0x7f0100d6
+			public const int buttonTintMode = 2130772182;
 			
 			// aapt resource value: 0x7f010001
 			public const int cameraBearing = 2130771969;
@@ -328,257 +2166,257 @@ namespace BookAStar.Droid
 			// aapt resource value: 0x7f010005
 			public const int cameraZoom = 2130771973;
 			
-			// aapt resource value: 0x7f010032
-			public const int cardBackgroundColor = 2130772018;
-			
-			// aapt resource value: 0x7f010033
-			public const int cardCornerRadius = 2130772019;
-			
-			// aapt resource value: 0x7f010034
-			public const int cardElevation = 2130772020;
-			
 			// aapt resource value: 0x7f010035
-			public const int cardMaxElevation = 2130772021;
-			
-			// aapt resource value: 0x7f010037
-			public const int cardPreventCornerOverlap = 2130772023;
+			public const int cardBackgroundColor = 2130772021;
 			
 			// aapt resource value: 0x7f010036
-			public const int cardUseCompatPadding = 2130772022;
+			public const int cardCornerRadius = 2130772022;
 			
-			// aapt resource value: 0x7f0100c7
-			public const int checkboxStyle = 2130772167;
+			// aapt resource value: 0x7f010037
+			public const int cardElevation = 2130772023;
 			
-			// aapt resource value: 0x7f0100c8
-			public const int checkedTextViewStyle = 2130772168;
+			// aapt resource value: 0x7f010038
+			public const int cardMaxElevation = 2130772024;
+			
+			// aapt resource value: 0x7f01003a
+			public const int cardPreventCornerOverlap = 2130772026;
+			
+			// aapt resource value: 0x7f010039
+			public const int cardUseCompatPadding = 2130772025;
+			
+			// aapt resource value: 0x7f0100ca
+			public const int checkboxStyle = 2130772170;
+			
+			// aapt resource value: 0x7f0100cb
+			public const int checkedTextViewStyle = 2130772171;
 			
 			// aapt resource value: 0x7f010013
 			public const int circleCrop = 2130771987;
 			
-			// aapt resource value: 0x7f0100ea
-			public const int closeIcon = 2130772202;
+			// aapt resource value: 0x7f0100ed
+			public const int closeIcon = 2130772205;
 			
-			// aapt resource value: 0x7f010059
-			public const int closeItemLayout = 2130772057;
+			// aapt resource value: 0x7f01005c
+			public const int closeItemLayout = 2130772060;
 			
-			// aapt resource value: 0x7f010103
-			public const int collapseContentDescription = 2130772227;
+			// aapt resource value: 0x7f010106
+			public const int collapseContentDescription = 2130772230;
 			
-			// aapt resource value: 0x7f010102
-			public const int collapseIcon = 2130772226;
+			// aapt resource value: 0x7f010105
+			public const int collapseIcon = 2130772229;
 			
-			// aapt resource value: 0x7f01011f
-			public const int collapsedTitleGravity = 2130772255;
+			// aapt resource value: 0x7f010122
+			public const int collapsedTitleGravity = 2130772258;
 			
-			// aapt resource value: 0x7f01011b
-			public const int collapsedTitleTextAppearance = 2130772251;
+			// aapt resource value: 0x7f01011e
+			public const int collapsedTitleTextAppearance = 2130772254;
 			
-			// aapt resource value: 0x7f0100d4
-			public const int color = 2130772180;
-			
-			// aapt resource value: 0x7f0100b5
-			public const int colorAccent = 2130772149;
-			
-			// aapt resource value: 0x7f0100b9
-			public const int colorButtonNormal = 2130772153;
-			
-			// aapt resource value: 0x7f0100b7
-			public const int colorControlActivated = 2130772151;
+			// aapt resource value: 0x7f0100d7
+			public const int color = 2130772183;
 			
 			// aapt resource value: 0x7f0100b8
-			public const int colorControlHighlight = 2130772152;
+			public const int colorAccent = 2130772152;
+			
+			// aapt resource value: 0x7f0100bc
+			public const int colorButtonNormal = 2130772156;
+			
+			// aapt resource value: 0x7f0100ba
+			public const int colorControlActivated = 2130772154;
+			
+			// aapt resource value: 0x7f0100bb
+			public const int colorControlHighlight = 2130772155;
+			
+			// aapt resource value: 0x7f0100b9
+			public const int colorControlNormal = 2130772153;
 			
 			// aapt resource value: 0x7f0100b6
-			public const int colorControlNormal = 2130772150;
+			public const int colorPrimary = 2130772150;
 			
-			// aapt resource value: 0x7f0100b3
-			public const int colorPrimary = 2130772147;
-			
-			// aapt resource value: 0x7f0100b4
-			public const int colorPrimaryDark = 2130772148;
+			// aapt resource value: 0x7f0100b7
+			public const int colorPrimaryDark = 2130772151;
 			
 			// aapt resource value: 0x7f010015
 			public const int colorScheme = 2130771989;
 			
-			// aapt resource value: 0x7f0100ba
-			public const int colorSwitchThumbNormal = 2130772154;
+			// aapt resource value: 0x7f0100bd
+			public const int colorSwitchThumbNormal = 2130772157;
 			
-			// aapt resource value: 0x7f0100ef
-			public const int commitIcon = 2130772207;
-			
-			// aapt resource value: 0x7f010054
-			public const int contentInsetEnd = 2130772052;
-			
-			// aapt resource value: 0x7f010055
-			public const int contentInsetLeft = 2130772053;
-			
-			// aapt resource value: 0x7f010056
-			public const int contentInsetRight = 2130772054;
-			
-			// aapt resource value: 0x7f010053
-			public const int contentInsetStart = 2130772051;
-			
-			// aapt resource value: 0x7f010038
-			public const int contentPadding = 2130772024;
-			
-			// aapt resource value: 0x7f01003c
-			public const int contentPaddingBottom = 2130772028;
-			
-			// aapt resource value: 0x7f010039
-			public const int contentPaddingLeft = 2130772025;
-			
-			// aapt resource value: 0x7f01003a
-			public const int contentPaddingRight = 2130772026;
-			
-			// aapt resource value: 0x7f01003b
-			public const int contentPaddingTop = 2130772027;
-			
-			// aapt resource value: 0x7f01011c
-			public const int contentScrim = 2130772252;
-			
-			// aapt resource value: 0x7f0100bb
-			public const int controlBackground = 2130772155;
-			
-			// aapt resource value: 0x7f01014e
-			public const int counterEnabled = 2130772302;
-			
-			// aapt resource value: 0x7f01014f
-			public const int counterMaxLength = 2130772303;
-			
-			// aapt resource value: 0x7f010151
-			public const int counterOverflowTextAppearance = 2130772305;
-			
-			// aapt resource value: 0x7f010150
-			public const int counterTextAppearance = 2130772304;
-			
-			// aapt resource value: 0x7f01004c
-			public const int customNavigationLayout = 2130772044;
-			
-			// aapt resource value: 0x7f0100e9
-			public const int defaultQueryHint = 2130772201;
-			
-			// aapt resource value: 0x7f01008c
-			public const int dialogPreferredPadding = 2130772108;
-			
-			// aapt resource value: 0x7f01008b
-			public const int dialogTheme = 2130772107;
-			
-			// aapt resource value: 0x7f010042
-			public const int displayOptions = 2130772034;
-			
-			// aapt resource value: 0x7f010048
-			public const int divider = 2130772040;
-			
-			// aapt resource value: 0x7f010099
-			public const int dividerHorizontal = 2130772121;
-			
-			// aapt resource value: 0x7f0100de
-			public const int dividerPadding = 2130772190;
-			
-			// aapt resource value: 0x7f010098
-			public const int dividerVertical = 2130772120;
-			
-			// aapt resource value: 0x7f0100d6
-			public const int drawableSize = 2130772182;
-			
-			// aapt resource value: 0x7f01003d
-			public const int drawerArrowStyle = 2130772029;
-			
-			// aapt resource value: 0x7f0100ab
-			public const int dropDownListViewStyle = 2130772139;
-			
-			// aapt resource value: 0x7f01008f
-			public const int dropdownListPreferredItemHeight = 2130772111;
-			
-			// aapt resource value: 0x7f0100a0
-			public const int editTextBackground = 2130772128;
-			
-			// aapt resource value: 0x7f01009f
-			public const int editTextColor = 2130772127;
-			
-			// aapt resource value: 0x7f0100c9
-			public const int editTextStyle = 2130772169;
+			// aapt resource value: 0x7f0100f2
+			public const int commitIcon = 2130772210;
 			
 			// aapt resource value: 0x7f010057
-			public const int elevation = 2130772055;
+			public const int contentInsetEnd = 2130772055;
 			
-			// aapt resource value: 0x7f01014c
-			public const int errorEnabled = 2130772300;
+			// aapt resource value: 0x7f010058
+			public const int contentInsetLeft = 2130772056;
 			
-			// aapt resource value: 0x7f01014d
-			public const int errorTextAppearance = 2130772301;
+			// aapt resource value: 0x7f010059
+			public const int contentInsetRight = 2130772057;
 			
-			// aapt resource value: 0x7f01005b
-			public const int expandActivityOverflowButtonDrawable = 2130772059;
+			// aapt resource value: 0x7f010056
+			public const int contentInsetStart = 2130772054;
 			
-			// aapt resource value: 0x7f01010e
-			public const int expanded = 2130772238;
+			// aapt resource value: 0x7f01003b
+			public const int contentPadding = 2130772027;
 			
-			// aapt resource value: 0x7f010120
-			public const int expandedTitleGravity = 2130772256;
+			// aapt resource value: 0x7f01003f
+			public const int contentPaddingBottom = 2130772031;
 			
-			// aapt resource value: 0x7f010115
-			public const int expandedTitleMargin = 2130772245;
+			// aapt resource value: 0x7f01003c
+			public const int contentPaddingLeft = 2130772028;
 			
-			// aapt resource value: 0x7f010119
-			public const int expandedTitleMarginBottom = 2130772249;
-			
-			// aapt resource value: 0x7f010118
-			public const int expandedTitleMarginEnd = 2130772248;
-			
-			// aapt resource value: 0x7f010116
-			public const int expandedTitleMarginStart = 2130772246;
-			
-			// aapt resource value: 0x7f010117
-			public const int expandedTitleMarginTop = 2130772247;
-			
-			// aapt resource value: 0x7f01011a
-			public const int expandedTitleTextAppearance = 2130772250;
-			
-			// aapt resource value: 0x7f010031
-			public const int externalRouteEnabledDrawable = 2130772017;
-			
-			// aapt resource value: 0x7f01012c
-			public const int fabSize = 2130772268;
-			
-			// aapt resource value: 0x7f010130
-			public const int foregroundInsidePadding = 2130772272;
-			
-			// aapt resource value: 0x7f0100d7
-			public const int gapBetweenBars = 2130772183;
-			
-			// aapt resource value: 0x7f0100eb
-			public const int goIcon = 2130772203;
-			
-			// aapt resource value: 0x7f010136
-			public const int headerLayout = 2130772278;
+			// aapt resource value: 0x7f01003d
+			public const int contentPaddingRight = 2130772029;
 			
 			// aapt resource value: 0x7f01003e
-			public const int height = 2130772030;
+			public const int contentPaddingTop = 2130772030;
 			
-			// aapt resource value: 0x7f010052
-			public const int hideOnContentScroll = 2130772050;
+			// aapt resource value: 0x7f01011f
+			public const int contentScrim = 2130772255;
+			
+			// aapt resource value: 0x7f0100be
+			public const int controlBackground = 2130772158;
+			
+			// aapt resource value: 0x7f010151
+			public const int counterEnabled = 2130772305;
 			
 			// aapt resource value: 0x7f010152
-			public const int hintAnimationEnabled = 2130772306;
+			public const int counterMaxLength = 2130772306;
 			
-			// aapt resource value: 0x7f01014b
-			public const int hintEnabled = 2130772299;
+			// aapt resource value: 0x7f010154
+			public const int counterOverflowTextAppearance = 2130772308;
 			
-			// aapt resource value: 0x7f01014a
-			public const int hintTextAppearance = 2130772298;
+			// aapt resource value: 0x7f010153
+			public const int counterTextAppearance = 2130772307;
 			
-			// aapt resource value: 0x7f010091
-			public const int homeAsUpIndicator = 2130772113;
+			// aapt resource value: 0x7f01004f
+			public const int customNavigationLayout = 2130772047;
 			
-			// aapt resource value: 0x7f01004d
-			public const int homeLayout = 2130772045;
+			// aapt resource value: 0x7f0100ec
+			public const int defaultQueryHint = 2130772204;
 			
-			// aapt resource value: 0x7f010046
-			public const int icon = 2130772038;
+			// aapt resource value: 0x7f01008f
+			public const int dialogPreferredPadding = 2130772111;
 			
-			// aapt resource value: 0x7f0100e7
-			public const int iconifiedByDefault = 2130772199;
+			// aapt resource value: 0x7f01008e
+			public const int dialogTheme = 2130772110;
+			
+			// aapt resource value: 0x7f010045
+			public const int displayOptions = 2130772037;
+			
+			// aapt resource value: 0x7f01004b
+			public const int divider = 2130772043;
+			
+			// aapt resource value: 0x7f01009c
+			public const int dividerHorizontal = 2130772124;
+			
+			// aapt resource value: 0x7f0100e1
+			public const int dividerPadding = 2130772193;
+			
+			// aapt resource value: 0x7f01009b
+			public const int dividerVertical = 2130772123;
+			
+			// aapt resource value: 0x7f0100d9
+			public const int drawableSize = 2130772185;
+			
+			// aapt resource value: 0x7f010040
+			public const int drawerArrowStyle = 2130772032;
+			
+			// aapt resource value: 0x7f0100ae
+			public const int dropDownListViewStyle = 2130772142;
+			
+			// aapt resource value: 0x7f010092
+			public const int dropdownListPreferredItemHeight = 2130772114;
+			
+			// aapt resource value: 0x7f0100a3
+			public const int editTextBackground = 2130772131;
+			
+			// aapt resource value: 0x7f0100a2
+			public const int editTextColor = 2130772130;
+			
+			// aapt resource value: 0x7f0100cc
+			public const int editTextStyle = 2130772172;
+			
+			// aapt resource value: 0x7f01005a
+			public const int elevation = 2130772058;
+			
+			// aapt resource value: 0x7f01014f
+			public const int errorEnabled = 2130772303;
+			
+			// aapt resource value: 0x7f010150
+			public const int errorTextAppearance = 2130772304;
+			
+			// aapt resource value: 0x7f01005e
+			public const int expandActivityOverflowButtonDrawable = 2130772062;
+			
+			// aapt resource value: 0x7f010111
+			public const int expanded = 2130772241;
+			
+			// aapt resource value: 0x7f010123
+			public const int expandedTitleGravity = 2130772259;
+			
+			// aapt resource value: 0x7f010118
+			public const int expandedTitleMargin = 2130772248;
+			
+			// aapt resource value: 0x7f01011c
+			public const int expandedTitleMarginBottom = 2130772252;
+			
+			// aapt resource value: 0x7f01011b
+			public const int expandedTitleMarginEnd = 2130772251;
+			
+			// aapt resource value: 0x7f010119
+			public const int expandedTitleMarginStart = 2130772249;
+			
+			// aapt resource value: 0x7f01011a
+			public const int expandedTitleMarginTop = 2130772250;
+			
+			// aapt resource value: 0x7f01011d
+			public const int expandedTitleTextAppearance = 2130772253;
+			
+			// aapt resource value: 0x7f010034
+			public const int externalRouteEnabledDrawable = 2130772020;
+			
+			// aapt resource value: 0x7f01012f
+			public const int fabSize = 2130772271;
+			
+			// aapt resource value: 0x7f010133
+			public const int foregroundInsidePadding = 2130772275;
+			
+			// aapt resource value: 0x7f0100da
+			public const int gapBetweenBars = 2130772186;
+			
+			// aapt resource value: 0x7f0100ee
+			public const int goIcon = 2130772206;
+			
+			// aapt resource value: 0x7f010139
+			public const int headerLayout = 2130772281;
+			
+			// aapt resource value: 0x7f010041
+			public const int height = 2130772033;
+			
+			// aapt resource value: 0x7f010055
+			public const int hideOnContentScroll = 2130772053;
+			
+			// aapt resource value: 0x7f010155
+			public const int hintAnimationEnabled = 2130772309;
+			
+			// aapt resource value: 0x7f01014e
+			public const int hintEnabled = 2130772302;
+			
+			// aapt resource value: 0x7f01014d
+			public const int hintTextAppearance = 2130772301;
+			
+			// aapt resource value: 0x7f010094
+			public const int homeAsUpIndicator = 2130772116;
+			
+			// aapt resource value: 0x7f010050
+			public const int homeLayout = 2130772048;
+			
+			// aapt resource value: 0x7f010049
+			public const int icon = 2130772041;
+			
+			// aapt resource value: 0x7f0100ea
+			public const int iconifiedByDefault = 2130772202;
 			
 			// aapt resource value: 0x7f010012
 			public const int imageAspectRatio = 2130771986;
@@ -586,482 +2424,482 @@ namespace BookAStar.Droid
 			// aapt resource value: 0x7f010011
 			public const int imageAspectRatioAdjust = 2130771985;
 			
-			// aapt resource value: 0x7f0100a1
-			public const int imageButtonStyle = 2130772129;
+			// aapt resource value: 0x7f0100a4
+			public const int imageButtonStyle = 2130772132;
 			
-			// aapt resource value: 0x7f01004f
-			public const int indeterminateProgressStyle = 2130772047;
-			
-			// aapt resource value: 0x7f01005a
-			public const int initialActivityCount = 2130772058;
-			
-			// aapt resource value: 0x7f010137
-			public const int insetForeground = 2130772279;
-			
-			// aapt resource value: 0x7f01003f
-			public const int isLightTheme = 2130772031;
-			
-			// aapt resource value: 0x7f010134
-			public const int itemBackground = 2130772276;
-			
-			// aapt resource value: 0x7f010132
-			public const int itemIconTint = 2130772274;
-			
-			// aapt resource value: 0x7f010051
-			public const int itemPadding = 2130772049;
-			
-			// aapt resource value: 0x7f010135
-			public const int itemTextAppearance = 2130772277;
-			
-			// aapt resource value: 0x7f010133
-			public const int itemTextColor = 2130772275;
-			
-			// aapt resource value: 0x7f010122
-			public const int keylines = 2130772258;
-			
-			// aapt resource value: 0x7f0100e6
-			public const int layout = 2130772198;
-			
-			// aapt resource value: 0x7f010017
-			public const int layoutManager = 2130771991;
-			
-			// aapt resource value: 0x7f010125
-			public const int layout_anchor = 2130772261;
-			
-			// aapt resource value: 0x7f010127
-			public const int layout_anchorGravity = 2130772263;
-			
-			// aapt resource value: 0x7f010124
-			public const int layout_behavior = 2130772260;
-			
-			// aapt resource value: 0x7f010113
-			public const int layout_collapseMode = 2130772243;
-			
-			// aapt resource value: 0x7f010114
-			public const int layout_collapseParallaxMultiplier = 2130772244;
-			
-			// aapt resource value: 0x7f010126
-			public const int layout_keyline = 2130772262;
-			
-			// aapt resource value: 0x7f01010f
-			public const int layout_scrollFlags = 2130772239;
-			
-			// aapt resource value: 0x7f010110
-			public const int layout_scrollInterpolator = 2130772240;
-			
-			// aapt resource value: 0x7f0100b2
-			public const int listChoiceBackgroundIndicator = 2130772146;
-			
-			// aapt resource value: 0x7f01008d
-			public const int listDividerAlertDialog = 2130772109;
-			
-			// aapt resource value: 0x7f010060
-			public const int listItemLayout = 2130772064;
+			// aapt resource value: 0x7f010052
+			public const int indeterminateProgressStyle = 2130772050;
 			
 			// aapt resource value: 0x7f01005d
-			public const int listLayout = 2130772061;
+			public const int initialActivityCount = 2130772061;
 			
-			// aapt resource value: 0x7f0100ac
-			public const int listPopupWindowStyle = 2130772140;
+			// aapt resource value: 0x7f01013a
+			public const int insetForeground = 2130772282;
 			
-			// aapt resource value: 0x7f0100a6
-			public const int listPreferredItemHeight = 2130772134;
+			// aapt resource value: 0x7f010042
+			public const int isLightTheme = 2130772034;
 			
-			// aapt resource value: 0x7f0100a8
-			public const int listPreferredItemHeightLarge = 2130772136;
+			// aapt resource value: 0x7f010137
+			public const int itemBackground = 2130772279;
 			
-			// aapt resource value: 0x7f0100a7
-			public const int listPreferredItemHeightSmall = 2130772135;
+			// aapt resource value: 0x7f010135
+			public const int itemIconTint = 2130772277;
+			
+			// aapt resource value: 0x7f010054
+			public const int itemPadding = 2130772052;
+			
+			// aapt resource value: 0x7f010138
+			public const int itemTextAppearance = 2130772280;
+			
+			// aapt resource value: 0x7f010136
+			public const int itemTextColor = 2130772278;
+			
+			// aapt resource value: 0x7f010125
+			public const int keylines = 2130772261;
+			
+			// aapt resource value: 0x7f0100e9
+			public const int layout = 2130772201;
+			
+			// aapt resource value: 0x7f01001a
+			public const int layoutManager = 2130771994;
+			
+			// aapt resource value: 0x7f010128
+			public const int layout_anchor = 2130772264;
+			
+			// aapt resource value: 0x7f01012a
+			public const int layout_anchorGravity = 2130772266;
+			
+			// aapt resource value: 0x7f010127
+			public const int layout_behavior = 2130772263;
+			
+			// aapt resource value: 0x7f010116
+			public const int layout_collapseMode = 2130772246;
+			
+			// aapt resource value: 0x7f010117
+			public const int layout_collapseParallaxMultiplier = 2130772247;
+			
+			// aapt resource value: 0x7f010129
+			public const int layout_keyline = 2130772265;
+			
+			// aapt resource value: 0x7f010112
+			public const int layout_scrollFlags = 2130772242;
+			
+			// aapt resource value: 0x7f010113
+			public const int layout_scrollInterpolator = 2130772243;
+			
+			// aapt resource value: 0x7f0100b5
+			public const int listChoiceBackgroundIndicator = 2130772149;
+			
+			// aapt resource value: 0x7f010090
+			public const int listDividerAlertDialog = 2130772112;
+			
+			// aapt resource value: 0x7f010063
+			public const int listItemLayout = 2130772067;
+			
+			// aapt resource value: 0x7f010060
+			public const int listLayout = 2130772064;
+			
+			// aapt resource value: 0x7f0100af
+			public const int listPopupWindowStyle = 2130772143;
 			
 			// aapt resource value: 0x7f0100a9
-			public const int listPreferredItemPaddingLeft = 2130772137;
+			public const int listPreferredItemHeight = 2130772137;
+			
+			// aapt resource value: 0x7f0100ab
+			public const int listPreferredItemHeightLarge = 2130772139;
 			
 			// aapt resource value: 0x7f0100aa
-			public const int listPreferredItemPaddingRight = 2130772138;
+			public const int listPreferredItemHeightSmall = 2130772138;
+			
+			// aapt resource value: 0x7f0100ac
+			public const int listPreferredItemPaddingLeft = 2130772140;
+			
+			// aapt resource value: 0x7f0100ad
+			public const int listPreferredItemPaddingRight = 2130772141;
 			
 			// aapt resource value: 0x7f010006
 			public const int liteMode = 2130771974;
 			
-			// aapt resource value: 0x7f010047
-			public const int logo = 2130772039;
+			// aapt resource value: 0x7f01004a
+			public const int logo = 2130772042;
 			
-			// aapt resource value: 0x7f010106
-			public const int logoDescription = 2130772230;
+			// aapt resource value: 0x7f010109
+			public const int logoDescription = 2130772233;
 			
 			// aapt resource value: 0x7f010000
 			public const int mapType = 2130771968;
 			
-			// aapt resource value: 0x7f010139
-			public const int maxActionInlineWidth = 2130772281;
-			
-			// aapt resource value: 0x7f010101
-			public const int maxButtonHeight = 2130772225;
-			
-			// aapt resource value: 0x7f0100dc
-			public const int measureWithLargestChild = 2130772188;
-			
-			// aapt resource value: 0x7f01001c
-			public const int mediaRouteAudioTrackDrawable = 2130771996;
-			
-			// aapt resource value: 0x7f01001d
-			public const int mediaRouteBluetoothIconDrawable = 2130771997;
-			
-			// aapt resource value: 0x7f01001e
-			public const int mediaRouteButtonStyle = 2130771998;
-			
-			// aapt resource value: 0x7f01001f
-			public const int mediaRouteCastDrawable = 2130771999;
-			
-			// aapt resource value: 0x7f010020
-			public const int mediaRouteChooserPrimaryTextStyle = 2130772000;
-			
-			// aapt resource value: 0x7f010021
-			public const int mediaRouteChooserSecondaryTextStyle = 2130772001;
-			
-			// aapt resource value: 0x7f010022
-			public const int mediaRouteCloseDrawable = 2130772002;
-			
-			// aapt resource value: 0x7f010023
-			public const int mediaRouteCollapseGroupDrawable = 2130772003;
-			
-			// aapt resource value: 0x7f010024
-			public const int mediaRouteConnectingDrawable = 2130772004;
-			
-			// aapt resource value: 0x7f010025
-			public const int mediaRouteControllerPrimaryTextStyle = 2130772005;
-			
-			// aapt resource value: 0x7f010026
-			public const int mediaRouteControllerSecondaryTextStyle = 2130772006;
-			
-			// aapt resource value: 0x7f010027
-			public const int mediaRouteControllerTitleTextStyle = 2130772007;
-			
-			// aapt resource value: 0x7f010028
-			public const int mediaRouteDefaultIconDrawable = 2130772008;
-			
-			// aapt resource value: 0x7f010029
-			public const int mediaRouteExpandGroupDrawable = 2130772009;
-			
-			// aapt resource value: 0x7f01002a
-			public const int mediaRouteOffDrawable = 2130772010;
-			
-			// aapt resource value: 0x7f01002b
-			public const int mediaRouteOnDrawable = 2130772011;
-			
-			// aapt resource value: 0x7f01002c
-			public const int mediaRoutePauseDrawable = 2130772012;
-			
-			// aapt resource value: 0x7f01002d
-			public const int mediaRoutePlayDrawable = 2130772013;
-			
-			// aapt resource value: 0x7f01002e
-			public const int mediaRouteSpeakerGroupIconDrawable = 2130772014;
-			
-			// aapt resource value: 0x7f01002f
-			public const int mediaRouteSpeakerIconDrawable = 2130772015;
-			
-			// aapt resource value: 0x7f010030
-			public const int mediaRouteTvIconDrawable = 2130772016;
-			
-			// aapt resource value: 0x7f010131
-			public const int menu = 2130772273;
-			
-			// aapt resource value: 0x7f01005e
-			public const int multiChoiceItemLayout = 2130772062;
-			
-			// aapt resource value: 0x7f010105
-			public const int navigationContentDescription = 2130772229;
+			// aapt resource value: 0x7f01013c
+			public const int maxActionInlineWidth = 2130772284;
 			
 			// aapt resource value: 0x7f010104
-			public const int navigationIcon = 2130772228;
+			public const int maxButtonHeight = 2130772228;
 			
-			// aapt resource value: 0x7f010041
-			public const int navigationMode = 2130772033;
+			// aapt resource value: 0x7f0100df
+			public const int measureWithLargestChild = 2130772191;
 			
-			// aapt resource value: 0x7f0100e4
-			public const int overlapAnchor = 2130772196;
+			// aapt resource value: 0x7f01001f
+			public const int mediaRouteAudioTrackDrawable = 2130771999;
 			
-			// aapt resource value: 0x7f01010a
-			public const int paddingEnd = 2130772234;
+			// aapt resource value: 0x7f010020
+			public const int mediaRouteBluetoothIconDrawable = 2130772000;
 			
-			// aapt resource value: 0x7f010109
-			public const int paddingStart = 2130772233;
+			// aapt resource value: 0x7f010021
+			public const int mediaRouteButtonStyle = 2130772001;
 			
-			// aapt resource value: 0x7f0100af
-			public const int panelBackground = 2130772143;
+			// aapt resource value: 0x7f010022
+			public const int mediaRouteCastDrawable = 2130772002;
 			
-			// aapt resource value: 0x7f0100b1
-			public const int panelMenuListTheme = 2130772145;
+			// aapt resource value: 0x7f010023
+			public const int mediaRouteChooserPrimaryTextStyle = 2130772003;
 			
-			// aapt resource value: 0x7f0100b0
-			public const int panelMenuListWidth = 2130772144;
+			// aapt resource value: 0x7f010024
+			public const int mediaRouteChooserSecondaryTextStyle = 2130772004;
 			
-			// aapt resource value: 0x7f01009d
-			public const int popupMenuStyle = 2130772125;
+			// aapt resource value: 0x7f010025
+			public const int mediaRouteCloseDrawable = 2130772005;
 			
-			// aapt resource value: 0x7f010058
-			public const int popupTheme = 2130772056;
+			// aapt resource value: 0x7f010026
+			public const int mediaRouteCollapseGroupDrawable = 2130772006;
 			
-			// aapt resource value: 0x7f01009e
-			public const int popupWindowStyle = 2130772126;
+			// aapt resource value: 0x7f010027
+			public const int mediaRouteConnectingDrawable = 2130772007;
 			
-			// aapt resource value: 0x7f0100e3
-			public const int preserveIconSpacing = 2130772195;
+			// aapt resource value: 0x7f010028
+			public const int mediaRouteControllerPrimaryTextStyle = 2130772008;
 			
-			// aapt resource value: 0x7f01012d
-			public const int pressedTranslationZ = 2130772269;
+			// aapt resource value: 0x7f010029
+			public const int mediaRouteControllerSecondaryTextStyle = 2130772009;
 			
-			// aapt resource value: 0x7f010050
-			public const int progressBarPadding = 2130772048;
+			// aapt resource value: 0x7f01002a
+			public const int mediaRouteControllerTitleTextStyle = 2130772010;
 			
-			// aapt resource value: 0x7f01004e
-			public const int progressBarStyle = 2130772046;
+			// aapt resource value: 0x7f01002b
+			public const int mediaRouteDefaultIconDrawable = 2130772011;
 			
-			// aapt resource value: 0x7f0100f1
-			public const int queryBackground = 2130772209;
+			// aapt resource value: 0x7f01002c
+			public const int mediaRouteExpandGroupDrawable = 2130772012;
 			
-			// aapt resource value: 0x7f0100e8
-			public const int queryHint = 2130772200;
+			// aapt resource value: 0x7f01002d
+			public const int mediaRouteOffDrawable = 2130772013;
 			
-			// aapt resource value: 0x7f0100ca
-			public const int radioButtonStyle = 2130772170;
+			// aapt resource value: 0x7f01002e
+			public const int mediaRouteOnDrawable = 2130772014;
 			
-			// aapt resource value: 0x7f0100cb
-			public const int ratingBarStyle = 2130772171;
+			// aapt resource value: 0x7f01002f
+			public const int mediaRoutePauseDrawable = 2130772015;
 			
-			// aapt resource value: 0x7f0100cc
-			public const int ratingBarStyleIndicator = 2130772172;
+			// aapt resource value: 0x7f010030
+			public const int mediaRoutePlayDrawable = 2130772016;
+			
+			// aapt resource value: 0x7f010031
+			public const int mediaRouteSpeakerGroupIconDrawable = 2130772017;
+			
+			// aapt resource value: 0x7f010032
+			public const int mediaRouteSpeakerIconDrawable = 2130772018;
+			
+			// aapt resource value: 0x7f010033
+			public const int mediaRouteTvIconDrawable = 2130772019;
+			
+			// aapt resource value: 0x7f010134
+			public const int menu = 2130772276;
+			
+			// aapt resource value: 0x7f010061
+			public const int multiChoiceItemLayout = 2130772065;
+			
+			// aapt resource value: 0x7f010108
+			public const int navigationContentDescription = 2130772232;
+			
+			// aapt resource value: 0x7f010107
+			public const int navigationIcon = 2130772231;
+			
+			// aapt resource value: 0x7f010044
+			public const int navigationMode = 2130772036;
+			
+			// aapt resource value: 0x7f0100e7
+			public const int overlapAnchor = 2130772199;
+			
+			// aapt resource value: 0x7f01010d
+			public const int paddingEnd = 2130772237;
+			
+			// aapt resource value: 0x7f01010c
+			public const int paddingStart = 2130772236;
+			
+			// aapt resource value: 0x7f0100b2
+			public const int panelBackground = 2130772146;
+			
+			// aapt resource value: 0x7f0100b4
+			public const int panelMenuListTheme = 2130772148;
+			
+			// aapt resource value: 0x7f0100b3
+			public const int panelMenuListWidth = 2130772147;
+			
+			// aapt resource value: 0x7f0100a0
+			public const int popupMenuStyle = 2130772128;
+			
+			// aapt resource value: 0x7f01005b
+			public const int popupTheme = 2130772059;
+			
+			// aapt resource value: 0x7f0100a1
+			public const int popupWindowStyle = 2130772129;
+			
+			// aapt resource value: 0x7f0100e6
+			public const int preserveIconSpacing = 2130772198;
+			
+			// aapt resource value: 0x7f010130
+			public const int pressedTranslationZ = 2130772272;
+			
+			// aapt resource value: 0x7f010053
+			public const int progressBarPadding = 2130772051;
+			
+			// aapt resource value: 0x7f010051
+			public const int progressBarStyle = 2130772049;
+			
+			// aapt resource value: 0x7f0100f4
+			public const int queryBackground = 2130772212;
+			
+			// aapt resource value: 0x7f0100eb
+			public const int queryHint = 2130772203;
 			
 			// aapt resource value: 0x7f0100cd
-			public const int ratingBarStyleSmall = 2130772173;
+			public const int radioButtonStyle = 2130772173;
 			
-			// aapt resource value: 0x7f010019
-			public const int reverseLayout = 2130771993;
+			// aapt resource value: 0x7f0100ce
+			public const int ratingBarStyle = 2130772174;
 			
-			// aapt resource value: 0x7f01012b
-			public const int rippleColor = 2130772267;
+			// aapt resource value: 0x7f0100cf
+			public const int ratingBarStyleIndicator = 2130772175;
+			
+			// aapt resource value: 0x7f0100d0
+			public const int ratingBarStyleSmall = 2130772176;
+			
+			// aapt resource value: 0x7f01001c
+			public const int reverseLayout = 2130771996;
+			
+			// aapt resource value: 0x7f01012e
+			public const int rippleColor = 2130772270;
 			
 			// aapt resource value: 0x7f010016
 			public const int scopeUris = 2130771990;
 			
-			// aapt resource value: 0x7f0100ed
-			public const int searchHintIcon = 2130772205;
-			
-			// aapt resource value: 0x7f0100ec
-			public const int searchIcon = 2130772204;
-			
-			// aapt resource value: 0x7f0100a5
-			public const int searchViewStyle = 2130772133;
-			
-			// aapt resource value: 0x7f0100ce
-			public const int seekBarStyle = 2130772174;
-			
-			// aapt resource value: 0x7f010095
-			public const int selectableItemBackground = 2130772117;
-			
-			// aapt resource value: 0x7f010096
-			public const int selectableItemBackgroundBorderless = 2130772118;
-			
-			// aapt resource value: 0x7f0100df
-			public const int showAsAction = 2130772191;
-			
-			// aapt resource value: 0x7f0100dd
-			public const int showDividers = 2130772189;
-			
-			// aapt resource value: 0x7f0100f9
-			public const int showText = 2130772217;
-			
-			// aapt resource value: 0x7f01005f
-			public const int singleChoiceItemLayout = 2130772063;
-			
-			// aapt resource value: 0x7f010018
-			public const int spanCount = 2130771992;
-			
-			// aapt resource value: 0x7f0100d5
-			public const int spinBars = 2130772181;
-			
-			// aapt resource value: 0x7f010090
-			public const int spinnerDropDownItemStyle = 2130772112;
-			
-			// aapt resource value: 0x7f0100cf
-			public const int spinnerStyle = 2130772175;
-			
-			// aapt resource value: 0x7f0100f8
-			public const int splitTrack = 2130772216;
-			
-			// aapt resource value: 0x7f010061
-			public const int srcCompat = 2130772065;
-			
-			// aapt resource value: 0x7f01001a
-			public const int stackFromEnd = 2130771994;
-			
-			// aapt resource value: 0x7f0100e5
-			public const int state_above_anchor = 2130772197;
-			
-			// aapt resource value: 0x7f010123
-			public const int statusBarBackground = 2130772259;
-			
-			// aapt resource value: 0x7f01011d
-			public const int statusBarScrim = 2130772253;
-			
-			// aapt resource value: 0x7f0100f2
-			public const int submitBackground = 2130772210;
-			
-			// aapt resource value: 0x7f010043
-			public const int subtitle = 2130772035;
-			
-			// aapt resource value: 0x7f0100fb
-			public const int subtitleTextAppearance = 2130772219;
-			
-			// aapt resource value: 0x7f010108
-			public const int subtitleTextColor = 2130772232;
-			
-			// aapt resource value: 0x7f010045
-			public const int subtitleTextStyle = 2130772037;
-			
 			// aapt resource value: 0x7f0100f0
-			public const int suggestionRowLayout = 2130772208;
+			public const int searchHintIcon = 2130772208;
 			
-			// aapt resource value: 0x7f0100f6
-			public const int switchMinWidth = 2130772214;
+			// aapt resource value: 0x7f0100ef
+			public const int searchIcon = 2130772207;
 			
-			// aapt resource value: 0x7f0100f7
-			public const int switchPadding = 2130772215;
+			// aapt resource value: 0x7f0100a8
+			public const int searchViewStyle = 2130772136;
 			
-			// aapt resource value: 0x7f0100d0
-			public const int switchStyle = 2130772176;
+			// aapt resource value: 0x7f0100d1
+			public const int seekBarStyle = 2130772177;
 			
-			// aapt resource value: 0x7f0100f5
-			public const int switchTextAppearance = 2130772213;
+			// aapt resource value: 0x7f010098
+			public const int selectableItemBackground = 2130772120;
 			
-			// aapt resource value: 0x7f01013d
-			public const int tabBackground = 2130772285;
+			// aapt resource value: 0x7f010099
+			public const int selectableItemBackgroundBorderless = 2130772121;
 			
-			// aapt resource value: 0x7f01013c
-			public const int tabContentStart = 2130772284;
+			// aapt resource value: 0x7f0100e2
+			public const int showAsAction = 2130772194;
 			
-			// aapt resource value: 0x7f01013f
-			public const int tabGravity = 2130772287;
-			
-			// aapt resource value: 0x7f01013a
-			public const int tabIndicatorColor = 2130772282;
-			
-			// aapt resource value: 0x7f01013b
-			public const int tabIndicatorHeight = 2130772283;
-			
-			// aapt resource value: 0x7f010141
-			public const int tabMaxWidth = 2130772289;
-			
-			// aapt resource value: 0x7f010140
-			public const int tabMinWidth = 2130772288;
-			
-			// aapt resource value: 0x7f01013e
-			public const int tabMode = 2130772286;
-			
-			// aapt resource value: 0x7f010149
-			public const int tabPadding = 2130772297;
-			
-			// aapt resource value: 0x7f010148
-			public const int tabPaddingBottom = 2130772296;
-			
-			// aapt resource value: 0x7f010147
-			public const int tabPaddingEnd = 2130772295;
-			
-			// aapt resource value: 0x7f010145
-			public const int tabPaddingStart = 2130772293;
-			
-			// aapt resource value: 0x7f010146
-			public const int tabPaddingTop = 2130772294;
-			
-			// aapt resource value: 0x7f010144
-			public const int tabSelectedTextColor = 2130772292;
-			
-			// aapt resource value: 0x7f010142
-			public const int tabTextAppearance = 2130772290;
-			
-			// aapt resource value: 0x7f010143
-			public const int tabTextColor = 2130772291;
-			
-			// aapt resource value: 0x7f010062
-			public const int textAllCaps = 2130772066;
-			
-			// aapt resource value: 0x7f010089
-			public const int textAppearanceLargePopupMenu = 2130772105;
-			
-			// aapt resource value: 0x7f0100ad
-			public const int textAppearanceListItem = 2130772141;
-			
-			// aapt resource value: 0x7f0100ae
-			public const int textAppearanceListItemSmall = 2130772142;
-			
-			// aapt resource value: 0x7f0100a3
-			public const int textAppearanceSearchResultSubtitle = 2130772131;
-			
-			// aapt resource value: 0x7f0100a2
-			public const int textAppearanceSearchResultTitle = 2130772130;
-			
-			// aapt resource value: 0x7f01008a
-			public const int textAppearanceSmallPopupMenu = 2130772106;
-			
-			// aapt resource value: 0x7f0100c0
-			public const int textColorAlertDialogListItem = 2130772160;
-			
-			// aapt resource value: 0x7f01012a
-			public const int textColorError = 2130772266;
-			
-			// aapt resource value: 0x7f0100a4
-			public const int textColorSearchUrl = 2130772132;
-			
-			// aapt resource value: 0x7f01010b
-			public const int theme = 2130772235;
-			
-			// aapt resource value: 0x7f0100db
-			public const int thickness = 2130772187;
-			
-			// aapt resource value: 0x7f0100f4
-			public const int thumbTextPadding = 2130772212;
-			
-			// aapt resource value: 0x7f010040
-			public const int title = 2130772032;
-			
-			// aapt resource value: 0x7f010121
-			public const int titleEnabled = 2130772257;
-			
-			// aapt resource value: 0x7f010100
-			public const int titleMarginBottom = 2130772224;
-			
-			// aapt resource value: 0x7f0100fe
-			public const int titleMarginEnd = 2130772222;
-			
-			// aapt resource value: 0x7f0100fd
-			public const int titleMarginStart = 2130772221;
-			
-			// aapt resource value: 0x7f0100ff
-			public const int titleMarginTop = 2130772223;
+			// aapt resource value: 0x7f0100e0
+			public const int showDividers = 2130772192;
 			
 			// aapt resource value: 0x7f0100fc
-			public const int titleMargins = 2130772220;
+			public const int showText = 2130772220;
 			
-			// aapt resource value: 0x7f0100fa
-			public const int titleTextAppearance = 2130772218;
+			// aapt resource value: 0x7f010062
+			public const int singleChoiceItemLayout = 2130772066;
 			
-			// aapt resource value: 0x7f010107
-			public const int titleTextColor = 2130772231;
+			// aapt resource value: 0x7f01001b
+			public const int spanCount = 2130771995;
 			
-			// aapt resource value: 0x7f010044
-			public const int titleTextStyle = 2130772036;
+			// aapt resource value: 0x7f0100d8
+			public const int spinBars = 2130772184;
 			
-			// aapt resource value: 0x7f01011e
-			public const int toolbarId = 2130772254;
+			// aapt resource value: 0x7f010093
+			public const int spinnerDropDownItemStyle = 2130772115;
 			
-			// aapt resource value: 0x7f01009c
-			public const int toolbarNavigationButtonStyle = 2130772124;
+			// aapt resource value: 0x7f0100d2
+			public const int spinnerStyle = 2130772178;
 			
-			// aapt resource value: 0x7f01009b
-			public const int toolbarStyle = 2130772123;
+			// aapt resource value: 0x7f0100fb
+			public const int splitTrack = 2130772219;
+			
+			// aapt resource value: 0x7f010064
+			public const int srcCompat = 2130772068;
+			
+			// aapt resource value: 0x7f01001d
+			public const int stackFromEnd = 2130771997;
+			
+			// aapt resource value: 0x7f0100e8
+			public const int state_above_anchor = 2130772200;
+			
+			// aapt resource value: 0x7f010126
+			public const int statusBarBackground = 2130772262;
+			
+			// aapt resource value: 0x7f010120
+			public const int statusBarScrim = 2130772256;
+			
+			// aapt resource value: 0x7f0100f5
+			public const int submitBackground = 2130772213;
+			
+			// aapt resource value: 0x7f010046
+			public const int subtitle = 2130772038;
+			
+			// aapt resource value: 0x7f0100fe
+			public const int subtitleTextAppearance = 2130772222;
+			
+			// aapt resource value: 0x7f01010b
+			public const int subtitleTextColor = 2130772235;
+			
+			// aapt resource value: 0x7f010048
+			public const int subtitleTextStyle = 2130772040;
 			
 			// aapt resource value: 0x7f0100f3
-			public const int track = 2130772211;
+			public const int suggestionRowLayout = 2130772211;
+			
+			// aapt resource value: 0x7f0100f9
+			public const int switchMinWidth = 2130772217;
+			
+			// aapt resource value: 0x7f0100fa
+			public const int switchPadding = 2130772218;
+			
+			// aapt resource value: 0x7f0100d3
+			public const int switchStyle = 2130772179;
+			
+			// aapt resource value: 0x7f0100f8
+			public const int switchTextAppearance = 2130772216;
+			
+			// aapt resource value: 0x7f010140
+			public const int tabBackground = 2130772288;
+			
+			// aapt resource value: 0x7f01013f
+			public const int tabContentStart = 2130772287;
+			
+			// aapt resource value: 0x7f010142
+			public const int tabGravity = 2130772290;
+			
+			// aapt resource value: 0x7f01013d
+			public const int tabIndicatorColor = 2130772285;
+			
+			// aapt resource value: 0x7f01013e
+			public const int tabIndicatorHeight = 2130772286;
+			
+			// aapt resource value: 0x7f010144
+			public const int tabMaxWidth = 2130772292;
+			
+			// aapt resource value: 0x7f010143
+			public const int tabMinWidth = 2130772291;
+			
+			// aapt resource value: 0x7f010141
+			public const int tabMode = 2130772289;
+			
+			// aapt resource value: 0x7f01014c
+			public const int tabPadding = 2130772300;
+			
+			// aapt resource value: 0x7f01014b
+			public const int tabPaddingBottom = 2130772299;
+			
+			// aapt resource value: 0x7f01014a
+			public const int tabPaddingEnd = 2130772298;
+			
+			// aapt resource value: 0x7f010148
+			public const int tabPaddingStart = 2130772296;
+			
+			// aapt resource value: 0x7f010149
+			public const int tabPaddingTop = 2130772297;
+			
+			// aapt resource value: 0x7f010147
+			public const int tabSelectedTextColor = 2130772295;
+			
+			// aapt resource value: 0x7f010145
+			public const int tabTextAppearance = 2130772293;
+			
+			// aapt resource value: 0x7f010146
+			public const int tabTextColor = 2130772294;
+			
+			// aapt resource value: 0x7f010065
+			public const int textAllCaps = 2130772069;
+			
+			// aapt resource value: 0x7f01008c
+			public const int textAppearanceLargePopupMenu = 2130772108;
+			
+			// aapt resource value: 0x7f0100b0
+			public const int textAppearanceListItem = 2130772144;
+			
+			// aapt resource value: 0x7f0100b1
+			public const int textAppearanceListItemSmall = 2130772145;
+			
+			// aapt resource value: 0x7f0100a6
+			public const int textAppearanceSearchResultSubtitle = 2130772134;
+			
+			// aapt resource value: 0x7f0100a5
+			public const int textAppearanceSearchResultTitle = 2130772133;
+			
+			// aapt resource value: 0x7f01008d
+			public const int textAppearanceSmallPopupMenu = 2130772109;
+			
+			// aapt resource value: 0x7f0100c3
+			public const int textColorAlertDialogListItem = 2130772163;
+			
+			// aapt resource value: 0x7f01012d
+			public const int textColorError = 2130772269;
+			
+			// aapt resource value: 0x7f0100a7
+			public const int textColorSearchUrl = 2130772135;
+			
+			// aapt resource value: 0x7f01010e
+			public const int theme = 2130772238;
+			
+			// aapt resource value: 0x7f0100de
+			public const int thickness = 2130772190;
+			
+			// aapt resource value: 0x7f0100f7
+			public const int thumbTextPadding = 2130772215;
+			
+			// aapt resource value: 0x7f010043
+			public const int title = 2130772035;
+			
+			// aapt resource value: 0x7f010124
+			public const int titleEnabled = 2130772260;
+			
+			// aapt resource value: 0x7f010103
+			public const int titleMarginBottom = 2130772227;
+			
+			// aapt resource value: 0x7f010101
+			public const int titleMarginEnd = 2130772225;
+			
+			// aapt resource value: 0x7f010100
+			public const int titleMarginStart = 2130772224;
+			
+			// aapt resource value: 0x7f010102
+			public const int titleMarginTop = 2130772226;
+			
+			// aapt resource value: 0x7f0100ff
+			public const int titleMargins = 2130772223;
+			
+			// aapt resource value: 0x7f0100fd
+			public const int titleTextAppearance = 2130772221;
+			
+			// aapt resource value: 0x7f01010a
+			public const int titleTextColor = 2130772234;
+			
+			// aapt resource value: 0x7f010047
+			public const int titleTextStyle = 2130772039;
+			
+			// aapt resource value: 0x7f010121
+			public const int toolbarId = 2130772257;
+			
+			// aapt resource value: 0x7f01009f
+			public const int toolbarNavigationButtonStyle = 2130772127;
+			
+			// aapt resource value: 0x7f01009e
+			public const int toolbarStyle = 2130772126;
+			
+			// aapt resource value: 0x7f0100f6
+			public const int track = 2130772214;
 			
 			// aapt resource value: 0x7f010007
 			public const int uiCompass = 2130771975;
@@ -1084,44 +2922,44 @@ namespace BookAStar.Droid
 			// aapt resource value: 0x7f01000c
 			public const int uiZoomGestures = 2130771980;
 			
-			// aapt resource value: 0x7f01012f
-			public const int useCompatPadding = 2130772271;
+			// aapt resource value: 0x7f010132
+			public const int useCompatPadding = 2130772274;
 			
 			// aapt resource value: 0x7f01000d
 			public const int useViewLifecycle = 2130771981;
 			
-			// aapt resource value: 0x7f0100ee
-			public const int voiceIcon = 2130772206;
-			
-			// aapt resource value: 0x7f010063
-			public const int windowActionBar = 2130772067;
-			
-			// aapt resource value: 0x7f010065
-			public const int windowActionBarOverlay = 2130772069;
+			// aapt resource value: 0x7f0100f1
+			public const int voiceIcon = 2130772209;
 			
 			// aapt resource value: 0x7f010066
-			public const int windowActionModeOverlay = 2130772070;
-			
-			// aapt resource value: 0x7f01006a
-			public const int windowFixedHeightMajor = 2130772074;
+			public const int windowActionBar = 2130772070;
 			
 			// aapt resource value: 0x7f010068
-			public const int windowFixedHeightMinor = 2130772072;
-			
-			// aapt resource value: 0x7f010067
-			public const int windowFixedWidthMajor = 2130772071;
+			public const int windowActionBarOverlay = 2130772072;
 			
 			// aapt resource value: 0x7f010069
-			public const int windowFixedWidthMinor = 2130772073;
+			public const int windowActionModeOverlay = 2130772073;
+			
+			// aapt resource value: 0x7f01006d
+			public const int windowFixedHeightMajor = 2130772077;
 			
 			// aapt resource value: 0x7f01006b
-			public const int windowMinWidthMajor = 2130772075;
+			public const int windowFixedHeightMinor = 2130772075;
+			
+			// aapt resource value: 0x7f01006a
+			public const int windowFixedWidthMajor = 2130772074;
 			
 			// aapt resource value: 0x7f01006c
-			public const int windowMinWidthMinor = 2130772076;
+			public const int windowFixedWidthMinor = 2130772076;
 			
-			// aapt resource value: 0x7f010064
-			public const int windowNoTitle = 2130772068;
+			// aapt resource value: 0x7f01006e
+			public const int windowMinWidthMajor = 2130772078;
+			
+			// aapt resource value: 0x7f01006f
+			public const int windowMinWidthMinor = 2130772079;
+			
+			// aapt resource value: 0x7f010067
+			public const int windowNoTitle = 2130772071;
 			
 			// aapt resource value: 0x7f01000e
 			public const int zOrderOnTop = 2130771982;
@@ -1139,29 +2977,29 @@ namespace BookAStar.Droid
 		public partial class Boolean
 		{
 			
-			// aapt resource value: 0x7f0c0003
-			public const int abc_action_bar_embed_tabs = 2131492867;
+			// aapt resource value: 0x7f0d0003
+			public const int abc_action_bar_embed_tabs = 2131558403;
 			
-			// aapt resource value: 0x7f0c0001
-			public const int abc_action_bar_embed_tabs_pre_jb = 2131492865;
+			// aapt resource value: 0x7f0d0001
+			public const int abc_action_bar_embed_tabs_pre_jb = 2131558401;
 			
-			// aapt resource value: 0x7f0c0004
-			public const int abc_action_bar_expanded_action_views_exclusive = 2131492868;
+			// aapt resource value: 0x7f0d0004
+			public const int abc_action_bar_expanded_action_views_exclusive = 2131558404;
 			
-			// aapt resource value: 0x7f0c0000
-			public const int abc_allow_stacked_button_bar = 2131492864;
+			// aapt resource value: 0x7f0d0000
+			public const int abc_allow_stacked_button_bar = 2131558400;
 			
-			// aapt resource value: 0x7f0c0005
-			public const int abc_config_actionMenuItemAllCaps = 2131492869;
+			// aapt resource value: 0x7f0d0005
+			public const int abc_config_actionMenuItemAllCaps = 2131558405;
 			
-			// aapt resource value: 0x7f0c0002
-			public const int abc_config_allowActionMenuItemTextWithIcon = 2131492866;
+			// aapt resource value: 0x7f0d0002
+			public const int abc_config_allowActionMenuItemTextWithIcon = 2131558402;
 			
-			// aapt resource value: 0x7f0c0006
-			public const int abc_config_closeDialogWhenTouchOutside = 2131492870;
+			// aapt resource value: 0x7f0d0006
+			public const int abc_config_closeDialogWhenTouchOutside = 2131558406;
 			
-			// aapt resource value: 0x7f0c0007
-			public const int abc_config_showMenuShortcutsWhenKeyboardPresent = 2131492871;
+			// aapt resource value: 0x7f0d0007
+			public const int abc_config_showMenuShortcutsWhenKeyboardPresent = 2131558407;
 			
 			static Boolean()
 			{
@@ -1176,335 +3014,374 @@ namespace BookAStar.Droid
 		public partial class Color
 		{
 			
-			// aapt resource value: 0x7f08005e
-			public const int abc_background_cache_hint_selector_material_dark = 2131230814;
+			// aapt resource value: 0x7f09006a
+			public const int abc_background_cache_hint_selector_material_dark = 2131296362;
 			
-			// aapt resource value: 0x7f08005f
-			public const int abc_background_cache_hint_selector_material_light = 2131230815;
+			// aapt resource value: 0x7f09006b
+			public const int abc_background_cache_hint_selector_material_light = 2131296363;
 			
-			// aapt resource value: 0x7f080060
-			public const int abc_color_highlight_material = 2131230816;
+			// aapt resource value: 0x7f09006c
+			public const int abc_color_highlight_material = 2131296364;
 			
-			// aapt resource value: 0x7f080015
-			public const int abc_input_method_navigation_guard = 2131230741;
+			// aapt resource value: 0x7f090015
+			public const int abc_input_method_navigation_guard = 2131296277;
 			
-			// aapt resource value: 0x7f080061
-			public const int abc_primary_text_disable_only_material_dark = 2131230817;
+			// aapt resource value: 0x7f09006d
+			public const int abc_primary_text_disable_only_material_dark = 2131296365;
 			
-			// aapt resource value: 0x7f080062
-			public const int abc_primary_text_disable_only_material_light = 2131230818;
+			// aapt resource value: 0x7f09006e
+			public const int abc_primary_text_disable_only_material_light = 2131296366;
 			
-			// aapt resource value: 0x7f080063
-			public const int abc_primary_text_material_dark = 2131230819;
+			// aapt resource value: 0x7f09006f
+			public const int abc_primary_text_material_dark = 2131296367;
 			
-			// aapt resource value: 0x7f080064
-			public const int abc_primary_text_material_light = 2131230820;
+			// aapt resource value: 0x7f090070
+			public const int abc_primary_text_material_light = 2131296368;
 			
-			// aapt resource value: 0x7f080065
-			public const int abc_search_url_text = 2131230821;
+			// aapt resource value: 0x7f090071
+			public const int abc_search_url_text = 2131296369;
 			
-			// aapt resource value: 0x7f080016
-			public const int abc_search_url_text_normal = 2131230742;
+			// aapt resource value: 0x7f090016
+			public const int abc_search_url_text_normal = 2131296278;
 			
-			// aapt resource value: 0x7f080017
-			public const int abc_search_url_text_pressed = 2131230743;
+			// aapt resource value: 0x7f090017
+			public const int abc_search_url_text_pressed = 2131296279;
 			
-			// aapt resource value: 0x7f080018
-			public const int abc_search_url_text_selected = 2131230744;
+			// aapt resource value: 0x7f090018
+			public const int abc_search_url_text_selected = 2131296280;
 			
-			// aapt resource value: 0x7f080066
-			public const int abc_secondary_text_material_dark = 2131230822;
+			// aapt resource value: 0x7f090072
+			public const int abc_secondary_text_material_dark = 2131296370;
 			
-			// aapt resource value: 0x7f080067
-			public const int abc_secondary_text_material_light = 2131230823;
+			// aapt resource value: 0x7f090073
+			public const int abc_secondary_text_material_light = 2131296371;
 			
-			// aapt resource value: 0x7f08005c
-			public const int accent = 2131230812;
+			// aapt resource value: 0x7f090068
+			public const int accent = 2131296360;
 			
-			// aapt resource value: 0x7f080019
-			public const int accent_material_dark = 2131230745;
+			// aapt resource value: 0x7f090019
+			public const int accent_material_dark = 2131296281;
 			
-			// aapt resource value: 0x7f08001a
-			public const int accent_material_light = 2131230746;
+			// aapt resource value: 0x7f09001a
+			public const int accent_material_light = 2131296282;
 			
-			// aapt resource value: 0x7f08001b
-			public const int background_floating_material_dark = 2131230747;
+			// aapt resource value: 0x7f09001b
+			public const int background_floating_material_dark = 2131296283;
 			
-			// aapt resource value: 0x7f08001c
-			public const int background_floating_material_light = 2131230748;
+			// aapt resource value: 0x7f09001c
+			public const int background_floating_material_light = 2131296284;
 			
-			// aapt resource value: 0x7f08001d
-			public const int background_material_dark = 2131230749;
+			// aapt resource value: 0x7f09001d
+			public const int background_material_dark = 2131296285;
 			
-			// aapt resource value: 0x7f08001e
-			public const int background_material_light = 2131230750;
+			// aapt resource value: 0x7f09001e
+			public const int background_material_light = 2131296286;
 			
-			// aapt resource value: 0x7f08001f
-			public const int bright_foreground_disabled_material_dark = 2131230751;
+			// aapt resource value: 0x7f09001f
+			public const int bright_foreground_disabled_material_dark = 2131296287;
 			
-			// aapt resource value: 0x7f080020
-			public const int bright_foreground_disabled_material_light = 2131230752;
+			// aapt resource value: 0x7f090020
+			public const int bright_foreground_disabled_material_light = 2131296288;
 			
-			// aapt resource value: 0x7f080021
-			public const int bright_foreground_inverse_material_dark = 2131230753;
+			// aapt resource value: 0x7f090021
+			public const int bright_foreground_inverse_material_dark = 2131296289;
 			
-			// aapt resource value: 0x7f080022
-			public const int bright_foreground_inverse_material_light = 2131230754;
+			// aapt resource value: 0x7f090022
+			public const int bright_foreground_inverse_material_light = 2131296290;
 			
-			// aapt resource value: 0x7f080023
-			public const int bright_foreground_material_dark = 2131230755;
+			// aapt resource value: 0x7f090023
+			public const int bright_foreground_material_dark = 2131296291;
 			
-			// aapt resource value: 0x7f080024
-			public const int bright_foreground_material_light = 2131230756;
+			// aapt resource value: 0x7f090024
+			public const int bright_foreground_material_light = 2131296292;
 			
-			// aapt resource value: 0x7f080025
-			public const int button_material_dark = 2131230757;
+			// aapt resource value: 0x7f090025
+			public const int button_material_dark = 2131296293;
 			
-			// aapt resource value: 0x7f080026
-			public const int button_material_light = 2131230758;
+			// aapt resource value: 0x7f090026
+			public const int button_material_light = 2131296294;
 			
-			// aapt resource value: 0x7f080011
-			public const int cardview_dark_background = 2131230737;
+			// aapt resource value: 0x7f090059
+			public const int calendar_active_month_bg = 2131296345;
 			
-			// aapt resource value: 0x7f080012
-			public const int cardview_light_background = 2131230738;
+			// aapt resource value: 0x7f09005a
+			public const int calendar_bg = 2131296346;
 			
-			// aapt resource value: 0x7f080013
-			public const int cardview_shadow_end_color = 2131230739;
+			// aapt resource value: 0x7f09005b
+			public const int calendar_divider = 2131296347;
 			
-			// aapt resource value: 0x7f080014
-			public const int cardview_shadow_start_color = 2131230740;
+			// aapt resource value: 0x7f09005e
+			public const int calendar_highlighted_day_bg = 2131296350;
 			
-			// aapt resource value: 0x7f080008
-			public const int common_action_bar_splitter = 2131230728;
+			// aapt resource value: 0x7f09005c
+			public const int calendar_inactive_month_bg = 2131296348;
 			
-			// aapt resource value: 0x7f080068
-			public const int common_google_signin_btn_text_dark = 2131230824;
+			// aapt resource value: 0x7f09005d
+			public const int calendar_selected_day_bg = 2131296349;
 			
-			// aapt resource value: 0x7f080009
-			public const int common_google_signin_btn_text_dark_default = 2131230729;
+			// aapt resource value: 0x7f09005f
+			public const int calendar_selected_range_bg = 2131296351;
 			
-			// aapt resource value: 0x7f08000b
-			public const int common_google_signin_btn_text_dark_disabled = 2131230731;
+			// aapt resource value: 0x7f090061
+			public const int calendar_text_active = 2131296353;
 			
-			// aapt resource value: 0x7f08000c
-			public const int common_google_signin_btn_text_dark_focused = 2131230732;
+			// aapt resource value: 0x7f090060
+			public const int calendar_text_inactive = 2131296352;
 			
-			// aapt resource value: 0x7f08000a
-			public const int common_google_signin_btn_text_dark_pressed = 2131230730;
+			// aapt resource value: 0x7f090062
+			public const int calendar_text_selected = 2131296354;
 			
-			// aapt resource value: 0x7f080069
-			public const int common_google_signin_btn_text_light = 2131230825;
+			// aapt resource value: 0x7f090074
+			public const int calendar_text_selector = 2131296372;
 			
-			// aapt resource value: 0x7f08000d
-			public const int common_google_signin_btn_text_light_default = 2131230733;
+			// aapt resource value: 0x7f090063
+			public const int calendar_text_unselectable = 2131296355;
 			
-			// aapt resource value: 0x7f08000f
-			public const int common_google_signin_btn_text_light_disabled = 2131230735;
+			// aapt resource value: 0x7f090011
+			public const int cardview_dark_background = 2131296273;
 			
-			// aapt resource value: 0x7f080010
-			public const int common_google_signin_btn_text_light_focused = 2131230736;
+			// aapt resource value: 0x7f090012
+			public const int cardview_light_background = 2131296274;
 			
-			// aapt resource value: 0x7f08000e
-			public const int common_google_signin_btn_text_light_pressed = 2131230734;
+			// aapt resource value: 0x7f090013
+			public const int cardview_shadow_end_color = 2131296275;
 			
-			// aapt resource value: 0x7f08006a
-			public const int common_plus_signin_btn_text_dark = 2131230826;
+			// aapt resource value: 0x7f090014
+			public const int cardview_shadow_start_color = 2131296276;
 			
-			// aapt resource value: 0x7f080000
-			public const int common_plus_signin_btn_text_dark_default = 2131230720;
+			// aapt resource value: 0x7f090008
+			public const int common_action_bar_splitter = 2131296264;
 			
-			// aapt resource value: 0x7f080002
-			public const int common_plus_signin_btn_text_dark_disabled = 2131230722;
+			// aapt resource value: 0x7f090075
+			public const int common_google_signin_btn_text_dark = 2131296373;
 			
-			// aapt resource value: 0x7f080003
-			public const int common_plus_signin_btn_text_dark_focused = 2131230723;
+			// aapt resource value: 0x7f090009
+			public const int common_google_signin_btn_text_dark_default = 2131296265;
 			
-			// aapt resource value: 0x7f080001
-			public const int common_plus_signin_btn_text_dark_pressed = 2131230721;
+			// aapt resource value: 0x7f09000b
+			public const int common_google_signin_btn_text_dark_disabled = 2131296267;
 			
-			// aapt resource value: 0x7f08006b
-			public const int common_plus_signin_btn_text_light = 2131230827;
+			// aapt resource value: 0x7f09000c
+			public const int common_google_signin_btn_text_dark_focused = 2131296268;
 			
-			// aapt resource value: 0x7f080004
-			public const int common_plus_signin_btn_text_light_default = 2131230724;
+			// aapt resource value: 0x7f09000a
+			public const int common_google_signin_btn_text_dark_pressed = 2131296266;
 			
-			// aapt resource value: 0x7f080006
-			public const int common_plus_signin_btn_text_light_disabled = 2131230726;
+			// aapt resource value: 0x7f090076
+			public const int common_google_signin_btn_text_light = 2131296374;
 			
-			// aapt resource value: 0x7f080007
-			public const int common_plus_signin_btn_text_light_focused = 2131230727;
+			// aapt resource value: 0x7f09000d
+			public const int common_google_signin_btn_text_light_default = 2131296269;
 			
-			// aapt resource value: 0x7f080005
-			public const int common_plus_signin_btn_text_light_pressed = 2131230725;
+			// aapt resource value: 0x7f09000f
+			public const int common_google_signin_btn_text_light_disabled = 2131296271;
 			
-			// aapt resource value: 0x7f08004f
-			public const int design_fab_shadow_end_color = 2131230799;
+			// aapt resource value: 0x7f090010
+			public const int common_google_signin_btn_text_light_focused = 2131296272;
 			
-			// aapt resource value: 0x7f080050
-			public const int design_fab_shadow_mid_color = 2131230800;
+			// aapt resource value: 0x7f09000e
+			public const int common_google_signin_btn_text_light_pressed = 2131296270;
 			
-			// aapt resource value: 0x7f080051
-			public const int design_fab_shadow_start_color = 2131230801;
+			// aapt resource value: 0x7f090077
+			public const int common_plus_signin_btn_text_dark = 2131296375;
 			
-			// aapt resource value: 0x7f080052
-			public const int design_fab_stroke_end_inner_color = 2131230802;
+			// aapt resource value: 0x7f090000
+			public const int common_plus_signin_btn_text_dark_default = 2131296256;
 			
-			// aapt resource value: 0x7f080053
-			public const int design_fab_stroke_end_outer_color = 2131230803;
+			// aapt resource value: 0x7f090002
+			public const int common_plus_signin_btn_text_dark_disabled = 2131296258;
 			
-			// aapt resource value: 0x7f080054
-			public const int design_fab_stroke_top_inner_color = 2131230804;
+			// aapt resource value: 0x7f090003
+			public const int common_plus_signin_btn_text_dark_focused = 2131296259;
 			
-			// aapt resource value: 0x7f080055
-			public const int design_fab_stroke_top_outer_color = 2131230805;
+			// aapt resource value: 0x7f090001
+			public const int common_plus_signin_btn_text_dark_pressed = 2131296257;
 			
-			// aapt resource value: 0x7f080056
-			public const int design_snackbar_background_color = 2131230806;
+			// aapt resource value: 0x7f090078
+			public const int common_plus_signin_btn_text_light = 2131296376;
 			
-			// aapt resource value: 0x7f080059
-			public const int design_textinput_error_color = 2131230809;
+			// aapt resource value: 0x7f090004
+			public const int common_plus_signin_btn_text_light_default = 2131296260;
 			
-			// aapt resource value: 0x7f080057
-			public const int design_textinput_error_color_dark = 2131230807;
+			// aapt resource value: 0x7f090006
+			public const int common_plus_signin_btn_text_light_disabled = 2131296262;
 			
-			// aapt resource value: 0x7f080058
-			public const int design_textinput_error_color_light = 2131230808;
+			// aapt resource value: 0x7f090007
+			public const int common_plus_signin_btn_text_light_focused = 2131296263;
 			
-			// aapt resource value: 0x7f080027
-			public const int dim_foreground_disabled_material_dark = 2131230759;
+			// aapt resource value: 0x7f090005
+			public const int common_plus_signin_btn_text_light_pressed = 2131296261;
 			
-			// aapt resource value: 0x7f080028
-			public const int dim_foreground_disabled_material_light = 2131230760;
+			// aapt resource value: 0x7f09004f
+			public const int design_fab_shadow_end_color = 2131296335;
 			
-			// aapt resource value: 0x7f080029
-			public const int dim_foreground_material_dark = 2131230761;
+			// aapt resource value: 0x7f090050
+			public const int design_fab_shadow_mid_color = 2131296336;
 			
-			// aapt resource value: 0x7f08002a
-			public const int dim_foreground_material_light = 2131230762;
+			// aapt resource value: 0x7f090051
+			public const int design_fab_shadow_start_color = 2131296337;
 			
-			// aapt resource value: 0x7f08002b
-			public const int foreground_material_dark = 2131230763;
+			// aapt resource value: 0x7f090052
+			public const int design_fab_stroke_end_inner_color = 2131296338;
 			
-			// aapt resource value: 0x7f08002c
-			public const int foreground_material_light = 2131230764;
+			// aapt resource value: 0x7f090053
+			public const int design_fab_stroke_end_outer_color = 2131296339;
 			
-			// aapt resource value: 0x7f08002d
-			public const int highlighted_text_material_dark = 2131230765;
+			// aapt resource value: 0x7f090054
+			public const int design_fab_stroke_top_inner_color = 2131296340;
 			
-			// aapt resource value: 0x7f08002e
-			public const int highlighted_text_material_light = 2131230766;
+			// aapt resource value: 0x7f090055
+			public const int design_fab_stroke_top_outer_color = 2131296341;
 			
-			// aapt resource value: 0x7f08002f
-			public const int hint_foreground_material_dark = 2131230767;
+			// aapt resource value: 0x7f090056
+			public const int design_snackbar_background_color = 2131296342;
 			
-			// aapt resource value: 0x7f080030
-			public const int hint_foreground_material_light = 2131230768;
+			// aapt resource value: 0x7f090065
+			public const int design_textinput_error_color = 2131296357;
 			
-			// aapt resource value: 0x7f080031
-			public const int material_blue_grey_800 = 2131230769;
+			// aapt resource value: 0x7f090057
+			public const int design_textinput_error_color_dark = 2131296343;
 			
-			// aapt resource value: 0x7f080032
-			public const int material_blue_grey_900 = 2131230770;
+			// aapt resource value: 0x7f090058
+			public const int design_textinput_error_color_light = 2131296344;
 			
-			// aapt resource value: 0x7f080033
-			public const int material_blue_grey_950 = 2131230771;
+			// aapt resource value: 0x7f090027
+			public const int dim_foreground_disabled_material_dark = 2131296295;
 			
-			// aapt resource value: 0x7f080034
-			public const int material_deep_teal_200 = 2131230772;
+			// aapt resource value: 0x7f090028
+			public const int dim_foreground_disabled_material_light = 2131296296;
 			
-			// aapt resource value: 0x7f080035
-			public const int material_deep_teal_500 = 2131230773;
+			// aapt resource value: 0x7f090029
+			public const int dim_foreground_material_dark = 2131296297;
 			
-			// aapt resource value: 0x7f080036
-			public const int material_grey_100 = 2131230774;
+			// aapt resource value: 0x7f09002a
+			public const int dim_foreground_material_light = 2131296298;
 			
-			// aapt resource value: 0x7f080037
-			public const int material_grey_300 = 2131230775;
+			// aapt resource value: 0x7f09002b
+			public const int foreground_material_dark = 2131296299;
 			
-			// aapt resource value: 0x7f080038
-			public const int material_grey_50 = 2131230776;
+			// aapt resource value: 0x7f09002c
+			public const int foreground_material_light = 2131296300;
 			
-			// aapt resource value: 0x7f080039
-			public const int material_grey_600 = 2131230777;
+			// aapt resource value: 0x7f09002d
+			public const int highlighted_text_material_dark = 2131296301;
 			
-			// aapt resource value: 0x7f08003a
-			public const int material_grey_800 = 2131230778;
+			// aapt resource value: 0x7f09002e
+			public const int highlighted_text_material_light = 2131296302;
 			
-			// aapt resource value: 0x7f08003b
-			public const int material_grey_850 = 2131230779;
+			// aapt resource value: 0x7f09002f
+			public const int hint_foreground_material_dark = 2131296303;
 			
-			// aapt resource value: 0x7f08003c
-			public const int material_grey_900 = 2131230780;
+			// aapt resource value: 0x7f090030
+			public const int hint_foreground_material_light = 2131296304;
 			
-			// aapt resource value: 0x7f08005a
-			public const int primary = 2131230810;
+			// aapt resource value: 0x7f090031
+			public const int material_blue_grey_800 = 2131296305;
 			
-			// aapt resource value: 0x7f08005b
-			public const int primaryDark = 2131230811;
+			// aapt resource value: 0x7f090032
+			public const int material_blue_grey_900 = 2131296306;
 			
-			// aapt resource value: 0x7f08003d
-			public const int primary_dark_material_dark = 2131230781;
+			// aapt resource value: 0x7f090033
+			public const int material_blue_grey_950 = 2131296307;
 			
-			// aapt resource value: 0x7f08003e
-			public const int primary_dark_material_light = 2131230782;
+			// aapt resource value: 0x7f090034
+			public const int material_deep_teal_200 = 2131296308;
 			
-			// aapt resource value: 0x7f08003f
-			public const int primary_material_dark = 2131230783;
+			// aapt resource value: 0x7f090035
+			public const int material_deep_teal_500 = 2131296309;
 			
-			// aapt resource value: 0x7f080040
-			public const int primary_material_light = 2131230784;
+			// aapt resource value: 0x7f090036
+			public const int material_grey_100 = 2131296310;
 			
-			// aapt resource value: 0x7f080041
-			public const int primary_text_default_material_dark = 2131230785;
+			// aapt resource value: 0x7f090037
+			public const int material_grey_300 = 2131296311;
 			
-			// aapt resource value: 0x7f080042
-			public const int primary_text_default_material_light = 2131230786;
+			// aapt resource value: 0x7f090038
+			public const int material_grey_50 = 2131296312;
 			
-			// aapt resource value: 0x7f080043
-			public const int primary_text_disabled_material_dark = 2131230787;
+			// aapt resource value: 0x7f090039
+			public const int material_grey_600 = 2131296313;
 			
-			// aapt resource value: 0x7f080044
-			public const int primary_text_disabled_material_light = 2131230788;
+			// aapt resource value: 0x7f09003a
+			public const int material_grey_800 = 2131296314;
 			
-			// aapt resource value: 0x7f080045
-			public const int ripple_material_dark = 2131230789;
+			// aapt resource value: 0x7f09003b
+			public const int material_grey_850 = 2131296315;
 			
-			// aapt resource value: 0x7f080046
-			public const int ripple_material_light = 2131230790;
+			// aapt resource value: 0x7f09003c
+			public const int material_grey_900 = 2131296316;
 			
-			// aapt resource value: 0x7f080047
-			public const int secondary_text_default_material_dark = 2131230791;
+			// aapt resource value: 0x7f090066
+			public const int primary = 2131296358;
 			
-			// aapt resource value: 0x7f080048
-			public const int secondary_text_default_material_light = 2131230792;
+			// aapt resource value: 0x7f090067
+			public const int primaryDark = 2131296359;
 			
-			// aapt resource value: 0x7f080049
-			public const int secondary_text_disabled_material_dark = 2131230793;
+			// aapt resource value: 0x7f09003d
+			public const int primary_dark_material_dark = 2131296317;
 			
-			// aapt resource value: 0x7f08004a
-			public const int secondary_text_disabled_material_light = 2131230794;
+			// aapt resource value: 0x7f09003e
+			public const int primary_dark_material_light = 2131296318;
 			
-			// aapt resource value: 0x7f08004b
-			public const int switch_thumb_disabled_material_dark = 2131230795;
+			// aapt resource value: 0x7f09003f
+			public const int primary_material_dark = 2131296319;
 			
-			// aapt resource value: 0x7f08004c
-			public const int switch_thumb_disabled_material_light = 2131230796;
+			// aapt resource value: 0x7f090040
+			public const int primary_material_light = 2131296320;
 			
-			// aapt resource value: 0x7f08006c
-			public const int switch_thumb_material_dark = 2131230828;
+			// aapt resource value: 0x7f090041
+			public const int primary_text_default_material_dark = 2131296321;
 			
-			// aapt resource value: 0x7f08006d
-			public const int switch_thumb_material_light = 2131230829;
+			// aapt resource value: 0x7f090042
+			public const int primary_text_default_material_light = 2131296322;
 			
-			// aapt resource value: 0x7f08004d
-			public const int switch_thumb_normal_material_dark = 2131230797;
+			// aapt resource value: 0x7f090043
+			public const int primary_text_disabled_material_dark = 2131296323;
 			
-			// aapt resource value: 0x7f08004e
-			public const int switch_thumb_normal_material_light = 2131230798;
+			// aapt resource value: 0x7f090044
+			public const int primary_text_disabled_material_light = 2131296324;
 			
-			// aapt resource value: 0x7f08005d
-			public const int windowBackground = 2131230813;
+			// aapt resource value: 0x7f090045
+			public const int ripple_material_dark = 2131296325;
+			
+			// aapt resource value: 0x7f090046
+			public const int ripple_material_light = 2131296326;
+			
+			// aapt resource value: 0x7f090047
+			public const int secondary_text_default_material_dark = 2131296327;
+			
+			// aapt resource value: 0x7f090048
+			public const int secondary_text_default_material_light = 2131296328;
+			
+			// aapt resource value: 0x7f090049
+			public const int secondary_text_disabled_material_dark = 2131296329;
+			
+			// aapt resource value: 0x7f09004a
+			public const int secondary_text_disabled_material_light = 2131296330;
+			
+			// aapt resource value: 0x7f09004b
+			public const int switch_thumb_disabled_material_dark = 2131296331;
+			
+			// aapt resource value: 0x7f09004c
+			public const int switch_thumb_disabled_material_light = 2131296332;
+			
+			// aapt resource value: 0x7f090079
+			public const int switch_thumb_material_dark = 2131296377;
+			
+			// aapt resource value: 0x7f09007a
+			public const int switch_thumb_material_light = 2131296378;
+			
+			// aapt resource value: 0x7f09004d
+			public const int switch_thumb_normal_material_dark = 2131296333;
+			
+			// aapt resource value: 0x7f09004e
+			public const int switch_thumb_normal_material_light = 2131296334;
+			
+			// aapt resource value: 0x7f090064
+			public const int transparent_black_hex_8 = 2131296356;
+			
+			// aapt resource value: 0x7f090069
+			public const int windowBackground = 2131296361;
 			
 			static Color()
 			{
@@ -1519,374 +3396,389 @@ namespace BookAStar.Droid
 		public partial class Dimension
 		{
 			
-			// aapt resource value: 0x7f090019
-			public const int abc_action_bar_content_inset_material = 2131296281;
+			// aapt resource value: 0x7f0b0019
+			public const int abc_action_bar_content_inset_material = 2131427353;
 			
-			// aapt resource value: 0x7f09000d
-			public const int abc_action_bar_default_height_material = 2131296269;
+			// aapt resource value: 0x7f0b000d
+			public const int abc_action_bar_default_height_material = 2131427341;
 			
-			// aapt resource value: 0x7f09001a
-			public const int abc_action_bar_default_padding_end_material = 2131296282;
+			// aapt resource value: 0x7f0b001a
+			public const int abc_action_bar_default_padding_end_material = 2131427354;
 			
-			// aapt resource value: 0x7f09001b
-			public const int abc_action_bar_default_padding_start_material = 2131296283;
+			// aapt resource value: 0x7f0b001b
+			public const int abc_action_bar_default_padding_start_material = 2131427355;
 			
-			// aapt resource value: 0x7f09001d
-			public const int abc_action_bar_icon_vertical_padding_material = 2131296285;
+			// aapt resource value: 0x7f0b001d
+			public const int abc_action_bar_icon_vertical_padding_material = 2131427357;
 			
-			// aapt resource value: 0x7f09001e
-			public const int abc_action_bar_overflow_padding_end_material = 2131296286;
+			// aapt resource value: 0x7f0b001e
+			public const int abc_action_bar_overflow_padding_end_material = 2131427358;
 			
-			// aapt resource value: 0x7f09001f
-			public const int abc_action_bar_overflow_padding_start_material = 2131296287;
+			// aapt resource value: 0x7f0b001f
+			public const int abc_action_bar_overflow_padding_start_material = 2131427359;
 			
-			// aapt resource value: 0x7f09000e
-			public const int abc_action_bar_progress_bar_size = 2131296270;
+			// aapt resource value: 0x7f0b000e
+			public const int abc_action_bar_progress_bar_size = 2131427342;
 			
-			// aapt resource value: 0x7f090020
-			public const int abc_action_bar_stacked_max_height = 2131296288;
+			// aapt resource value: 0x7f0b0020
+			public const int abc_action_bar_stacked_max_height = 2131427360;
 			
-			// aapt resource value: 0x7f090021
-			public const int abc_action_bar_stacked_tab_max_width = 2131296289;
+			// aapt resource value: 0x7f0b0021
+			public const int abc_action_bar_stacked_tab_max_width = 2131427361;
 			
-			// aapt resource value: 0x7f090022
-			public const int abc_action_bar_subtitle_bottom_margin_material = 2131296290;
+			// aapt resource value: 0x7f0b0022
+			public const int abc_action_bar_subtitle_bottom_margin_material = 2131427362;
 			
-			// aapt resource value: 0x7f090023
-			public const int abc_action_bar_subtitle_top_margin_material = 2131296291;
+			// aapt resource value: 0x7f0b0023
+			public const int abc_action_bar_subtitle_top_margin_material = 2131427363;
 			
-			// aapt resource value: 0x7f090024
-			public const int abc_action_button_min_height_material = 2131296292;
+			// aapt resource value: 0x7f0b0024
+			public const int abc_action_button_min_height_material = 2131427364;
 			
-			// aapt resource value: 0x7f090025
-			public const int abc_action_button_min_width_material = 2131296293;
+			// aapt resource value: 0x7f0b0025
+			public const int abc_action_button_min_width_material = 2131427365;
 			
-			// aapt resource value: 0x7f090026
-			public const int abc_action_button_min_width_overflow_material = 2131296294;
+			// aapt resource value: 0x7f0b0026
+			public const int abc_action_button_min_width_overflow_material = 2131427366;
 			
-			// aapt resource value: 0x7f09000c
-			public const int abc_alert_dialog_button_bar_height = 2131296268;
+			// aapt resource value: 0x7f0b000c
+			public const int abc_alert_dialog_button_bar_height = 2131427340;
 			
-			// aapt resource value: 0x7f090027
-			public const int abc_button_inset_horizontal_material = 2131296295;
+			// aapt resource value: 0x7f0b0027
+			public const int abc_button_inset_horizontal_material = 2131427367;
 			
-			// aapt resource value: 0x7f090028
-			public const int abc_button_inset_vertical_material = 2131296296;
+			// aapt resource value: 0x7f0b0028
+			public const int abc_button_inset_vertical_material = 2131427368;
 			
-			// aapt resource value: 0x7f090029
-			public const int abc_button_padding_horizontal_material = 2131296297;
+			// aapt resource value: 0x7f0b0029
+			public const int abc_button_padding_horizontal_material = 2131427369;
 			
-			// aapt resource value: 0x7f09002a
-			public const int abc_button_padding_vertical_material = 2131296298;
+			// aapt resource value: 0x7f0b002a
+			public const int abc_button_padding_vertical_material = 2131427370;
 			
-			// aapt resource value: 0x7f090011
-			public const int abc_config_prefDialogWidth = 2131296273;
+			// aapt resource value: 0x7f0b0011
+			public const int abc_config_prefDialogWidth = 2131427345;
 			
-			// aapt resource value: 0x7f09002b
-			public const int abc_control_corner_material = 2131296299;
+			// aapt resource value: 0x7f0b002b
+			public const int abc_control_corner_material = 2131427371;
 			
-			// aapt resource value: 0x7f09002c
-			public const int abc_control_inset_material = 2131296300;
+			// aapt resource value: 0x7f0b002c
+			public const int abc_control_inset_material = 2131427372;
 			
-			// aapt resource value: 0x7f09002d
-			public const int abc_control_padding_material = 2131296301;
+			// aapt resource value: 0x7f0b002d
+			public const int abc_control_padding_material = 2131427373;
 			
-			// aapt resource value: 0x7f090012
-			public const int abc_dialog_fixed_height_major = 2131296274;
+			// aapt resource value: 0x7f0b0012
+			public const int abc_dialog_fixed_height_major = 2131427346;
 			
-			// aapt resource value: 0x7f090013
-			public const int abc_dialog_fixed_height_minor = 2131296275;
+			// aapt resource value: 0x7f0b0013
+			public const int abc_dialog_fixed_height_minor = 2131427347;
 			
-			// aapt resource value: 0x7f090014
-			public const int abc_dialog_fixed_width_major = 2131296276;
+			// aapt resource value: 0x7f0b0014
+			public const int abc_dialog_fixed_width_major = 2131427348;
 			
-			// aapt resource value: 0x7f090015
-			public const int abc_dialog_fixed_width_minor = 2131296277;
+			// aapt resource value: 0x7f0b0015
+			public const int abc_dialog_fixed_width_minor = 2131427349;
 			
-			// aapt resource value: 0x7f09002e
-			public const int abc_dialog_list_padding_vertical_material = 2131296302;
+			// aapt resource value: 0x7f0b002e
+			public const int abc_dialog_list_padding_vertical_material = 2131427374;
 			
-			// aapt resource value: 0x7f090016
-			public const int abc_dialog_min_width_major = 2131296278;
+			// aapt resource value: 0x7f0b0016
+			public const int abc_dialog_min_width_major = 2131427350;
 			
-			// aapt resource value: 0x7f090017
-			public const int abc_dialog_min_width_minor = 2131296279;
+			// aapt resource value: 0x7f0b0017
+			public const int abc_dialog_min_width_minor = 2131427351;
 			
-			// aapt resource value: 0x7f09002f
-			public const int abc_dialog_padding_material = 2131296303;
+			// aapt resource value: 0x7f0b002f
+			public const int abc_dialog_padding_material = 2131427375;
 			
-			// aapt resource value: 0x7f090030
-			public const int abc_dialog_padding_top_material = 2131296304;
+			// aapt resource value: 0x7f0b0030
+			public const int abc_dialog_padding_top_material = 2131427376;
 			
-			// aapt resource value: 0x7f090031
-			public const int abc_disabled_alpha_material_dark = 2131296305;
+			// aapt resource value: 0x7f0b0031
+			public const int abc_disabled_alpha_material_dark = 2131427377;
 			
-			// aapt resource value: 0x7f090032
-			public const int abc_disabled_alpha_material_light = 2131296306;
+			// aapt resource value: 0x7f0b0032
+			public const int abc_disabled_alpha_material_light = 2131427378;
 			
-			// aapt resource value: 0x7f090033
-			public const int abc_dropdownitem_icon_width = 2131296307;
+			// aapt resource value: 0x7f0b0033
+			public const int abc_dropdownitem_icon_width = 2131427379;
 			
-			// aapt resource value: 0x7f090034
-			public const int abc_dropdownitem_text_padding_left = 2131296308;
+			// aapt resource value: 0x7f0b0034
+			public const int abc_dropdownitem_text_padding_left = 2131427380;
 			
-			// aapt resource value: 0x7f090035
-			public const int abc_dropdownitem_text_padding_right = 2131296309;
+			// aapt resource value: 0x7f0b0035
+			public const int abc_dropdownitem_text_padding_right = 2131427381;
 			
-			// aapt resource value: 0x7f090036
-			public const int abc_edit_text_inset_bottom_material = 2131296310;
+			// aapt resource value: 0x7f0b0036
+			public const int abc_edit_text_inset_bottom_material = 2131427382;
 			
-			// aapt resource value: 0x7f090037
-			public const int abc_edit_text_inset_horizontal_material = 2131296311;
+			// aapt resource value: 0x7f0b0037
+			public const int abc_edit_text_inset_horizontal_material = 2131427383;
 			
-			// aapt resource value: 0x7f090038
-			public const int abc_edit_text_inset_top_material = 2131296312;
+			// aapt resource value: 0x7f0b0038
+			public const int abc_edit_text_inset_top_material = 2131427384;
 			
-			// aapt resource value: 0x7f090039
-			public const int abc_floating_window_z = 2131296313;
+			// aapt resource value: 0x7f0b0039
+			public const int abc_floating_window_z = 2131427385;
 			
-			// aapt resource value: 0x7f09003a
-			public const int abc_list_item_padding_horizontal_material = 2131296314;
+			// aapt resource value: 0x7f0b003a
+			public const int abc_list_item_padding_horizontal_material = 2131427386;
 			
-			// aapt resource value: 0x7f09003b
-			public const int abc_panel_menu_list_width = 2131296315;
+			// aapt resource value: 0x7f0b003b
+			public const int abc_panel_menu_list_width = 2131427387;
 			
-			// aapt resource value: 0x7f09003c
-			public const int abc_search_view_preferred_width = 2131296316;
+			// aapt resource value: 0x7f0b003c
+			public const int abc_search_view_preferred_width = 2131427388;
 			
-			// aapt resource value: 0x7f090018
-			public const int abc_search_view_text_min_width = 2131296280;
+			// aapt resource value: 0x7f0b0018
+			public const int abc_search_view_text_min_width = 2131427352;
 			
-			// aapt resource value: 0x7f09003d
-			public const int abc_seekbar_track_background_height_material = 2131296317;
+			// aapt resource value: 0x7f0b003d
+			public const int abc_seekbar_track_background_height_material = 2131427389;
 			
-			// aapt resource value: 0x7f09003e
-			public const int abc_seekbar_track_progress_height_material = 2131296318;
+			// aapt resource value: 0x7f0b003e
+			public const int abc_seekbar_track_progress_height_material = 2131427390;
 			
-			// aapt resource value: 0x7f09003f
-			public const int abc_select_dialog_padding_start_material = 2131296319;
+			// aapt resource value: 0x7f0b003f
+			public const int abc_select_dialog_padding_start_material = 2131427391;
 			
-			// aapt resource value: 0x7f09001c
-			public const int abc_switch_padding = 2131296284;
+			// aapt resource value: 0x7f0b001c
+			public const int abc_switch_padding = 2131427356;
 			
-			// aapt resource value: 0x7f090040
-			public const int abc_text_size_body_1_material = 2131296320;
+			// aapt resource value: 0x7f0b0040
+			public const int abc_text_size_body_1_material = 2131427392;
 			
-			// aapt resource value: 0x7f090041
-			public const int abc_text_size_body_2_material = 2131296321;
+			// aapt resource value: 0x7f0b0041
+			public const int abc_text_size_body_2_material = 2131427393;
 			
-			// aapt resource value: 0x7f090042
-			public const int abc_text_size_button_material = 2131296322;
+			// aapt resource value: 0x7f0b0042
+			public const int abc_text_size_button_material = 2131427394;
 			
-			// aapt resource value: 0x7f090043
-			public const int abc_text_size_caption_material = 2131296323;
+			// aapt resource value: 0x7f0b0043
+			public const int abc_text_size_caption_material = 2131427395;
 			
-			// aapt resource value: 0x7f090044
-			public const int abc_text_size_display_1_material = 2131296324;
+			// aapt resource value: 0x7f0b0044
+			public const int abc_text_size_display_1_material = 2131427396;
 			
-			// aapt resource value: 0x7f090045
-			public const int abc_text_size_display_2_material = 2131296325;
+			// aapt resource value: 0x7f0b0045
+			public const int abc_text_size_display_2_material = 2131427397;
 			
-			// aapt resource value: 0x7f090046
-			public const int abc_text_size_display_3_material = 2131296326;
+			// aapt resource value: 0x7f0b0046
+			public const int abc_text_size_display_3_material = 2131427398;
 			
-			// aapt resource value: 0x7f090047
-			public const int abc_text_size_display_4_material = 2131296327;
+			// aapt resource value: 0x7f0b0047
+			public const int abc_text_size_display_4_material = 2131427399;
 			
-			// aapt resource value: 0x7f090048
-			public const int abc_text_size_headline_material = 2131296328;
+			// aapt resource value: 0x7f0b0048
+			public const int abc_text_size_headline_material = 2131427400;
 			
-			// aapt resource value: 0x7f090049
-			public const int abc_text_size_large_material = 2131296329;
+			// aapt resource value: 0x7f0b0049
+			public const int abc_text_size_large_material = 2131427401;
 			
-			// aapt resource value: 0x7f09004a
-			public const int abc_text_size_medium_material = 2131296330;
+			// aapt resource value: 0x7f0b004a
+			public const int abc_text_size_medium_material = 2131427402;
 			
-			// aapt resource value: 0x7f09004b
-			public const int abc_text_size_menu_material = 2131296331;
+			// aapt resource value: 0x7f0b004b
+			public const int abc_text_size_menu_material = 2131427403;
 			
-			// aapt resource value: 0x7f09004c
-			public const int abc_text_size_small_material = 2131296332;
+			// aapt resource value: 0x7f0b004c
+			public const int abc_text_size_small_material = 2131427404;
 			
-			// aapt resource value: 0x7f09004d
-			public const int abc_text_size_subhead_material = 2131296333;
+			// aapt resource value: 0x7f0b004d
+			public const int abc_text_size_subhead_material = 2131427405;
 			
-			// aapt resource value: 0x7f09000f
-			public const int abc_text_size_subtitle_material_toolbar = 2131296271;
+			// aapt resource value: 0x7f0b000f
+			public const int abc_text_size_subtitle_material_toolbar = 2131427343;
 			
-			// aapt resource value: 0x7f09004e
-			public const int abc_text_size_title_material = 2131296334;
+			// aapt resource value: 0x7f0b004e
+			public const int abc_text_size_title_material = 2131427406;
 			
-			// aapt resource value: 0x7f090010
-			public const int abc_text_size_title_material_toolbar = 2131296272;
+			// aapt resource value: 0x7f0b0010
+			public const int abc_text_size_title_material_toolbar = 2131427344;
 			
-			// aapt resource value: 0x7f090074
-			public const int btnwidth = 2131296372;
+			// aapt resource value: 0x7f0b0079
+			public const int btnwidth = 2131427449;
 			
-			// aapt resource value: 0x7f090009
-			public const int cardview_compat_inset_shadow = 2131296265;
+			// aapt resource value: 0x7f0b0074
+			public const int calendar_day_headers_paddingbottom = 2131427444;
 			
-			// aapt resource value: 0x7f09000a
-			public const int cardview_default_elevation = 2131296266;
+			// aapt resource value: 0x7f0b0076
+			public const int calendar_month_title_bottommargin = 2131427446;
 			
-			// aapt resource value: 0x7f09000b
-			public const int cardview_default_radius = 2131296267;
+			// aapt resource value: 0x7f0b0075
+			public const int calendar_month_topmargin = 2131427445;
 			
-			// aapt resource value: 0x7f09005f
-			public const int design_appbar_elevation = 2131296351;
+			// aapt resource value: 0x7f0b0077
+			public const int calendar_text_medium = 2131427447;
 			
-			// aapt resource value: 0x7f090060
-			public const int design_bottom_sheet_modal_elevation = 2131296352;
+			// aapt resource value: 0x7f0b0078
+			public const int calendar_text_small = 2131427448;
 			
-			// aapt resource value: 0x7f090061
-			public const int design_bottom_sheet_modal_peek_height = 2131296353;
+			// aapt resource value: 0x7f0b0009
+			public const int cardview_compat_inset_shadow = 2131427337;
 			
-			// aapt resource value: 0x7f090062
-			public const int design_fab_border_width = 2131296354;
+			// aapt resource value: 0x7f0b000a
+			public const int cardview_default_elevation = 2131427338;
 			
-			// aapt resource value: 0x7f090075
-			public const int design_fab_content_size = 2131296373;
+			// aapt resource value: 0x7f0b000b
+			public const int cardview_default_radius = 2131427339;
 			
-			// aapt resource value: 0x7f090063
-			public const int design_fab_elevation = 2131296355;
+			// aapt resource value: 0x7f0b005f
+			public const int design_appbar_elevation = 2131427423;
 			
-			// aapt resource value: 0x7f090064
-			public const int design_fab_image_size = 2131296356;
+			// aapt resource value: 0x7f0b0060
+			public const int design_bottom_sheet_modal_elevation = 2131427424;
 			
-			// aapt resource value: 0x7f090065
-			public const int design_fab_size_mini = 2131296357;
+			// aapt resource value: 0x7f0b0061
+			public const int design_bottom_sheet_modal_peek_height = 2131427425;
 			
-			// aapt resource value: 0x7f090066
-			public const int design_fab_size_normal = 2131296358;
+			// aapt resource value: 0x7f0b0062
+			public const int design_fab_border_width = 2131427426;
 			
-			// aapt resource value: 0x7f090067
-			public const int design_fab_translation_z_pressed = 2131296359;
+			// aapt resource value: 0x7f0b007a
+			public const int design_fab_content_size = 2131427450;
 			
-			// aapt resource value: 0x7f090068
-			public const int design_navigation_elevation = 2131296360;
+			// aapt resource value: 0x7f0b0063
+			public const int design_fab_elevation = 2131427427;
 			
-			// aapt resource value: 0x7f090069
-			public const int design_navigation_icon_padding = 2131296361;
+			// aapt resource value: 0x7f0b0064
+			public const int design_fab_image_size = 2131427428;
 			
-			// aapt resource value: 0x7f09006a
-			public const int design_navigation_icon_size = 2131296362;
+			// aapt resource value: 0x7f0b0065
+			public const int design_fab_size_mini = 2131427429;
 			
-			// aapt resource value: 0x7f090057
-			public const int design_navigation_max_width = 2131296343;
+			// aapt resource value: 0x7f0b0066
+			public const int design_fab_size_normal = 2131427430;
 			
-			// aapt resource value: 0x7f09006b
-			public const int design_navigation_padding_bottom = 2131296363;
+			// aapt resource value: 0x7f0b0067
+			public const int design_fab_translation_z_pressed = 2131427431;
 			
-			// aapt resource value: 0x7f090076
-			public const int design_navigation_padding_top_default = 2131296374;
+			// aapt resource value: 0x7f0b0068
+			public const int design_navigation_elevation = 2131427432;
 			
-			// aapt resource value: 0x7f09006c
-			public const int design_navigation_separator_vertical_padding = 2131296364;
+			// aapt resource value: 0x7f0b0069
+			public const int design_navigation_icon_padding = 2131427433;
 			
-			// aapt resource value: 0x7f090058
-			public const int design_snackbar_action_inline_max_width = 2131296344;
+			// aapt resource value: 0x7f0b006a
+			public const int design_navigation_icon_size = 2131427434;
 			
-			// aapt resource value: 0x7f090059
-			public const int design_snackbar_background_corner_radius = 2131296345;
+			// aapt resource value: 0x7f0b0057
+			public const int design_navigation_max_width = 2131427415;
 			
-			// aapt resource value: 0x7f09006d
-			public const int design_snackbar_elevation = 2131296365;
+			// aapt resource value: 0x7f0b006b
+			public const int design_navigation_padding_bottom = 2131427435;
 			
-			// aapt resource value: 0x7f09005a
-			public const int design_snackbar_extra_spacing_horizontal = 2131296346;
+			// aapt resource value: 0x7f0b007b
+			public const int design_navigation_padding_top_default = 2131427451;
 			
-			// aapt resource value: 0x7f09005b
-			public const int design_snackbar_max_width = 2131296347;
+			// aapt resource value: 0x7f0b006c
+			public const int design_navigation_separator_vertical_padding = 2131427436;
 			
-			// aapt resource value: 0x7f09005c
-			public const int design_snackbar_min_width = 2131296348;
+			// aapt resource value: 0x7f0b0058
+			public const int design_snackbar_action_inline_max_width = 2131427416;
 			
-			// aapt resource value: 0x7f09006e
-			public const int design_snackbar_padding_horizontal = 2131296366;
+			// aapt resource value: 0x7f0b0059
+			public const int design_snackbar_background_corner_radius = 2131427417;
 			
-			// aapt resource value: 0x7f09006f
-			public const int design_snackbar_padding_vertical = 2131296367;
+			// aapt resource value: 0x7f0b006d
+			public const int design_snackbar_elevation = 2131427437;
 			
-			// aapt resource value: 0x7f09005d
-			public const int design_snackbar_padding_vertical_2lines = 2131296349;
+			// aapt resource value: 0x7f0b005a
+			public const int design_snackbar_extra_spacing_horizontal = 2131427418;
 			
-			// aapt resource value: 0x7f090070
-			public const int design_snackbar_text_size = 2131296368;
+			// aapt resource value: 0x7f0b005b
+			public const int design_snackbar_max_width = 2131427419;
 			
-			// aapt resource value: 0x7f090071
-			public const int design_tab_max_width = 2131296369;
+			// aapt resource value: 0x7f0b005c
+			public const int design_snackbar_min_width = 2131427420;
 			
-			// aapt resource value: 0x7f090077
-			public const int design_tab_min_width = 2131296375;
+			// aapt resource value: 0x7f0b006e
+			public const int design_snackbar_padding_horizontal = 2131427438;
 			
-			// aapt resource value: 0x7f09005e
-			public const int design_tab_scrollable_min_width = 2131296350;
+			// aapt resource value: 0x7f0b006f
+			public const int design_snackbar_padding_vertical = 2131427439;
 			
-			// aapt resource value: 0x7f090072
-			public const int design_tab_text_size = 2131296370;
+			// aapt resource value: 0x7f0b005d
+			public const int design_snackbar_padding_vertical_2lines = 2131427421;
 			
-			// aapt resource value: 0x7f090073
-			public const int design_tab_text_size_2line = 2131296371;
+			// aapt resource value: 0x7f0b0070
+			public const int design_snackbar_text_size = 2131427440;
 			
-			// aapt resource value: 0x7f090078
-			public const int dialog_fixed_height_major = 2131296376;
+			// aapt resource value: 0x7f0b0071
+			public const int design_tab_max_width = 2131427441;
 			
-			// aapt resource value: 0x7f090079
-			public const int dialog_fixed_width_major = 2131296377;
+			// aapt resource value: 0x7f0b007c
+			public const int design_tab_min_width = 2131427452;
 			
-			// aapt resource value: 0x7f09007a
-			public const int dialog_fixed_width_minor = 2131296378;
+			// aapt resource value: 0x7f0b005e
+			public const int design_tab_scrollable_min_width = 2131427422;
 			
-			// aapt resource value: 0x7f09004f
-			public const int disabled_alpha_material_dark = 2131296335;
+			// aapt resource value: 0x7f0b0072
+			public const int design_tab_text_size = 2131427442;
 			
-			// aapt resource value: 0x7f090050
-			public const int disabled_alpha_material_light = 2131296336;
+			// aapt resource value: 0x7f0b0073
+			public const int design_tab_text_size_2line = 2131427443;
 			
-			// aapt resource value: 0x7f090051
-			public const int highlight_alpha_material_colored = 2131296337;
+			// aapt resource value: 0x7f0b007d
+			public const int dialog_fixed_height_major = 2131427453;
 			
-			// aapt resource value: 0x7f090052
-			public const int highlight_alpha_material_dark = 2131296338;
+			// aapt resource value: 0x7f0b007e
+			public const int dialog_fixed_width_major = 2131427454;
 			
-			// aapt resource value: 0x7f090053
-			public const int highlight_alpha_material_light = 2131296339;
+			// aapt resource value: 0x7f0b007f
+			public const int dialog_fixed_width_minor = 2131427455;
 			
-			// aapt resource value: 0x7f090000
-			public const int item_touch_helper_max_drag_scroll_per_frame = 2131296256;
+			// aapt resource value: 0x7f0b004f
+			public const int disabled_alpha_material_dark = 2131427407;
 			
-			// aapt resource value: 0x7f090001
-			public const int item_touch_helper_swipe_escape_max_velocity = 2131296257;
+			// aapt resource value: 0x7f0b0050
+			public const int disabled_alpha_material_light = 2131427408;
 			
-			// aapt resource value: 0x7f090002
-			public const int item_touch_helper_swipe_escape_velocity = 2131296258;
+			// aapt resource value: 0x7f0b0051
+			public const int highlight_alpha_material_colored = 2131427409;
 			
-			// aapt resource value: 0x7f090003
-			public const int mr_controller_volume_group_list_item_height = 2131296259;
+			// aapt resource value: 0x7f0b0052
+			public const int highlight_alpha_material_dark = 2131427410;
 			
-			// aapt resource value: 0x7f090004
-			public const int mr_controller_volume_group_list_item_icon_size = 2131296260;
+			// aapt resource value: 0x7f0b0053
+			public const int highlight_alpha_material_light = 2131427411;
 			
-			// aapt resource value: 0x7f090005
-			public const int mr_controller_volume_group_list_max_height = 2131296261;
+			// aapt resource value: 0x7f0b0000
+			public const int item_touch_helper_max_drag_scroll_per_frame = 2131427328;
 			
-			// aapt resource value: 0x7f090008
-			public const int mr_controller_volume_group_list_padding_top = 2131296264;
+			// aapt resource value: 0x7f0b0001
+			public const int item_touch_helper_swipe_escape_max_velocity = 2131427329;
 			
-			// aapt resource value: 0x7f090006
-			public const int mr_dialog_fixed_width_major = 2131296262;
+			// aapt resource value: 0x7f0b0002
+			public const int item_touch_helper_swipe_escape_velocity = 2131427330;
 			
-			// aapt resource value: 0x7f090007
-			public const int mr_dialog_fixed_width_minor = 2131296263;
+			// aapt resource value: 0x7f0b0003
+			public const int mr_controller_volume_group_list_item_height = 2131427331;
 			
-			// aapt resource value: 0x7f090054
-			public const int notification_large_icon_height = 2131296340;
+			// aapt resource value: 0x7f0b0004
+			public const int mr_controller_volume_group_list_item_icon_size = 2131427332;
 			
-			// aapt resource value: 0x7f090055
-			public const int notification_large_icon_width = 2131296341;
+			// aapt resource value: 0x7f0b0005
+			public const int mr_controller_volume_group_list_max_height = 2131427333;
 			
-			// aapt resource value: 0x7f090056
-			public const int notification_subtext_size = 2131296342;
+			// aapt resource value: 0x7f0b0008
+			public const int mr_controller_volume_group_list_padding_top = 2131427336;
+			
+			// aapt resource value: 0x7f0b0006
+			public const int mr_dialog_fixed_width_major = 2131427334;
+			
+			// aapt resource value: 0x7f0b0007
+			public const int mr_dialog_fixed_width_minor = 2131427335;
+			
+			// aapt resource value: 0x7f0b0054
+			public const int notification_large_icon_height = 2131427412;
+			
+			// aapt resource value: 0x7f0b0055
+			public const int notification_large_icon_width = 2131427413;
+			
+			// aapt resource value: 0x7f0b0056
+			public const int notification_subtext_size = 2131427414;
 			
 			static Dimension()
 			{
@@ -2127,412 +4019,448 @@ namespace BookAStar.Droid
 			public const int abc_textfield_search_material = 2130837578;
 			
 			// aapt resource value: 0x7f02004b
-			public const int common_full_open_on_phone = 2130837579;
+			public const int ad16 = 2130837579;
 			
 			// aapt resource value: 0x7f02004c
-			public const int common_google_signin_btn_icon_dark = 2130837580;
+			public const int calendar_bg_selector = 2130837580;
 			
 			// aapt resource value: 0x7f02004d
-			public const int common_google_signin_btn_icon_dark_disabled = 2130837581;
+			public const int common_full_open_on_phone = 2130837581;
 			
 			// aapt resource value: 0x7f02004e
-			public const int common_google_signin_btn_icon_dark_focused = 2130837582;
+			public const int common_google_signin_btn_icon_dark = 2130837582;
 			
 			// aapt resource value: 0x7f02004f
-			public const int common_google_signin_btn_icon_dark_normal = 2130837583;
+			public const int common_google_signin_btn_icon_dark_disabled = 2130837583;
 			
 			// aapt resource value: 0x7f020050
-			public const int common_google_signin_btn_icon_dark_pressed = 2130837584;
+			public const int common_google_signin_btn_icon_dark_focused = 2130837584;
 			
 			// aapt resource value: 0x7f020051
-			public const int common_google_signin_btn_icon_light = 2130837585;
+			public const int common_google_signin_btn_icon_dark_normal = 2130837585;
 			
 			// aapt resource value: 0x7f020052
-			public const int common_google_signin_btn_icon_light_disabled = 2130837586;
+			public const int common_google_signin_btn_icon_dark_pressed = 2130837586;
 			
 			// aapt resource value: 0x7f020053
-			public const int common_google_signin_btn_icon_light_focused = 2130837587;
+			public const int common_google_signin_btn_icon_light = 2130837587;
 			
 			// aapt resource value: 0x7f020054
-			public const int common_google_signin_btn_icon_light_normal = 2130837588;
+			public const int common_google_signin_btn_icon_light_disabled = 2130837588;
 			
 			// aapt resource value: 0x7f020055
-			public const int common_google_signin_btn_icon_light_pressed = 2130837589;
+			public const int common_google_signin_btn_icon_light_focused = 2130837589;
 			
 			// aapt resource value: 0x7f020056
-			public const int common_google_signin_btn_text_dark = 2130837590;
+			public const int common_google_signin_btn_icon_light_normal = 2130837590;
 			
 			// aapt resource value: 0x7f020057
-			public const int common_google_signin_btn_text_dark_disabled = 2130837591;
+			public const int common_google_signin_btn_icon_light_pressed = 2130837591;
 			
 			// aapt resource value: 0x7f020058
-			public const int common_google_signin_btn_text_dark_focused = 2130837592;
+			public const int common_google_signin_btn_text_dark = 2130837592;
 			
 			// aapt resource value: 0x7f020059
-			public const int common_google_signin_btn_text_dark_normal = 2130837593;
+			public const int common_google_signin_btn_text_dark_disabled = 2130837593;
 			
 			// aapt resource value: 0x7f02005a
-			public const int common_google_signin_btn_text_dark_pressed = 2130837594;
+			public const int common_google_signin_btn_text_dark_focused = 2130837594;
 			
 			// aapt resource value: 0x7f02005b
-			public const int common_google_signin_btn_text_light = 2130837595;
+			public const int common_google_signin_btn_text_dark_normal = 2130837595;
 			
 			// aapt resource value: 0x7f02005c
-			public const int common_google_signin_btn_text_light_disabled = 2130837596;
+			public const int common_google_signin_btn_text_dark_pressed = 2130837596;
 			
 			// aapt resource value: 0x7f02005d
-			public const int common_google_signin_btn_text_light_focused = 2130837597;
+			public const int common_google_signin_btn_text_light = 2130837597;
 			
 			// aapt resource value: 0x7f02005e
-			public const int common_google_signin_btn_text_light_normal = 2130837598;
+			public const int common_google_signin_btn_text_light_disabled = 2130837598;
 			
 			// aapt resource value: 0x7f02005f
-			public const int common_google_signin_btn_text_light_pressed = 2130837599;
+			public const int common_google_signin_btn_text_light_focused = 2130837599;
 			
 			// aapt resource value: 0x7f020060
-			public const int common_ic_googleplayservices = 2130837600;
+			public const int common_google_signin_btn_text_light_normal = 2130837600;
 			
 			// aapt resource value: 0x7f020061
-			public const int common_plus_signin_btn_icon_dark = 2130837601;
+			public const int common_google_signin_btn_text_light_pressed = 2130837601;
 			
 			// aapt resource value: 0x7f020062
-			public const int common_plus_signin_btn_icon_dark_disabled = 2130837602;
+			public const int common_ic_googleplayservices = 2130837602;
 			
 			// aapt resource value: 0x7f020063
-			public const int common_plus_signin_btn_icon_dark_focused = 2130837603;
+			public const int common_plus_signin_btn_icon_dark = 2130837603;
 			
 			// aapt resource value: 0x7f020064
-			public const int common_plus_signin_btn_icon_dark_normal = 2130837604;
+			public const int common_plus_signin_btn_icon_dark_disabled = 2130837604;
 			
 			// aapt resource value: 0x7f020065
-			public const int common_plus_signin_btn_icon_dark_pressed = 2130837605;
+			public const int common_plus_signin_btn_icon_dark_focused = 2130837605;
 			
 			// aapt resource value: 0x7f020066
-			public const int common_plus_signin_btn_icon_light = 2130837606;
+			public const int common_plus_signin_btn_icon_dark_normal = 2130837606;
 			
 			// aapt resource value: 0x7f020067
-			public const int common_plus_signin_btn_icon_light_disabled = 2130837607;
+			public const int common_plus_signin_btn_icon_dark_pressed = 2130837607;
 			
 			// aapt resource value: 0x7f020068
-			public const int common_plus_signin_btn_icon_light_focused = 2130837608;
+			public const int common_plus_signin_btn_icon_light = 2130837608;
 			
 			// aapt resource value: 0x7f020069
-			public const int common_plus_signin_btn_icon_light_normal = 2130837609;
+			public const int common_plus_signin_btn_icon_light_disabled = 2130837609;
 			
 			// aapt resource value: 0x7f02006a
-			public const int common_plus_signin_btn_icon_light_pressed = 2130837610;
+			public const int common_plus_signin_btn_icon_light_focused = 2130837610;
 			
 			// aapt resource value: 0x7f02006b
-			public const int common_plus_signin_btn_text_dark = 2130837611;
+			public const int common_plus_signin_btn_icon_light_normal = 2130837611;
 			
 			// aapt resource value: 0x7f02006c
-			public const int common_plus_signin_btn_text_dark_disabled = 2130837612;
+			public const int common_plus_signin_btn_icon_light_pressed = 2130837612;
 			
 			// aapt resource value: 0x7f02006d
-			public const int common_plus_signin_btn_text_dark_focused = 2130837613;
+			public const int common_plus_signin_btn_text_dark = 2130837613;
 			
 			// aapt resource value: 0x7f02006e
-			public const int common_plus_signin_btn_text_dark_normal = 2130837614;
+			public const int common_plus_signin_btn_text_dark_disabled = 2130837614;
 			
 			// aapt resource value: 0x7f02006f
-			public const int common_plus_signin_btn_text_dark_pressed = 2130837615;
+			public const int common_plus_signin_btn_text_dark_focused = 2130837615;
 			
 			// aapt resource value: 0x7f020070
-			public const int common_plus_signin_btn_text_light = 2130837616;
+			public const int common_plus_signin_btn_text_dark_normal = 2130837616;
 			
 			// aapt resource value: 0x7f020071
-			public const int common_plus_signin_btn_text_light_disabled = 2130837617;
+			public const int common_plus_signin_btn_text_dark_pressed = 2130837617;
 			
 			// aapt resource value: 0x7f020072
-			public const int common_plus_signin_btn_text_light_focused = 2130837618;
+			public const int common_plus_signin_btn_text_light = 2130837618;
 			
 			// aapt resource value: 0x7f020073
-			public const int common_plus_signin_btn_text_light_normal = 2130837619;
+			public const int common_plus_signin_btn_text_light_disabled = 2130837619;
 			
 			// aapt resource value: 0x7f020074
-			public const int common_plus_signin_btn_text_light_pressed = 2130837620;
+			public const int common_plus_signin_btn_text_light_focused = 2130837620;
 			
 			// aapt resource value: 0x7f020075
-			public const int design_fab_background = 2130837621;
+			public const int common_plus_signin_btn_text_light_normal = 2130837621;
 			
 			// aapt resource value: 0x7f020076
-			public const int design_snackbar_background = 2130837622;
+			public const int common_plus_signin_btn_text_light_pressed = 2130837622;
 			
 			// aapt resource value: 0x7f020077
-			public const int glyphish_07_map_marker = 2130837623;
+			public const int design_fab_background = 2130837623;
 			
 			// aapt resource value: 0x7f020078
-			public const int glyphish_103_map = 2130837624;
+			public const int design_snackbar_background = 2130837624;
 			
 			// aapt resource value: 0x7f020079
-			public const int glyphish_13_target = 2130837625;
+			public const int glyphish_07_map_marker = 2130837625;
 			
 			// aapt resource value: 0x7f02007a
-			public const int glyphish_74_location = 2130837626;
+			public const int glyphish_103_map = 2130837626;
 			
 			// aapt resource value: 0x7f02007b
-			public const int ic_audiotrack = 2130837627;
+			public const int glyphish_13_target = 2130837627;
 			
 			// aapt resource value: 0x7f02007c
-			public const int ic_audiotrack_light = 2130837628;
+			public const int glyphish_74_location = 2130837628;
 			
 			// aapt resource value: 0x7f02007d
-			public const int ic_bluetooth_grey = 2130837629;
+			public const int gmf_icon = 2130837629;
 			
 			// aapt resource value: 0x7f02007e
-			public const int ic_bluetooth_white = 2130837630;
+			public const int ic_action_full_screen = 2130837630;
 			
 			// aapt resource value: 0x7f02007f
-			public const int ic_cast_dark = 2130837631;
+			public const int ic_action_overflow = 2130837631;
 			
 			// aapt resource value: 0x7f020080
-			public const int ic_cast_disabled_light = 2130837632;
+			public const int ic_action_pause = 2130837632;
 			
 			// aapt resource value: 0x7f020081
-			public const int ic_cast_grey = 2130837633;
+			public const int ic_action_pause_large = 2130837633;
 			
 			// aapt resource value: 0x7f020082
-			public const int ic_cast_light = 2130837634;
+			public const int ic_action_play = 2130837634;
 			
 			// aapt resource value: 0x7f020083
-			public const int ic_cast_off_light = 2130837635;
+			public const int ic_action_play_large = 2130837635;
 			
 			// aapt resource value: 0x7f020084
-			public const int ic_cast_on_0_light = 2130837636;
+			public const int ic_action_return_from_full_screen = 2130837636;
 			
 			// aapt resource value: 0x7f020085
-			public const int ic_cast_on_1_light = 2130837637;
+			public const int ic_audiotrack = 2130837637;
 			
 			// aapt resource value: 0x7f020086
-			public const int ic_cast_on_2_light = 2130837638;
+			public const int ic_audiotrack_light = 2130837638;
 			
 			// aapt resource value: 0x7f020087
-			public const int ic_cast_on_light = 2130837639;
+			public const int ic_bluetooth_grey = 2130837639;
 			
 			// aapt resource value: 0x7f020088
-			public const int ic_cast_white = 2130837640;
+			public const int ic_bluetooth_white = 2130837640;
 			
 			// aapt resource value: 0x7f020089
-			public const int ic_close_dark = 2130837641;
+			public const int ic_cast_dark = 2130837641;
 			
 			// aapt resource value: 0x7f02008a
-			public const int ic_close_light = 2130837642;
+			public const int ic_cast_disabled_light = 2130837642;
 			
 			// aapt resource value: 0x7f02008b
-			public const int ic_collapse = 2130837643;
+			public const int ic_cast_grey = 2130837643;
 			
 			// aapt resource value: 0x7f02008c
-			public const int ic_collapse_00000 = 2130837644;
+			public const int ic_cast_light = 2130837644;
 			
 			// aapt resource value: 0x7f02008d
-			public const int ic_collapse_00001 = 2130837645;
+			public const int ic_cast_off_light = 2130837645;
 			
 			// aapt resource value: 0x7f02008e
-			public const int ic_collapse_00002 = 2130837646;
+			public const int ic_cast_on_0_light = 2130837646;
 			
 			// aapt resource value: 0x7f02008f
-			public const int ic_collapse_00003 = 2130837647;
+			public const int ic_cast_on_1_light = 2130837647;
 			
 			// aapt resource value: 0x7f020090
-			public const int ic_collapse_00004 = 2130837648;
+			public const int ic_cast_on_2_light = 2130837648;
 			
 			// aapt resource value: 0x7f020091
-			public const int ic_collapse_00005 = 2130837649;
+			public const int ic_cast_on_light = 2130837649;
 			
 			// aapt resource value: 0x7f020092
-			public const int ic_collapse_00006 = 2130837650;
+			public const int ic_cast_white = 2130837650;
 			
 			// aapt resource value: 0x7f020093
-			public const int ic_collapse_00007 = 2130837651;
+			public const int ic_close_dark = 2130837651;
 			
 			// aapt resource value: 0x7f020094
-			public const int ic_collapse_00008 = 2130837652;
+			public const int ic_close_light = 2130837652;
 			
 			// aapt resource value: 0x7f020095
-			public const int ic_collapse_00009 = 2130837653;
+			public const int ic_collapse = 2130837653;
 			
 			// aapt resource value: 0x7f020096
-			public const int ic_collapse_00010 = 2130837654;
+			public const int ic_collapse_00000 = 2130837654;
 			
 			// aapt resource value: 0x7f020097
-			public const int ic_collapse_00011 = 2130837655;
+			public const int ic_collapse_00001 = 2130837655;
 			
 			// aapt resource value: 0x7f020098
-			public const int ic_collapse_00012 = 2130837656;
+			public const int ic_collapse_00002 = 2130837656;
 			
 			// aapt resource value: 0x7f020099
-			public const int ic_collapse_00013 = 2130837657;
+			public const int ic_collapse_00003 = 2130837657;
 			
 			// aapt resource value: 0x7f02009a
-			public const int ic_collapse_00014 = 2130837658;
+			public const int ic_collapse_00004 = 2130837658;
 			
 			// aapt resource value: 0x7f02009b
-			public const int ic_collapse_00015 = 2130837659;
+			public const int ic_collapse_00005 = 2130837659;
 			
 			// aapt resource value: 0x7f02009c
-			public const int ic_corp_icon = 2130837660;
+			public const int ic_collapse_00006 = 2130837660;
 			
 			// aapt resource value: 0x7f02009d
-			public const int ic_expand = 2130837661;
+			public const int ic_collapse_00007 = 2130837661;
 			
 			// aapt resource value: 0x7f02009e
-			public const int ic_expand_00000 = 2130837662;
+			public const int ic_collapse_00008 = 2130837662;
 			
 			// aapt resource value: 0x7f02009f
-			public const int ic_expand_00001 = 2130837663;
+			public const int ic_collapse_00009 = 2130837663;
 			
 			// aapt resource value: 0x7f0200a0
-			public const int ic_expand_00002 = 2130837664;
+			public const int ic_collapse_00010 = 2130837664;
 			
 			// aapt resource value: 0x7f0200a1
-			public const int ic_expand_00003 = 2130837665;
+			public const int ic_collapse_00011 = 2130837665;
 			
 			// aapt resource value: 0x7f0200a2
-			public const int ic_expand_00004 = 2130837666;
+			public const int ic_collapse_00012 = 2130837666;
 			
 			// aapt resource value: 0x7f0200a3
-			public const int ic_expand_00005 = 2130837667;
+			public const int ic_collapse_00013 = 2130837667;
 			
 			// aapt resource value: 0x7f0200a4
-			public const int ic_expand_00006 = 2130837668;
+			public const int ic_collapse_00014 = 2130837668;
 			
 			// aapt resource value: 0x7f0200a5
-			public const int ic_expand_00007 = 2130837669;
+			public const int ic_collapse_00015 = 2130837669;
 			
 			// aapt resource value: 0x7f0200a6
-			public const int ic_expand_00008 = 2130837670;
+			public const int ic_corp_icon = 2130837670;
 			
 			// aapt resource value: 0x7f0200a7
-			public const int ic_expand_00009 = 2130837671;
+			public const int ic_expand = 2130837671;
 			
 			// aapt resource value: 0x7f0200a8
-			public const int ic_expand_00010 = 2130837672;
+			public const int ic_expand_00000 = 2130837672;
 			
 			// aapt resource value: 0x7f0200a9
-			public const int ic_expand_00011 = 2130837673;
+			public const int ic_expand_00001 = 2130837673;
 			
 			// aapt resource value: 0x7f0200aa
-			public const int ic_expand_00012 = 2130837674;
+			public const int ic_expand_00002 = 2130837674;
 			
 			// aapt resource value: 0x7f0200ab
-			public const int ic_expand_00013 = 2130837675;
+			public const int ic_expand_00003 = 2130837675;
 			
 			// aapt resource value: 0x7f0200ac
-			public const int ic_expand_00014 = 2130837676;
+			public const int ic_expand_00004 = 2130837676;
 			
 			// aapt resource value: 0x7f0200ad
-			public const int ic_expand_00015 = 2130837677;
+			public const int ic_expand_00005 = 2130837677;
 			
 			// aapt resource value: 0x7f0200ae
-			public const int ic_media_pause = 2130837678;
+			public const int ic_expand_00006 = 2130837678;
 			
 			// aapt resource value: 0x7f0200af
-			public const int ic_media_play = 2130837679;
+			public const int ic_expand_00007 = 2130837679;
 			
 			// aapt resource value: 0x7f0200b0
-			public const int ic_media_route_disabled_mono_dark = 2130837680;
+			public const int ic_expand_00008 = 2130837680;
 			
 			// aapt resource value: 0x7f0200b1
-			public const int ic_media_route_off_mono_dark = 2130837681;
+			public const int ic_expand_00009 = 2130837681;
 			
 			// aapt resource value: 0x7f0200b2
-			public const int ic_media_route_on_0_mono_dark = 2130837682;
+			public const int ic_expand_00010 = 2130837682;
 			
 			// aapt resource value: 0x7f0200b3
-			public const int ic_media_route_on_1_mono_dark = 2130837683;
+			public const int ic_expand_00011 = 2130837683;
 			
 			// aapt resource value: 0x7f0200b4
-			public const int ic_media_route_on_2_mono_dark = 2130837684;
+			public const int ic_expand_00012 = 2130837684;
 			
 			// aapt resource value: 0x7f0200b5
-			public const int ic_media_route_on_mono_dark = 2130837685;
+			public const int ic_expand_00013 = 2130837685;
 			
 			// aapt resource value: 0x7f0200b6
-			public const int ic_pause_dark = 2130837686;
+			public const int ic_expand_00014 = 2130837686;
 			
 			// aapt resource value: 0x7f0200b7
-			public const int ic_pause_light = 2130837687;
+			public const int ic_expand_00015 = 2130837687;
 			
 			// aapt resource value: 0x7f0200b8
-			public const int ic_play_dark = 2130837688;
+			public const int ic_launcher = 2130837688;
 			
 			// aapt resource value: 0x7f0200b9
-			public const int ic_play_light = 2130837689;
+			public const int ic_media_pause = 2130837689;
 			
 			// aapt resource value: 0x7f0200ba
-			public const int ic_speaker_dark = 2130837690;
+			public const int ic_media_play = 2130837690;
 			
 			// aapt resource value: 0x7f0200bb
-			public const int ic_speaker_group_dark = 2130837691;
+			public const int ic_media_route_disabled_mono_dark = 2130837691;
 			
 			// aapt resource value: 0x7f0200bc
-			public const int ic_speaker_group_light = 2130837692;
+			public const int ic_media_route_off_mono_dark = 2130837692;
 			
 			// aapt resource value: 0x7f0200bd
-			public const int ic_speaker_light = 2130837693;
+			public const int ic_media_route_on_0_mono_dark = 2130837693;
 			
 			// aapt resource value: 0x7f0200be
-			public const int ic_tv_dark = 2130837694;
+			public const int ic_media_route_on_1_mono_dark = 2130837694;
 			
 			// aapt resource value: 0x7f0200bf
-			public const int ic_tv_light = 2130837695;
+			public const int ic_media_route_on_2_mono_dark = 2130837695;
 			
 			// aapt resource value: 0x7f0200c0
-			public const int icon = 2130837696;
+			public const int ic_media_route_on_mono_dark = 2130837696;
 			
 			// aapt resource value: 0x7f0200c1
-			public const int mr_dialog_material_background_dark = 2130837697;
+			public const int ic_pause_dark = 2130837697;
 			
 			// aapt resource value: 0x7f0200c2
-			public const int mr_dialog_material_background_light = 2130837698;
+			public const int ic_pause_light = 2130837698;
 			
 			// aapt resource value: 0x7f0200c3
-			public const int mr_ic_audiotrack_light = 2130837699;
+			public const int ic_play_dark = 2130837699;
 			
 			// aapt resource value: 0x7f0200c4
-			public const int mr_ic_cast_dark = 2130837700;
+			public const int ic_play_light = 2130837700;
 			
 			// aapt resource value: 0x7f0200c5
-			public const int mr_ic_cast_light = 2130837701;
+			public const int ic_speaker_dark = 2130837701;
 			
 			// aapt resource value: 0x7f0200c6
-			public const int mr_ic_close_dark = 2130837702;
+			public const int ic_speaker_group_dark = 2130837702;
 			
 			// aapt resource value: 0x7f0200c7
-			public const int mr_ic_close_light = 2130837703;
+			public const int ic_speaker_group_light = 2130837703;
 			
 			// aapt resource value: 0x7f0200c8
-			public const int mr_ic_media_route_connecting_mono_dark = 2130837704;
+			public const int ic_speaker_light = 2130837704;
 			
 			// aapt resource value: 0x7f0200c9
-			public const int mr_ic_media_route_connecting_mono_light = 2130837705;
+			public const int ic_tv_dark = 2130837705;
 			
 			// aapt resource value: 0x7f0200ca
-			public const int mr_ic_media_route_mono_dark = 2130837706;
+			public const int ic_tv_light = 2130837706;
 			
 			// aapt resource value: 0x7f0200cb
-			public const int mr_ic_media_route_mono_light = 2130837707;
+			public const int icon = 2130837707;
 			
 			// aapt resource value: 0x7f0200cc
-			public const int mr_ic_pause_dark = 2130837708;
+			public const int icon_anon = 2130837708;
 			
 			// aapt resource value: 0x7f0200cd
-			public const int mr_ic_pause_light = 2130837709;
+			public const int mr_dialog_material_background_dark = 2130837709;
 			
 			// aapt resource value: 0x7f0200ce
-			public const int mr_ic_play_dark = 2130837710;
+			public const int mr_dialog_material_background_light = 2130837710;
 			
 			// aapt resource value: 0x7f0200cf
-			public const int mr_ic_play_light = 2130837711;
+			public const int mr_ic_audiotrack_light = 2130837711;
 			
 			// aapt resource value: 0x7f0200d0
-			public const int nfqrcode = 2130837712;
-			
-			// aapt resource value: 0x7f0200d2
-			public const int notification_template_icon_bg = 2130837714;
+			public const int mr_ic_cast_dark = 2130837712;
 			
 			// aapt resource value: 0x7f0200d1
-			public const int visuel_sexion = 2130837713;
+			public const int mr_ic_cast_light = 2130837713;
+			
+			// aapt resource value: 0x7f0200d2
+			public const int mr_ic_close_dark = 2130837714;
+			
+			// aapt resource value: 0x7f0200d3
+			public const int mr_ic_close_light = 2130837715;
+			
+			// aapt resource value: 0x7f0200d4
+			public const int mr_ic_media_route_connecting_mono_dark = 2130837716;
+			
+			// aapt resource value: 0x7f0200d5
+			public const int mr_ic_media_route_connecting_mono_light = 2130837717;
+			
+			// aapt resource value: 0x7f0200d6
+			public const int mr_ic_media_route_mono_dark = 2130837718;
+			
+			// aapt resource value: 0x7f0200d7
+			public const int mr_ic_media_route_mono_light = 2130837719;
+			
+			// aapt resource value: 0x7f0200d8
+			public const int mr_ic_pause_dark = 2130837720;
+			
+			// aapt resource value: 0x7f0200d9
+			public const int mr_ic_pause_light = 2130837721;
+			
+			// aapt resource value: 0x7f0200da
+			public const int mr_ic_play_dark = 2130837722;
+			
+			// aapt resource value: 0x7f0200db
+			public const int mr_ic_play_light = 2130837723;
+			
+			// aapt resource value: 0x7f0200dc
+			public const int nfqrcode = 2130837724;
+			
+			// aapt resource value: 0x7f0200de
+			public const int notification_template_icon_bg = 2130837726;
+			
+			// aapt resource value: 0x7f0200dd
+			public const int visuel_sexion = 2130837725;
 			
 			static Drawable()
 			{
@@ -2547,500 +4475,554 @@ namespace BookAStar.Droid
 		public partial class Id
 		{
 			
-			// aapt resource value: 0x7f0a0096
-			public const int action0 = 2131361942;
+			// aapt resource value: 0x7f0c009b
+			public const int action0 = 2131493019;
 			
-			// aapt resource value: 0x7f0a0065
-			public const int action_bar = 2131361893;
+			// aapt resource value: 0x7f0c0065
+			public const int action_bar = 2131492965;
 			
-			// aapt resource value: 0x7f0a0001
-			public const int action_bar_activity_content = 2131361793;
+			// aapt resource value: 0x7f0c0001
+			public const int action_bar_activity_content = 2131492865;
 			
-			// aapt resource value: 0x7f0a0064
-			public const int action_bar_container = 2131361892;
+			// aapt resource value: 0x7f0c0064
+			public const int action_bar_container = 2131492964;
 			
-			// aapt resource value: 0x7f0a0060
-			public const int action_bar_root = 2131361888;
+			// aapt resource value: 0x7f0c0060
+			public const int action_bar_root = 2131492960;
 			
-			// aapt resource value: 0x7f0a0002
-			public const int action_bar_spinner = 2131361794;
+			// aapt resource value: 0x7f0c0002
+			public const int action_bar_spinner = 2131492866;
 			
-			// aapt resource value: 0x7f0a0046
-			public const int action_bar_subtitle = 2131361862;
+			// aapt resource value: 0x7f0c0046
+			public const int action_bar_subtitle = 2131492934;
 			
-			// aapt resource value: 0x7f0a0045
-			public const int action_bar_title = 2131361861;
+			// aapt resource value: 0x7f0c0045
+			public const int action_bar_title = 2131492933;
 			
-			// aapt resource value: 0x7f0a0066
-			public const int action_context_bar = 2131361894;
+			// aapt resource value: 0x7f0c0066
+			public const int action_context_bar = 2131492966;
 			
-			// aapt resource value: 0x7f0a009a
-			public const int action_divider = 2131361946;
+			// aapt resource value: 0x7f0c009f
+			public const int action_divider = 2131493023;
 			
-			// aapt resource value: 0x7f0a0003
-			public const int action_menu_divider = 2131361795;
+			// aapt resource value: 0x7f0c0003
+			public const int action_menu_divider = 2131492867;
 			
-			// aapt resource value: 0x7f0a0004
-			public const int action_menu_presenter = 2131361796;
+			// aapt resource value: 0x7f0c0004
+			public const int action_menu_presenter = 2131492868;
 			
-			// aapt resource value: 0x7f0a0062
-			public const int action_mode_bar = 2131361890;
+			// aapt resource value: 0x7f0c0062
+			public const int action_mode_bar = 2131492962;
 			
-			// aapt resource value: 0x7f0a0061
-			public const int action_mode_bar_stub = 2131361889;
+			// aapt resource value: 0x7f0c0061
+			public const int action_mode_bar_stub = 2131492961;
 			
-			// aapt resource value: 0x7f0a0047
-			public const int action_mode_close_button = 2131361863;
+			// aapt resource value: 0x7f0c0047
+			public const int action_mode_close_button = 2131492935;
 			
-			// aapt resource value: 0x7f0a0048
-			public const int activity_chooser_view_content = 2131361864;
+			// aapt resource value: 0x7f0c00ac
+			public const int actions_container = 2131493036;
 			
-			// aapt resource value: 0x7f0a0010
-			public const int adjust_height = 2131361808;
+			// aapt resource value: 0x7f0c0048
+			public const int activity_chooser_view_content = 2131492936;
 			
-			// aapt resource value: 0x7f0a0011
-			public const int adjust_width = 2131361809;
+			// aapt resource value: 0x7f0c0010
+			public const int adjust_height = 2131492880;
 			
-			// aapt resource value: 0x7f0a0054
-			public const int alertTitle = 2131361876;
+			// aapt resource value: 0x7f0c0011
+			public const int adjust_width = 2131492881;
 			
-			// aapt resource value: 0x7f0a0029
-			public const int always = 2131361833;
+			// aapt resource value: 0x7f0c0054
+			public const int alertTitle = 2131492948;
 			
-			// aapt resource value: 0x7f0a0015
-			public const int auto = 2131361813;
+			// aapt resource value: 0x7f0c0029
+			public const int always = 2131492905;
 			
-			// aapt resource value: 0x7f0a0026
-			public const int beginning = 2131361830;
+			// aapt resource value: 0x7f0c0015
+			public const int auto = 2131492885;
 			
-			// aapt resource value: 0x7f0a0035
-			public const int bottom = 2131361845;
+			// aapt resource value: 0x7f0c0026
+			public const int beginning = 2131492902;
 			
-			// aapt resource value: 0x7f0a004f
-			public const int buttonPanel = 2131361871;
+			// aapt resource value: 0x7f0c0035
+			public const int bottom = 2131492917;
 			
-			// aapt resource value: 0x7f0a0097
-			public const int cancel_action = 2131361943;
+			// aapt resource value: 0x7f0c00ae
+			public const int bottom_chrome = 2131493038;
 			
-			// aapt resource value: 0x7f0a0036
-			public const int center = 2131361846;
+			// aapt resource value: 0x7f0c004f
+			public const int buttonPanel = 2131492943;
 			
-			// aapt resource value: 0x7f0a0037
-			public const int center_horizontal = 2131361847;
+			// aapt resource value: 0x7f0c0081
+			public const int calendar_grid = 2131492993;
 			
-			// aapt resource value: 0x7f0a0038
-			public const int center_vertical = 2131361848;
+			// aapt resource value: 0x7f0c0075
+			public const int calendar_view = 2131492981;
 			
-			// aapt resource value: 0x7f0a005d
-			public const int checkbox = 2131361885;
+			// aapt resource value: 0x7f0c0074
+			public const int calendarr_pager = 2131492980;
 			
-			// aapt resource value: 0x7f0a009d
-			public const int chronometer = 2131361949;
+			// aapt resource value: 0x7f0c009c
+			public const int cancel_action = 2131493020;
 			
-			// aapt resource value: 0x7f0a003e
-			public const int clip_horizontal = 2131361854;
+			// aapt resource value: 0x7f0c0036
+			public const int center = 2131492918;
 			
-			// aapt resource value: 0x7f0a003f
-			public const int clip_vertical = 2131361855;
+			// aapt resource value: 0x7f0c0037
+			public const int center_horizontal = 2131492919;
 			
-			// aapt resource value: 0x7f0a002a
-			public const int collapseActionView = 2131361834;
+			// aapt resource value: 0x7f0c0038
+			public const int center_vertical = 2131492920;
 			
-			// aapt resource value: 0x7f0a0055
-			public const int contentPanel = 2131361877;
+			// aapt resource value: 0x7f0c005d
+			public const int checkbox = 2131492957;
 			
-			// aapt resource value: 0x7f0a005b
-			public const int custom = 2131361883;
+			// aapt resource value: 0x7f0c00a2
+			public const int chronometer = 2131493026;
 			
-			// aapt resource value: 0x7f0a005a
-			public const int customPanel = 2131361882;
+			// aapt resource value: 0x7f0c003e
+			public const int clip_horizontal = 2131492926;
 			
-			// aapt resource value: 0x7f0a0016
-			public const int dark = 2131361814;
+			// aapt resource value: 0x7f0c003f
+			public const int clip_vertical = 2131492927;
 			
-			// aapt resource value: 0x7f0a0063
-			public const int decor_content_parent = 2131361891;
+			// aapt resource value: 0x7f0c002a
+			public const int collapseActionView = 2131492906;
 			
-			// aapt resource value: 0x7f0a004b
-			public const int default_activity_button = 2131361867;
+			// aapt resource value: 0x7f0c0055
+			public const int contentPanel = 2131492949;
 			
-			// aapt resource value: 0x7f0a0075
-			public const int design_bottom_sheet = 2131361909;
+			// aapt resource value: 0x7f0c005b
+			public const int custom = 2131492955;
 			
-			// aapt resource value: 0x7f0a007c
-			public const int design_menu_item_action_area = 2131361916;
+			// aapt resource value: 0x7f0c005a
+			public const int customPanel = 2131492954;
 			
-			// aapt resource value: 0x7f0a007b
-			public const int design_menu_item_action_area_stub = 2131361915;
+			// aapt resource value: 0x7f0c0016
+			public const int dark = 2131492886;
 			
-			// aapt resource value: 0x7f0a007a
-			public const int design_menu_item_text = 2131361914;
+			// aapt resource value: 0x7f0c0063
+			public const int decor_content_parent = 2131492963;
 			
-			// aapt resource value: 0x7f0a0079
-			public const int design_navigation_view = 2131361913;
+			// aapt resource value: 0x7f0c004b
+			public const int default_activity_button = 2131492939;
 			
-			// aapt resource value: 0x7f0a001a
-			public const int disableHome = 2131361818;
+			// aapt resource value: 0x7f0c0079
+			public const int design_bottom_sheet = 2131492985;
 			
-			// aapt resource value: 0x7f0a0067
-			public const int edit_query = 2131361895;
+			// aapt resource value: 0x7f0c0080
+			public const int design_menu_item_action_area = 2131492992;
 			
-			// aapt resource value: 0x7f0a0027
-			public const int end = 2131361831;
+			// aapt resource value: 0x7f0c007f
+			public const int design_menu_item_action_area_stub = 2131492991;
 			
-			// aapt resource value: 0x7f0a00a2
-			public const int end_padder = 2131361954;
+			// aapt resource value: 0x7f0c007e
+			public const int design_menu_item_text = 2131492990;
 			
-			// aapt resource value: 0x7f0a002e
-			public const int enterAlways = 2131361838;
+			// aapt resource value: 0x7f0c007d
+			public const int design_navigation_view = 2131492989;
 			
-			// aapt resource value: 0x7f0a002f
-			public const int enterAlwaysCollapsed = 2131361839;
+			// aapt resource value: 0x7f0c001a
+			public const int disableHome = 2131492890;
 			
-			// aapt resource value: 0x7f0a0030
-			public const int exitUntilCollapsed = 2131361840;
+			// aapt resource value: 0x7f0c0067
+			public const int edit_query = 2131492967;
 			
-			// aapt resource value: 0x7f0a0049
-			public const int expand_activities_button = 2131361865;
+			// aapt resource value: 0x7f0c0027
+			public const int end = 2131492903;
 			
-			// aapt resource value: 0x7f0a005c
-			public const int expanded_menu = 2131361884;
+			// aapt resource value: 0x7f0c00a7
+			public const int end_padder = 2131493031;
 			
-			// aapt resource value: 0x7f0a0040
-			public const int fill = 2131361856;
+			// aapt resource value: 0x7f0c002e
+			public const int enterAlways = 2131492910;
 			
-			// aapt resource value: 0x7f0a0041
-			public const int fill_horizontal = 2131361857;
+			// aapt resource value: 0x7f0c002f
+			public const int enterAlwaysCollapsed = 2131492911;
 			
-			// aapt resource value: 0x7f0a0039
-			public const int fill_vertical = 2131361849;
+			// aapt resource value: 0x7f0c0030
+			public const int exitUntilCollapsed = 2131492912;
 			
-			// aapt resource value: 0x7f0a0043
-			public const int @fixed = 2131361859;
+			// aapt resource value: 0x7f0c0049
+			public const int expand_activities_button = 2131492937;
 			
-			// aapt resource value: 0x7f0a0005
-			public const int home = 2131361797;
+			// aapt resource value: 0x7f0c005c
+			public const int expanded_menu = 2131492956;
 			
-			// aapt resource value: 0x7f0a001b
-			public const int homeAsUp = 2131361819;
+			// aapt resource value: 0x7f0c0040
+			public const int fill = 2131492928;
 			
-			// aapt resource value: 0x7f0a000b
-			public const int hybrid = 2131361803;
+			// aapt resource value: 0x7f0c0041
+			public const int fill_horizontal = 2131492929;
 			
-			// aapt resource value: 0x7f0a004d
-			public const int icon = 2131361869;
+			// aapt resource value: 0x7f0c0039
+			public const int fill_vertical = 2131492921;
 			
-			// aapt resource value: 0x7f0a0012
-			public const int icon_only = 2131361810;
+			// aapt resource value: 0x7f0c0043
+			public const int @fixed = 2131492931;
 			
-			// aapt resource value: 0x7f0a002b
-			public const int ifRoom = 2131361835;
+			// aapt resource value: 0x7f0c00b2
+			public const int fullscreen = 2131493042;
 			
-			// aapt resource value: 0x7f0a004a
-			public const int image = 2131361866;
+			// aapt resource value: 0x7f0c0005
+			public const int home = 2131492869;
 			
-			// aapt resource value: 0x7f0a00a1
-			public const int info = 2131361953;
+			// aapt resource value: 0x7f0c001b
+			public const int homeAsUp = 2131492891;
 			
-			// aapt resource value: 0x7f0a0000
-			public const int item_touch_helper_previous_elevation = 2131361792;
+			// aapt resource value: 0x7f0c000b
+			public const int hybrid = 2131492875;
 			
-			// aapt resource value: 0x7f0a003a
-			public const int left = 2131361850;
+			// aapt resource value: 0x7f0c004d
+			public const int icon = 2131492941;
 			
-			// aapt resource value: 0x7f0a0017
-			public const int light = 2131361815;
+			// aapt resource value: 0x7f0c0012
+			public const int icon_only = 2131492882;
 			
-			// aapt resource value: 0x7f0a009b
-			public const int line1 = 2131361947;
+			// aapt resource value: 0x7f0c002b
+			public const int ifRoom = 2131492907;
 			
-			// aapt resource value: 0x7f0a009f
-			public const int line3 = 2131361951;
+			// aapt resource value: 0x7f0c004a
+			public const int image = 2131492938;
 			
-			// aapt resource value: 0x7f0a0018
-			public const int listMode = 2131361816;
+			// aapt resource value: 0x7f0c00a6
+			public const int info = 2131493030;
 			
-			// aapt resource value: 0x7f0a004c
-			public const int list_item = 2131361868;
+			// aapt resource value: 0x7f0c0000
+			public const int item_touch_helper_previous_elevation = 2131492864;
 			
-			// aapt resource value: 0x7f0a0099
-			public const int media_actions = 2131361945;
+			// aapt resource value: 0x7f0c003a
+			public const int left = 2131492922;
 			
-			// aapt resource value: 0x7f0a0028
-			public const int middle = 2131361832;
+			// aapt resource value: 0x7f0c0077
+			public const int left_arrow = 2131492983;
 			
-			// aapt resource value: 0x7f0a0042
-			public const int mini = 2131361858;
+			// aapt resource value: 0x7f0c0017
+			public const int light = 2131492887;
 			
-			// aapt resource value: 0x7f0a0088
-			public const int mr_art = 2131361928;
+			// aapt resource value: 0x7f0c00a0
+			public const int line1 = 2131493024;
 			
-			// aapt resource value: 0x7f0a007d
-			public const int mr_chooser_list = 2131361917;
+			// aapt resource value: 0x7f0c00a4
+			public const int line3 = 2131493028;
 			
-			// aapt resource value: 0x7f0a0080
-			public const int mr_chooser_route_desc = 2131361920;
+			// aapt resource value: 0x7f0c0018
+			public const int listMode = 2131492888;
 			
-			// aapt resource value: 0x7f0a007e
-			public const int mr_chooser_route_icon = 2131361918;
+			// aapt resource value: 0x7f0c004c
+			public const int list_item = 2131492940;
 			
-			// aapt resource value: 0x7f0a007f
-			public const int mr_chooser_route_name = 2131361919;
+			// aapt resource value: 0x7f0c00aa
+			public const int logo_image = 2131493034;
 			
-			// aapt resource value: 0x7f0a0085
-			public const int mr_close = 2131361925;
+			// aapt resource value: 0x7f0c009e
+			public const int media_actions = 2131493022;
 			
-			// aapt resource value: 0x7f0a008b
-			public const int mr_control_divider = 2131361931;
+			// aapt resource value: 0x7f0c00b0
+			public const int mediacontroller_progress = 2131493040;
 			
-			// aapt resource value: 0x7f0a0091
-			public const int mr_control_play_pause = 2131361937;
+			// aapt resource value: 0x7f0c0028
+			public const int middle = 2131492904;
 			
-			// aapt resource value: 0x7f0a0094
-			public const int mr_control_subtitle = 2131361940;
+			// aapt resource value: 0x7f0c00a8
+			public const int middle_section = 2131493032;
 			
-			// aapt resource value: 0x7f0a0093
-			public const int mr_control_title = 2131361939;
+			// aapt resource value: 0x7f0c0042
+			public const int mini = 2131492930;
 			
-			// aapt resource value: 0x7f0a0092
-			public const int mr_control_title_container = 2131361938;
+			// aapt resource value: 0x7f0c008d
+			public const int mr_art = 2131493005;
 			
-			// aapt resource value: 0x7f0a0086
-			public const int mr_custom_control = 2131361926;
+			// aapt resource value: 0x7f0c0082
+			public const int mr_chooser_list = 2131492994;
 			
-			// aapt resource value: 0x7f0a0087
-			public const int mr_default_control = 2131361927;
+			// aapt resource value: 0x7f0c0085
+			public const int mr_chooser_route_desc = 2131492997;
 			
-			// aapt resource value: 0x7f0a0082
-			public const int mr_dialog_area = 2131361922;
+			// aapt resource value: 0x7f0c0083
+			public const int mr_chooser_route_icon = 2131492995;
 			
-			// aapt resource value: 0x7f0a0081
-			public const int mr_expandable_area = 2131361921;
+			// aapt resource value: 0x7f0c0084
+			public const int mr_chooser_route_name = 2131492996;
 			
-			// aapt resource value: 0x7f0a0095
-			public const int mr_group_expand_collapse = 2131361941;
+			// aapt resource value: 0x7f0c008a
+			public const int mr_close = 2131493002;
 			
-			// aapt resource value: 0x7f0a0089
-			public const int mr_media_main_control = 2131361929;
+			// aapt resource value: 0x7f0c0090
+			public const int mr_control_divider = 2131493008;
 			
-			// aapt resource value: 0x7f0a0084
-			public const int mr_name = 2131361924;
+			// aapt resource value: 0x7f0c0096
+			public const int mr_control_play_pause = 2131493014;
 			
-			// aapt resource value: 0x7f0a008a
-			public const int mr_playback_control = 2131361930;
+			// aapt resource value: 0x7f0c0099
+			public const int mr_control_subtitle = 2131493017;
 			
-			// aapt resource value: 0x7f0a0083
-			public const int mr_title_bar = 2131361923;
+			// aapt resource value: 0x7f0c0098
+			public const int mr_control_title = 2131493016;
 			
-			// aapt resource value: 0x7f0a008c
-			public const int mr_volume_control = 2131361932;
+			// aapt resource value: 0x7f0c0097
+			public const int mr_control_title_container = 2131493015;
 			
-			// aapt resource value: 0x7f0a008d
-			public const int mr_volume_group_list = 2131361933;
+			// aapt resource value: 0x7f0c008b
+			public const int mr_custom_control = 2131493003;
 			
-			// aapt resource value: 0x7f0a008f
-			public const int mr_volume_item_icon = 2131361935;
+			// aapt resource value: 0x7f0c008c
+			public const int mr_default_control = 2131493004;
 			
-			// aapt resource value: 0x7f0a0090
-			public const int mr_volume_slider = 2131361936;
+			// aapt resource value: 0x7f0c0087
+			public const int mr_dialog_area = 2131492999;
 			
-			// aapt resource value: 0x7f0a0021
-			public const int multiply = 2131361825;
+			// aapt resource value: 0x7f0c0086
+			public const int mr_expandable_area = 2131492998;
 			
-			// aapt resource value: 0x7f0a0078
-			public const int navigation_header_container = 2131361912;
+			// aapt resource value: 0x7f0c009a
+			public const int mr_group_expand_collapse = 2131493018;
 			
-			// aapt resource value: 0x7f0a002c
-			public const int never = 2131361836;
+			// aapt resource value: 0x7f0c008e
+			public const int mr_media_main_control = 2131493006;
 			
-			// aapt resource value: 0x7f0a000c
-			public const int none = 2131361804;
+			// aapt resource value: 0x7f0c0089
+			public const int mr_name = 2131493001;
 			
-			// aapt resource value: 0x7f0a000d
-			public const int normal = 2131361805;
+			// aapt resource value: 0x7f0c008f
+			public const int mr_playback_control = 2131493007;
 			
-			// aapt resource value: 0x7f0a0033
-			public const int parallax = 2131361843;
+			// aapt resource value: 0x7f0c0088
+			public const int mr_title_bar = 2131493000;
 			
-			// aapt resource value: 0x7f0a0051
-			public const int parentPanel = 2131361873;
+			// aapt resource value: 0x7f0c0091
+			public const int mr_volume_control = 2131493009;
 			
-			// aapt resource value: 0x7f0a0034
-			public const int pin = 2131361844;
+			// aapt resource value: 0x7f0c0092
+			public const int mr_volume_group_list = 2131493010;
 			
-			// aapt resource value: 0x7f0a0006
-			public const int progress_circular = 2131361798;
+			// aapt resource value: 0x7f0c0094
+			public const int mr_volume_item_icon = 2131493012;
 			
-			// aapt resource value: 0x7f0a0007
-			public const int progress_horizontal = 2131361799;
+			// aapt resource value: 0x7f0c0095
+			public const int mr_volume_slider = 2131493013;
 			
-			// aapt resource value: 0x7f0a005f
-			public const int radio = 2131361887;
+			// aapt resource value: 0x7f0c0021
+			public const int multiply = 2131492897;
 			
-			// aapt resource value: 0x7f0a003b
-			public const int right = 2131361851;
+			// aapt resource value: 0x7f0c007c
+			public const int navigation_header_container = 2131492988;
 			
-			// aapt resource value: 0x7f0a000e
-			public const int satellite = 2131361806;
+			// aapt resource value: 0x7f0c002c
+			public const int never = 2131492908;
 			
-			// aapt resource value: 0x7f0a0022
-			public const int screen = 2131361826;
+			// aapt resource value: 0x7f0c000c
+			public const int none = 2131492876;
 			
-			// aapt resource value: 0x7f0a0031
-			public const int scroll = 2131361841;
+			// aapt resource value: 0x7f0c000d
+			public const int normal = 2131492877;
 			
-			// aapt resource value: 0x7f0a0059
-			public const int scrollIndicatorDown = 2131361881;
+			// aapt resource value: 0x7f0c0033
+			public const int parallax = 2131492915;
 			
-			// aapt resource value: 0x7f0a0056
-			public const int scrollIndicatorUp = 2131361878;
+			// aapt resource value: 0x7f0c0051
+			public const int parentPanel = 2131492945;
 			
-			// aapt resource value: 0x7f0a0057
-			public const int scrollView = 2131361879;
+			// aapt resource value: 0x7f0c00ad
+			public const int pause = 2131493037;
 			
-			// aapt resource value: 0x7f0a0044
-			public const int scrollable = 2131361860;
+			// aapt resource value: 0x7f0c0034
+			public const int pin = 2131492916;
 			
-			// aapt resource value: 0x7f0a0069
-			public const int search_badge = 2131361897;
+			// aapt resource value: 0x7f0c0006
+			public const int progress_circular = 2131492870;
 			
-			// aapt resource value: 0x7f0a0068
-			public const int search_bar = 2131361896;
+			// aapt resource value: 0x7f0c0007
+			public const int progress_horizontal = 2131492871;
 			
-			// aapt resource value: 0x7f0a006a
-			public const int search_button = 2131361898;
+			// aapt resource value: 0x7f0c005f
+			public const int radio = 2131492959;
 			
-			// aapt resource value: 0x7f0a006f
-			public const int search_close_btn = 2131361903;
+			// aapt resource value: 0x7f0c003b
+			public const int right = 2131492923;
 			
-			// aapt resource value: 0x7f0a006b
-			public const int search_edit_frame = 2131361899;
+			// aapt resource value: 0x7f0c0076
+			public const int right_arrow = 2131492982;
 			
-			// aapt resource value: 0x7f0a0071
-			public const int search_go_btn = 2131361905;
+			// aapt resource value: 0x7f0c000e
+			public const int satellite = 2131492878;
 			
-			// aapt resource value: 0x7f0a006c
-			public const int search_mag_icon = 2131361900;
+			// aapt resource value: 0x7f0c0022
+			public const int screen = 2131492898;
 			
-			// aapt resource value: 0x7f0a006d
-			public const int search_plate = 2131361901;
+			// aapt resource value: 0x7f0c0031
+			public const int scroll = 2131492913;
 			
-			// aapt resource value: 0x7f0a006e
-			public const int search_src_text = 2131361902;
+			// aapt resource value: 0x7f0c0059
+			public const int scrollIndicatorDown = 2131492953;
 			
-			// aapt resource value: 0x7f0a0072
-			public const int search_voice_btn = 2131361906;
+			// aapt resource value: 0x7f0c0056
+			public const int scrollIndicatorUp = 2131492950;
 			
-			// aapt resource value: 0x7f0a0073
-			public const int select_dialog_listview = 2131361907;
+			// aapt resource value: 0x7f0c0057
+			public const int scrollView = 2131492951;
 			
-			// aapt resource value: 0x7f0a005e
-			public const int shortcut = 2131361886;
+			// aapt resource value: 0x7f0c0044
+			public const int scrollable = 2131492932;
 			
-			// aapt resource value: 0x7f0a001c
-			public const int showCustom = 2131361820;
+			// aapt resource value: 0x7f0c0069
+			public const int search_badge = 2131492969;
 			
-			// aapt resource value: 0x7f0a001d
-			public const int showHome = 2131361821;
+			// aapt resource value: 0x7f0c0068
+			public const int search_bar = 2131492968;
 			
-			// aapt resource value: 0x7f0a001e
-			public const int showTitle = 2131361822;
+			// aapt resource value: 0x7f0c006a
+			public const int search_button = 2131492970;
 			
-			// aapt resource value: 0x7f0a00a3
-			public const int sliding_tabs = 2131361955;
+			// aapt resource value: 0x7f0c006f
+			public const int search_close_btn = 2131492975;
 			
-			// aapt resource value: 0x7f0a0077
-			public const int snackbar_action = 2131361911;
+			// aapt resource value: 0x7f0c006b
+			public const int search_edit_frame = 2131492971;
 			
-			// aapt resource value: 0x7f0a0076
-			public const int snackbar_text = 2131361910;
+			// aapt resource value: 0x7f0c0071
+			public const int search_go_btn = 2131492977;
 			
-			// aapt resource value: 0x7f0a0032
-			public const int snap = 2131361842;
+			// aapt resource value: 0x7f0c006c
+			public const int search_mag_icon = 2131492972;
 			
-			// aapt resource value: 0x7f0a0050
-			public const int spacer = 2131361872;
+			// aapt resource value: 0x7f0c006d
+			public const int search_plate = 2131492973;
 			
-			// aapt resource value: 0x7f0a0008
-			public const int split_action_bar = 2131361800;
+			// aapt resource value: 0x7f0c006e
+			public const int search_src_text = 2131492974;
 			
-			// aapt resource value: 0x7f0a0023
-			public const int src_atop = 2131361827;
+			// aapt resource value: 0x7f0c0072
+			public const int search_voice_btn = 2131492978;
 			
-			// aapt resource value: 0x7f0a0024
-			public const int src_in = 2131361828;
+			// aapt resource value: 0x7f0c0073
+			public const int select_dialog_listview = 2131492979;
 			
-			// aapt resource value: 0x7f0a0025
-			public const int src_over = 2131361829;
+			// aapt resource value: 0x7f0c005e
+			public const int shortcut = 2131492958;
 			
-			// aapt resource value: 0x7f0a0013
-			public const int standard = 2131361811;
+			// aapt resource value: 0x7f0c001c
+			public const int showCustom = 2131492892;
 			
-			// aapt resource value: 0x7f0a003c
-			public const int start = 2131361852;
+			// aapt resource value: 0x7f0c001d
+			public const int showHome = 2131492893;
 			
-			// aapt resource value: 0x7f0a0098
-			public const int status_bar_latest_event_content = 2131361944;
+			// aapt resource value: 0x7f0c001e
+			public const int showTitle = 2131492894;
 			
-			// aapt resource value: 0x7f0a0070
-			public const int submit_area = 2131361904;
+			// aapt resource value: 0x7f0c00b4
+			public const int sliding_tabs = 2131493044;
 			
-			// aapt resource value: 0x7f0a0019
-			public const int tabMode = 2131361817;
+			// aapt resource value: 0x7f0c007b
+			public const int snackbar_action = 2131492987;
 			
-			// aapt resource value: 0x7f0a000f
-			public const int terrain = 2131361807;
+			// aapt resource value: 0x7f0c007a
+			public const int snackbar_text = 2131492986;
 			
-			// aapt resource value: 0x7f0a00a0
-			public const int text = 2131361952;
+			// aapt resource value: 0x7f0c0032
+			public const int snap = 2131492914;
 			
-			// aapt resource value: 0x7f0a009e
-			public const int text2 = 2131361950;
+			// aapt resource value: 0x7f0c0050
+			public const int spacer = 2131492944;
 			
-			// aapt resource value: 0x7f0a0058
-			public const int textSpacerNoButtons = 2131361880;
+			// aapt resource value: 0x7f0c0008
+			public const int split_action_bar = 2131492872;
 			
-			// aapt resource value: 0x7f0a009c
-			public const int time = 2131361948;
+			// aapt resource value: 0x7f0c0023
+			public const int src_atop = 2131492899;
 			
-			// aapt resource value: 0x7f0a004e
-			public const int title = 2131361870;
+			// aapt resource value: 0x7f0c0024
+			public const int src_in = 2131492900;
 			
-			// aapt resource value: 0x7f0a0053
-			public const int title_template = 2131361875;
+			// aapt resource value: 0x7f0c0025
+			public const int src_over = 2131492901;
 			
-			// aapt resource value: 0x7f0a00a4
-			public const int toolbar = 2131361956;
+			// aapt resource value: 0x7f0c0013
+			public const int standard = 2131492883;
 			
-			// aapt resource value: 0x7f0a003d
-			public const int top = 2131361853;
+			// aapt resource value: 0x7f0c003c
+			public const int start = 2131492924;
 			
-			// aapt resource value: 0x7f0a0052
-			public const int topPanel = 2131361874;
+			// aapt resource value: 0x7f0c009d
+			public const int status_bar_latest_event_content = 2131493021;
 			
-			// aapt resource value: 0x7f0a0074
-			public const int touch_outside = 2131361908;
+			// aapt resource value: 0x7f0c0070
+			public const int submit_area = 2131492976;
 			
-			// aapt resource value: 0x7f0a0009
-			public const int up = 2131361801;
+			// aapt resource value: 0x7f0c00b3
+			public const int subtitles = 2131493043;
 			
-			// aapt resource value: 0x7f0a001f
-			public const int useLogo = 2131361823;
+			// aapt resource value: 0x7f0c00b6
+			public const int surface_view = 2131493046;
 			
-			// aapt resource value: 0x7f0a000a
-			public const int view_offset_helper = 2131361802;
+			// aapt resource value: 0x7f0c0019
+			public const int tabMode = 2131492889;
 			
-			// aapt resource value: 0x7f0a008e
-			public const int volume_item_container = 2131361934;
+			// aapt resource value: 0x7f0c000f
+			public const int terrain = 2131492879;
 			
-			// aapt resource value: 0x7f0a0014
-			public const int wide = 2131361812;
+			// aapt resource value: 0x7f0c00a5
+			public const int text = 2131493029;
 			
-			// aapt resource value: 0x7f0a002d
-			public const int withText = 2131361837;
+			// aapt resource value: 0x7f0c00a3
+			public const int text2 = 2131493027;
 			
-			// aapt resource value: 0x7f0a0020
-			public const int wrap_content = 2131361824;
+			// aapt resource value: 0x7f0c0058
+			public const int textSpacerNoButtons = 2131492952;
+			
+			// aapt resource value: 0x7f0c00a1
+			public const int time = 2131493025;
+			
+			// aapt resource value: 0x7f0c00af
+			public const int time_current = 2131493039;
+			
+			// aapt resource value: 0x7f0c00b1
+			public const int time_duration = 2131493041;
+			
+			// aapt resource value: 0x7f0c004e
+			public const int title = 2131492942;
+			
+			// aapt resource value: 0x7f0c0053
+			public const int title_template = 2131492947;
+			
+			// aapt resource value: 0x7f0c00b5
+			public const int toolbar = 2131493045;
+			
+			// aapt resource value: 0x7f0c003d
+			public const int top = 2131492925;
+			
+			// aapt resource value: 0x7f0c0052
+			public const int topPanel = 2131492946;
+			
+			// aapt resource value: 0x7f0c00a9
+			public const int top_chrome = 2131493033;
+			
+			// aapt resource value: 0x7f0c0078
+			public const int touch_outside = 2131492984;
+			
+			// aapt resource value: 0x7f0c0009
+			public const int up = 2131492873;
+			
+			// aapt resource value: 0x7f0c001f
+			public const int useLogo = 2131492895;
+			
+			// aapt resource value: 0x7f0c00ab
+			public const int video_title = 2131493035;
+			
+			// aapt resource value: 0x7f0c000a
+			public const int view_offset_helper = 2131492874;
+			
+			// aapt resource value: 0x7f0c0093
+			public const int volume_item_container = 2131493011;
+			
+			// aapt resource value: 0x7f0c0014
+			public const int wide = 2131492884;
+			
+			// aapt resource value: 0x7f0c002d
+			public const int withText = 2131492909;
+			
+			// aapt resource value: 0x7f0c0020
+			public const int wrap_content = 2131492896;
 			
 			static Id()
 			{
@@ -3055,38 +5037,38 @@ namespace BookAStar.Droid
 		public partial class Integer
 		{
 			
-			// aapt resource value: 0x7f070005
-			public const int abc_config_activityDefaultDur = 2131165189;
+			// aapt resource value: 0x7f080005
+			public const int abc_config_activityDefaultDur = 2131230725;
 			
-			// aapt resource value: 0x7f070006
-			public const int abc_config_activityShortDur = 2131165190;
+			// aapt resource value: 0x7f080006
+			public const int abc_config_activityShortDur = 2131230726;
 			
-			// aapt resource value: 0x7f070004
-			public const int abc_max_action_buttons = 2131165188;
+			// aapt resource value: 0x7f080004
+			public const int abc_max_action_buttons = 2131230724;
 			
-			// aapt resource value: 0x7f07000a
-			public const int bottom_sheet_slide_duration = 2131165194;
+			// aapt resource value: 0x7f08000a
+			public const int bottom_sheet_slide_duration = 2131230730;
 			
-			// aapt resource value: 0x7f070007
-			public const int cancel_button_image_alpha = 2131165191;
+			// aapt resource value: 0x7f080007
+			public const int cancel_button_image_alpha = 2131230727;
 			
-			// aapt resource value: 0x7f070009
-			public const int design_snackbar_text_max_lines = 2131165193;
+			// aapt resource value: 0x7f080009
+			public const int design_snackbar_text_max_lines = 2131230729;
 			
-			// aapt resource value: 0x7f070000
-			public const int google_play_services_version = 2131165184;
+			// aapt resource value: 0x7f080000
+			public const int google_play_services_version = 2131230720;
 			
-			// aapt resource value: 0x7f070001
-			public const int mr_controller_volume_group_list_animation_duration_ms = 2131165185;
+			// aapt resource value: 0x7f080001
+			public const int mr_controller_volume_group_list_animation_duration_ms = 2131230721;
 			
-			// aapt resource value: 0x7f070002
-			public const int mr_controller_volume_group_list_fade_in_duration_ms = 2131165186;
+			// aapt resource value: 0x7f080002
+			public const int mr_controller_volume_group_list_fade_in_duration_ms = 2131230722;
 			
-			// aapt resource value: 0x7f070003
-			public const int mr_controller_volume_group_list_fade_out_duration_ms = 2131165187;
+			// aapt resource value: 0x7f080003
+			public const int mr_controller_volume_group_list_fade_out_duration_ms = 2131230723;
 			
-			// aapt resource value: 0x7f070008
-			public const int status_bar_notification_info_maxnum = 2131165192;
+			// aapt resource value: 0x7f080008
+			public const int status_bar_notification_info_maxnum = 2131230728;
 			
 			static Integer()
 			{
@@ -3196,103 +5178,130 @@ namespace BookAStar.Droid
 			public const int abc_select_dialog_material = 2130903064;
 			
 			// aapt resource value: 0x7f030019
-			public const int design_bottom_sheet_dialog = 2130903065;
+			public const int calendar_pager = 2130903065;
 			
 			// aapt resource value: 0x7f03001a
-			public const int design_layout_snackbar = 2130903066;
+			public const int calendar_pager_layout = 2130903066;
 			
 			// aapt resource value: 0x7f03001b
-			public const int design_layout_snackbar_include = 2130903067;
+			public const int calendar_picker = 2130903067;
 			
 			// aapt resource value: 0x7f03001c
-			public const int design_layout_tab_icon = 2130903068;
+			public const int design_bottom_sheet_dialog = 2130903068;
 			
 			// aapt resource value: 0x7f03001d
-			public const int design_layout_tab_text = 2130903069;
+			public const int design_layout_snackbar = 2130903069;
 			
 			// aapt resource value: 0x7f03001e
-			public const int design_menu_item_action_area = 2130903070;
+			public const int design_layout_snackbar_include = 2130903070;
 			
 			// aapt resource value: 0x7f03001f
-			public const int design_navigation_item = 2130903071;
+			public const int design_layout_tab_icon = 2130903071;
 			
 			// aapt resource value: 0x7f030020
-			public const int design_navigation_item_header = 2130903072;
+			public const int design_layout_tab_text = 2130903072;
 			
 			// aapt resource value: 0x7f030021
-			public const int design_navigation_item_separator = 2130903073;
+			public const int design_menu_item_action_area = 2130903073;
 			
 			// aapt resource value: 0x7f030022
-			public const int design_navigation_item_subheader = 2130903074;
+			public const int design_navigation_item = 2130903074;
 			
 			// aapt resource value: 0x7f030023
-			public const int design_navigation_menu = 2130903075;
+			public const int design_navigation_item_header = 2130903075;
 			
 			// aapt resource value: 0x7f030024
-			public const int design_navigation_menu_item = 2130903076;
+			public const int design_navigation_item_separator = 2130903076;
 			
 			// aapt resource value: 0x7f030025
-			public const int EditEstimate = 2130903077;
+			public const int design_navigation_item_subheader = 2130903077;
 			
 			// aapt resource value: 0x7f030026
-			public const int mr_chooser_dialog = 2130903078;
+			public const int design_navigation_menu = 2130903078;
 			
 			// aapt resource value: 0x7f030027
-			public const int mr_chooser_list_item = 2130903079;
+			public const int design_navigation_menu_item = 2130903079;
 			
 			// aapt resource value: 0x7f030028
-			public const int mr_controller_material_dialog_b = 2130903080;
+			public const int dialog = 2130903080;
 			
 			// aapt resource value: 0x7f030029
-			public const int mr_controller_volume_item = 2130903081;
+			public const int EditEstimate = 2130903081;
 			
 			// aapt resource value: 0x7f03002a
-			public const int mr_playback_control = 2130903082;
+			public const int month = 2130903082;
 			
 			// aapt resource value: 0x7f03002b
-			public const int mr_volume_control = 2130903083;
+			public const int mr_chooser_dialog = 2130903083;
 			
 			// aapt resource value: 0x7f03002c
-			public const int notification_media_action = 2130903084;
+			public const int mr_chooser_list_item = 2130903084;
 			
 			// aapt resource value: 0x7f03002d
-			public const int notification_media_cancel_action = 2130903085;
+			public const int mr_controller_material_dialog_b = 2130903085;
 			
 			// aapt resource value: 0x7f03002e
-			public const int notification_template_big_media = 2130903086;
+			public const int mr_controller_volume_item = 2130903086;
 			
 			// aapt resource value: 0x7f03002f
-			public const int notification_template_big_media_narrow = 2130903087;
+			public const int mr_playback_control = 2130903087;
 			
 			// aapt resource value: 0x7f030030
-			public const int notification_template_lines = 2130903088;
+			public const int mr_volume_control = 2130903088;
 			
 			// aapt resource value: 0x7f030031
-			public const int notification_template_media = 2130903089;
+			public const int notification_media_action = 2130903089;
 			
 			// aapt resource value: 0x7f030032
-			public const int notification_template_part_chronometer = 2130903090;
+			public const int notification_media_cancel_action = 2130903090;
 			
 			// aapt resource value: 0x7f030033
-			public const int notification_template_part_time = 2130903091;
+			public const int notification_template_big_media = 2130903091;
 			
 			// aapt resource value: 0x7f030034
-			public const int select_dialog_item_material = 2130903092;
+			public const int notification_template_big_media_narrow = 2130903092;
 			
 			// aapt resource value: 0x7f030035
-			public const int select_dialog_multichoice_material = 2130903093;
+			public const int notification_template_lines = 2130903093;
 			
 			// aapt resource value: 0x7f030036
-			public const int select_dialog_singlechoice_material = 2130903094;
+			public const int notification_template_media = 2130903094;
 			
 			// aapt resource value: 0x7f030037
-			public const int support_simple_spinner_dropdown_item = 2130903095;
+			public const int notification_template_part_chronometer = 2130903095;
 			
 			// aapt resource value: 0x7f030038
-			public const int Tabbar = 2130903096;
+			public const int notification_template_part_time = 2130903096;
 			
 			// aapt resource value: 0x7f030039
-			public const int Toolbar = 2130903097;
+			public const int playback_control_layer = 2130903097;
+			
+			// aapt resource value: 0x7f03003a
+			public const int select_dialog_item_material = 2130903098;
+			
+			// aapt resource value: 0x7f03003b
+			public const int select_dialog_multichoice_material = 2130903099;
+			
+			// aapt resource value: 0x7f03003c
+			public const int select_dialog_singlechoice_material = 2130903100;
+			
+			// aapt resource value: 0x7f03003d
+			public const int subtitle_layer = 2130903101;
+			
+			// aapt resource value: 0x7f03003e
+			public const int support_simple_spinner_dropdown_item = 2130903102;
+			
+			// aapt resource value: 0x7f03003f
+			public const int Tabbar = 2130903103;
+			
+			// aapt resource value: 0x7f030040
+			public const int Toolbar = 2130903104;
+			
+			// aapt resource value: 0x7f030041
+			public const int video_surface_layer = 2130903105;
+			
+			// aapt resource value: 0x7f030042
+			public const int week = 2130903106;
 			
 			static Layout()
 			{
@@ -3304,254 +5313,336 @@ namespace BookAStar.Droid
 			}
 		}
 		
+		public partial class Raw
+		{
+			
+			// aapt resource value: 0x7f060000
+			public const int gtm_analytics = 2131099648;
+			
+			static Raw()
+			{
+				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+			}
+			
+			private Raw()
+			{
+			}
+		}
+		
 		public partial class String
 		{
 			
-			// aapt resource value: 0x7f06004c
-			public const int Date = 2131099724;
+			// aapt resource value: 0x7f07004c
+			public const int ApplicationName = 2131165260;
 			
-			// aapt resource value: 0x7f06004b
-			public const int Description = 2131099723;
+			// aapt resource value: 0x7f070061
+			public const int Date = 2131165281;
 			
-			// aapt resource value: 0x7f06004d
-			public const int Location = 2131099725;
+			// aapt resource value: 0x7f070060
+			public const int Description = 2131165280;
 			
-			// aapt resource value: 0x7f06004e
-			public const int Pricing = 2131099726;
+			// aapt resource value: 0x7f07004b
+			public const int Hello = 2131165259;
 			
-			// aapt resource value: 0x7f060049
-			public const int Settings = 2131099721;
+			// aapt resource value: 0x7f070062
+			public const int Location = 2131165282;
 			
-			// aapt resource value: 0x7f06004a
-			public const int Title = 2131099722;
+			// aapt resource value: 0x7f070063
+			public const int Pricing = 2131165283;
 			
-			// aapt resource value: 0x7f06002e
-			public const int abc_action_bar_home_description = 2131099694;
+			// aapt resource value: 0x7f07005e
+			public const int Settings = 2131165278;
 			
-			// aapt resource value: 0x7f06002f
-			public const int abc_action_bar_home_description_format = 2131099695;
+			// aapt resource value: 0x7f07005f
+			public const int Title = 2131165279;
 			
-			// aapt resource value: 0x7f060030
-			public const int abc_action_bar_home_subtitle_description_format = 2131099696;
+			// aapt resource value: 0x7f070034
+			public const int abc_action_bar_home_description = 2131165236;
 			
-			// aapt resource value: 0x7f060031
-			public const int abc_action_bar_up_description = 2131099697;
+			// aapt resource value: 0x7f070035
+			public const int abc_action_bar_home_description_format = 2131165237;
 			
-			// aapt resource value: 0x7f060032
-			public const int abc_action_menu_overflow_description = 2131099698;
+			// aapt resource value: 0x7f070036
+			public const int abc_action_bar_home_subtitle_description_format = 2131165238;
 			
-			// aapt resource value: 0x7f060033
-			public const int abc_action_mode_done = 2131099699;
+			// aapt resource value: 0x7f070037
+			public const int abc_action_bar_up_description = 2131165239;
 			
-			// aapt resource value: 0x7f060034
-			public const int abc_activity_chooser_view_see_all = 2131099700;
+			// aapt resource value: 0x7f070038
+			public const int abc_action_menu_overflow_description = 2131165240;
 			
-			// aapt resource value: 0x7f060035
-			public const int abc_activitychooserview_choose_application = 2131099701;
+			// aapt resource value: 0x7f070039
+			public const int abc_action_mode_done = 2131165241;
 			
-			// aapt resource value: 0x7f060036
-			public const int abc_capital_off = 2131099702;
+			// aapt resource value: 0x7f07003a
+			public const int abc_activity_chooser_view_see_all = 2131165242;
 			
-			// aapt resource value: 0x7f060037
-			public const int abc_capital_on = 2131099703;
+			// aapt resource value: 0x7f07003b
+			public const int abc_activitychooserview_choose_application = 2131165243;
 			
-			// aapt resource value: 0x7f060038
-			public const int abc_search_hint = 2131099704;
+			// aapt resource value: 0x7f07003c
+			public const int abc_capital_off = 2131165244;
 			
-			// aapt resource value: 0x7f060039
-			public const int abc_searchview_description_clear = 2131099705;
+			// aapt resource value: 0x7f07003d
+			public const int abc_capital_on = 2131165245;
 			
-			// aapt resource value: 0x7f06003a
-			public const int abc_searchview_description_query = 2131099706;
+			// aapt resource value: 0x7f07003e
+			public const int abc_search_hint = 2131165246;
 			
-			// aapt resource value: 0x7f06003b
-			public const int abc_searchview_description_search = 2131099707;
+			// aapt resource value: 0x7f07003f
+			public const int abc_searchview_description_clear = 2131165247;
 			
-			// aapt resource value: 0x7f06003c
-			public const int abc_searchview_description_submit = 2131099708;
+			// aapt resource value: 0x7f070040
+			public const int abc_searchview_description_query = 2131165248;
 			
-			// aapt resource value: 0x7f06003d
-			public const int abc_searchview_description_voice = 2131099709;
+			// aapt resource value: 0x7f070041
+			public const int abc_searchview_description_search = 2131165249;
 			
-			// aapt resource value: 0x7f06003e
-			public const int abc_shareactionprovider_share_with = 2131099710;
+			// aapt resource value: 0x7f070042
+			public const int abc_searchview_description_submit = 2131165250;
 			
-			// aapt resource value: 0x7f06003f
-			public const int abc_shareactionprovider_share_with_application = 2131099711;
+			// aapt resource value: 0x7f070043
+			public const int abc_searchview_description_voice = 2131165251;
 			
-			// aapt resource value: 0x7f060040
-			public const int abc_toolbar_collapse_description = 2131099712;
+			// aapt resource value: 0x7f070044
+			public const int abc_shareactionprovider_share_with = 2131165252;
 			
-			// aapt resource value: 0x7f060045
-			public const int app_name = 2131099717;
+			// aapt resource value: 0x7f070045
+			public const int abc_shareactionprovider_share_with_application = 2131165253;
 			
-			// aapt resource value: 0x7f060042
-			public const int appbar_scrolling_view_behavior = 2131099714;
+			// aapt resource value: 0x7f070046
+			public const int abc_toolbar_collapse_description = 2131165254;
 			
-			// aapt resource value: 0x7f060001
-			public const int auth_google_play_services_client_facebook_display_name = 2131099649;
+			// aapt resource value: 0x7f070021
+			public const int accept = 2131165217;
 			
-			// aapt resource value: 0x7f060000
-			public const int auth_google_play_services_client_google_display_name = 2131099648;
+			// aapt resource value: 0x7f07005a
+			public const int app_name = 2131165274;
 			
-			// aapt resource value: 0x7f060043
-			public const int bottom_sheet_behavior = 2131099715;
+			// aapt resource value: 0x7f070048
+			public const int appbar_scrolling_view_behavior = 2131165256;
 			
-			// aapt resource value: 0x7f060048
-			public const int cancel = 2131099720;
+			// aapt resource value: 0x7f070001
+			public const int auth_google_play_services_client_facebook_display_name = 2131165185;
 			
-			// aapt resource value: 0x7f060044
-			public const int character_counter_pattern = 2131099716;
+			// aapt resource value: 0x7f070000
+			public const int auth_google_play_services_client_google_display_name = 2131165184;
 			
-			// aapt resource value: 0x7f060018
-			public const int common_google_play_services_api_unavailable_text = 2131099672;
+			// aapt resource value: 0x7f070049
+			public const int bottom_sheet_behavior = 2131165257;
 			
-			// aapt resource value: 0x7f06000a
-			public const int common_google_play_services_enable_button = 2131099658;
+			// aapt resource value: 0x7f07005d
+			public const int cancel = 2131165277;
 			
-			// aapt resource value: 0x7f060009
-			public const int common_google_play_services_enable_text = 2131099657;
+			// aapt resource value: 0x7f07004a
+			public const int character_counter_pattern = 2131165258;
 			
-			// aapt resource value: 0x7f060008
-			public const int common_google_play_services_enable_title = 2131099656;
+			// aapt resource value: 0x7f070018
+			public const int common_google_play_services_api_unavailable_text = 2131165208;
 			
-			// aapt resource value: 0x7f060007
-			public const int common_google_play_services_install_button = 2131099655;
+			// aapt resource value: 0x7f07000a
+			public const int common_google_play_services_enable_button = 2131165194;
 			
-			// aapt resource value: 0x7f060005
-			public const int common_google_play_services_install_text_phone = 2131099653;
+			// aapt resource value: 0x7f070009
+			public const int common_google_play_services_enable_text = 2131165193;
 			
-			// aapt resource value: 0x7f060006
-			public const int common_google_play_services_install_text_tablet = 2131099654;
+			// aapt resource value: 0x7f070008
+			public const int common_google_play_services_enable_title = 2131165192;
 			
-			// aapt resource value: 0x7f060004
-			public const int common_google_play_services_install_title = 2131099652;
+			// aapt resource value: 0x7f070007
+			public const int common_google_play_services_install_button = 2131165191;
 			
-			// aapt resource value: 0x7f060013
-			public const int common_google_play_services_invalid_account_text = 2131099667;
+			// aapt resource value: 0x7f070005
+			public const int common_google_play_services_install_text_phone = 2131165189;
 			
-			// aapt resource value: 0x7f060012
-			public const int common_google_play_services_invalid_account_title = 2131099666;
+			// aapt resource value: 0x7f070006
+			public const int common_google_play_services_install_text_tablet = 2131165190;
 			
-			// aapt resource value: 0x7f060011
-			public const int common_google_play_services_network_error_text = 2131099665;
+			// aapt resource value: 0x7f070004
+			public const int common_google_play_services_install_title = 2131165188;
 			
-			// aapt resource value: 0x7f060010
-			public const int common_google_play_services_network_error_title = 2131099664;
+			// aapt resource value: 0x7f070013
+			public const int common_google_play_services_invalid_account_text = 2131165203;
 			
-			// aapt resource value: 0x7f060003
-			public const int common_google_play_services_notification_ticker = 2131099651;
+			// aapt resource value: 0x7f070012
+			public const int common_google_play_services_invalid_account_title = 2131165202;
 			
-			// aapt resource value: 0x7f06001c
-			public const int common_google_play_services_restricted_profile_text = 2131099676;
+			// aapt resource value: 0x7f070011
+			public const int common_google_play_services_network_error_text = 2131165201;
 			
-			// aapt resource value: 0x7f06001b
-			public const int common_google_play_services_restricted_profile_title = 2131099675;
+			// aapt resource value: 0x7f070010
+			public const int common_google_play_services_network_error_title = 2131165200;
 			
-			// aapt resource value: 0x7f06001a
-			public const int common_google_play_services_sign_in_failed_text = 2131099674;
+			// aapt resource value: 0x7f070003
+			public const int common_google_play_services_notification_ticker = 2131165187;
 			
-			// aapt resource value: 0x7f060019
-			public const int common_google_play_services_sign_in_failed_title = 2131099673;
+			// aapt resource value: 0x7f07001c
+			public const int common_google_play_services_restricted_profile_text = 2131165212;
 			
-			// aapt resource value: 0x7f060002
-			public const int common_google_play_services_unknown_issue = 2131099650;
+			// aapt resource value: 0x7f07001b
+			public const int common_google_play_services_restricted_profile_title = 2131165211;
 			
-			// aapt resource value: 0x7f060015
-			public const int common_google_play_services_unsupported_text = 2131099669;
+			// aapt resource value: 0x7f07001a
+			public const int common_google_play_services_sign_in_failed_text = 2131165210;
 			
-			// aapt resource value: 0x7f060014
-			public const int common_google_play_services_unsupported_title = 2131099668;
+			// aapt resource value: 0x7f070019
+			public const int common_google_play_services_sign_in_failed_title = 2131165209;
 			
-			// aapt resource value: 0x7f060016
-			public const int common_google_play_services_update_button = 2131099670;
+			// aapt resource value: 0x7f070002
+			public const int common_google_play_services_unknown_issue = 2131165186;
 			
-			// aapt resource value: 0x7f06000c
-			public const int common_google_play_services_update_text = 2131099660;
+			// aapt resource value: 0x7f070015
+			public const int common_google_play_services_unsupported_text = 2131165205;
 			
-			// aapt resource value: 0x7f06000b
-			public const int common_google_play_services_update_title = 2131099659;
+			// aapt resource value: 0x7f070014
+			public const int common_google_play_services_unsupported_title = 2131165204;
 			
-			// aapt resource value: 0x7f06000f
-			public const int common_google_play_services_updating_text = 2131099663;
+			// aapt resource value: 0x7f070016
+			public const int common_google_play_services_update_button = 2131165206;
 			
-			// aapt resource value: 0x7f06000e
-			public const int common_google_play_services_updating_title = 2131099662;
+			// aapt resource value: 0x7f07000c
+			public const int common_google_play_services_update_text = 2131165196;
 			
-			// aapt resource value: 0x7f06000d
-			public const int common_google_play_services_wear_update_text = 2131099661;
+			// aapt resource value: 0x7f07000b
+			public const int common_google_play_services_update_title = 2131165195;
 			
-			// aapt resource value: 0x7f060017
-			public const int common_open_on_phone = 2131099671;
+			// aapt resource value: 0x7f07000f
+			public const int common_google_play_services_updating_text = 2131165199;
 			
-			// aapt resource value: 0x7f06001d
-			public const int common_signin_button_text = 2131099677;
+			// aapt resource value: 0x7f07000e
+			public const int common_google_play_services_updating_title = 2131165198;
 			
-			// aapt resource value: 0x7f06001e
-			public const int common_signin_button_text_long = 2131099678;
+			// aapt resource value: 0x7f07000d
+			public const int common_google_play_services_wear_update_text = 2131165197;
 			
-			// aapt resource value: 0x7f06001f
-			public const int mr_button_content_description = 2131099679;
+			// aapt resource value: 0x7f070017
+			public const int common_open_on_phone = 2131165207;
 			
-			// aapt resource value: 0x7f060020
-			public const int mr_chooser_searching = 2131099680;
+			// aapt resource value: 0x7f07001d
+			public const int common_signin_button_text = 2131165213;
 			
-			// aapt resource value: 0x7f060021
-			public const int mr_chooser_title = 2131099681;
+			// aapt resource value: 0x7f07001e
+			public const int common_signin_button_text_long = 2131165214;
 			
-			// aapt resource value: 0x7f060022
-			public const int mr_controller_casting_screen = 2131099682;
+			// aapt resource value: 0x7f070024
+			public const int create_calendar_message = 2131165220;
 			
-			// aapt resource value: 0x7f060023
-			public const int mr_controller_close_description = 2131099683;
+			// aapt resource value: 0x7f070023
+			public const int create_calendar_title = 2131165219;
 			
-			// aapt resource value: 0x7f060024
-			public const int mr_controller_collapse_group = 2131099684;
+			// aapt resource value: 0x7f07004e
+			public const int day_name_format = 2131165262;
 			
-			// aapt resource value: 0x7f060025
-			public const int mr_controller_disconnect = 2131099685;
+			// aapt resource value: 0x7f070022
+			public const int decline = 2131165218;
 			
-			// aapt resource value: 0x7f060026
-			public const int mr_controller_expand_group = 2131099686;
+			// aapt resource value: 0x7f070051
+			public const int full_date_format = 2131165265;
 			
-			// aapt resource value: 0x7f060027
-			public const int mr_controller_no_info_available = 2131099687;
+			// aapt resource value: 0x7f070052
+			public const int fullscreen_button = 2131165266;
 			
-			// aapt resource value: 0x7f060028
-			public const int mr_controller_no_media_selected = 2131099688;
+			// aapt resource value: 0x7f070067
+			public const int google_app_id = 2131165287;
 			
-			// aapt resource value: 0x7f060029
-			public const int mr_controller_pause = 2131099689;
+			// aapt resource value: 0x7f07004f
+			public const int invalid_date = 2131165263;
 			
-			// aapt resource value: 0x7f06002a
-			public const int mr_controller_play = 2131099690;
+			// aapt resource value: 0x7f07004d
+			public const int library_name = 2131165261;
 			
-			// aapt resource value: 0x7f06002b
-			public const int mr_controller_stop = 2131099691;
+			// aapt resource value: 0x7f070053
+			public const int logo_image = 2131165267;
 			
-			// aapt resource value: 0x7f06002c
-			public const int mr_system_route_name = 2131099692;
+			// aapt resource value: 0x7f070050
+			public const int month_name_format = 2131165264;
 			
-			// aapt resource value: 0x7f06002d
-			public const int mr_user_route_category_name = 2131099693;
+			// aapt resource value: 0x7f070025
+			public const int mr_button_content_description = 2131165221;
 			
-			// aapt resource value: 0x7f060051
-			public const int picture = 2131099729;
+			// aapt resource value: 0x7f070026
+			public const int mr_chooser_searching = 2131165222;
 			
-			// aapt resource value: 0x7f060041
-			public const int status_bar_notification_info_overflow = 2131099713;
+			// aapt resource value: 0x7f070027
+			public const int mr_chooser_title = 2131165223;
 			
-			// aapt resource value: 0x7f06004f
-			public const int url = 2131099727;
+			// aapt resource value: 0x7f070028
+			public const int mr_controller_casting_screen = 2131165224;
 			
-			// aapt resource value: 0x7f060050
-			public const int url_hint = 2131099728;
+			// aapt resource value: 0x7f070029
+			public const int mr_controller_close_description = 2131165225;
 			
-			// aapt resource value: 0x7f060047
-			public const int yavscAccountTypeName = 2131099719;
+			// aapt resource value: 0x7f07002a
+			public const int mr_controller_collapse_group = 2131165226;
 			
-			// aapt resource value: 0x7f060046
-			public const int yavscIdentRemoved = 2131099718;
+			// aapt resource value: 0x7f07002b
+			public const int mr_controller_disconnect = 2131165227;
+			
+			// aapt resource value: 0x7f07002c
+			public const int mr_controller_expand_group = 2131165228;
+			
+			// aapt resource value: 0x7f07002d
+			public const int mr_controller_no_info_available = 2131165229;
+			
+			// aapt resource value: 0x7f07002e
+			public const int mr_controller_no_media_selected = 2131165230;
+			
+			// aapt resource value: 0x7f07002f
+			public const int mr_controller_pause = 2131165231;
+			
+			// aapt resource value: 0x7f070030
+			public const int mr_controller_play = 2131165232;
+			
+			// aapt resource value: 0x7f070031
+			public const int mr_controller_stop = 2131165233;
+			
+			// aapt resource value: 0x7f070032
+			public const int mr_system_route_name = 2131165234;
+			
+			// aapt resource value: 0x7f070033
+			public const int mr_user_route_category_name = 2131165235;
+			
+			// aapt resource value: 0x7f070054
+			public const int overflow = 2131165268;
+			
+			// aapt resource value: 0x7f070055
+			public const int pause = 2131165269;
+			
+			// aapt resource value: 0x7f070066
+			public const int picture = 2131165286;
+			
+			// aapt resource value: 0x7f070056
+			public const int seekbar = 2131165270;
+			
+			// aapt resource value: 0x7f070057
+			public const int select_an_action = 2131165271;
+			
+			// aapt resource value: 0x7f070047
+			public const int status_bar_notification_info_overflow = 2131165255;
+			
+			// aapt resource value: 0x7f070020
+			public const int store_picture_message = 2131165216;
+			
+			// aapt resource value: 0x7f07001f
+			public const int store_picture_title = 2131165215;
+			
+			// aapt resource value: 0x7f070058
+			public const int time_current = 2131165272;
+			
+			// aapt resource value: 0x7f070059
+			public const int time_duration = 2131165273;
+			
+			// aapt resource value: 0x7f070064
+			public const int url = 2131165284;
+			
+			// aapt resource value: 0x7f070065
+			public const int url_hint = 2131165285;
+			
+			// aapt resource value: 0x7f07005c
+			public const int yavscAccountTypeName = 2131165276;
+			
+			// aapt resource value: 0x7f07005b
+			public const int yavscIdentRemoved = 2131165275;
 			
 			static String()
 			{
@@ -3566,1124 +5657,1148 @@ namespace BookAStar.Droid
 		public partial class Style
 		{
 			
-			// aapt resource value: 0x7f0b00a1
-			public const int AlertDialog_AppCompat = 2131427489;
+			// aapt resource value: 0x7f0a00a2
+			public const int AlertDialog_AppCompat = 2131361954;
 			
-			// aapt resource value: 0x7f0b00a2
-			public const int AlertDialog_AppCompat_Light = 2131427490;
+			// aapt resource value: 0x7f0a00a3
+			public const int AlertDialog_AppCompat_Light = 2131361955;
 			
-			// aapt resource value: 0x7f0b00a3
-			public const int Animation_AppCompat_Dialog = 2131427491;
+			// aapt resource value: 0x7f0a00a4
+			public const int Animation_AppCompat_Dialog = 2131361956;
 			
-			// aapt resource value: 0x7f0b00a4
-			public const int Animation_AppCompat_DropDownUp = 2131427492;
+			// aapt resource value: 0x7f0a00a5
+			public const int Animation_AppCompat_DropDownUp = 2131361957;
 			
-			// aapt resource value: 0x7f0b015a
-			public const int Animation_Design_BottomSheetDialog = 2131427674;
+			// aapt resource value: 0x7f0a015b
+			public const int Animation_Design_BottomSheetDialog = 2131362139;
 			
-			// aapt resource value: 0x7f0b0174
-			public const int AppCompatDialogStyle = 2131427700;
+			// aapt resource value: 0x7f0a017c
+			public const int AppCompatDialogStyle = 2131362172;
 			
-			// aapt resource value: 0x7f0b00a5
-			public const int Base_AlertDialog_AppCompat = 2131427493;
+			// aapt resource value: 0x7f0a00a6
+			public const int Base_AlertDialog_AppCompat = 2131361958;
 			
-			// aapt resource value: 0x7f0b00a6
-			public const int Base_AlertDialog_AppCompat_Light = 2131427494;
+			// aapt resource value: 0x7f0a00a7
+			public const int Base_AlertDialog_AppCompat_Light = 2131361959;
 			
-			// aapt resource value: 0x7f0b00a7
-			public const int Base_Animation_AppCompat_Dialog = 2131427495;
+			// aapt resource value: 0x7f0a00a8
+			public const int Base_Animation_AppCompat_Dialog = 2131361960;
 			
-			// aapt resource value: 0x7f0b00a8
-			public const int Base_Animation_AppCompat_DropDownUp = 2131427496;
+			// aapt resource value: 0x7f0a00a9
+			public const int Base_Animation_AppCompat_DropDownUp = 2131361961;
 			
-			// aapt resource value: 0x7f0b0018
-			public const int Base_CardView = 2131427352;
+			// aapt resource value: 0x7f0a0019
+			public const int Base_CardView = 2131361817;
 			
-			// aapt resource value: 0x7f0b00a9
-			public const int Base_DialogWindowTitle_AppCompat = 2131427497;
+			// aapt resource value: 0x7f0a00aa
+			public const int Base_DialogWindowTitle_AppCompat = 2131361962;
 			
-			// aapt resource value: 0x7f0b00aa
-			public const int Base_DialogWindowTitleBackground_AppCompat = 2131427498;
+			// aapt resource value: 0x7f0a00ab
+			public const int Base_DialogWindowTitleBackground_AppCompat = 2131361963;
 			
-			// aapt resource value: 0x7f0b0051
-			public const int Base_TextAppearance_AppCompat = 2131427409;
+			// aapt resource value: 0x7f0a0052
+			public const int Base_TextAppearance_AppCompat = 2131361874;
 			
-			// aapt resource value: 0x7f0b0052
-			public const int Base_TextAppearance_AppCompat_Body1 = 2131427410;
+			// aapt resource value: 0x7f0a0053
+			public const int Base_TextAppearance_AppCompat_Body1 = 2131361875;
 			
-			// aapt resource value: 0x7f0b0053
-			public const int Base_TextAppearance_AppCompat_Body2 = 2131427411;
+			// aapt resource value: 0x7f0a0054
+			public const int Base_TextAppearance_AppCompat_Body2 = 2131361876;
 			
-			// aapt resource value: 0x7f0b003b
-			public const int Base_TextAppearance_AppCompat_Button = 2131427387;
+			// aapt resource value: 0x7f0a003c
+			public const int Base_TextAppearance_AppCompat_Button = 2131361852;
 			
-			// aapt resource value: 0x7f0b0054
-			public const int Base_TextAppearance_AppCompat_Caption = 2131427412;
+			// aapt resource value: 0x7f0a0055
+			public const int Base_TextAppearance_AppCompat_Caption = 2131361877;
 			
-			// aapt resource value: 0x7f0b0055
-			public const int Base_TextAppearance_AppCompat_Display1 = 2131427413;
+			// aapt resource value: 0x7f0a0056
+			public const int Base_TextAppearance_AppCompat_Display1 = 2131361878;
 			
-			// aapt resource value: 0x7f0b0056
-			public const int Base_TextAppearance_AppCompat_Display2 = 2131427414;
+			// aapt resource value: 0x7f0a0057
+			public const int Base_TextAppearance_AppCompat_Display2 = 2131361879;
 			
-			// aapt resource value: 0x7f0b0057
-			public const int Base_TextAppearance_AppCompat_Display3 = 2131427415;
+			// aapt resource value: 0x7f0a0058
+			public const int Base_TextAppearance_AppCompat_Display3 = 2131361880;
 			
-			// aapt resource value: 0x7f0b0058
-			public const int Base_TextAppearance_AppCompat_Display4 = 2131427416;
+			// aapt resource value: 0x7f0a0059
+			public const int Base_TextAppearance_AppCompat_Display4 = 2131361881;
 			
-			// aapt resource value: 0x7f0b0059
-			public const int Base_TextAppearance_AppCompat_Headline = 2131427417;
+			// aapt resource value: 0x7f0a005a
+			public const int Base_TextAppearance_AppCompat_Headline = 2131361882;
 			
-			// aapt resource value: 0x7f0b0026
-			public const int Base_TextAppearance_AppCompat_Inverse = 2131427366;
+			// aapt resource value: 0x7f0a0027
+			public const int Base_TextAppearance_AppCompat_Inverse = 2131361831;
 			
-			// aapt resource value: 0x7f0b005a
-			public const int Base_TextAppearance_AppCompat_Large = 2131427418;
+			// aapt resource value: 0x7f0a005b
+			public const int Base_TextAppearance_AppCompat_Large = 2131361883;
 			
-			// aapt resource value: 0x7f0b0027
-			public const int Base_TextAppearance_AppCompat_Large_Inverse = 2131427367;
+			// aapt resource value: 0x7f0a0028
+			public const int Base_TextAppearance_AppCompat_Large_Inverse = 2131361832;
 			
-			// aapt resource value: 0x7f0b005b
-			public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131427419;
+			// aapt resource value: 0x7f0a005c
+			public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131361884;
 			
-			// aapt resource value: 0x7f0b005c
-			public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131427420;
+			// aapt resource value: 0x7f0a005d
+			public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131361885;
 			
-			// aapt resource value: 0x7f0b005d
-			public const int Base_TextAppearance_AppCompat_Medium = 2131427421;
+			// aapt resource value: 0x7f0a005e
+			public const int Base_TextAppearance_AppCompat_Medium = 2131361886;
 			
-			// aapt resource value: 0x7f0b0028
-			public const int Base_TextAppearance_AppCompat_Medium_Inverse = 2131427368;
+			// aapt resource value: 0x7f0a0029
+			public const int Base_TextAppearance_AppCompat_Medium_Inverse = 2131361833;
 			
-			// aapt resource value: 0x7f0b005e
-			public const int Base_TextAppearance_AppCompat_Menu = 2131427422;
+			// aapt resource value: 0x7f0a005f
+			public const int Base_TextAppearance_AppCompat_Menu = 2131361887;
 			
-			// aapt resource value: 0x7f0b00ab
-			public const int Base_TextAppearance_AppCompat_SearchResult = 2131427499;
+			// aapt resource value: 0x7f0a00ac
+			public const int Base_TextAppearance_AppCompat_SearchResult = 2131361964;
 			
-			// aapt resource value: 0x7f0b005f
-			public const int Base_TextAppearance_AppCompat_SearchResult_Subtitle = 2131427423;
+			// aapt resource value: 0x7f0a0060
+			public const int Base_TextAppearance_AppCompat_SearchResult_Subtitle = 2131361888;
 			
-			// aapt resource value: 0x7f0b0060
-			public const int Base_TextAppearance_AppCompat_SearchResult_Title = 2131427424;
+			// aapt resource value: 0x7f0a0061
+			public const int Base_TextAppearance_AppCompat_SearchResult_Title = 2131361889;
 			
-			// aapt resource value: 0x7f0b0061
-			public const int Base_TextAppearance_AppCompat_Small = 2131427425;
+			// aapt resource value: 0x7f0a0062
+			public const int Base_TextAppearance_AppCompat_Small = 2131361890;
 			
-			// aapt resource value: 0x7f0b0029
-			public const int Base_TextAppearance_AppCompat_Small_Inverse = 2131427369;
+			// aapt resource value: 0x7f0a002a
+			public const int Base_TextAppearance_AppCompat_Small_Inverse = 2131361834;
 			
-			// aapt resource value: 0x7f0b0062
-			public const int Base_TextAppearance_AppCompat_Subhead = 2131427426;
+			// aapt resource value: 0x7f0a0063
+			public const int Base_TextAppearance_AppCompat_Subhead = 2131361891;
 			
-			// aapt resource value: 0x7f0b002a
-			public const int Base_TextAppearance_AppCompat_Subhead_Inverse = 2131427370;
+			// aapt resource value: 0x7f0a002b
+			public const int Base_TextAppearance_AppCompat_Subhead_Inverse = 2131361835;
 			
-			// aapt resource value: 0x7f0b0063
-			public const int Base_TextAppearance_AppCompat_Title = 2131427427;
+			// aapt resource value: 0x7f0a0064
+			public const int Base_TextAppearance_AppCompat_Title = 2131361892;
 			
-			// aapt resource value: 0x7f0b002b
-			public const int Base_TextAppearance_AppCompat_Title_Inverse = 2131427371;
+			// aapt resource value: 0x7f0a002c
+			public const int Base_TextAppearance_AppCompat_Title_Inverse = 2131361836;
 			
-			// aapt resource value: 0x7f0b009a
-			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131427482;
+			// aapt resource value: 0x7f0a009b
+			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131361947;
 			
-			// aapt resource value: 0x7f0b0064
-			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131427428;
+			// aapt resource value: 0x7f0a0065
+			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131361893;
 			
-			// aapt resource value: 0x7f0b0065
-			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131427429;
+			// aapt resource value: 0x7f0a0066
+			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131361894;
 			
-			// aapt resource value: 0x7f0b0066
-			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title = 2131427430;
+			// aapt resource value: 0x7f0a0067
+			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title = 2131361895;
 			
-			// aapt resource value: 0x7f0b0067
-			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131427431;
+			// aapt resource value: 0x7f0a0068
+			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131361896;
 			
-			// aapt resource value: 0x7f0b0068
-			public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131427432;
+			// aapt resource value: 0x7f0a0069
+			public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131361897;
 			
-			// aapt resource value: 0x7f0b0069
-			public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Title = 2131427433;
+			// aapt resource value: 0x7f0a006a
+			public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Title = 2131361898;
 			
-			// aapt resource value: 0x7f0b006a
-			public const int Base_TextAppearance_AppCompat_Widget_Button = 2131427434;
+			// aapt resource value: 0x7f0a006b
+			public const int Base_TextAppearance_AppCompat_Widget_Button = 2131361899;
 			
-			// aapt resource value: 0x7f0b009b
-			public const int Base_TextAppearance_AppCompat_Widget_Button_Inverse = 2131427483;
+			// aapt resource value: 0x7f0a009c
+			public const int Base_TextAppearance_AppCompat_Widget_Button_Inverse = 2131361948;
 			
-			// aapt resource value: 0x7f0b00ac
-			public const int Base_TextAppearance_AppCompat_Widget_DropDownItem = 2131427500;
+			// aapt resource value: 0x7f0a00ad
+			public const int Base_TextAppearance_AppCompat_Widget_DropDownItem = 2131361965;
 			
-			// aapt resource value: 0x7f0b006b
-			public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131427435;
+			// aapt resource value: 0x7f0a006c
+			public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131361900;
 			
-			// aapt resource value: 0x7f0b006c
-			public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131427436;
+			// aapt resource value: 0x7f0a006d
+			public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131361901;
 			
-			// aapt resource value: 0x7f0b006d
-			public const int Base_TextAppearance_AppCompat_Widget_Switch = 2131427437;
+			// aapt resource value: 0x7f0a006e
+			public const int Base_TextAppearance_AppCompat_Widget_Switch = 2131361902;
 			
-			// aapt resource value: 0x7f0b006e
-			public const int Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131427438;
+			// aapt resource value: 0x7f0a006f
+			public const int Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131361903;
 			
-			// aapt resource value: 0x7f0b00ad
-			public const int Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131427501;
+			// aapt resource value: 0x7f0a00ae
+			public const int Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131361966;
 			
-			// aapt resource value: 0x7f0b006f
-			public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131427439;
+			// aapt resource value: 0x7f0a0070
+			public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131361904;
 			
-			// aapt resource value: 0x7f0b0070
-			public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Title = 2131427440;
+			// aapt resource value: 0x7f0a0071
+			public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Title = 2131361905;
 			
-			// aapt resource value: 0x7f0b0071
-			public const int Base_Theme_AppCompat = 2131427441;
+			// aapt resource value: 0x7f0a0072
+			public const int Base_Theme_AppCompat = 2131361906;
 			
-			// aapt resource value: 0x7f0b00ae
-			public const int Base_Theme_AppCompat_CompactMenu = 2131427502;
+			// aapt resource value: 0x7f0a00af
+			public const int Base_Theme_AppCompat_CompactMenu = 2131361967;
 			
-			// aapt resource value: 0x7f0b002c
-			public const int Base_Theme_AppCompat_Dialog = 2131427372;
+			// aapt resource value: 0x7f0a002d
+			public const int Base_Theme_AppCompat_Dialog = 2131361837;
 			
-			// aapt resource value: 0x7f0b00af
-			public const int Base_Theme_AppCompat_Dialog_Alert = 2131427503;
+			// aapt resource value: 0x7f0a00b0
+			public const int Base_Theme_AppCompat_Dialog_Alert = 2131361968;
 			
-			// aapt resource value: 0x7f0b00b0
-			public const int Base_Theme_AppCompat_Dialog_FixedSize = 2131427504;
+			// aapt resource value: 0x7f0a00b1
+			public const int Base_Theme_AppCompat_Dialog_FixedSize = 2131361969;
 			
-			// aapt resource value: 0x7f0b00b1
-			public const int Base_Theme_AppCompat_Dialog_MinWidth = 2131427505;
+			// aapt resource value: 0x7f0a00b2
+			public const int Base_Theme_AppCompat_Dialog_MinWidth = 2131361970;
 			
-			// aapt resource value: 0x7f0b001c
-			public const int Base_Theme_AppCompat_DialogWhenLarge = 2131427356;
+			// aapt resource value: 0x7f0a001d
+			public const int Base_Theme_AppCompat_DialogWhenLarge = 2131361821;
 			
-			// aapt resource value: 0x7f0b0072
-			public const int Base_Theme_AppCompat_Light = 2131427442;
+			// aapt resource value: 0x7f0a0073
+			public const int Base_Theme_AppCompat_Light = 2131361907;
 			
-			// aapt resource value: 0x7f0b00b2
-			public const int Base_Theme_AppCompat_Light_DarkActionBar = 2131427506;
+			// aapt resource value: 0x7f0a00b3
+			public const int Base_Theme_AppCompat_Light_DarkActionBar = 2131361971;
 			
-			// aapt resource value: 0x7f0b002d
-			public const int Base_Theme_AppCompat_Light_Dialog = 2131427373;
+			// aapt resource value: 0x7f0a002e
+			public const int Base_Theme_AppCompat_Light_Dialog = 2131361838;
 			
-			// aapt resource value: 0x7f0b00b3
-			public const int Base_Theme_AppCompat_Light_Dialog_Alert = 2131427507;
+			// aapt resource value: 0x7f0a00b4
+			public const int Base_Theme_AppCompat_Light_Dialog_Alert = 2131361972;
 			
-			// aapt resource value: 0x7f0b00b4
-			public const int Base_Theme_AppCompat_Light_Dialog_FixedSize = 2131427508;
+			// aapt resource value: 0x7f0a00b5
+			public const int Base_Theme_AppCompat_Light_Dialog_FixedSize = 2131361973;
 			
-			// aapt resource value: 0x7f0b00b5
-			public const int Base_Theme_AppCompat_Light_Dialog_MinWidth = 2131427509;
+			// aapt resource value: 0x7f0a00b6
+			public const int Base_Theme_AppCompat_Light_Dialog_MinWidth = 2131361974;
 			
-			// aapt resource value: 0x7f0b001d
-			public const int Base_Theme_AppCompat_Light_DialogWhenLarge = 2131427357;
+			// aapt resource value: 0x7f0a001e
+			public const int Base_Theme_AppCompat_Light_DialogWhenLarge = 2131361822;
 			
-			// aapt resource value: 0x7f0b00b6
-			public const int Base_ThemeOverlay_AppCompat = 2131427510;
+			// aapt resource value: 0x7f0a00b7
+			public const int Base_ThemeOverlay_AppCompat = 2131361975;
 			
-			// aapt resource value: 0x7f0b00b7
-			public const int Base_ThemeOverlay_AppCompat_ActionBar = 2131427511;
+			// aapt resource value: 0x7f0a00b8
+			public const int Base_ThemeOverlay_AppCompat_ActionBar = 2131361976;
 			
-			// aapt resource value: 0x7f0b00b8
-			public const int Base_ThemeOverlay_AppCompat_Dark = 2131427512;
+			// aapt resource value: 0x7f0a00b9
+			public const int Base_ThemeOverlay_AppCompat_Dark = 2131361977;
 			
-			// aapt resource value: 0x7f0b00b9
-			public const int Base_ThemeOverlay_AppCompat_Dark_ActionBar = 2131427513;
+			// aapt resource value: 0x7f0a00ba
+			public const int Base_ThemeOverlay_AppCompat_Dark_ActionBar = 2131361978;
 			
-			// aapt resource value: 0x7f0b00ba
-			public const int Base_ThemeOverlay_AppCompat_Light = 2131427514;
+			// aapt resource value: 0x7f0a00bb
+			public const int Base_ThemeOverlay_AppCompat_Light = 2131361979;
 			
-			// aapt resource value: 0x7f0b002e
-			public const int Base_V11_Theme_AppCompat_Dialog = 2131427374;
+			// aapt resource value: 0x7f0a002f
+			public const int Base_V11_Theme_AppCompat_Dialog = 2131361839;
 			
-			// aapt resource value: 0x7f0b002f
-			public const int Base_V11_Theme_AppCompat_Light_Dialog = 2131427375;
+			// aapt resource value: 0x7f0a0030
+			public const int Base_V11_Theme_AppCompat_Light_Dialog = 2131361840;
 			
-			// aapt resource value: 0x7f0b0037
-			public const int Base_V12_Widget_AppCompat_AutoCompleteTextView = 2131427383;
+			// aapt resource value: 0x7f0a0038
+			public const int Base_V12_Widget_AppCompat_AutoCompleteTextView = 2131361848;
 			
-			// aapt resource value: 0x7f0b0038
-			public const int Base_V12_Widget_AppCompat_EditText = 2131427384;
+			// aapt resource value: 0x7f0a0039
+			public const int Base_V12_Widget_AppCompat_EditText = 2131361849;
 			
-			// aapt resource value: 0x7f0b0073
-			public const int Base_V21_Theme_AppCompat = 2131427443;
+			// aapt resource value: 0x7f0a0074
+			public const int Base_V21_Theme_AppCompat = 2131361908;
 			
-			// aapt resource value: 0x7f0b0074
-			public const int Base_V21_Theme_AppCompat_Dialog = 2131427444;
+			// aapt resource value: 0x7f0a0075
+			public const int Base_V21_Theme_AppCompat_Dialog = 2131361909;
 			
-			// aapt resource value: 0x7f0b0075
-			public const int Base_V21_Theme_AppCompat_Light = 2131427445;
+			// aapt resource value: 0x7f0a0076
+			public const int Base_V21_Theme_AppCompat_Light = 2131361910;
 			
-			// aapt resource value: 0x7f0b0076
-			public const int Base_V21_Theme_AppCompat_Light_Dialog = 2131427446;
+			// aapt resource value: 0x7f0a0077
+			public const int Base_V21_Theme_AppCompat_Light_Dialog = 2131361911;
 			
-			// aapt resource value: 0x7f0b0098
-			public const int Base_V22_Theme_AppCompat = 2131427480;
+			// aapt resource value: 0x7f0a0099
+			public const int Base_V22_Theme_AppCompat = 2131361945;
 			
-			// aapt resource value: 0x7f0b0099
-			public const int Base_V22_Theme_AppCompat_Light = 2131427481;
+			// aapt resource value: 0x7f0a009a
+			public const int Base_V22_Theme_AppCompat_Light = 2131361946;
 			
-			// aapt resource value: 0x7f0b009c
-			public const int Base_V23_Theme_AppCompat = 2131427484;
+			// aapt resource value: 0x7f0a009d
+			public const int Base_V23_Theme_AppCompat = 2131361949;
 			
-			// aapt resource value: 0x7f0b009d
-			public const int Base_V23_Theme_AppCompat_Light = 2131427485;
+			// aapt resource value: 0x7f0a009e
+			public const int Base_V23_Theme_AppCompat_Light = 2131361950;
 			
-			// aapt resource value: 0x7f0b00bb
-			public const int Base_V7_Theme_AppCompat = 2131427515;
+			// aapt resource value: 0x7f0a00bc
+			public const int Base_V7_Theme_AppCompat = 2131361980;
 			
-			// aapt resource value: 0x7f0b00bc
-			public const int Base_V7_Theme_AppCompat_Dialog = 2131427516;
+			// aapt resource value: 0x7f0a00bd
+			public const int Base_V7_Theme_AppCompat_Dialog = 2131361981;
 			
-			// aapt resource value: 0x7f0b00bd
-			public const int Base_V7_Theme_AppCompat_Light = 2131427517;
+			// aapt resource value: 0x7f0a00be
+			public const int Base_V7_Theme_AppCompat_Light = 2131361982;
 			
-			// aapt resource value: 0x7f0b00be
-			public const int Base_V7_Theme_AppCompat_Light_Dialog = 2131427518;
+			// aapt resource value: 0x7f0a00bf
+			public const int Base_V7_Theme_AppCompat_Light_Dialog = 2131361983;
 			
-			// aapt resource value: 0x7f0b00bf
-			public const int Base_V7_Widget_AppCompat_AutoCompleteTextView = 2131427519;
+			// aapt resource value: 0x7f0a00c0
+			public const int Base_V7_Widget_AppCompat_AutoCompleteTextView = 2131361984;
 			
-			// aapt resource value: 0x7f0b00c0
-			public const int Base_V7_Widget_AppCompat_EditText = 2131427520;
+			// aapt resource value: 0x7f0a00c1
+			public const int Base_V7_Widget_AppCompat_EditText = 2131361985;
 			
-			// aapt resource value: 0x7f0b00c1
-			public const int Base_Widget_AppCompat_ActionBar = 2131427521;
+			// aapt resource value: 0x7f0a00c2
+			public const int Base_Widget_AppCompat_ActionBar = 2131361986;
 			
-			// aapt resource value: 0x7f0b00c2
-			public const int Base_Widget_AppCompat_ActionBar_Solid = 2131427522;
+			// aapt resource value: 0x7f0a00c3
+			public const int Base_Widget_AppCompat_ActionBar_Solid = 2131361987;
 			
-			// aapt resource value: 0x7f0b00c3
-			public const int Base_Widget_AppCompat_ActionBar_TabBar = 2131427523;
+			// aapt resource value: 0x7f0a00c4
+			public const int Base_Widget_AppCompat_ActionBar_TabBar = 2131361988;
 			
-			// aapt resource value: 0x7f0b0077
-			public const int Base_Widget_AppCompat_ActionBar_TabText = 2131427447;
+			// aapt resource value: 0x7f0a0078
+			public const int Base_Widget_AppCompat_ActionBar_TabText = 2131361912;
 			
-			// aapt resource value: 0x7f0b0078
-			public const int Base_Widget_AppCompat_ActionBar_TabView = 2131427448;
+			// aapt resource value: 0x7f0a0079
+			public const int Base_Widget_AppCompat_ActionBar_TabView = 2131361913;
 			
-			// aapt resource value: 0x7f0b0079
-			public const int Base_Widget_AppCompat_ActionButton = 2131427449;
+			// aapt resource value: 0x7f0a007a
+			public const int Base_Widget_AppCompat_ActionButton = 2131361914;
 			
-			// aapt resource value: 0x7f0b007a
-			public const int Base_Widget_AppCompat_ActionButton_CloseMode = 2131427450;
+			// aapt resource value: 0x7f0a007b
+			public const int Base_Widget_AppCompat_ActionButton_CloseMode = 2131361915;
 			
-			// aapt resource value: 0x7f0b007b
-			public const int Base_Widget_AppCompat_ActionButton_Overflow = 2131427451;
+			// aapt resource value: 0x7f0a007c
+			public const int Base_Widget_AppCompat_ActionButton_Overflow = 2131361916;
 			
-			// aapt resource value: 0x7f0b00c4
-			public const int Base_Widget_AppCompat_ActionMode = 2131427524;
+			// aapt resource value: 0x7f0a00c5
+			public const int Base_Widget_AppCompat_ActionMode = 2131361989;
 			
-			// aapt resource value: 0x7f0b00c5
-			public const int Base_Widget_AppCompat_ActivityChooserView = 2131427525;
+			// aapt resource value: 0x7f0a00c6
+			public const int Base_Widget_AppCompat_ActivityChooserView = 2131361990;
 			
-			// aapt resource value: 0x7f0b0039
-			public const int Base_Widget_AppCompat_AutoCompleteTextView = 2131427385;
+			// aapt resource value: 0x7f0a003a
+			public const int Base_Widget_AppCompat_AutoCompleteTextView = 2131361850;
 			
-			// aapt resource value: 0x7f0b007c
-			public const int Base_Widget_AppCompat_Button = 2131427452;
+			// aapt resource value: 0x7f0a007d
+			public const int Base_Widget_AppCompat_Button = 2131361917;
 			
-			// aapt resource value: 0x7f0b007d
-			public const int Base_Widget_AppCompat_Button_Borderless = 2131427453;
+			// aapt resource value: 0x7f0a007e
+			public const int Base_Widget_AppCompat_Button_Borderless = 2131361918;
 			
-			// aapt resource value: 0x7f0b007e
-			public const int Base_Widget_AppCompat_Button_Borderless_Colored = 2131427454;
+			// aapt resource value: 0x7f0a007f
+			public const int Base_Widget_AppCompat_Button_Borderless_Colored = 2131361919;
 			
-			// aapt resource value: 0x7f0b00c6
-			public const int Base_Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131427526;
+			// aapt resource value: 0x7f0a00c7
+			public const int Base_Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131361991;
 			
-			// aapt resource value: 0x7f0b009e
-			public const int Base_Widget_AppCompat_Button_Colored = 2131427486;
+			// aapt resource value: 0x7f0a009f
+			public const int Base_Widget_AppCompat_Button_Colored = 2131361951;
 			
-			// aapt resource value: 0x7f0b007f
-			public const int Base_Widget_AppCompat_Button_Small = 2131427455;
+			// aapt resource value: 0x7f0a0080
+			public const int Base_Widget_AppCompat_Button_Small = 2131361920;
 			
-			// aapt resource value: 0x7f0b0080
-			public const int Base_Widget_AppCompat_ButtonBar = 2131427456;
+			// aapt resource value: 0x7f0a0081
+			public const int Base_Widget_AppCompat_ButtonBar = 2131361921;
 			
-			// aapt resource value: 0x7f0b00c7
-			public const int Base_Widget_AppCompat_ButtonBar_AlertDialog = 2131427527;
+			// aapt resource value: 0x7f0a00c8
+			public const int Base_Widget_AppCompat_ButtonBar_AlertDialog = 2131361992;
 			
-			// aapt resource value: 0x7f0b0081
-			public const int Base_Widget_AppCompat_CompoundButton_CheckBox = 2131427457;
+			// aapt resource value: 0x7f0a0082
+			public const int Base_Widget_AppCompat_CompoundButton_CheckBox = 2131361922;
 			
-			// aapt resource value: 0x7f0b0082
-			public const int Base_Widget_AppCompat_CompoundButton_RadioButton = 2131427458;
+			// aapt resource value: 0x7f0a0083
+			public const int Base_Widget_AppCompat_CompoundButton_RadioButton = 2131361923;
 			
-			// aapt resource value: 0x7f0b00c8
-			public const int Base_Widget_AppCompat_CompoundButton_Switch = 2131427528;
+			// aapt resource value: 0x7f0a00c9
+			public const int Base_Widget_AppCompat_CompoundButton_Switch = 2131361993;
 			
-			// aapt resource value: 0x7f0b001b
-			public const int Base_Widget_AppCompat_DrawerArrowToggle = 2131427355;
+			// aapt resource value: 0x7f0a001c
+			public const int Base_Widget_AppCompat_DrawerArrowToggle = 2131361820;
 			
-			// aapt resource value: 0x7f0b00c9
-			public const int Base_Widget_AppCompat_DrawerArrowToggle_Common = 2131427529;
+			// aapt resource value: 0x7f0a00ca
+			public const int Base_Widget_AppCompat_DrawerArrowToggle_Common = 2131361994;
 			
-			// aapt resource value: 0x7f0b0083
-			public const int Base_Widget_AppCompat_DropDownItem_Spinner = 2131427459;
+			// aapt resource value: 0x7f0a0084
+			public const int Base_Widget_AppCompat_DropDownItem_Spinner = 2131361924;
 			
-			// aapt resource value: 0x7f0b003a
-			public const int Base_Widget_AppCompat_EditText = 2131427386;
+			// aapt resource value: 0x7f0a003b
+			public const int Base_Widget_AppCompat_EditText = 2131361851;
 			
-			// aapt resource value: 0x7f0b0084
-			public const int Base_Widget_AppCompat_ImageButton = 2131427460;
+			// aapt resource value: 0x7f0a0085
+			public const int Base_Widget_AppCompat_ImageButton = 2131361925;
 			
-			// aapt resource value: 0x7f0b00ca
-			public const int Base_Widget_AppCompat_Light_ActionBar = 2131427530;
+			// aapt resource value: 0x7f0a00cb
+			public const int Base_Widget_AppCompat_Light_ActionBar = 2131361995;
 			
-			// aapt resource value: 0x7f0b00cb
-			public const int Base_Widget_AppCompat_Light_ActionBar_Solid = 2131427531;
+			// aapt resource value: 0x7f0a00cc
+			public const int Base_Widget_AppCompat_Light_ActionBar_Solid = 2131361996;
 			
-			// aapt resource value: 0x7f0b00cc
-			public const int Base_Widget_AppCompat_Light_ActionBar_TabBar = 2131427532;
+			// aapt resource value: 0x7f0a00cd
+			public const int Base_Widget_AppCompat_Light_ActionBar_TabBar = 2131361997;
 			
-			// aapt resource value: 0x7f0b0085
-			public const int Base_Widget_AppCompat_Light_ActionBar_TabText = 2131427461;
+			// aapt resource value: 0x7f0a0086
+			public const int Base_Widget_AppCompat_Light_ActionBar_TabText = 2131361926;
 			
-			// aapt resource value: 0x7f0b0086
-			public const int Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131427462;
+			// aapt resource value: 0x7f0a0087
+			public const int Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131361927;
 			
-			// aapt resource value: 0x7f0b0087
-			public const int Base_Widget_AppCompat_Light_ActionBar_TabView = 2131427463;
+			// aapt resource value: 0x7f0a0088
+			public const int Base_Widget_AppCompat_Light_ActionBar_TabView = 2131361928;
 			
-			// aapt resource value: 0x7f0b0088
-			public const int Base_Widget_AppCompat_Light_PopupMenu = 2131427464;
+			// aapt resource value: 0x7f0a0089
+			public const int Base_Widget_AppCompat_Light_PopupMenu = 2131361929;
 			
-			// aapt resource value: 0x7f0b0089
-			public const int Base_Widget_AppCompat_Light_PopupMenu_Overflow = 2131427465;
+			// aapt resource value: 0x7f0a008a
+			public const int Base_Widget_AppCompat_Light_PopupMenu_Overflow = 2131361930;
 			
-			// aapt resource value: 0x7f0b008a
-			public const int Base_Widget_AppCompat_ListPopupWindow = 2131427466;
+			// aapt resource value: 0x7f0a008b
+			public const int Base_Widget_AppCompat_ListPopupWindow = 2131361931;
 			
-			// aapt resource value: 0x7f0b008b
-			public const int Base_Widget_AppCompat_ListView = 2131427467;
+			// aapt resource value: 0x7f0a008c
+			public const int Base_Widget_AppCompat_ListView = 2131361932;
 			
-			// aapt resource value: 0x7f0b008c
-			public const int Base_Widget_AppCompat_ListView_DropDown = 2131427468;
+			// aapt resource value: 0x7f0a008d
+			public const int Base_Widget_AppCompat_ListView_DropDown = 2131361933;
 			
-			// aapt resource value: 0x7f0b008d
-			public const int Base_Widget_AppCompat_ListView_Menu = 2131427469;
+			// aapt resource value: 0x7f0a008e
+			public const int Base_Widget_AppCompat_ListView_Menu = 2131361934;
 			
-			// aapt resource value: 0x7f0b008e
-			public const int Base_Widget_AppCompat_PopupMenu = 2131427470;
+			// aapt resource value: 0x7f0a008f
+			public const int Base_Widget_AppCompat_PopupMenu = 2131361935;
 			
-			// aapt resource value: 0x7f0b008f
-			public const int Base_Widget_AppCompat_PopupMenu_Overflow = 2131427471;
+			// aapt resource value: 0x7f0a0090
+			public const int Base_Widget_AppCompat_PopupMenu_Overflow = 2131361936;
 			
-			// aapt resource value: 0x7f0b00cd
-			public const int Base_Widget_AppCompat_PopupWindow = 2131427533;
+			// aapt resource value: 0x7f0a00ce
+			public const int Base_Widget_AppCompat_PopupWindow = 2131361998;
 			
-			// aapt resource value: 0x7f0b0030
-			public const int Base_Widget_AppCompat_ProgressBar = 2131427376;
+			// aapt resource value: 0x7f0a0031
+			public const int Base_Widget_AppCompat_ProgressBar = 2131361841;
 			
-			// aapt resource value: 0x7f0b0031
-			public const int Base_Widget_AppCompat_ProgressBar_Horizontal = 2131427377;
+			// aapt resource value: 0x7f0a0032
+			public const int Base_Widget_AppCompat_ProgressBar_Horizontal = 2131361842;
 			
-			// aapt resource value: 0x7f0b0090
-			public const int Base_Widget_AppCompat_RatingBar = 2131427472;
+			// aapt resource value: 0x7f0a0091
+			public const int Base_Widget_AppCompat_RatingBar = 2131361937;
 			
-			// aapt resource value: 0x7f0b009f
-			public const int Base_Widget_AppCompat_RatingBar_Indicator = 2131427487;
+			// aapt resource value: 0x7f0a00a0
+			public const int Base_Widget_AppCompat_RatingBar_Indicator = 2131361952;
 			
-			// aapt resource value: 0x7f0b00a0
-			public const int Base_Widget_AppCompat_RatingBar_Small = 2131427488;
+			// aapt resource value: 0x7f0a00a1
+			public const int Base_Widget_AppCompat_RatingBar_Small = 2131361953;
 			
-			// aapt resource value: 0x7f0b00ce
-			public const int Base_Widget_AppCompat_SearchView = 2131427534;
+			// aapt resource value: 0x7f0a00cf
+			public const int Base_Widget_AppCompat_SearchView = 2131361999;
 			
-			// aapt resource value: 0x7f0b00cf
-			public const int Base_Widget_AppCompat_SearchView_ActionBar = 2131427535;
+			// aapt resource value: 0x7f0a00d0
+			public const int Base_Widget_AppCompat_SearchView_ActionBar = 2131362000;
 			
-			// aapt resource value: 0x7f0b0091
-			public const int Base_Widget_AppCompat_SeekBar = 2131427473;
+			// aapt resource value: 0x7f0a0092
+			public const int Base_Widget_AppCompat_SeekBar = 2131361938;
 			
-			// aapt resource value: 0x7f0b0092
-			public const int Base_Widget_AppCompat_Spinner = 2131427474;
+			// aapt resource value: 0x7f0a0093
+			public const int Base_Widget_AppCompat_Spinner = 2131361939;
 			
-			// aapt resource value: 0x7f0b001e
-			public const int Base_Widget_AppCompat_Spinner_Underlined = 2131427358;
+			// aapt resource value: 0x7f0a001f
+			public const int Base_Widget_AppCompat_Spinner_Underlined = 2131361823;
 			
-			// aapt resource value: 0x7f0b0093
-			public const int Base_Widget_AppCompat_TextView_SpinnerItem = 2131427475;
+			// aapt resource value: 0x7f0a0094
+			public const int Base_Widget_AppCompat_TextView_SpinnerItem = 2131361940;
 			
-			// aapt resource value: 0x7f0b00d0
-			public const int Base_Widget_AppCompat_Toolbar = 2131427536;
+			// aapt resource value: 0x7f0a00d1
+			public const int Base_Widget_AppCompat_Toolbar = 2131362001;
 			
-			// aapt resource value: 0x7f0b0094
-			public const int Base_Widget_AppCompat_Toolbar_Button_Navigation = 2131427476;
+			// aapt resource value: 0x7f0a0095
+			public const int Base_Widget_AppCompat_Toolbar_Button_Navigation = 2131361941;
 			
-			// aapt resource value: 0x7f0b015b
-			public const int Base_Widget_Design_TabLayout = 2131427675;
+			// aapt resource value: 0x7f0a015c
+			public const int Base_Widget_Design_TabLayout = 2131362140;
 			
-			// aapt resource value: 0x7f0b0017
-			public const int CardView = 2131427351;
+			// aapt resource value: 0x7f0a0174
+			public const int CalendarCell = 2131362164;
 			
-			// aapt resource value: 0x7f0b0019
-			public const int CardView_Dark = 2131427353;
+			// aapt resource value: 0x7f0a0176
+			public const int CalendarCell_CalendarDate = 2131362166;
 			
-			// aapt resource value: 0x7f0b001a
-			public const int CardView_Light = 2131427354;
+			// aapt resource value: 0x7f0a0175
+			public const int CalendarCell_DayHeader = 2131362165;
 			
-			// aapt resource value: 0x7f0b0172
-			public const int MainTheme = 2131427698;
+			// aapt resource value: 0x7f0a0173
+			public const int CalendarTitle = 2131362163;
 			
-			// aapt resource value: 0x7f0b0173
-			public const int MainTheme_Base = 2131427699;
+			// aapt resource value: 0x7f0a0018
+			public const int CardView = 2131361816;
 			
-			// aapt resource value: 0x7f0b0032
-			public const int Platform_AppCompat = 2131427378;
+			// aapt resource value: 0x7f0a001a
+			public const int CardView_Dark = 2131361818;
 			
-			// aapt resource value: 0x7f0b0033
-			public const int Platform_AppCompat_Light = 2131427379;
+			// aapt resource value: 0x7f0a001b
+			public const int CardView_Light = 2131361819;
 			
-			// aapt resource value: 0x7f0b0095
-			public const int Platform_ThemeOverlay_AppCompat = 2131427477;
+			// aapt resource value: 0x7f0a0177
+			public const int DemoButton = 2131362167;
 			
-			// aapt resource value: 0x7f0b0096
-			public const int Platform_ThemeOverlay_AppCompat_Dark = 2131427478;
+			// aapt resource value: 0x7f0a017a
+			public const int MainTheme = 2131362170;
 			
-			// aapt resource value: 0x7f0b0097
-			public const int Platform_ThemeOverlay_AppCompat_Light = 2131427479;
+			// aapt resource value: 0x7f0a017b
+			public const int MainTheme_Base = 2131362171;
 			
-			// aapt resource value: 0x7f0b0034
-			public const int Platform_V11_AppCompat = 2131427380;
+			// aapt resource value: 0x7f0a0033
+			public const int Platform_AppCompat = 2131361843;
 			
-			// aapt resource value: 0x7f0b0035
-			public const int Platform_V11_AppCompat_Light = 2131427381;
+			// aapt resource value: 0x7f0a0034
+			public const int Platform_AppCompat_Light = 2131361844;
 			
-			// aapt resource value: 0x7f0b003c
-			public const int Platform_V14_AppCompat = 2131427388;
+			// aapt resource value: 0x7f0a0096
+			public const int Platform_ThemeOverlay_AppCompat = 2131361942;
 			
-			// aapt resource value: 0x7f0b003d
-			public const int Platform_V14_AppCompat_Light = 2131427389;
+			// aapt resource value: 0x7f0a0097
+			public const int Platform_ThemeOverlay_AppCompat_Dark = 2131361943;
 			
-			// aapt resource value: 0x7f0b0036
-			public const int Platform_Widget_AppCompat_Spinner = 2131427382;
+			// aapt resource value: 0x7f0a0098
+			public const int Platform_ThemeOverlay_AppCompat_Light = 2131361944;
 			
-			// aapt resource value: 0x7f0b0043
-			public const int RtlOverlay_DialogWindowTitle_AppCompat = 2131427395;
+			// aapt resource value: 0x7f0a0035
+			public const int Platform_V11_AppCompat = 2131361845;
 			
-			// aapt resource value: 0x7f0b0044
-			public const int RtlOverlay_Widget_AppCompat_ActionBar_TitleItem = 2131427396;
+			// aapt resource value: 0x7f0a0036
+			public const int Platform_V11_AppCompat_Light = 2131361846;
 			
-			// aapt resource value: 0x7f0b0045
-			public const int RtlOverlay_Widget_AppCompat_DialogTitle_Icon = 2131427397;
+			// aapt resource value: 0x7f0a003d
+			public const int Platform_V14_AppCompat = 2131361853;
 			
-			// aapt resource value: 0x7f0b0046
-			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem = 2131427398;
+			// aapt resource value: 0x7f0a003e
+			public const int Platform_V14_AppCompat_Light = 2131361854;
 			
-			// aapt resource value: 0x7f0b0047
-			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup = 2131427399;
+			// aapt resource value: 0x7f0a0037
+			public const int Platform_Widget_AppCompat_Spinner = 2131361847;
 			
-			// aapt resource value: 0x7f0b0048
-			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_Text = 2131427400;
+			// aapt resource value: 0x7f0a0178
+			public const int PlayerTheme = 2131362168;
 			
-			// aapt resource value: 0x7f0b0049
-			public const int RtlOverlay_Widget_AppCompat_Search_DropDown = 2131427401;
+			// aapt resource value: 0x7f0a0179
+			public const int RootTheme = 2131362169;
 			
-			// aapt resource value: 0x7f0b004a
-			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 = 2131427402;
+			// aapt resource value: 0x7f0a0044
+			public const int RtlOverlay_DialogWindowTitle_AppCompat = 2131361860;
 			
-			// aapt resource value: 0x7f0b004b
-			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 = 2131427403;
+			// aapt resource value: 0x7f0a0045
+			public const int RtlOverlay_Widget_AppCompat_ActionBar_TitleItem = 2131361861;
 			
-			// aapt resource value: 0x7f0b004c
-			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Query = 2131427404;
+			// aapt resource value: 0x7f0a0046
+			public const int RtlOverlay_Widget_AppCompat_DialogTitle_Icon = 2131361862;
 			
-			// aapt resource value: 0x7f0b004d
-			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Text = 2131427405;
+			// aapt resource value: 0x7f0a0047
+			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem = 2131361863;
 			
-			// aapt resource value: 0x7f0b004e
-			public const int RtlOverlay_Widget_AppCompat_SearchView_MagIcon = 2131427406;
+			// aapt resource value: 0x7f0a0048
+			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup = 2131361864;
 			
-			// aapt resource value: 0x7f0b004f
-			public const int RtlUnderlay_Widget_AppCompat_ActionButton = 2131427407;
+			// aapt resource value: 0x7f0a0049
+			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_Text = 2131361865;
 			
-			// aapt resource value: 0x7f0b0050
-			public const int RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = 2131427408;
+			// aapt resource value: 0x7f0a004a
+			public const int RtlOverlay_Widget_AppCompat_Search_DropDown = 2131361866;
 			
-			// aapt resource value: 0x7f0b00d1
-			public const int TextAppearance_AppCompat = 2131427537;
+			// aapt resource value: 0x7f0a004b
+			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 = 2131361867;
 			
-			// aapt resource value: 0x7f0b00d2
-			public const int TextAppearance_AppCompat_Body1 = 2131427538;
+			// aapt resource value: 0x7f0a004c
+			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 = 2131361868;
 			
-			// aapt resource value: 0x7f0b00d3
-			public const int TextAppearance_AppCompat_Body2 = 2131427539;
+			// aapt resource value: 0x7f0a004d
+			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Query = 2131361869;
 			
-			// aapt resource value: 0x7f0b00d4
-			public const int TextAppearance_AppCompat_Button = 2131427540;
+			// aapt resource value: 0x7f0a004e
+			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Text = 2131361870;
 			
-			// aapt resource value: 0x7f0b00d5
-			public const int TextAppearance_AppCompat_Caption = 2131427541;
+			// aapt resource value: 0x7f0a004f
+			public const int RtlOverlay_Widget_AppCompat_SearchView_MagIcon = 2131361871;
 			
-			// aapt resource value: 0x7f0b00d6
-			public const int TextAppearance_AppCompat_Display1 = 2131427542;
+			// aapt resource value: 0x7f0a0050
+			public const int RtlUnderlay_Widget_AppCompat_ActionButton = 2131361872;
 			
-			// aapt resource value: 0x7f0b00d7
-			public const int TextAppearance_AppCompat_Display2 = 2131427543;
+			// aapt resource value: 0x7f0a0051
+			public const int RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = 2131361873;
 			
-			// aapt resource value: 0x7f0b00d8
-			public const int TextAppearance_AppCompat_Display3 = 2131427544;
+			// aapt resource value: 0x7f0a00d2
+			public const int TextAppearance_AppCompat = 2131362002;
 			
-			// aapt resource value: 0x7f0b00d9
-			public const int TextAppearance_AppCompat_Display4 = 2131427545;
+			// aapt resource value: 0x7f0a00d3
+			public const int TextAppearance_AppCompat_Body1 = 2131362003;
 			
-			// aapt resource value: 0x7f0b00da
-			public const int TextAppearance_AppCompat_Headline = 2131427546;
+			// aapt resource value: 0x7f0a00d4
+			public const int TextAppearance_AppCompat_Body2 = 2131362004;
 			
-			// aapt resource value: 0x7f0b00db
-			public const int TextAppearance_AppCompat_Inverse = 2131427547;
+			// aapt resource value: 0x7f0a00d5
+			public const int TextAppearance_AppCompat_Button = 2131362005;
 			
-			// aapt resource value: 0x7f0b00dc
-			public const int TextAppearance_AppCompat_Large = 2131427548;
+			// aapt resource value: 0x7f0a00d6
+			public const int TextAppearance_AppCompat_Caption = 2131362006;
 			
-			// aapt resource value: 0x7f0b00dd
-			public const int TextAppearance_AppCompat_Large_Inverse = 2131427549;
+			// aapt resource value: 0x7f0a00d7
+			public const int TextAppearance_AppCompat_Display1 = 2131362007;
 			
-			// aapt resource value: 0x7f0b00de
-			public const int TextAppearance_AppCompat_Light_SearchResult_Subtitle = 2131427550;
+			// aapt resource value: 0x7f0a00d8
+			public const int TextAppearance_AppCompat_Display2 = 2131362008;
 			
-			// aapt resource value: 0x7f0b00df
-			public const int TextAppearance_AppCompat_Light_SearchResult_Title = 2131427551;
+			// aapt resource value: 0x7f0a00d9
+			public const int TextAppearance_AppCompat_Display3 = 2131362009;
 			
-			// aapt resource value: 0x7f0b00e0
-			public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131427552;
+			// aapt resource value: 0x7f0a00da
+			public const int TextAppearance_AppCompat_Display4 = 2131362010;
 			
-			// aapt resource value: 0x7f0b00e1
-			public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131427553;
+			// aapt resource value: 0x7f0a00db
+			public const int TextAppearance_AppCompat_Headline = 2131362011;
 			
-			// aapt resource value: 0x7f0b00e2
-			public const int TextAppearance_AppCompat_Medium = 2131427554;
+			// aapt resource value: 0x7f0a00dc
+			public const int TextAppearance_AppCompat_Inverse = 2131362012;
 			
-			// aapt resource value: 0x7f0b00e3
-			public const int TextAppearance_AppCompat_Medium_Inverse = 2131427555;
+			// aapt resource value: 0x7f0a00dd
+			public const int TextAppearance_AppCompat_Large = 2131362013;
 			
-			// aapt resource value: 0x7f0b00e4
-			public const int TextAppearance_AppCompat_Menu = 2131427556;
+			// aapt resource value: 0x7f0a00de
+			public const int TextAppearance_AppCompat_Large_Inverse = 2131362014;
 			
-			// aapt resource value: 0x7f0b00e5
-			public const int TextAppearance_AppCompat_SearchResult_Subtitle = 2131427557;
+			// aapt resource value: 0x7f0a00df
+			public const int TextAppearance_AppCompat_Light_SearchResult_Subtitle = 2131362015;
 			
-			// aapt resource value: 0x7f0b00e6
-			public const int TextAppearance_AppCompat_SearchResult_Title = 2131427558;
+			// aapt resource value: 0x7f0a00e0
+			public const int TextAppearance_AppCompat_Light_SearchResult_Title = 2131362016;
 			
-			// aapt resource value: 0x7f0b00e7
-			public const int TextAppearance_AppCompat_Small = 2131427559;
+			// aapt resource value: 0x7f0a00e1
+			public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131362017;
 			
-			// aapt resource value: 0x7f0b00e8
-			public const int TextAppearance_AppCompat_Small_Inverse = 2131427560;
+			// aapt resource value: 0x7f0a00e2
+			public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131362018;
 			
-			// aapt resource value: 0x7f0b00e9
-			public const int TextAppearance_AppCompat_Subhead = 2131427561;
+			// aapt resource value: 0x7f0a00e3
+			public const int TextAppearance_AppCompat_Medium = 2131362019;
 			
-			// aapt resource value: 0x7f0b00ea
-			public const int TextAppearance_AppCompat_Subhead_Inverse = 2131427562;
+			// aapt resource value: 0x7f0a00e4
+			public const int TextAppearance_AppCompat_Medium_Inverse = 2131362020;
 			
-			// aapt resource value: 0x7f0b00eb
-			public const int TextAppearance_AppCompat_Title = 2131427563;
+			// aapt resource value: 0x7f0a00e5
+			public const int TextAppearance_AppCompat_Menu = 2131362021;
 			
-			// aapt resource value: 0x7f0b00ec
-			public const int TextAppearance_AppCompat_Title_Inverse = 2131427564;
+			// aapt resource value: 0x7f0a00e6
+			public const int TextAppearance_AppCompat_SearchResult_Subtitle = 2131362022;
 			
-			// aapt resource value: 0x7f0b00ed
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131427565;
+			// aapt resource value: 0x7f0a00e7
+			public const int TextAppearance_AppCompat_SearchResult_Title = 2131362023;
 			
-			// aapt resource value: 0x7f0b00ee
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131427566;
+			// aapt resource value: 0x7f0a00e8
+			public const int TextAppearance_AppCompat_Small = 2131362024;
 			
-			// aapt resource value: 0x7f0b00ef
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131427567;
+			// aapt resource value: 0x7f0a00e9
+			public const int TextAppearance_AppCompat_Small_Inverse = 2131362025;
 			
-			// aapt resource value: 0x7f0b00f0
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Title = 2131427568;
+			// aapt resource value: 0x7f0a00ea
+			public const int TextAppearance_AppCompat_Subhead = 2131362026;
 			
-			// aapt resource value: 0x7f0b00f1
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131427569;
+			// aapt resource value: 0x7f0a00eb
+			public const int TextAppearance_AppCompat_Subhead_Inverse = 2131362027;
 			
-			// aapt resource value: 0x7f0b00f2
-			public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131427570;
+			// aapt resource value: 0x7f0a00ec
+			public const int TextAppearance_AppCompat_Title = 2131362028;
 			
-			// aapt resource value: 0x7f0b00f3
-			public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse = 2131427571;
+			// aapt resource value: 0x7f0a00ed
+			public const int TextAppearance_AppCompat_Title_Inverse = 2131362029;
 			
-			// aapt resource value: 0x7f0b00f4
-			public const int TextAppearance_AppCompat_Widget_ActionMode_Title = 2131427572;
+			// aapt resource value: 0x7f0a00ee
+			public const int TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131362030;
 			
-			// aapt resource value: 0x7f0b00f5
-			public const int TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse = 2131427573;
+			// aapt resource value: 0x7f0a00ef
+			public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131362031;
 			
-			// aapt resource value: 0x7f0b00f6
-			public const int TextAppearance_AppCompat_Widget_Button = 2131427574;
+			// aapt resource value: 0x7f0a00f0
+			public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131362032;
 			
-			// aapt resource value: 0x7f0b00f7
-			public const int TextAppearance_AppCompat_Widget_Button_Inverse = 2131427575;
+			// aapt resource value: 0x7f0a00f1
+			public const int TextAppearance_AppCompat_Widget_ActionBar_Title = 2131362033;
 			
-			// aapt resource value: 0x7f0b00f8
-			public const int TextAppearance_AppCompat_Widget_DropDownItem = 2131427576;
+			// aapt resource value: 0x7f0a00f2
+			public const int TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131362034;
 			
-			// aapt resource value: 0x7f0b00f9
-			public const int TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131427577;
+			// aapt resource value: 0x7f0a00f3
+			public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131362035;
 			
-			// aapt resource value: 0x7f0b00fa
-			public const int TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131427578;
+			// aapt resource value: 0x7f0a00f4
+			public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse = 2131362036;
 			
-			// aapt resource value: 0x7f0b00fb
-			public const int TextAppearance_AppCompat_Widget_Switch = 2131427579;
+			// aapt resource value: 0x7f0a00f5
+			public const int TextAppearance_AppCompat_Widget_ActionMode_Title = 2131362037;
 			
-			// aapt resource value: 0x7f0b00fc
-			public const int TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131427580;
+			// aapt resource value: 0x7f0a00f6
+			public const int TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse = 2131362038;
 			
-			// aapt resource value: 0x7f0b015c
-			public const int TextAppearance_Design_CollapsingToolbar_Expanded = 2131427676;
+			// aapt resource value: 0x7f0a00f7
+			public const int TextAppearance_AppCompat_Widget_Button = 2131362039;
 			
-			// aapt resource value: 0x7f0b015d
-			public const int TextAppearance_Design_Counter = 2131427677;
+			// aapt resource value: 0x7f0a00f8
+			public const int TextAppearance_AppCompat_Widget_Button_Inverse = 2131362040;
 			
-			// aapt resource value: 0x7f0b015e
-			public const int TextAppearance_Design_Counter_Overflow = 2131427678;
+			// aapt resource value: 0x7f0a00f9
+			public const int TextAppearance_AppCompat_Widget_DropDownItem = 2131362041;
 			
-			// aapt resource value: 0x7f0b015f
-			public const int TextAppearance_Design_Error = 2131427679;
+			// aapt resource value: 0x7f0a00fa
+			public const int TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131362042;
 			
-			// aapt resource value: 0x7f0b0160
-			public const int TextAppearance_Design_Hint = 2131427680;
+			// aapt resource value: 0x7f0a00fb
+			public const int TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131362043;
 			
-			// aapt resource value: 0x7f0b0161
-			public const int TextAppearance_Design_Snackbar_Message = 2131427681;
+			// aapt resource value: 0x7f0a00fc
+			public const int TextAppearance_AppCompat_Widget_Switch = 2131362044;
 			
-			// aapt resource value: 0x7f0b0162
-			public const int TextAppearance_Design_Tab = 2131427682;
+			// aapt resource value: 0x7f0a00fd
+			public const int TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131362045;
 			
-			// aapt resource value: 0x7f0b003e
-			public const int TextAppearance_StatusBar_EventContent = 2131427390;
+			// aapt resource value: 0x7f0a015d
+			public const int TextAppearance_Design_CollapsingToolbar_Expanded = 2131362141;
 			
-			// aapt resource value: 0x7f0b003f
-			public const int TextAppearance_StatusBar_EventContent_Info = 2131427391;
+			// aapt resource value: 0x7f0a015e
+			public const int TextAppearance_Design_Counter = 2131362142;
 			
-			// aapt resource value: 0x7f0b0040
-			public const int TextAppearance_StatusBar_EventContent_Line2 = 2131427392;
+			// aapt resource value: 0x7f0a015f
+			public const int TextAppearance_Design_Counter_Overflow = 2131362143;
 			
-			// aapt resource value: 0x7f0b0041
-			public const int TextAppearance_StatusBar_EventContent_Time = 2131427393;
+			// aapt resource value: 0x7f0a0160
+			public const int TextAppearance_Design_Error = 2131362144;
 			
-			// aapt resource value: 0x7f0b0042
-			public const int TextAppearance_StatusBar_EventContent_Title = 2131427394;
+			// aapt resource value: 0x7f0a0161
+			public const int TextAppearance_Design_Hint = 2131362145;
 			
-			// aapt resource value: 0x7f0b00fd
-			public const int TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131427581;
+			// aapt resource value: 0x7f0a0162
+			public const int TextAppearance_Design_Snackbar_Message = 2131362146;
 			
-			// aapt resource value: 0x7f0b00fe
-			public const int TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131427582;
+			// aapt resource value: 0x7f0a0163
+			public const int TextAppearance_Design_Tab = 2131362147;
 			
-			// aapt resource value: 0x7f0b00ff
-			public const int TextAppearance_Widget_AppCompat_Toolbar_Title = 2131427583;
+			// aapt resource value: 0x7f0a003f
+			public const int TextAppearance_StatusBar_EventContent = 2131361855;
 			
-			// aapt resource value: 0x7f0b0100
-			public const int Theme_AppCompat = 2131427584;
+			// aapt resource value: 0x7f0a0040
+			public const int TextAppearance_StatusBar_EventContent_Info = 2131361856;
 			
-			// aapt resource value: 0x7f0b0101
-			public const int Theme_AppCompat_CompactMenu = 2131427585;
+			// aapt resource value: 0x7f0a0041
+			public const int TextAppearance_StatusBar_EventContent_Line2 = 2131361857;
 			
-			// aapt resource value: 0x7f0b001f
-			public const int Theme_AppCompat_DayNight = 2131427359;
+			// aapt resource value: 0x7f0a0042
+			public const int TextAppearance_StatusBar_EventContent_Time = 2131361858;
 			
-			// aapt resource value: 0x7f0b0020
-			public const int Theme_AppCompat_DayNight_DarkActionBar = 2131427360;
+			// aapt resource value: 0x7f0a0043
+			public const int TextAppearance_StatusBar_EventContent_Title = 2131361859;
 			
-			// aapt resource value: 0x7f0b0021
-			public const int Theme_AppCompat_DayNight_Dialog = 2131427361;
+			// aapt resource value: 0x7f0a00fe
+			public const int TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131362046;
 			
-			// aapt resource value: 0x7f0b0022
-			public const int Theme_AppCompat_DayNight_Dialog_Alert = 2131427362;
+			// aapt resource value: 0x7f0a00ff
+			public const int TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131362047;
 			
-			// aapt resource value: 0x7f0b0023
-			public const int Theme_AppCompat_DayNight_Dialog_MinWidth = 2131427363;
+			// aapt resource value: 0x7f0a0100
+			public const int TextAppearance_Widget_AppCompat_Toolbar_Title = 2131362048;
 			
-			// aapt resource value: 0x7f0b0024
-			public const int Theme_AppCompat_DayNight_DialogWhenLarge = 2131427364;
+			// aapt resource value: 0x7f0a0101
+			public const int Theme_AppCompat = 2131362049;
 			
-			// aapt resource value: 0x7f0b0025
-			public const int Theme_AppCompat_DayNight_NoActionBar = 2131427365;
+			// aapt resource value: 0x7f0a0102
+			public const int Theme_AppCompat_CompactMenu = 2131362050;
 			
-			// aapt resource value: 0x7f0b0102
-			public const int Theme_AppCompat_Dialog = 2131427586;
+			// aapt resource value: 0x7f0a0020
+			public const int Theme_AppCompat_DayNight = 2131361824;
 			
-			// aapt resource value: 0x7f0b0103
-			public const int Theme_AppCompat_Dialog_Alert = 2131427587;
+			// aapt resource value: 0x7f0a0021
+			public const int Theme_AppCompat_DayNight_DarkActionBar = 2131361825;
 			
-			// aapt resource value: 0x7f0b0104
-			public const int Theme_AppCompat_Dialog_MinWidth = 2131427588;
+			// aapt resource value: 0x7f0a0022
+			public const int Theme_AppCompat_DayNight_Dialog = 2131361826;
 			
-			// aapt resource value: 0x7f0b0105
-			public const int Theme_AppCompat_DialogWhenLarge = 2131427589;
+			// aapt resource value: 0x7f0a0023
+			public const int Theme_AppCompat_DayNight_Dialog_Alert = 2131361827;
 			
-			// aapt resource value: 0x7f0b0106
-			public const int Theme_AppCompat_Light = 2131427590;
+			// aapt resource value: 0x7f0a0024
+			public const int Theme_AppCompat_DayNight_Dialog_MinWidth = 2131361828;
 			
-			// aapt resource value: 0x7f0b0107
-			public const int Theme_AppCompat_Light_DarkActionBar = 2131427591;
+			// aapt resource value: 0x7f0a0025
+			public const int Theme_AppCompat_DayNight_DialogWhenLarge = 2131361829;
 			
-			// aapt resource value: 0x7f0b0108
-			public const int Theme_AppCompat_Light_Dialog = 2131427592;
+			// aapt resource value: 0x7f0a0026
+			public const int Theme_AppCompat_DayNight_NoActionBar = 2131361830;
 			
-			// aapt resource value: 0x7f0b0109
-			public const int Theme_AppCompat_Light_Dialog_Alert = 2131427593;
+			// aapt resource value: 0x7f0a0103
+			public const int Theme_AppCompat_Dialog = 2131362051;
 			
-			// aapt resource value: 0x7f0b010a
-			public const int Theme_AppCompat_Light_Dialog_MinWidth = 2131427594;
+			// aapt resource value: 0x7f0a0104
+			public const int Theme_AppCompat_Dialog_Alert = 2131362052;
 			
-			// aapt resource value: 0x7f0b010b
-			public const int Theme_AppCompat_Light_DialogWhenLarge = 2131427595;
+			// aapt resource value: 0x7f0a0105
+			public const int Theme_AppCompat_Dialog_MinWidth = 2131362053;
 			
-			// aapt resource value: 0x7f0b010c
-			public const int Theme_AppCompat_Light_NoActionBar = 2131427596;
+			// aapt resource value: 0x7f0a0106
+			public const int Theme_AppCompat_DialogWhenLarge = 2131362054;
 			
-			// aapt resource value: 0x7f0b010d
-			public const int Theme_AppCompat_NoActionBar = 2131427597;
+			// aapt resource value: 0x7f0a0107
+			public const int Theme_AppCompat_Light = 2131362055;
 			
-			// aapt resource value: 0x7f0b0163
-			public const int Theme_Design = 2131427683;
+			// aapt resource value: 0x7f0a0108
+			public const int Theme_AppCompat_Light_DarkActionBar = 2131362056;
 			
-			// aapt resource value: 0x7f0b0164
-			public const int Theme_Design_BottomSheetDialog = 2131427684;
+			// aapt resource value: 0x7f0a0109
+			public const int Theme_AppCompat_Light_Dialog = 2131362057;
 			
-			// aapt resource value: 0x7f0b0165
-			public const int Theme_Design_Light = 2131427685;
+			// aapt resource value: 0x7f0a010a
+			public const int Theme_AppCompat_Light_Dialog_Alert = 2131362058;
 			
-			// aapt resource value: 0x7f0b0166
-			public const int Theme_Design_Light_BottomSheetDialog = 2131427686;
+			// aapt resource value: 0x7f0a010b
+			public const int Theme_AppCompat_Light_Dialog_MinWidth = 2131362059;
 			
-			// aapt resource value: 0x7f0b0167
-			public const int Theme_Design_Light_NoActionBar = 2131427687;
+			// aapt resource value: 0x7f0a010c
+			public const int Theme_AppCompat_Light_DialogWhenLarge = 2131362060;
 			
-			// aapt resource value: 0x7f0b0168
-			public const int Theme_Design_NoActionBar = 2131427688;
+			// aapt resource value: 0x7f0a010d
+			public const int Theme_AppCompat_Light_NoActionBar = 2131362061;
 			
-			// aapt resource value: 0x7f0b0000
-			public const int Theme_MediaRouter = 2131427328;
+			// aapt resource value: 0x7f0a010e
+			public const int Theme_AppCompat_NoActionBar = 2131362062;
 			
-			// aapt resource value: 0x7f0b0001
-			public const int Theme_MediaRouter_Light = 2131427329;
+			// aapt resource value: 0x7f0a0164
+			public const int Theme_Design = 2131362148;
 			
-			// aapt resource value: 0x7f0b0002
-			public const int Theme_MediaRouter_Light_DarkControlPanel = 2131427330;
+			// aapt resource value: 0x7f0a0165
+			public const int Theme_Design_BottomSheetDialog = 2131362149;
 			
-			// aapt resource value: 0x7f0b0003
-			public const int Theme_MediaRouter_LightControlPanel = 2131427331;
+			// aapt resource value: 0x7f0a0166
+			public const int Theme_Design_Light = 2131362150;
 			
-			// aapt resource value: 0x7f0b010e
-			public const int ThemeOverlay_AppCompat = 2131427598;
+			// aapt resource value: 0x7f0a0167
+			public const int Theme_Design_Light_BottomSheetDialog = 2131362151;
 			
-			// aapt resource value: 0x7f0b010f
-			public const int ThemeOverlay_AppCompat_ActionBar = 2131427599;
+			// aapt resource value: 0x7f0a0168
+			public const int Theme_Design_Light_NoActionBar = 2131362152;
 			
-			// aapt resource value: 0x7f0b0110
-			public const int ThemeOverlay_AppCompat_Dark = 2131427600;
+			// aapt resource value: 0x7f0a0169
+			public const int Theme_Design_NoActionBar = 2131362153;
 			
-			// aapt resource value: 0x7f0b0111
-			public const int ThemeOverlay_AppCompat_Dark_ActionBar = 2131427601;
+			// aapt resource value: 0x7f0a0000
+			public const int Theme_IAPTheme = 2131361792;
 			
-			// aapt resource value: 0x7f0b0112
-			public const int ThemeOverlay_AppCompat_Light = 2131427602;
+			// aapt resource value: 0x7f0a0001
+			public const int Theme_MediaRouter = 2131361793;
 			
-			// aapt resource value: 0x7f0b0113
-			public const int Widget_AppCompat_ActionBar = 2131427603;
+			// aapt resource value: 0x7f0a0002
+			public const int Theme_MediaRouter_Light = 2131361794;
 			
-			// aapt resource value: 0x7f0b0114
-			public const int Widget_AppCompat_ActionBar_Solid = 2131427604;
+			// aapt resource value: 0x7f0a0003
+			public const int Theme_MediaRouter_Light_DarkControlPanel = 2131361795;
 			
-			// aapt resource value: 0x7f0b0115
-			public const int Widget_AppCompat_ActionBar_TabBar = 2131427605;
+			// aapt resource value: 0x7f0a0004
+			public const int Theme_MediaRouter_LightControlPanel = 2131361796;
 			
-			// aapt resource value: 0x7f0b0116
-			public const int Widget_AppCompat_ActionBar_TabText = 2131427606;
+			// aapt resource value: 0x7f0a010f
+			public const int ThemeOverlay_AppCompat = 2131362063;
 			
-			// aapt resource value: 0x7f0b0117
-			public const int Widget_AppCompat_ActionBar_TabView = 2131427607;
+			// aapt resource value: 0x7f0a0110
+			public const int ThemeOverlay_AppCompat_ActionBar = 2131362064;
 			
-			// aapt resource value: 0x7f0b0118
-			public const int Widget_AppCompat_ActionButton = 2131427608;
+			// aapt resource value: 0x7f0a0111
+			public const int ThemeOverlay_AppCompat_Dark = 2131362065;
 			
-			// aapt resource value: 0x7f0b0119
-			public const int Widget_AppCompat_ActionButton_CloseMode = 2131427609;
+			// aapt resource value: 0x7f0a0112
+			public const int ThemeOverlay_AppCompat_Dark_ActionBar = 2131362066;
 			
-			// aapt resource value: 0x7f0b011a
-			public const int Widget_AppCompat_ActionButton_Overflow = 2131427610;
+			// aapt resource value: 0x7f0a0113
+			public const int ThemeOverlay_AppCompat_Light = 2131362067;
 			
-			// aapt resource value: 0x7f0b011b
-			public const int Widget_AppCompat_ActionMode = 2131427611;
+			// aapt resource value: 0x7f0a0114
+			public const int Widget_AppCompat_ActionBar = 2131362068;
 			
-			// aapt resource value: 0x7f0b011c
-			public const int Widget_AppCompat_ActivityChooserView = 2131427612;
+			// aapt resource value: 0x7f0a0115
+			public const int Widget_AppCompat_ActionBar_Solid = 2131362069;
 			
-			// aapt resource value: 0x7f0b011d
-			public const int Widget_AppCompat_AutoCompleteTextView = 2131427613;
+			// aapt resource value: 0x7f0a0116
+			public const int Widget_AppCompat_ActionBar_TabBar = 2131362070;
 			
-			// aapt resource value: 0x7f0b011e
-			public const int Widget_AppCompat_Button = 2131427614;
+			// aapt resource value: 0x7f0a0117
+			public const int Widget_AppCompat_ActionBar_TabText = 2131362071;
 			
-			// aapt resource value: 0x7f0b011f
-			public const int Widget_AppCompat_Button_Borderless = 2131427615;
+			// aapt resource value: 0x7f0a0118
+			public const int Widget_AppCompat_ActionBar_TabView = 2131362072;
 			
-			// aapt resource value: 0x7f0b0120
-			public const int Widget_AppCompat_Button_Borderless_Colored = 2131427616;
+			// aapt resource value: 0x7f0a0119
+			public const int Widget_AppCompat_ActionButton = 2131362073;
 			
-			// aapt resource value: 0x7f0b0121
-			public const int Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131427617;
+			// aapt resource value: 0x7f0a011a
+			public const int Widget_AppCompat_ActionButton_CloseMode = 2131362074;
 			
-			// aapt resource value: 0x7f0b0122
-			public const int Widget_AppCompat_Button_Colored = 2131427618;
+			// aapt resource value: 0x7f0a011b
+			public const int Widget_AppCompat_ActionButton_Overflow = 2131362075;
 			
-			// aapt resource value: 0x7f0b0123
-			public const int Widget_AppCompat_Button_Small = 2131427619;
+			// aapt resource value: 0x7f0a011c
+			public const int Widget_AppCompat_ActionMode = 2131362076;
 			
-			// aapt resource value: 0x7f0b0124
-			public const int Widget_AppCompat_ButtonBar = 2131427620;
+			// aapt resource value: 0x7f0a011d
+			public const int Widget_AppCompat_ActivityChooserView = 2131362077;
 			
-			// aapt resource value: 0x7f0b0125
-			public const int Widget_AppCompat_ButtonBar_AlertDialog = 2131427621;
+			// aapt resource value: 0x7f0a011e
+			public const int Widget_AppCompat_AutoCompleteTextView = 2131362078;
 			
-			// aapt resource value: 0x7f0b0126
-			public const int Widget_AppCompat_CompoundButton_CheckBox = 2131427622;
+			// aapt resource value: 0x7f0a011f
+			public const int Widget_AppCompat_Button = 2131362079;
 			
-			// aapt resource value: 0x7f0b0127
-			public const int Widget_AppCompat_CompoundButton_RadioButton = 2131427623;
+			// aapt resource value: 0x7f0a0120
+			public const int Widget_AppCompat_Button_Borderless = 2131362080;
 			
-			// aapt resource value: 0x7f0b0128
-			public const int Widget_AppCompat_CompoundButton_Switch = 2131427624;
+			// aapt resource value: 0x7f0a0121
+			public const int Widget_AppCompat_Button_Borderless_Colored = 2131362081;
 			
-			// aapt resource value: 0x7f0b0129
-			public const int Widget_AppCompat_DrawerArrowToggle = 2131427625;
+			// aapt resource value: 0x7f0a0122
+			public const int Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131362082;
 			
-			// aapt resource value: 0x7f0b012a
-			public const int Widget_AppCompat_DropDownItem_Spinner = 2131427626;
+			// aapt resource value: 0x7f0a0123
+			public const int Widget_AppCompat_Button_Colored = 2131362083;
 			
-			// aapt resource value: 0x7f0b012b
-			public const int Widget_AppCompat_EditText = 2131427627;
+			// aapt resource value: 0x7f0a0124
+			public const int Widget_AppCompat_Button_Small = 2131362084;
 			
-			// aapt resource value: 0x7f0b012c
-			public const int Widget_AppCompat_ImageButton = 2131427628;
+			// aapt resource value: 0x7f0a0125
+			public const int Widget_AppCompat_ButtonBar = 2131362085;
 			
-			// aapt resource value: 0x7f0b012d
-			public const int Widget_AppCompat_Light_ActionBar = 2131427629;
+			// aapt resource value: 0x7f0a0126
+			public const int Widget_AppCompat_ButtonBar_AlertDialog = 2131362086;
 			
-			// aapt resource value: 0x7f0b012e
-			public const int Widget_AppCompat_Light_ActionBar_Solid = 2131427630;
+			// aapt resource value: 0x7f0a0127
+			public const int Widget_AppCompat_CompoundButton_CheckBox = 2131362087;
 			
-			// aapt resource value: 0x7f0b012f
-			public const int Widget_AppCompat_Light_ActionBar_Solid_Inverse = 2131427631;
+			// aapt resource value: 0x7f0a0128
+			public const int Widget_AppCompat_CompoundButton_RadioButton = 2131362088;
 			
-			// aapt resource value: 0x7f0b0130
-			public const int Widget_AppCompat_Light_ActionBar_TabBar = 2131427632;
+			// aapt resource value: 0x7f0a0129
+			public const int Widget_AppCompat_CompoundButton_Switch = 2131362089;
 			
-			// aapt resource value: 0x7f0b0131
-			public const int Widget_AppCompat_Light_ActionBar_TabBar_Inverse = 2131427633;
+			// aapt resource value: 0x7f0a012a
+			public const int Widget_AppCompat_DrawerArrowToggle = 2131362090;
 			
-			// aapt resource value: 0x7f0b0132
-			public const int Widget_AppCompat_Light_ActionBar_TabText = 2131427634;
+			// aapt resource value: 0x7f0a012b
+			public const int Widget_AppCompat_DropDownItem_Spinner = 2131362091;
 			
-			// aapt resource value: 0x7f0b0133
-			public const int Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131427635;
+			// aapt resource value: 0x7f0a012c
+			public const int Widget_AppCompat_EditText = 2131362092;
 			
-			// aapt resource value: 0x7f0b0134
-			public const int Widget_AppCompat_Light_ActionBar_TabView = 2131427636;
+			// aapt resource value: 0x7f0a012d
+			public const int Widget_AppCompat_ImageButton = 2131362093;
 			
-			// aapt resource value: 0x7f0b0135
-			public const int Widget_AppCompat_Light_ActionBar_TabView_Inverse = 2131427637;
+			// aapt resource value: 0x7f0a012e
+			public const int Widget_AppCompat_Light_ActionBar = 2131362094;
 			
-			// aapt resource value: 0x7f0b0136
-			public const int Widget_AppCompat_Light_ActionButton = 2131427638;
+			// aapt resource value: 0x7f0a012f
+			public const int Widget_AppCompat_Light_ActionBar_Solid = 2131362095;
 			
-			// aapt resource value: 0x7f0b0137
-			public const int Widget_AppCompat_Light_ActionButton_CloseMode = 2131427639;
+			// aapt resource value: 0x7f0a0130
+			public const int Widget_AppCompat_Light_ActionBar_Solid_Inverse = 2131362096;
 			
-			// aapt resource value: 0x7f0b0138
-			public const int Widget_AppCompat_Light_ActionButton_Overflow = 2131427640;
+			// aapt resource value: 0x7f0a0131
+			public const int Widget_AppCompat_Light_ActionBar_TabBar = 2131362097;
 			
-			// aapt resource value: 0x7f0b0139
-			public const int Widget_AppCompat_Light_ActionMode_Inverse = 2131427641;
+			// aapt resource value: 0x7f0a0132
+			public const int Widget_AppCompat_Light_ActionBar_TabBar_Inverse = 2131362098;
 			
-			// aapt resource value: 0x7f0b013a
-			public const int Widget_AppCompat_Light_ActivityChooserView = 2131427642;
+			// aapt resource value: 0x7f0a0133
+			public const int Widget_AppCompat_Light_ActionBar_TabText = 2131362099;
 			
-			// aapt resource value: 0x7f0b013b
-			public const int Widget_AppCompat_Light_AutoCompleteTextView = 2131427643;
+			// aapt resource value: 0x7f0a0134
+			public const int Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131362100;
 			
-			// aapt resource value: 0x7f0b013c
-			public const int Widget_AppCompat_Light_DropDownItem_Spinner = 2131427644;
+			// aapt resource value: 0x7f0a0135
+			public const int Widget_AppCompat_Light_ActionBar_TabView = 2131362101;
 			
-			// aapt resource value: 0x7f0b013d
-			public const int Widget_AppCompat_Light_ListPopupWindow = 2131427645;
+			// aapt resource value: 0x7f0a0136
+			public const int Widget_AppCompat_Light_ActionBar_TabView_Inverse = 2131362102;
 			
-			// aapt resource value: 0x7f0b013e
-			public const int Widget_AppCompat_Light_ListView_DropDown = 2131427646;
+			// aapt resource value: 0x7f0a0137
+			public const int Widget_AppCompat_Light_ActionButton = 2131362103;
 			
-			// aapt resource value: 0x7f0b013f
-			public const int Widget_AppCompat_Light_PopupMenu = 2131427647;
+			// aapt resource value: 0x7f0a0138
+			public const int Widget_AppCompat_Light_ActionButton_CloseMode = 2131362104;
 			
-			// aapt resource value: 0x7f0b0140
-			public const int Widget_AppCompat_Light_PopupMenu_Overflow = 2131427648;
+			// aapt resource value: 0x7f0a0139
+			public const int Widget_AppCompat_Light_ActionButton_Overflow = 2131362105;
 			
-			// aapt resource value: 0x7f0b0141
-			public const int Widget_AppCompat_Light_SearchView = 2131427649;
+			// aapt resource value: 0x7f0a013a
+			public const int Widget_AppCompat_Light_ActionMode_Inverse = 2131362106;
 			
-			// aapt resource value: 0x7f0b0142
-			public const int Widget_AppCompat_Light_Spinner_DropDown_ActionBar = 2131427650;
+			// aapt resource value: 0x7f0a013b
+			public const int Widget_AppCompat_Light_ActivityChooserView = 2131362107;
 			
-			// aapt resource value: 0x7f0b0143
-			public const int Widget_AppCompat_ListPopupWindow = 2131427651;
+			// aapt resource value: 0x7f0a013c
+			public const int Widget_AppCompat_Light_AutoCompleteTextView = 2131362108;
 			
-			// aapt resource value: 0x7f0b0144
-			public const int Widget_AppCompat_ListView = 2131427652;
+			// aapt resource value: 0x7f0a013d
+			public const int Widget_AppCompat_Light_DropDownItem_Spinner = 2131362109;
 			
-			// aapt resource value: 0x7f0b0145
-			public const int Widget_AppCompat_ListView_DropDown = 2131427653;
+			// aapt resource value: 0x7f0a013e
+			public const int Widget_AppCompat_Light_ListPopupWindow = 2131362110;
 			
-			// aapt resource value: 0x7f0b0146
-			public const int Widget_AppCompat_ListView_Menu = 2131427654;
+			// aapt resource value: 0x7f0a013f
+			public const int Widget_AppCompat_Light_ListView_DropDown = 2131362111;
 			
-			// aapt resource value: 0x7f0b0147
-			public const int Widget_AppCompat_PopupMenu = 2131427655;
+			// aapt resource value: 0x7f0a0140
+			public const int Widget_AppCompat_Light_PopupMenu = 2131362112;
 			
-			// aapt resource value: 0x7f0b0148
-			public const int Widget_AppCompat_PopupMenu_Overflow = 2131427656;
+			// aapt resource value: 0x7f0a0141
+			public const int Widget_AppCompat_Light_PopupMenu_Overflow = 2131362113;
 			
-			// aapt resource value: 0x7f0b0149
-			public const int Widget_AppCompat_PopupWindow = 2131427657;
+			// aapt resource value: 0x7f0a0142
+			public const int Widget_AppCompat_Light_SearchView = 2131362114;
 			
-			// aapt resource value: 0x7f0b014a
-			public const int Widget_AppCompat_ProgressBar = 2131427658;
+			// aapt resource value: 0x7f0a0143
+			public const int Widget_AppCompat_Light_Spinner_DropDown_ActionBar = 2131362115;
 			
-			// aapt resource value: 0x7f0b014b
-			public const int Widget_AppCompat_ProgressBar_Horizontal = 2131427659;
+			// aapt resource value: 0x7f0a0144
+			public const int Widget_AppCompat_ListPopupWindow = 2131362116;
 			
-			// aapt resource value: 0x7f0b014c
-			public const int Widget_AppCompat_RatingBar = 2131427660;
+			// aapt resource value: 0x7f0a0145
+			public const int Widget_AppCompat_ListView = 2131362117;
 			
-			// aapt resource value: 0x7f0b014d
-			public const int Widget_AppCompat_RatingBar_Indicator = 2131427661;
+			// aapt resource value: 0x7f0a0146
+			public const int Widget_AppCompat_ListView_DropDown = 2131362118;
 			
-			// aapt resource value: 0x7f0b014e
-			public const int Widget_AppCompat_RatingBar_Small = 2131427662;
+			// aapt resource value: 0x7f0a0147
+			public const int Widget_AppCompat_ListView_Menu = 2131362119;
 			
-			// aapt resource value: 0x7f0b014f
-			public const int Widget_AppCompat_SearchView = 2131427663;
+			// aapt resource value: 0x7f0a0148
+			public const int Widget_AppCompat_PopupMenu = 2131362120;
 			
-			// aapt resource value: 0x7f0b0150
-			public const int Widget_AppCompat_SearchView_ActionBar = 2131427664;
+			// aapt resource value: 0x7f0a0149
+			public const int Widget_AppCompat_PopupMenu_Overflow = 2131362121;
 			
-			// aapt resource value: 0x7f0b0151
-			public const int Widget_AppCompat_SeekBar = 2131427665;
+			// aapt resource value: 0x7f0a014a
+			public const int Widget_AppCompat_PopupWindow = 2131362122;
 			
-			// aapt resource value: 0x7f0b0152
-			public const int Widget_AppCompat_Spinner = 2131427666;
+			// aapt resource value: 0x7f0a014b
+			public const int Widget_AppCompat_ProgressBar = 2131362123;
 			
-			// aapt resource value: 0x7f0b0153
-			public const int Widget_AppCompat_Spinner_DropDown = 2131427667;
+			// aapt resource value: 0x7f0a014c
+			public const int Widget_AppCompat_ProgressBar_Horizontal = 2131362124;
 			
-			// aapt resource value: 0x7f0b0154
-			public const int Widget_AppCompat_Spinner_DropDown_ActionBar = 2131427668;
+			// aapt resource value: 0x7f0a014d
+			public const int Widget_AppCompat_RatingBar = 2131362125;
 			
-			// aapt resource value: 0x7f0b0155
-			public const int Widget_AppCompat_Spinner_Underlined = 2131427669;
+			// aapt resource value: 0x7f0a014e
+			public const int Widget_AppCompat_RatingBar_Indicator = 2131362126;
 			
-			// aapt resource value: 0x7f0b0156
-			public const int Widget_AppCompat_TextView_SpinnerItem = 2131427670;
+			// aapt resource value: 0x7f0a014f
+			public const int Widget_AppCompat_RatingBar_Small = 2131362127;
 			
-			// aapt resource value: 0x7f0b0157
-			public const int Widget_AppCompat_Toolbar = 2131427671;
+			// aapt resource value: 0x7f0a0150
+			public const int Widget_AppCompat_SearchView = 2131362128;
 			
-			// aapt resource value: 0x7f0b0158
-			public const int Widget_AppCompat_Toolbar_Button_Navigation = 2131427672;
+			// aapt resource value: 0x7f0a0151
+			public const int Widget_AppCompat_SearchView_ActionBar = 2131362129;
 			
-			// aapt resource value: 0x7f0b0169
-			public const int Widget_Design_AppBarLayout = 2131427689;
+			// aapt resource value: 0x7f0a0152
+			public const int Widget_AppCompat_SeekBar = 2131362130;
 			
-			// aapt resource value: 0x7f0b016a
-			public const int Widget_Design_BottomSheet_Modal = 2131427690;
+			// aapt resource value: 0x7f0a0153
+			public const int Widget_AppCompat_Spinner = 2131362131;
 			
-			// aapt resource value: 0x7f0b016b
-			public const int Widget_Design_CollapsingToolbar = 2131427691;
+			// aapt resource value: 0x7f0a0154
+			public const int Widget_AppCompat_Spinner_DropDown = 2131362132;
 			
-			// aapt resource value: 0x7f0b016c
-			public const int Widget_Design_CoordinatorLayout = 2131427692;
+			// aapt resource value: 0x7f0a0155
+			public const int Widget_AppCompat_Spinner_DropDown_ActionBar = 2131362133;
 			
-			// aapt resource value: 0x7f0b016d
-			public const int Widget_Design_FloatingActionButton = 2131427693;
+			// aapt resource value: 0x7f0a0156
+			public const int Widget_AppCompat_Spinner_Underlined = 2131362134;
 			
-			// aapt resource value: 0x7f0b016e
-			public const int Widget_Design_NavigationView = 2131427694;
+			// aapt resource value: 0x7f0a0157
+			public const int Widget_AppCompat_TextView_SpinnerItem = 2131362135;
 			
-			// aapt resource value: 0x7f0b016f
-			public const int Widget_Design_ScrimInsetsFrameLayout = 2131427695;
+			// aapt resource value: 0x7f0a0158
+			public const int Widget_AppCompat_Toolbar = 2131362136;
 			
-			// aapt resource value: 0x7f0b0170
-			public const int Widget_Design_Snackbar = 2131427696;
+			// aapt resource value: 0x7f0a0159
+			public const int Widget_AppCompat_Toolbar_Button_Navigation = 2131362137;
 			
-			// aapt resource value: 0x7f0b0159
-			public const int Widget_Design_TabLayout = 2131427673;
+			// aapt resource value: 0x7f0a016a
+			public const int Widget_Design_AppBarLayout = 2131362154;
 			
-			// aapt resource value: 0x7f0b0171
-			public const int Widget_Design_TextInputLayout = 2131427697;
+			// aapt resource value: 0x7f0a016b
+			public const int Widget_Design_BottomSheet_Modal = 2131362155;
 			
-			// aapt resource value: 0x7f0b0004
-			public const int Widget_MediaRouter_ChooserText = 2131427332;
+			// aapt resource value: 0x7f0a016c
+			public const int Widget_Design_CollapsingToolbar = 2131362156;
 			
-			// aapt resource value: 0x7f0b0005
-			public const int Widget_MediaRouter_ChooserText_Primary = 2131427333;
+			// aapt resource value: 0x7f0a016d
+			public const int Widget_Design_CoordinatorLayout = 2131362157;
 			
-			// aapt resource value: 0x7f0b0006
-			public const int Widget_MediaRouter_ChooserText_Primary_Dark = 2131427334;
+			// aapt resource value: 0x7f0a016e
+			public const int Widget_Design_FloatingActionButton = 2131362158;
 			
-			// aapt resource value: 0x7f0b0007
-			public const int Widget_MediaRouter_ChooserText_Primary_Light = 2131427335;
+			// aapt resource value: 0x7f0a016f
+			public const int Widget_Design_NavigationView = 2131362159;
 			
-			// aapt resource value: 0x7f0b0008
-			public const int Widget_MediaRouter_ChooserText_Secondary = 2131427336;
+			// aapt resource value: 0x7f0a0170
+			public const int Widget_Design_ScrimInsetsFrameLayout = 2131362160;
 			
-			// aapt resource value: 0x7f0b0009
-			public const int Widget_MediaRouter_ChooserText_Secondary_Dark = 2131427337;
+			// aapt resource value: 0x7f0a0171
+			public const int Widget_Design_Snackbar = 2131362161;
 			
-			// aapt resource value: 0x7f0b000a
-			public const int Widget_MediaRouter_ChooserText_Secondary_Light = 2131427338;
+			// aapt resource value: 0x7f0a015a
+			public const int Widget_Design_TabLayout = 2131362138;
 			
-			// aapt resource value: 0x7f0b000b
-			public const int Widget_MediaRouter_ControllerText = 2131427339;
+			// aapt resource value: 0x7f0a0172
+			public const int Widget_Design_TextInputLayout = 2131362162;
 			
-			// aapt resource value: 0x7f0b000c
-			public const int Widget_MediaRouter_ControllerText_Primary = 2131427340;
+			// aapt resource value: 0x7f0a0005
+			public const int Widget_MediaRouter_ChooserText = 2131361797;
 			
-			// aapt resource value: 0x7f0b000d
-			public const int Widget_MediaRouter_ControllerText_Primary_Dark = 2131427341;
+			// aapt resource value: 0x7f0a0006
+			public const int Widget_MediaRouter_ChooserText_Primary = 2131361798;
 			
-			// aapt resource value: 0x7f0b000e
-			public const int Widget_MediaRouter_ControllerText_Primary_Light = 2131427342;
+			// aapt resource value: 0x7f0a0007
+			public const int Widget_MediaRouter_ChooserText_Primary_Dark = 2131361799;
 			
-			// aapt resource value: 0x7f0b000f
-			public const int Widget_MediaRouter_ControllerText_Secondary = 2131427343;
+			// aapt resource value: 0x7f0a0008
+			public const int Widget_MediaRouter_ChooserText_Primary_Light = 2131361800;
 			
-			// aapt resource value: 0x7f0b0010
-			public const int Widget_MediaRouter_ControllerText_Secondary_Dark = 2131427344;
+			// aapt resource value: 0x7f0a0009
+			public const int Widget_MediaRouter_ChooserText_Secondary = 2131361801;
 			
-			// aapt resource value: 0x7f0b0011
-			public const int Widget_MediaRouter_ControllerText_Secondary_Light = 2131427345;
+			// aapt resource value: 0x7f0a000a
+			public const int Widget_MediaRouter_ChooserText_Secondary_Dark = 2131361802;
 			
-			// aapt resource value: 0x7f0b0012
-			public const int Widget_MediaRouter_ControllerText_Title = 2131427346;
+			// aapt resource value: 0x7f0a000b
+			public const int Widget_MediaRouter_ChooserText_Secondary_Light = 2131361803;
 			
-			// aapt resource value: 0x7f0b0013
-			public const int Widget_MediaRouter_ControllerText_Title_Dark = 2131427347;
+			// aapt resource value: 0x7f0a000c
+			public const int Widget_MediaRouter_ControllerText = 2131361804;
 			
-			// aapt resource value: 0x7f0b0014
-			public const int Widget_MediaRouter_ControllerText_Title_Light = 2131427348;
+			// aapt resource value: 0x7f0a000d
+			public const int Widget_MediaRouter_ControllerText_Primary = 2131361805;
 			
-			// aapt resource value: 0x7f0b0015
-			public const int Widget_MediaRouter_Light_MediaRouteButton = 2131427349;
+			// aapt resource value: 0x7f0a000e
+			public const int Widget_MediaRouter_ControllerText_Primary_Dark = 2131361806;
 			
-			// aapt resource value: 0x7f0b0016
-			public const int Widget_MediaRouter_MediaRouteButton = 2131427350;
+			// aapt resource value: 0x7f0a000f
+			public const int Widget_MediaRouter_ControllerText_Primary_Light = 2131361807;
+			
+			// aapt resource value: 0x7f0a0010
+			public const int Widget_MediaRouter_ControllerText_Secondary = 2131361808;
+			
+			// aapt resource value: 0x7f0a0011
+			public const int Widget_MediaRouter_ControllerText_Secondary_Dark = 2131361809;
+			
+			// aapt resource value: 0x7f0a0012
+			public const int Widget_MediaRouter_ControllerText_Secondary_Light = 2131361810;
+			
+			// aapt resource value: 0x7f0a0013
+			public const int Widget_MediaRouter_ControllerText_Title = 2131361811;
+			
+			// aapt resource value: 0x7f0a0014
+			public const int Widget_MediaRouter_ControllerText_Title_Dark = 2131361812;
+			
+			// aapt resource value: 0x7f0a0015
+			public const int Widget_MediaRouter_ControllerText_Title_Light = 2131361813;
+			
+			// aapt resource value: 0x7f0a0016
+			public const int Widget_MediaRouter_Light_MediaRouteButton = 2131361814;
+			
+			// aapt resource value: 0x7f0a0017
+			public const int Widget_MediaRouter_MediaRouteButton = 2131361815;
 			
 			static Style()
 			{
@@ -4699,10 +6814,7 @@ namespace BookAStar.Droid
 		{
 			
 			public static int[] ActionBar = new int[] {
-					2130772030,
-					2130772032,
 					2130772033,
-					2130772034,
 					2130772035,
 					2130772036,
 					2130772037,
@@ -4725,7 +6837,10 @@ namespace BookAStar.Droid
 					2130772054,
 					2130772055,
 					2130772056,
-					2130772113};
+					2130772057,
+					2130772058,
+					2130772059,
+					2130772116};
 			
 			// aapt resource value: 10
 			public const int ActionBar_background = 10;
@@ -4823,12 +6938,12 @@ namespace BookAStar.Droid
 			public static int[] ActionMenuView;
 			
 			public static int[] ActionMode = new int[] {
-					2130772030,
-					2130772036,
-					2130772037,
-					2130772041,
-					2130772043,
-					2130772057};
+					2130772033,
+					2130772039,
+					2130772040,
+					2130772044,
+					2130772046,
+					2130772060};
 			
 			// aapt resource value: 3
 			public const int ActionMode_background = 3;
@@ -4849,8 +6964,8 @@ namespace BookAStar.Droid
 			public const int ActionMode_titleTextStyle = 1;
 			
 			public static int[] ActivityChooserView = new int[] {
-					2130772058,
-					2130772059};
+					2130772061,
+					2130772062};
 			
 			// aapt resource value: 1
 			public const int ActivityChooserView_expandActivityOverflowButtonDrawable = 1;
@@ -4858,13 +6973,27 @@ namespace BookAStar.Droid
 			// aapt resource value: 0
 			public const int ActivityChooserView_initialActivityCount = 0;
 			
+			public static int[] AdsAttrs = new int[] {
+					2130771991,
+					2130771992,
+					2130771993};
+			
+			// aapt resource value: 0
+			public const int AdsAttrs_adSize = 0;
+			
+			// aapt resource value: 1
+			public const int AdsAttrs_adSizes = 1;
+			
+			// aapt resource value: 2
+			public const int AdsAttrs_adUnitId = 2;
+			
 			public static int[] AlertDialog = new int[] {
 					16842994,
-					2130772060,
-					2130772061,
-					2130772062,
 					2130772063,
-					2130772064};
+					2130772064,
+					2130772065,
+					2130772066,
+					2130772067};
 			
 			// aapt resource value: 0
 			public const int AlertDialog_android_layout = 0;
@@ -4886,8 +7015,8 @@ namespace BookAStar.Droid
 			
 			public static int[] AppBarLayout = new int[] {
 					16842964,
-					2130772055,
-					2130772238};
+					2130772058,
+					2130772241};
 			
 			// aapt resource value: 0
 			public const int AppBarLayout_android_background = 0;
@@ -4899,8 +7028,8 @@ namespace BookAStar.Droid
 			public const int AppBarLayout_expanded = 2;
 			
 			public static int[] AppBarLayout_LayoutParams = new int[] {
-					2130772239,
-					2130772240};
+					2130772242,
+					2130772243};
 			
 			// aapt resource value: 0
 			public const int AppBarLayout_LayoutParams_layout_scrollFlags = 0;
@@ -4910,7 +7039,7 @@ namespace BookAStar.Droid
 			
 			public static int[] AppCompatImageView = new int[] {
 					16843033,
-					2130772065};
+					2130772068};
 			
 			// aapt resource value: 0
 			public const int AppCompatImageView_android_src = 0;
@@ -4920,7 +7049,7 @@ namespace BookAStar.Droid
 			
 			public static int[] AppCompatTextView = new int[] {
 					16842804,
-					2130772066};
+					2130772069};
 			
 			// aapt resource value: 0
 			public const int AppCompatTextView_android_textAppearance = 0;
@@ -4931,9 +7060,6 @@ namespace BookAStar.Droid
 			public static int[] AppCompatTheme = new int[] {
 					16842839,
 					16842926,
-					2130772067,
-					2130772068,
-					2130772069,
 					2130772070,
 					2130772071,
 					2130772072,
@@ -5040,7 +7166,10 @@ namespace BookAStar.Droid
 					2130772173,
 					2130772174,
 					2130772175,
-					2130772176};
+					2130772176,
+					2130772177,
+					2130772178,
+					2130772179};
 			
 			// aapt resource value: 23
 			public const int AppCompatTheme_actionBarDivider = 23;
@@ -5379,8 +7508,8 @@ namespace BookAStar.Droid
 			public const int AppCompatTheme_windowNoTitle = 3;
 			
 			public static int[] BottomSheetBehavior_Params = new int[] {
-					2130772241,
-					2130772242};
+					2130772244,
+					2130772245};
 			
 			// aapt resource value: 1
 			public const int BottomSheetBehavior_Params_behavior_hideable = 1;
@@ -5389,7 +7518,7 @@ namespace BookAStar.Droid
 			public const int BottomSheetBehavior_Params_behavior_peekHeight = 0;
 			
 			public static int[] ButtonBarLayout = new int[] {
-					2130772177};
+					2130772180};
 			
 			// aapt resource value: 0
 			public const int ButtonBarLayout_allowStacking = 0;
@@ -5397,9 +7526,6 @@ namespace BookAStar.Droid
 			public static int[] CardView = new int[] {
 					16843071,
 					16843072,
-					2130772018,
-					2130772019,
-					2130772020,
 					2130772021,
 					2130772022,
 					2130772023,
@@ -5407,7 +7533,10 @@ namespace BookAStar.Droid
 					2130772025,
 					2130772026,
 					2130772027,
-					2130772028};
+					2130772028,
+					2130772029,
+					2130772030,
+					2130772031};
 			
 			// aapt resource value: 1
 			public const int CardView_android_minHeight = 1;
@@ -5449,8 +7578,8 @@ namespace BookAStar.Droid
 			public const int CardView_contentPaddingTop = 11;
 			
 			public static int[] CollapsingAppBarLayout_LayoutParams = new int[] {
-					2130772243,
-					2130772244};
+					2130772246,
+					2130772247};
 			
 			// aapt resource value: 0
 			public const int CollapsingAppBarLayout_LayoutParams_layout_collapseMode = 0;
@@ -5459,10 +7588,7 @@ namespace BookAStar.Droid
 			public const int CollapsingAppBarLayout_LayoutParams_layout_collapseParallaxMultiplier = 1;
 			
 			public static int[] CollapsingToolbarLayout = new int[] {
-					2130772032,
-					2130772245,
-					2130772246,
-					2130772247,
+					2130772035,
 					2130772248,
 					2130772249,
 					2130772250,
@@ -5472,7 +7598,10 @@ namespace BookAStar.Droid
 					2130772254,
 					2130772255,
 					2130772256,
-					2130772257};
+					2130772257,
+					2130772258,
+					2130772259,
+					2130772260};
 			
 			// aapt resource value: 11
 			public const int CollapsingToolbarLayout_collapsedTitleGravity = 11;
@@ -5518,8 +7647,8 @@ namespace BookAStar.Droid
 			
 			public static int[] CompoundButton = new int[] {
 					16843015,
-					2130772178,
-					2130772179};
+					2130772181,
+					2130772182};
 			
 			// aapt resource value: 0
 			public const int CompoundButton_android_button = 0;
@@ -5531,8 +7660,8 @@ namespace BookAStar.Droid
 			public const int CompoundButton_buttonTintMode = 2;
 			
 			public static int[] CoordinatorLayout = new int[] {
-					2130772258,
-					2130772259};
+					2130772261,
+					2130772262};
 			
 			// aapt resource value: 0
 			public const int CoordinatorLayout_keylines = 0;
@@ -5542,10 +7671,10 @@ namespace BookAStar.Droid
 			
 			public static int[] CoordinatorLayout_LayoutParams = new int[] {
 					16842931,
-					2130772260,
-					2130772261,
-					2130772262,
-					2130772263};
+					2130772263,
+					2130772264,
+					2130772265,
+					2130772266};
 			
 			// aapt resource value: 0
 			public const int CoordinatorLayout_LayoutParams_android_layout_gravity = 0;
@@ -5563,9 +7692,9 @@ namespace BookAStar.Droid
 			public const int CoordinatorLayout_LayoutParams_layout_keyline = 3;
 			
 			public static int[] DesignTheme = new int[] {
-					2130772264,
-					2130772265,
-					2130772266};
+					2130772267,
+					2130772268,
+					2130772269};
 			
 			// aapt resource value: 0
 			public const int DesignTheme_bottomSheetDialogTheme = 0;
@@ -5577,14 +7706,14 @@ namespace BookAStar.Droid
 			public const int DesignTheme_textColorError = 2;
 			
 			public static int[] DrawerArrowToggle = new int[] {
-					2130772180,
-					2130772181,
-					2130772182,
 					2130772183,
 					2130772184,
 					2130772185,
 					2130772186,
-					2130772187};
+					2130772187,
+					2130772188,
+					2130772189,
+					2130772190};
 			
 			// aapt resource value: 4
 			public const int DrawerArrowToggle_arrowHeadLength = 4;
@@ -5611,14 +7740,14 @@ namespace BookAStar.Droid
 			public const int DrawerArrowToggle_thickness = 7;
 			
 			public static int[] FloatingActionButton = new int[] {
-					2130772055,
-					2130772236,
-					2130772237,
-					2130772267,
-					2130772268,
-					2130772269,
+					2130772058,
+					2130772239,
+					2130772240,
 					2130772270,
-					2130772271};
+					2130772271,
+					2130772272,
+					2130772273,
+					2130772274};
 			
 			// aapt resource value: 1
 			public const int FloatingActionButton_backgroundTint = 1;
@@ -5647,7 +7776,7 @@ namespace BookAStar.Droid
 			public static int[] ForegroundLinearLayout = new int[] {
 					16843017,
 					16843264,
-					2130772272};
+					2130772275};
 			
 			// aapt resource value: 0
 			public const int ForegroundLinearLayout_android_foreground = 0;
@@ -5664,10 +7793,10 @@ namespace BookAStar.Droid
 					16843046,
 					16843047,
 					16843048,
-					2130772040,
-					2130772188,
-					2130772189,
-					2130772190};
+					2130772043,
+					2130772191,
+					2130772192,
+					2130772193};
 			
 			// aapt resource value: 2
 			public const int LinearLayoutCompat_android_baselineAligned = 2;
@@ -5811,7 +7940,7 @@ namespace BookAStar.Droid
 			public static int[] MediaRouteButton = new int[] {
 					16843071,
 					16843072,
-					2130772017};
+					2130772020};
 			
 			// aapt resource value: 1
 			public const int MediaRouteButton_android_minHeight = 1;
@@ -5862,10 +7991,10 @@ namespace BookAStar.Droid
 					16843236,
 					16843237,
 					16843375,
-					2130772191,
-					2130772192,
-					2130772193,
-					2130772194};
+					2130772194,
+					2130772195,
+					2130772196,
+					2130772197};
 			
 			// aapt resource value: 14
 			public const int MenuItem_actionLayout = 14;
@@ -5926,7 +8055,7 @@ namespace BookAStar.Droid
 					16843055,
 					16843056,
 					16843057,
-					2130772195};
+					2130772198};
 			
 			// aapt resource value: 4
 			public const int MenuView_android_headerBackground = 4;
@@ -5956,13 +8085,13 @@ namespace BookAStar.Droid
 					16842964,
 					16842973,
 					16843039,
-					2130772055,
-					2130772273,
-					2130772274,
-					2130772275,
+					2130772058,
 					2130772276,
 					2130772277,
-					2130772278};
+					2130772278,
+					2130772279,
+					2130772280,
+					2130772281};
 			
 			// aapt resource value: 0
 			public const int NavigationView_android_background = 0;
@@ -5996,7 +8125,7 @@ namespace BookAStar.Droid
 			
 			public static int[] PopupWindow = new int[] {
 					16843126,
-					2130772196};
+					2130772199};
 			
 			// aapt resource value: 0
 			public const int PopupWindow_android_popupBackground = 0;
@@ -6005,17 +8134,17 @@ namespace BookAStar.Droid
 			public const int PopupWindow_overlapAnchor = 1;
 			
 			public static int[] PopupWindowBackgroundState = new int[] {
-					2130772197};
+					2130772200};
 			
 			// aapt resource value: 0
 			public const int PopupWindowBackgroundState_state_above_anchor = 0;
 			
 			public static int[] RecyclerView = new int[] {
 					16842948,
-					2130771991,
-					2130771992,
-					2130771993,
-					2130771994};
+					2130771994,
+					2130771995,
+					2130771996,
+					2130771997};
 			
 			// aapt resource value: 0
 			public const int RecyclerView_android_orientation = 0;
@@ -6033,13 +8162,13 @@ namespace BookAStar.Droid
 			public const int RecyclerView_stackFromEnd = 4;
 			
 			public static int[] ScrimInsetsFrameLayout = new int[] {
-					2130772279};
+					2130772282};
 			
 			// aapt resource value: 0
 			public const int ScrimInsetsFrameLayout_insetForeground = 0;
 			
 			public static int[] ScrollingViewBehavior_Params = new int[] {
-					2130772280};
+					2130772283};
 			
 			// aapt resource value: 0
 			public const int ScrollingViewBehavior_Params_behavior_overlapTop = 0;
@@ -6049,9 +8178,6 @@ namespace BookAStar.Droid
 					16843039,
 					16843296,
 					16843364,
-					2130772198,
-					2130772199,
-					2130772200,
 					2130772201,
 					2130772202,
 					2130772203,
@@ -6061,7 +8187,10 @@ namespace BookAStar.Droid
 					2130772207,
 					2130772208,
 					2130772209,
-					2130772210};
+					2130772210,
+					2130772211,
+					2130772212,
+					2130772213};
 			
 			// aapt resource value: 0
 			public const int SearchView_android_focusable = 0;
@@ -6130,8 +8259,8 @@ namespace BookAStar.Droid
 			
 			public static int[] SnackbarLayout = new int[] {
 					16843039,
-					2130772055,
-					2130772281};
+					2130772058,
+					2130772284};
 			
 			// aapt resource value: 0
 			public const int SnackbarLayout_android_maxWidth = 0;
@@ -6147,7 +8276,7 @@ namespace BookAStar.Droid
 					16843126,
 					16843131,
 					16843362,
-					2130772056};
+					2130772059};
 			
 			// aapt resource value: 3
 			public const int Spinner_android_dropDownWidth = 3;
@@ -6168,13 +8297,13 @@ namespace BookAStar.Droid
 					16843044,
 					16843045,
 					16843074,
-					2130772211,
-					2130772212,
-					2130772213,
 					2130772214,
 					2130772215,
 					2130772216,
-					2130772217};
+					2130772217,
+					2130772218,
+					2130772219,
+					2130772220};
 			
 			// aapt resource value: 1
 			public const int SwitchCompat_android_textOff = 1;
@@ -6221,9 +8350,6 @@ namespace BookAStar.Droid
 			public const int TabItem_android_text = 2;
 			
 			public static int[] TabLayout = new int[] {
-					2130772282,
-					2130772283,
-					2130772284,
 					2130772285,
 					2130772286,
 					2130772287,
@@ -6236,7 +8362,10 @@ namespace BookAStar.Droid
 					2130772294,
 					2130772295,
 					2130772296,
-					2130772297};
+					2130772297,
+					2130772298,
+					2130772299,
+					2130772300};
 			
 			// aapt resource value: 3
 			public const int TabLayout_tabBackground = 3;
@@ -6295,7 +8424,7 @@ namespace BookAStar.Droid
 					16843106,
 					16843107,
 					16843108,
-					2130772066};
+					2130772069};
 			
 			// aapt resource value: 4
 			public const int TextAppearance_android_shadowColor = 4;
@@ -6327,15 +8456,15 @@ namespace BookAStar.Droid
 			public static int[] TextInputLayout = new int[] {
 					16842906,
 					16843088,
-					2130772298,
-					2130772299,
-					2130772300,
 					2130772301,
 					2130772302,
 					2130772303,
 					2130772304,
 					2130772305,
-					2130772306};
+					2130772306,
+					2130772307,
+					2130772308,
+					2130772309};
 			
 			// aapt resource value: 1
 			public const int TextInputLayout_android_hint = 1;
@@ -6373,17 +8502,14 @@ namespace BookAStar.Droid
 			public static int[] Toolbar = new int[] {
 					16842927,
 					16843072,
-					2130772032,
 					2130772035,
-					2130772039,
-					2130772051,
-					2130772052,
-					2130772053,
+					2130772038,
+					2130772042,
 					2130772054,
+					2130772055,
 					2130772056,
-					2130772218,
-					2130772219,
-					2130772220,
+					2130772057,
+					2130772059,
 					2130772221,
 					2130772222,
 					2130772223,
@@ -6395,7 +8521,10 @@ namespace BookAStar.Droid
 					2130772229,
 					2130772230,
 					2130772231,
-					2130772232};
+					2130772232,
+					2130772233,
+					2130772234,
+					2130772235};
 			
 			// aapt resource value: 0
 			public const int Toolbar_android_gravity = 0;
@@ -6475,9 +8604,9 @@ namespace BookAStar.Droid
 			public static int[] View = new int[] {
 					16842752,
 					16842970,
-					2130772233,
-					2130772234,
-					2130772235};
+					2130772236,
+					2130772237,
+					2130772238};
 			
 			// aapt resource value: 1
 			public const int View_android_focusable = 1;
@@ -6496,8 +8625,8 @@ namespace BookAStar.Droid
 			
 			public static int[] ViewBackgroundHelper = new int[] {
 					16842964,
-					2130772236,
-					2130772237};
+					2130772239,
+					2130772240};
 			
 			// aapt resource value: 0
 			public const int ViewBackgroundHelper_android_background = 0;
diff --git a/BookAStar/BookAStar.Droid/Resources/drawable/icon-anon.png b/BookAStar/BookAStar.Droid/Resources/drawable/icon_anon.png
similarity index 100%
rename from BookAStar/BookAStar.Droid/Resources/drawable/icon-anon.png
rename to BookAStar/BookAStar.Droid/Resources/drawable/icon_anon.png
diff --git a/BookAStar/BookAStar.Droid/Resources/values/strings.xml b/BookAStar/BookAStar.Droid/Resources/values/strings.xml
index a5f60829..43cdc6cd 100644
--- a/BookAStar/BookAStar.Droid/Resources/values/strings.xml
+++ b/BookAStar/BookAStar.Droid/Resources/values/strings.xml
@@ -13,4 +13,5 @@
 	<string name="url">url</string>
 	<string name="url_hint">url_hint</string>
 	<string name="picture">picture</string>
+	<string name="google_app_id">325408689282</string>
 </resources>
diff --git a/BookAStar/BookAStar.Droid/Resources/values/styles.xml b/BookAStar/BookAStar.Droid/Resources/values/styles.xml
index 0e6f44ce..9fce3509 100644
--- a/BookAStar/BookAStar.Droid/Resources/values/styles.xml
+++ b/BookAStar/BookAStar.Droid/Resources/values/styles.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <resources>
-
+  
   <style name="MainTheme" parent="MainTheme.Base">
+    <item name="android:windowBackground">@color/windowBackground</item>
+    <item name="android:windowNoTitle">true</item>
+    <item name="android:statusBarColor">@color/primaryDark</item>
+    <item name="android:colorPrimaryDark">@color/primaryDark</item>
   </style>
+  
   <!-- Base theme applied no matter what API -->
   <style name="MainTheme.Base" parent="Theme.AppCompat.Light.DarkActionBar">
     <!--If you are using revision 22.1 please use just windowNoTitle. Without android:-->
@@ -21,13 +26,18 @@
          colorControlHighlight and colorSwitchThumbNormal. -->
     <item name="windowActionModeOverlay">true</item>
 
-    
     <item name="android:datePickerDialogTheme">@style/AppCompatDialogStyle</item>
-    <!--If you are using revision 22.1 please use just windowNoTitle. Without android:-->
-  
+    <!--We will be using the toolbar so no need to show ActionBar-->
+   <!-- <item name="android:actionBarStyle">@style/MyActionBar</item> -->
+    
   </style>
 
   <style name="AppCompatDialogStyle" parent="Theme.AppCompat.Light.Dialog">
     <item name="colorAccent">#FF4081</item>
   </style>
+  <!--  
+  <style name="MyActionBar" parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse">
+    <item name="android:background">#A97946</item>
+  </style> -->
+
 </resources>
diff --git a/BookAStar/BookAStar.Droid/Services/GcmListenerService.cs b/BookAStar/BookAStar.Droid/Services/GcmListenerService.cs
index 9dc7f15a..148fbdd5 100644
--- a/BookAStar/BookAStar.Droid/Services/GcmListenerService.cs
+++ b/BookAStar/BookAStar.Droid/Services/GcmListenerService.cs
@@ -43,7 +43,7 @@ namespace BookAStar.Droid.Services
                 var topic = data.GetString("Topic");
                 if (topic == "BookQuery")
                 {
-                    DateTime eventdate,enddate;
+                    DateTime eventdate;
                     
                     var sdatestr = data.GetString("EventDate");
                     DateTime.TryParse(sdatestr, out eventdate);
diff --git a/BookAStar/BookAStar.Droid/app.config b/BookAStar/BookAStar.Droid/app.config
index 5ff34869..c8df8462 100644
--- a/BookAStar/BookAStar.Droid/app.config
+++ b/BookAStar/BookAStar.Droid/app.config
@@ -2,6 +2,10 @@
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<dependentAssembly>
+				<assemblyIdentity name="System.Runtime" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+			</dependentAssembly>
 			<dependentAssembly>
 				<assemblyIdentity name="System.Drawing" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
 				<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
@@ -30,6 +34,10 @@
         <assemblyIdentity name="System.Drawing" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="XLabs.Serialization" publicKeyToken="d65109b36e5040e4" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.5782.15703" newVersion="2.0.5782.15703" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
diff --git a/BookAStar/BookAStar.Droid/google-services.json b/BookAStar/BookAStar.Droid/google-services.json
new file mode 100644
index 00000000..a6bd9aad
--- /dev/null
+++ b/BookAStar/BookAStar.Droid/google-services.json
@@ -0,0 +1,78 @@
+{
+  "project_info": {
+    "project_number": "325408689282",
+    "project_id": "yavsc-001"
+  },
+  "client": [
+    {
+      "client_info": {
+        "android_client_info": {
+          "package_name": "fr.pschneider.android.wearable.speedtracker"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "325408689282-6bekh7p3guj4k0f3301a6frf025cnrk1.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBCAE_pc6lrxLf8_Vyho0KSxLsqjxecPFk"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 1,
+          "other_platform_oauth_client": []
+        },
+        "ads_service": {
+          "status": 1
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:325408689282:android:50a2328516f10af3",
+        "android_client_info": {
+          "package_name": "fr.pschneider.bas"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "325408689282-emdeucmt5pr9jg7170t0q9gnndacsqqf.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "fr.pschneider.bas",
+            "certificate_hash": "E97A345457861B8E2E7BA79BB814BB1ACC0471A6"
+          }
+        },
+        {
+          "client_id": "325408689282-6bekh7p3guj4k0f3301a6frf025cnrk1.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBCAE_pc6lrxLf8_Vyho0KSxLsqjxecPFk"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 1,
+          "other_platform_oauth_client": []
+        },
+        "ads_service": {
+          "status": 1
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}
\ No newline at end of file
diff --git a/BookAStar/BookAStar.Droid/packages.config b/BookAStar/BookAStar.Droid/packages.config
index 3c8a0a89..b25e9b63 100644
--- a/BookAStar/BookAStar.Droid/packages.config
+++ b/BookAStar/BookAStar.Droid/packages.config
@@ -1,12 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="ExifLib.PCL" version="1.0.1" targetFramework="monoandroid70" />
   <package id="MarkdownDeep-av.NET" version="1.5.2" targetFramework="monoandroid60" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="monoandroid60" />
-  <package id="Xam.Plugin.Connectivity" version="1.0.1" targetFramework="monoandroid60" />
-  <package id="Xam.Plugin.DeviceInfo" version="1.0.0.2" targetFramework="monoandroid60" />
-  <package id="Xam.Plugin.Geolocator" version="1.0.0" targetFramework="monoandroid60" />
-  <package id="Xam.Plugin.Media" version="1.0.1" targetFramework="monoandroid60" />
-  <package id="Xam.Plugins.Settings" version="2.1.0" targetFramework="monoandroid60" />
+  <package id="Plugin.CurrentActivity" version="1.0.1" targetFramework="monoandroid70" />
+  <package id="Plugin.Permissions" version="1.1.7" targetFramework="monoandroid70" />
+  <package id="Scorchio.NinjaCoder.Xamarin.Forms.Labs" version="2.0.0" targetFramework="monoandroid70" />
+  <package id="SQLite.Net.Async-PCL" version="3.1.1" targetFramework="monoandroid70" />
+  <package id="SQLite.Net.Core-PCL" version="3.1.1" targetFramework="monoandroid70" />
+  <package id="SQLite.Net-PCL" version="3.1.1" targetFramework="monoandroid70" />
+  <package id="Xam.Plugin.Connectivity" version="2.2.12" targetFramework="monoandroid70" />
+  <package id="Xam.Plugin.DeviceInfo" version="2.0.2" targetFramework="monoandroid70" />
+  <package id="Xam.Plugin.Geolocator" version="3.0.4" targetFramework="monoandroid70" />
+  <package id="Xam.Plugin.Media" version="2.3.0" targetFramework="monoandroid70" />
+  <package id="Xam.Plugins.Settings" version="2.5.1.0" targetFramework="monoandroid70" />
   <package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="23.3.0" targetFramework="monoandroid60" />
   <package id="Xamarin.Android.Support.Design" version="23.3.0" targetFramework="monoandroid60" />
   <package id="Xamarin.Android.Support.v4" version="23.3.0" targetFramework="monoandroid60" />
@@ -15,11 +22,23 @@
   <package id="Xamarin.Android.Support.v7.MediaRouter" version="23.3.0" targetFramework="monoandroid60" />
   <package id="Xamarin.Android.Support.v7.RecyclerView" version="23.3.0" targetFramework="monoandroid60" />
   <package id="Xamarin.Android.Support.Vector.Drawable" version="23.3.0" targetFramework="monoandroid60" />
-  <package id="Xamarin.Forms" version="2.3.0.107" targetFramework="monoandroid60" />
-  <package id="Xamarin.GooglePlayServices" version="22.0.0.0" targetFramework="monoandroid60" />
-  <package id="Xamarin.GooglePlayServices.Base" version="29.0.0.2" targetFramework="monoandroid60" />
-  <package id="Xamarin.GooglePlayServices.Basement" version="29.0.0.2" targetFramework="monoandroid60" />
-  <package id="Xamarin.GooglePlayServices.Gcm" version="29.0.0.2" targetFramework="monoandroid60" />
-  <package id="Xamarin.GooglePlayServices.Maps" version="29.0.0.2" targetFramework="monoandroid60" />
-  <package id="Xamarin.GooglePlayServices.Measurement" version="29.0.0.2" targetFramework="monoandroid60" />
+  <package id="Xamarin.Controls.SignaturePad" version="1.4.0" targetFramework="monoandroid70" />
+  <package id="Xamarin.Forms" version="2.3.2.127" targetFramework="monoandroid70" />
+  <package id="Xamarin.Forms.Labs" version="1.0.1.0" targetFramework="monoandroid70" />
+  <package id="Xamarin.GooglePlayServices.Ads" version="29.0.0.2" targetFramework="monoandroid41" />
+  <package id="Xamarin.GooglePlayServices.Analytics" version="29.0.0.2" targetFramework="monoandroid41" />
+  <package id="Xamarin.GooglePlayServices.Base" version="29.0.0.2" targetFramework="monoandroid41" />
+  <package id="Xamarin.GooglePlayServices.Basement" version="29.0.0.2" targetFramework="monoandroid41" />
+  <package id="Xamarin.GooglePlayServices.Gcm" version="29.0.0.2" targetFramework="monoandroid41" />
+  <package id="Xamarin.GooglePlayServices.Maps" version="29.0.0.2" targetFramework="monoandroid41" />
+  <package id="Xamarin.GooglePlayServices.Measurement" version="29.0.0.2" targetFramework="monoandroid41" />
+  <package id="XLabs.Caching" version="2.2.0-pre05" targetFramework="monoandroid70" />
+  <package id="XLabs.Caching.SQLite" version="2.2.0-pre05" targetFramework="monoandroid70" />
+  <package id="XLabs.Core" version="2.2.0-pre05" targetFramework="monoandroid70" />
+  <package id="XLabs.Forms" version="2.2.0-pre05" targetFramework="monoandroid70" />
+  <package id="XLabs.IoC" version="2.2.0-pre05" targetFramework="monoandroid70" />
+  <package id="XLabs.Platform" version="2.2.0-pre05" targetFramework="monoandroid70" />
+  <package id="XLabs.Serialization" version="2.2.0-pre05" targetFramework="monoandroid70" />
+  <package id="XLabs.Settings" version="2.0.5782" targetFramework="monoandroid70" />
+  <package id="XLabs.Settings.XamSettings" version="2.0.5782" targetFramework="monoandroid70" />
 </packages>
\ No newline at end of file
diff --git a/BookAStar/BookAStar.iOS/AppDelegate.cs b/BookAStar/BookAStar.iOS/AppDelegate.cs
index 78b47126..dbcd76b8 100644
--- a/BookAStar/BookAStar.iOS/AppDelegate.cs
+++ b/BookAStar/BookAStar.iOS/AppDelegate.cs
@@ -4,6 +4,9 @@ using System.Linq;
 
 using Foundation;
 using UIKit;
+using BookAStar;
+using BookAStar.Interfaces;
+using Yavsc.Models.Identity;
 
 namespace App2.iOS
 {
@@ -11,8 +14,27 @@ namespace App2.iOS
     // User Interface of the application, as well as listening (and optionally responding) to 
     // application events from iOS.
     [Register("AppDelegate")]
-    public partial class AppDelegate : global::Xamarin.Forms.Platform.iOS.FormsApplicationDelegate
+    public partial class AppDelegate : global::Xamarin.Forms.Platform.iOS.FormsApplicationDelegate,
+        IPlatform
     {
+        public string GCMStatusMessage
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public void AddAccount()
+        {
+            throw new NotImplementedException();
+        }
+
+        public bool EnablePushNotifications(bool enable)
+        {
+            throw new NotImplementedException();
+        }
+
         //
         // This method is invoked when the application has loaded and is ready to run. In this 
         // method you should instantiate the window, load the UI into it and then make the window
@@ -23,9 +45,34 @@ namespace App2.iOS
         public override bool FinishedLaunching(UIApplication app, NSDictionary options)
         {
             global::Xamarin.Forms.Forms.Init();
-            LoadApplication(new App());
+            LoadApplication(new App(this));
 
             return base.FinishedLaunching(app, options);
         }
+
+        public IGCMDeclaration GetDeviceInfo()
+        {
+            throw new NotImplementedException();
+        }
+
+        public object InvokeApi(string method, object arg)
+        {
+            throw new NotImplementedException();
+        }
+
+        public TAnswer InvokeApi<TAnswer>(string method, object arg)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void OpenWeb(string Uri)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void RevokeAccount(string userName)
+        {
+            throw new NotImplementedException();
+        }
     }
 }
diff --git a/BookAStar/BookAStar.iOS/BookAStar.iOS.csproj b/BookAStar/BookAStar.iOS/BookAStar.iOS.csproj
index ca76670d..0cce83b0 100644
--- a/BookAStar/BookAStar.iOS/BookAStar.iOS.csproj
+++ b/BookAStar/BookAStar.iOS/BookAStar.iOS.csproj
@@ -133,35 +133,39 @@
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.0.0.6482\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.0.0.6482\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform.iOS, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.0.0.6482\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.0.0.6482\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.iOS" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\Yavsc.Client\Yavsc.Client.csproj">
+      <Project>{67F9D3A8-F71E-4428-913F-C37AE82CDB24}</Project>
+      <Name>Yavsc.Client</Name>
+    </ProjectReference>
     <ProjectReference Include="..\BookAStar\BookAStar.csproj">
       <Project>{A0815650-0A0A-47B0-8826-771F0E1AD137}</Project>
       <Name>BookAStar</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-  <Import Project="..\..\packages\Xamarin.Forms.2.0.0.6482\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.0.0.6482\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
+  <Import Project="..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>Ce projet fait référence à des packages NuGet qui sont manquants sur cet ordinateur. Utilisez l'option de restauration des packages NuGet pour les télécharger. Pour plus d'informations, consultez http://go.microsoft.com/fwlink/?LinkID=322105. Le fichier manquant est : {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.0.0.6482\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.0.0.6482\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/BookAStar/BookAStar.iOS/app.config b/BookAStar/BookAStar.iOS/app.config
index 8460dd43..bb76392c 100644
--- a/BookAStar/BookAStar.iOS/app.config
+++ b/BookAStar/BookAStar.iOS/app.config
@@ -6,6 +6,10 @@
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="XLabs.Serialization" publicKeyToken="d65109b36e5040e4" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.5782.15703" newVersion="2.0.5782.15703" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file
diff --git a/BookAStar/BookAStar.iOS/packages.config b/BookAStar/BookAStar.iOS/packages.config
index c044abf8..b78e7945 100644
--- a/BookAStar/BookAStar.iOS/packages.config
+++ b/BookAStar/BookAStar.iOS/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Xamarin.Forms" version="2.0.0.6482" targetFramework="xamarinios10" />
+  <package id="Xamarin.Forms" version="2.3.2.127" targetFramework="xamarinios10" />
 </packages>
\ No newline at end of file
diff --git a/BookAStar/BookAStar/App.xaml b/BookAStar/BookAStar/App.xaml
index a3f0bde3..9b6d74a0 100644
--- a/BookAStar/BookAStar/App.xaml
+++ b/BookAStar/BookAStar/App.xaml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Application xmlns="http://xamarin.com/schemas/2014/forms"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="BookAStar.App" >
+             x:Class="BookAStar.App"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib">
+  
   <Application.Resources>
+    
     <ResourceDictionary>
       
-      <Color x:Key="PageBackgroundColor">#f0f0ff</Color>
+      <Color x:Key="PageBackgroundColor">#30FAFAFA</Color>
+      <Color x:Key="ContentBackgroundColor">#ffffff</Color>
+      <Color x:Key="PageForegroundColor">#000000</Color>
       <Color x:Key="HeadingTextColor">Black</Color>
       <Color x:Key="NormalTextColor">Blue</Color>
       <Color x:Key="GroupingTextColor">#5050ff</Color>
@@ -15,9 +20,10 @@
       <OnPlatform x:TypeArguments="Font" Android="60" iOS="60" WinPhone="60" x:Key="LargeFontSize" />
       <OnPlatform x:TypeArguments="Font" Android="50" iOS="50" WinPhone="50" x:Key="MediumFontSize" />
       <OnPlatform x:TypeArguments="Font" Android="40" iOS="40" WinPhone="40" x:Key="SmallFontSize" />
+      <OnPlatform x:TypeArguments="x:Double" Android="130" iOS="130" WinPhone="130" x:Key="BigUserAvatarSize" />
+      
 
-
-      <Color x:Key="BackgroundColor">#30FAFAFA</Color>
+      <Color x:Key="BackgroundColor">#30AAAAFA</Color>
       <Color x:Key="OddColor">#207AFAFA</Color>
       <Color x:Key="TextColor">#FF103010</Color>
       <Color x:Key="LabelColor">#FF303010</Color>
@@ -47,6 +53,10 @@
 
       <Style x:Key="BigLabel"  BasedOn="{StaticResource LabelStyle}" TargetType="Label">
         <Setter Property="FontSize" Value="Large" />
+      </Style>      
+      <Style x:Key="ContentLabelStyle"  BasedOn="{StaticResource LabelStyle}" TargetType="Label">
+        <Setter Property="FontSize" Value="{StaticResource MediumFontSize}" />
+        <Setter Property="HorizontalOptions" Value="CenterAndExpand" />
       </Style>
       
       <Style x:Key="EntryStyle" TargetType="Entry">
@@ -69,7 +79,10 @@
         <Setter Property="WidthRequest" Value="200" />
         <Setter Property="TextColor" Value="Teal" />
       </Style>
-      <Style x:Key="PageStyle" TargetType="Page">
+      
+      <Style x:Key="PageStyle" TargetType="ContentPage">
+        <Setter Property="Padding" Value="5,5,5,5" />
+        <Setter Property="BackgroundColor" Value="{StaticResource PageBackgroundColor}" />
       </Style>
     </ResourceDictionary>
   </Application.Resources>
diff --git a/BookAStar/BookAStar/App.xaml.cs b/BookAStar/BookAStar/App.xaml.cs
index fa13a098..40882687 100644
--- a/BookAStar/BookAStar/App.xaml.cs
+++ b/BookAStar/BookAStar/App.xaml.cs
@@ -3,9 +3,19 @@ using BookAStar.Interfaces;
 using BookAStar.Model;
 using BookAStar.Model.Workflow;
 using BookAStar.Pages;
+using BookAStar.ViewModels;
 using System;
-using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
 using Xamarin.Forms;
+using XLabs.Forms.Mvvm;
+using XLabs.Forms.Services;
+using XLabs.Ioc;
+using XLabs.Platform.Mvvm;
+using XLabs.Platform.Services;
 /*
 Glyphish icons from
 http://www.glyphish.com/
@@ -18,97 +28,151 @@ namespace BookAStar
 {
     public partial class App : Application // superclass new in 1.3
     {
-        SearchPage searchPage = new SearchPage
-        {
-            Title = "Trouvez votre artiste",
-            Icon = "glyphish_07_map_marker.png"
-        };
-        NavigationPage mp;
-
-        SettingsPage settingsPage = new SettingsPage
-            {
-                Title = "Paramètres",
-                Icon = "ic_corp_icon.png"
-            };
-
-        PinPage pinPage = new PinPage
-        {
-            Title = "Carte",
-            Icon = "glyphish_07_map_marker.png"
-        };
-        
-
-        
-
-        
-
         public static IPlatform PlatformSpecificInstance { get; set; }
         public static string AppName { get; set; }
         public static App CurrentApp { get { return Current as App; } }
-
         public DataManager DataManager { get; set; } = new DataManager();
+        public static void Init()
+        {
+            var app = Resolver.Resolve<IXFormsApp>();
+            if (app == null)
+            {
+                return;
+            }
+            // navigation registration
 
-        internal void EditCommandLine(CommandLine com)
+            app.Closing += (o, e) => Debug.WriteLine("Application Closing");
+            app.Error += (o, e) => Debug.WriteLine("Application Error");
+            app.Initialize += (o, e) => Debug.WriteLine("Application Initialized");
+            app.Resumed += (o, e) => Debug.WriteLine("Application Resumed");
+            app.Rotation += (o, e) => Debug.WriteLine("Application Rotated");
+            app.Startup += (o, e) => Debug.WriteLine("Application Startup");
+            app.Suspended += (o, e) => Debug.WriteLine("Application Suspended");
+            
+        }
+
+        public App(IPlatform instance)
+        {
+            PlatformSpecificInstance = instance;
+            InitializeComponent();
+            Init();
+            MainPage = GetMainPage();
+        }
+
+        public static Page GetMainPage()
+        {
+            ViewFactory.Register<SettingsPage,SettingsViewModel>();
+            ViewFactory.Register<BookQueryPage, BookQueryViewModel>(
+                resolver => new BookQueryViewModel ()
+                );
+           
+            var bQueriesPage = new BookQueriesPage
+            {
+                BindingContext = DataManager.Current.BookQueries,
+                Title = "Demandes"
+            };
+
+            //  var mainPage = new NavigationPage(bQueriesPage);
+
+            var mainPage = new XLabs.Forms.Pages.ExtendedMasterDetailPage() {
+                Title="MainPAge"
+            };
+
+            mainPage.Master = bQueriesPage;
+            mainPage.Detail = new SettingsPage();
+            
+            Resolver.Resolve<IDependencyContainer>()
+                .Register<INavigationService>(t => new NavigationService(mainPage.Navigation));
+
+            ToolbarItem tiSetts = new ToolbarItem()
+            {
+                Text = "Paramètres",
+                Icon = "ic_corp_icon.png"
+            };
+
+            ToolbarItem tiHome = new ToolbarItem()
+            {
+                Text = "Accueil",
+                Icon = "icon.png"
+            };
+            mainPage.ToolbarItems.Add(tiHome);
+            mainPage.ToolbarItems.Add(tiSetts);
+            return mainPage;
+
+            /*     searchPage = new SearchPage
+                 {
+                     Title = "Trouvez votre artiste",
+                     Icon = "glyphish_07_map_marker.png"
+                 };
+
+                  settingsPage = new SettingsPage
+                 {
+                     Title = "Paramètres",
+                     Icon = "ic_corp_icon.png"
+                 };
+
+                  pinPage = new PinPage
+                 {
+                     Title = "Carte",
+                     Icon = "glyphish_07_map_marker.png"
+                 };
+                 PlatformSpecificInstance = instance;
+                 Navigation = new NavigationPage(searchPage);
+
+                 //var hasLabelStyle = r.ContainsKey("labelStyle");
+                 // var stid = this.StyleId;
+                 // null var appsstyle = settingsPage.Style;
+                 // appsstyle.CanCascade = true;
+                 MainPage = Navigation;
+                 ToolbarItem tiSetts = new ToolbarItem()
+                 {
+                     Text = "Settings",
+                     Icon = "ic_corp_icon.png"
+                 };
+                 Navigation.ToolbarItems.Add(tiSetts);
+                 tiSetts.Clicked += (object sender, EventArgs e) =>
+                 {
+                     ShowPage (settingsPage);
+                 };
+                 ToolbarItem tiQueries = new ToolbarItem
+                 {
+                     Text = "Demandes"
+                 };
+
+                 tiQueries.Clicked += (object sender, EventArgs e) =>
+                 {
+                     BookQueriesPage bookQueriesPage = new BookQueriesPage
+                     {
+                         Title = "Demandes de devis"
+                     };
+                     bookQueriesPage.BindingContext = DataManager.BookQueries;
+                     ShowPage(bookQueriesPage);
+                 };
+                 Navigation.ToolbarItems.Add(tiQueries);
+                 ToolbarItem tiMap = new ToolbarItem
+                 {
+                     Text = "Carte",
+                     Icon = "glyphish_07_map_marker.png"
+                 };
+                 Navigation.ToolbarItems.Add(tiMap);
+                 tiMap.Clicked += (object sender, EventArgs e) =>
+                 {
+                     ShowPage(pinPage);
+                 };
+                 MainPage = Navigation;
+                 */
+
+
+        }
+
+        internal void EditCommandLine(Page parentPage, CommandLine com)
         {
             CommandLineEditorPage editCommandLine = new CommandLineEditorPage
             {
                 Title = "Edition d'une ligne de facture",
                 BindingContext = com
             };
-            mp.Navigation.PushAsync(editCommandLine);
-        }
-
-        public App(IPlatform instance)
-        {
-            InitializeComponent();
-
-            PlatformSpecificInstance = instance;
-            mp = new NavigationPage(searchPage)
-            {
-                BackgroundColor = (Color)Application.Current.Resources["PageBackgroundColor"]
-            };
-            var color = Application.Current.Resources["PageBackgroundColor"];
-            //var hasLabelStyle = r.ContainsKey("labelStyle");
-            // var stid = this.StyleId;
-            // null var appsstyle = settingsPage.Style;
-            // appsstyle.CanCascade = true;
-            MainPage = mp;
-            ToolbarItem tiSetts = new ToolbarItem()
-            {
-                Text = "Settings",
-                Icon = "ic_corp_icon.png"
-            };
-            mp.ToolbarItems.Add(tiSetts);
-            tiSetts.Clicked += (object sender, EventArgs e) =>
-            {
-                ShowPage (settingsPage);
-            };
-            ToolbarItem tiQueries = new ToolbarItem
-            {
-                Text = "Demandes"
-            };
-
-            tiQueries.Clicked += (object sender, EventArgs e) =>
-            {
-                BookQueriesPage bookQueriesPage = new BookQueriesPage
-                {
-                    Title = "Demandes de devis"
-                };
-                bookQueriesPage.BindingContext = DataManager.BookQueries;
-                ShowPage(bookQueriesPage);
-            };
-            mp.ToolbarItems.Add(tiQueries);
-            ToolbarItem tiMap = new ToolbarItem
-            {
-                Text = "Carte",
-                Icon = "glyphish_07_map_marker.png"
-            };
-            mp.ToolbarItems.Add(tiMap);
-            tiMap.Clicked += (object sender, EventArgs e) =>
-            {
-                ShowPage(pinPage);
-            };
-           
+            parentPage.Navigation.PushAsync(editCommandLine);
         }
 
         public void PostDeviceInfo()
@@ -122,31 +186,45 @@ namespace BookAStar
         {
             BookQueryPage bookQueryPage = new BookQueryPage
             {
-                Title = "Demande de devis"
+                Title = "Demande de devis",
+                BindingContext = data
             };
-            bookQueryPage.BindingContext = data;
-            ShowPage(bookQueryPage);
+           ShowPage(bookQueryPage);
         }
 
         public void EditEstimate(Estimate data)
         {
+            throw new NotImplementedException();
             EditEstimatePage editEstimate = new EditEstimatePage
             {
                 Title = "Création d'un devis"
             };
             editEstimate.Estimate = data;
-            ShowPage(editEstimate);
+            // ShowPage(editEstimate);
         }
 
         // TODO système de persistance de l'état de l'appli
-        private void ShowPage(Page p) 
+
+        /// <summary>
+        /// Shows a page asynchronously by locating the default constructor, creating the page,
+        /// the pushing it onto the navigation stack.
+        /// </summary>
+        /// <param name="parentPage">Parent Page</param>
+        /// <param name="pageType">Type of page to show</param>
+        /// <returns></returns>
+        private static async Task ShowPage(VisualElement parentPage, Type pageType)
         {
-            if (p.Parent!=null)
+            // Get all the constructors of the page type.
+            var constructors = pageType.GetTypeInfo().DeclaredConstructors;
+
+            foreach ( var page in
+                    from constructor in constructors
+                    where constructor.GetParameters().Length == 0
+                    select (Page)constructor.Invoke(null))
             {
-                mp.Navigation.RemovePage(p);
-                p.Parent = null;
+                await parentPage.Navigation.PushAsync(page);
+                break;
             }
-            mp.Navigation.PushAsync(p);
         }
     }
 }
diff --git a/BookAStar/BookAStar/BookAStar.csproj b/BookAStar/BookAStar/BookAStar.csproj
index e7744bb4..b2216ffc 100644
--- a/BookAStar/BookAStar/BookAStar.csproj
+++ b/BookAStar/BookAStar/BookAStar.csproj
@@ -41,10 +41,16 @@
       <DependentUpon>App.xaml</DependentUpon>
     </Compile>
     <Compile Include="Constants.cs" />
+    <Compile Include="Factories\ViewFactory.cs" />
     <Compile Include="Helpers\AvatarImageSource.cs" />
     <Compile Include="Helpers\DataManager.cs" />
+    <Compile Include="Helpers\PropertySupport.cs" />
     <Compile Include="Helpers\RemoteEntityRO.cs" />
+    <Compile Include="Helpers\Settings.cs" />
+    <Compile Include="Interfaces\IComponentContext.cs" />
     <Compile Include="Interfaces\IMDEditor.cs" />
+    <Compile Include="Interfaces\IModelViewModel.cs" />
+    <Compile Include="Interfaces\IViewFactory.cs" />
     <Compile Include="Model\ClientProviderInfo.cs" />
     <Compile Include="Pages\BlogPage.cs" />
     <Compile Include="Pages\BookQueriesPage.xaml.cs">
@@ -105,6 +111,10 @@
       <DependentUpon>EditEstimatePage.xaml</DependentUpon>
     </Compile>
     <Compile Include="Pages\PinPage.cs" />
+    <Compile Include="ViewModels\BookQueriesViewModel.cs" />
+    <Compile Include="ViewModels\BookQueryViewModel.cs" />
+    <Compile Include="ViewModels\SettingsViewModel.cs" />
+    <Compile Include="ViewModels\ViewModelBase.cs" />
     <Compile Include="Views\CommandLineEditor.xaml.cs">
       <DependentUpon>CommandLineEditor.xaml</DependentUpon>
     </Compile>
@@ -147,6 +157,10 @@
     <Folder Include="Model\Billing\" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="ExifLib, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\ExifLib.PCL.1.0.1\lib\portable-net45+sl50+win+WindowsPhoneApp81+wp80+Xamarin.iOS10+MonoAndroid10+MonoTouch10\ExifLib.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Json.NET.Web">
       <HintPath>..\..\packages\Json.NET.Web.1.0.49\lib\portable45-net45+win8+wpa81\Json.NET.Web.dll</HintPath>
     </Reference>
@@ -159,28 +173,52 @@
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="Plugin.Settings, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xam.Plugins.Settings.2.1.0\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10+UAP10\Plugin.Settings.dll</HintPath>
+    <Reference Include="Plugin.Settings, Version=2.5.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xam.Plugins.Settings.2.5.1.0\lib\portable-net45+wp80+win8+wpa81\Plugin.Settings.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Plugin.Settings.Abstractions, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xam.Plugins.Settings.2.1.0\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10+UAP10\Plugin.Settings.Abstractions.dll</HintPath>
+    <Reference Include="Plugin.Settings.Abstractions, Version=2.5.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xam.Plugins.Settings.2.5.1.0\lib\portable-net45+wp80+win8+wpa81\Plugin.Settings.Abstractions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SQLite.Net, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\SQLite.Net-PCL.3.1.1\lib\portable-win8+net45+wp8+wpa81+MonoAndroid1+MonoTouch1\SQLite.Net.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.107\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Maps, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.Maps.2.3.0.107\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Maps.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.Maps.2.3.2.127\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Maps.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.107\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.107\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="XLabs.Core, Version=2.2.0.38178, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Core.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="XLabs.Forms, Version=2.2.0.38180, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Forms.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+monoandroid+MonoTouch+Xamarin.iOS10\XLabs.Forms.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="XLabs.IOC, Version=2.2.0.38178, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.IoC.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.IOC.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="XLabs.Platform, Version=2.2.0.38179, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Platform.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+monoandroid+MonoTouch+Xamarin.iOS10\XLabs.Platform.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="XLabs.Serialization, Version=2.2.0.38178, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Serialization.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Serialization.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -224,12 +262,12 @@
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <Import Project="..\..\packages\Xamarin.Forms.2.3.0.107\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.0.107\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
+  <Import Project="..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>Ce projet fait référence à des packages NuGet qui sont manquants sur cet ordinateur. Utilisez l'option de restauration des packages NuGet pour les télécharger. Pour plus d'informations, consultez http://go.microsoft.com/fwlink/?LinkID=322105. Le fichier manquant est : {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.0.107\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.0.107\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/BookAStar/BookAStar/Constants.cs b/BookAStar/BookAStar/Constants.cs
index f1c21e1d..078b40f3 100644
--- a/BookAStar/BookAStar/Constants.cs
+++ b/BookAStar/BookAStar/Constants.cs
@@ -22,22 +22,27 @@ namespace BookAStar
         #endregion
 
         #region Colors & sizes
-
+        [Obsolete]
         public static readonly Thickness PagePadding =
             new Thickness(5, Device.OnPlatform(20, 20, 20), 5, 5);
 
+        [Obsolete]
         public static readonly Thickness DefaultPadding =
             new Thickness(5, Device.OnPlatform(20, 20, 20), 3, 3);
 
+        [Obsolete]
         public static readonly Font TitleFont =
             Font.SystemFontOfSize(Device.OnPlatform(50, 50, 50), FontAttributes.Bold);
 
+        [Obsolete]
         public static readonly Color OddBackgroundColor =
             Device.OnPlatform(Color.Aqua, Color.Aqua, Color.Aqua);
 
+        [Obsolete]
         public static readonly Color ForegroundColor =
             Device.OnPlatform(Color.White, Color.White, Color.White);
 
+        [Obsolete]
         public static readonly Color BackgroundColor =
             Device.OnPlatform(Color.Black, Color.White, Color.White);
 
diff --git a/BookAStar/BookAStar/Factories/ViewFactory.cs b/BookAStar/BookAStar/Factories/ViewFactory.cs
new file mode 100644
index 00000000..aa7f88d8
--- /dev/null
+++ b/BookAStar/BookAStar/Factories/ViewFactory.cs
@@ -0,0 +1,58 @@
+using BookAStar.Interfaces;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Xamarin.Forms;
+
+namespace BookAStar.Factories
+{
+    public class ViewFactory : IViewFactory
+    {
+        private readonly IDictionary<Type, Type> _map = new Dictionary<Type, Type>();
+        private readonly IComponentContext _componentContext;
+
+        public ViewFactory(IComponentContext componentContext)
+        {
+            _componentContext = componentContext;
+        }
+
+        public void Register<TViewModel, TView>()
+            where TViewModel : class, IModelViewModel
+            where TView : Page
+        {
+            _map[typeof(TViewModel)] = typeof(TView);
+        }
+
+        public Page Resolve<TViewModel>(Action<TViewModel> setStateAction = null) where TViewModel : class, IModelViewModel
+        {
+            TViewModel viewModel;
+            return Resolve<TViewModel>(out viewModel, setStateAction) ;
+        }
+
+        public Page Resolve<TViewModel>(out TViewModel viewModel, Action<TViewModel> setStateAction = null)
+            where TViewModel : class, IModelViewModel
+        {
+            viewModel = _componentContext.Resolve<TViewModel>();
+
+            var viewType = _map[typeof(TViewModel)];
+            var view = _componentContext.Resolve(viewType) as Page;
+
+            if (setStateAction != null)
+                viewModel.SetState(setStateAction);
+
+            view.BindingContext = viewModel;
+            return view;
+        }
+
+        public Page Resolve<TViewModel>(TViewModel viewModel)
+            where TViewModel : class, IModelViewModel
+        {
+            var viewType = _map[typeof(TViewModel)];
+            var view = _componentContext.Resolve(viewType) as Page;
+            view.BindingContext = viewModel;
+            return view;
+        }
+    }
+}
diff --git a/BookAStar/BookAStar/Helpers/AvatarImageSource.cs b/BookAStar/BookAStar/Helpers/AvatarImageSource.cs
index d254ceff..6b511b87 100644
--- a/BookAStar/BookAStar/Helpers/AvatarImageSource.cs
+++ b/BookAStar/BookAStar/Helpers/AvatarImageSource.cs
@@ -9,7 +9,7 @@ using Xamarin.Forms.Xaml;
 namespace BookAStar
 {
     [ContentProperty("Source")]
-    public class AvatarImageSourceExtension : IMarkupExtension
+    public class MyExtension : IMarkupExtension
     {
         public string Source { get; set; }
 
@@ -20,6 +20,8 @@ namespace BookAStar
             
             if (Source != null)
             {
+                if (Source.StartsWith("res://"))
+                    return ImageSource.FromResource(Source.Substring(6));
                 return ImageSource.FromUri(new Uri(Source));
             }
             return ImageSource.FromResource("BookAStar.icon-anon.png");
diff --git a/BookAStar/BookAStar/Helpers/DataManager.cs b/BookAStar/BookAStar/Helpers/DataManager.cs
index 48713bf4..66a73427 100644
--- a/BookAStar/BookAStar/Helpers/DataManager.cs
+++ b/BookAStar/BookAStar/Helpers/DataManager.cs
@@ -17,7 +17,7 @@ namespace BookAStar.Helpers
         public RemoteEntity<Estimate, long> Estimates { get; set; }
         public RemoteEntity<Blog, long> Blogspot { get; set; }
         public LocalEntity<ClientProviderInfo,string> Contacts { get; set; }
-
+        
         public static DataManager Current
         {
             get
diff --git a/BookAStar/BookAStar/Helpers/PropertySupport.cs b/BookAStar/BookAStar/Helpers/PropertySupport.cs
new file mode 100644
index 00000000..c6638c43
--- /dev/null
+++ b/BookAStar/BookAStar/Helpers/PropertySupport.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BookAStar.Helpers
+{
+    public static class PropertySupport
+    {
+        public static string ExtractPropertyName<T>(Expression<Func<T>> propertyExpression)
+        {
+            if (propertyExpression == null)
+            {
+                throw new ArgumentNullException("propertyExpression");
+            }
+
+            var memberExpression = propertyExpression.Body as MemberExpression;
+            if (memberExpression == null)
+            {
+                throw new ArgumentException("Invalide Expression", "propertyExpression");
+            }
+            return memberExpression.Member.Name;
+        }
+    }
+}
diff --git a/BookAStar/BookAStar/Helpers/RemoteEntity.cs b/BookAStar/BookAStar/Helpers/RemoteEntity.cs
index e17a0ac5..16c48352 100644
--- a/BookAStar/BookAStar/Helpers/RemoteEntity.cs
+++ b/BookAStar/BookAStar/Helpers/RemoteEntity.cs
@@ -6,11 +6,24 @@ using System.Linq;
 using System.Net.Http;
 using Newtonsoft.Json;
 using System.Threading.Tasks;
+using System.Net;
 
 namespace BookAStar
 {
+
+    public class NotIdentifiedException : Exception {
+        public NotIdentifiedException(string message) : base(message) { }
+    }
+
+    public class ServiceNotAvailable : Exception
+    {
+        public ServiceNotAvailable(string message, Exception innerException) : base(message, innerException) { }
+
+    }
+
     public class LocalEntity<V, K> : ObservableCollection<V> where K : IEquatable<K>
     {
+        public V CurrentItem { get; protected set; }
         protected Func<V, K> GetKey { get; set; }
         public LocalEntity(Func<V, K> getKey) : base()
         {
@@ -25,10 +38,12 @@ namespace BookAStar
                 Remove(LocalGet(key));
             }
             Add(item);
+            CurrentItem = item;
         }
         public V LocalGet(K key)
         {
-            return this.Single(x => GetKey(x).Equals(key));
+            CurrentItem = this.Single(x => GetKey(x).Equals(key));
+            return CurrentItem;
         }
     }
 
@@ -41,7 +56,7 @@ namespace BookAStar
         private Uri controllerUri;
         public bool CanExecute(object parameter)
         {
-            return !IsExecuting;
+            return !IsExecuting && (MainSettings.CurrentUser != null);
         }
 
         public RemoteEntity(string controllerName, Func<V,K> getKey):base(getKey)
@@ -60,6 +75,8 @@ namespace BookAStar
             if (CanExecuteChanged != null)
                 CanExecuteChanged.Invoke(this, new EventArgs());
         }
+        
+       
 
         /// <summary>
         /// Refresh the collection
@@ -68,26 +85,33 @@ namespace BookAStar
         public async void Execute(object parameter)
         {
             BeforeExecute();
-            // Update credentials 
             using (HttpClient client = new HttpClient())
             {
+
+                // Update credentials 
                 client.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue(
                     "Bearer", MainSettings.CurrentUser.YavscTokens.AccessToken);
                 // Get the whole data
-
-                using (var response = await client.GetAsync(controllerUri))
+                try
                 {
-                    if (response.IsSuccessStatusCode)
+                    using (var response = await client.GetAsync(controllerUri))
                     {
-                        var content = await response.Content.ReadAsStringAsync();
-                        List<V> col = JsonConvert.DeserializeObject<List<V>>(content);
-                        // LocalData.Clear();
-                        foreach (var item in col)
+                        if (response.IsSuccessStatusCode)
                         {
-                            Merge(item);
+                            var content = await response.Content.ReadAsStringAsync();
+                            List<V> col = JsonConvert.DeserializeObject<List<V>>(content);
+                            // LocalData.Clear();
+                            foreach (var item in col)
+                            {
+                                Merge(item);
+                            }
                         }
                     }
                 }
+                catch (WebException webex) {
+                    throw new ServiceNotAvailable("No remote entity", webex);
+                }
+
             }
             AfterExecuting();
         }
@@ -100,8 +124,15 @@ namespace BookAStar
             if (CanExecuteChanged != null)
                 CanExecuteChanged.Invoke(this, new EventArgs());
         }
-
         public async Task<V> Get(K key)
+        {
+            var item = LocalGet(key);
+            if (item==null) item = await RemoteGet(key);
+            CurrentItem = item;
+            return CurrentItem;
+        }
+
+        public async Task<V> RemoteGet(K key)
         {
            V item = default(V);
            BeforeExecute();
@@ -123,6 +154,7 @@ namespace BookAStar
             }
 
             AfterExecuting();
+            CurrentItem = item;
             return item;
         }
         
diff --git a/BookAStar/BookAStar/Helpers/Settings.cs b/BookAStar/BookAStar/Helpers/Settings.cs
new file mode 100644
index 00000000..0025c2a4
--- /dev/null
+++ b/BookAStar/BookAStar/Helpers/Settings.cs
@@ -0,0 +1,43 @@
+// Helpers/Settings.cs
+using Plugin.Settings;
+using Plugin.Settings.Abstractions;
+
+namespace BookAStar.Helpers
+{
+  /// <summary>
+  /// This is the Settings static class that can be used in your Core solution or in any
+  /// of your client applications. All settings are laid out the same exact way with getters
+  /// and setters. 
+  /// </summary>
+  public static class Settings
+  {
+    private static ISettings AppSettings
+    {
+      get
+      {
+        return CrossSettings.Current;
+      }
+    }
+
+    #region Setting Constants
+
+    private const string SettingsKey = "settings_key";
+    private static readonly string SettingsDefault = string.Empty;
+
+    #endregion
+
+
+    public static string GeneralSettings
+    {
+      get
+      {
+        return AppSettings.GetValueOrDefault<string>(SettingsKey, SettingsDefault);
+      }
+      set
+      {
+        AppSettings.AddOrUpdateValue<string>(SettingsKey, value);
+      }
+    }
+
+  }
+}
\ No newline at end of file
diff --git a/BookAStar/BookAStar/Interfaces/IComponentContext.cs b/BookAStar/BookAStar/Interfaces/IComponentContext.cs
new file mode 100644
index 00000000..d0847836
--- /dev/null
+++ b/BookAStar/BookAStar/Interfaces/IComponentContext.cs
@@ -0,0 +1,11 @@
+
+using System;
+
+namespace BookAStar.Interfaces
+{
+    public interface IComponentContext
+    {
+        T Resolve<T>() ;
+        object Resolve(Type t);
+    }
+}
diff --git a/BookAStar/BookAStar/Interfaces/IModelViewModel.cs b/BookAStar/BookAStar/Interfaces/IModelViewModel.cs
new file mode 100644
index 00000000..f74f8539
--- /dev/null
+++ b/BookAStar/BookAStar/Interfaces/IModelViewModel.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BookAStar.Interfaces
+{
+    public interface IModelViewModel : INotifyPropertyChanged
+    {
+        string Title { get; set; }
+
+        void SetState<T>(Action<T> action) where T : class, IModelViewModel;
+    }
+}
diff --git a/BookAStar/BookAStar/Interfaces/IViewFactory.cs b/BookAStar/BookAStar/Interfaces/IViewFactory.cs
new file mode 100644
index 00000000..6166463b
--- /dev/null
+++ b/BookAStar/BookAStar/Interfaces/IViewFactory.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Xamarin.Forms;
+
+namespace BookAStar.Interfaces
+{
+    public interface IViewFactory
+    {
+        void Register<TViewModel, TView>()
+            where TViewModel : class, IModelViewModel
+            where TView : Page;
+
+        Page Resolve<TViewModel>(Action<TViewModel> setStateAction = null)
+            where TViewModel : class, IModelViewModel;
+
+        Page Resolve<TViewModel>(out TViewModel viewModel, Action<TViewModel> setStateAction = null)
+            where TViewModel : class, IModelViewModel;
+
+        Page Resolve<TViewModel>(TViewModel viewModel)
+            where TViewModel : class, IModelViewModel;
+    }
+}
diff --git a/BookAStar/BookAStar/Model/ClientProviderInfo.cs b/BookAStar/BookAStar/Model/ClientProviderInfo.cs
index 3012c13e..a684dc65 100644
--- a/BookAStar/BookAStar/Model/ClientProviderInfo.cs
+++ b/BookAStar/BookAStar/Model/ClientProviderInfo.cs
@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Xamarin.Forms;
 
 namespace BookAStar.Model
 {
@@ -19,5 +20,12 @@ namespace BookAStar.Model
         public string EMail { get; set; }
         public string Phone { get; set; }
         public Location BillingAddress { get; set; }
+        public ImageSource AvatarOrNot
+        {
+            get
+            {
+                return Avatar ?? ImageSource.FromResource("BookAStar.icon-anon.png");
+            }
+        }
     }
 }
diff --git a/BookAStar/BookAStar/Model/Workflow/Estimate.cs b/BookAStar/BookAStar/Model/Workflow/Estimate.cs
index 7e06a982..d9bb5f3b 100644
--- a/BookAStar/BookAStar/Model/Workflow/Estimate.cs
+++ b/BookAStar/BookAStar/Model/Workflow/Estimate.cs
@@ -95,5 +95,6 @@ namespace BookAStar.Model.Workflow
                 return Bill?.Aggregate((decimal)0, (t, l) => t + l.Count * l.UnitaryCost) ?? (decimal)0;
             }
         }
+        
     }
 }
diff --git a/BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs b/BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs
index 977886bc..c5df63c8 100644
--- a/BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs
@@ -1,4 +1,5 @@
-using BookAStar.Model;
+using BookAStar.Helpers;
+using BookAStar.Model;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -15,6 +16,8 @@ namespace BookAStar.Pages
         public BookQueriesPage()
         {
             InitializeComponent();
+
+            BindingContext = DataManager.Current.BookQueries;
         }
         protected override void OnBindingContextChanged()
         {
@@ -33,8 +36,7 @@ namespace BookAStar.Pages
         protected override void OnAppearing()
         {
             base.OnAppearing();
-            if (!Queries.IsExecuting)
-            Queries.Execute(null);
+            if (Queries.CanExecute(null)) Queries.Execute(null);
         }
 
         private void OnViewDetail(object sender, ItemTappedEventArgs e)
diff --git a/BookAStar/BookAStar/Pages/BookQueryPage.xaml b/BookAStar/BookAStar/Pages/BookQueryPage.xaml
index e9fc0ed2..b5c538c9 100644
--- a/BookAStar/BookAStar/Pages/BookQueryPage.xaml
+++ b/BookAStar/BookAStar/Pages/BookQueryPage.xaml
@@ -10,7 +10,7 @@
   <ContentPage.Resources>
     <ResourceDictionary>
       <Style TargetType="Label">
-        <Setter Property="Style" Value="{StaticResource LabelStyle}" />
+        <Setter Property="Style" Value="{StaticResource ContentLabelStyle}" />
       </Style>
       <Style TargetType="Button">
         <Setter Property="Style" Value="{StaticResource ButtonStyle}" />
@@ -19,8 +19,10 @@
   </ContentPage.Resources>
 
   <StackLayout x:Name="bookQueryLayout">
+    
+    <Image Source="{Binding Client.AvatarOrNot}" Aspect="AspectFit" VisualElement.HeightRequest="{StaticResource BigUserAvatarSize}"/>
     <Label Text="{Binding Client.UserName}"/>
-    <Label Text="{Binding EventDate}"  />
+    <Label Text="{Binding EventDate, StringFormat='le {0:dddd d MMMM yyyy à hh:mm}'}"  />
     <Label Text="{Binding Location.Address}" />
     <Label Text="{Binding Previsional}" />
     <maps:Map x:Name="map"></maps:Map>
diff --git a/BookAStar/BookAStar/Pages/BookQueryPage.xaml.cs b/BookAStar/BookAStar/Pages/BookQueryPage.xaml.cs
index 68357877..d7078eb4 100644
--- a/BookAStar/BookAStar/Pages/BookQueryPage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/BookQueryPage.xaml.cs
@@ -47,6 +47,7 @@ namespace BookAStar.Pages
             }
             
         }
+        
         public BookQueryPage(BookQueryData bookQuery=null)
         {
             
diff --git a/BookAStar/BookAStar/Pages/EditEstimatePage.xaml b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml
index 1dedba98..f9f790cf 100644
--- a/BookAStar/BookAStar/Pages/EditEstimatePage.xaml
+++ b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml
@@ -13,10 +13,24 @@
 
     <views:MarkdownView x:Name="mdview"
                         Edited="OnDescriptionChanged" HorizontalOptions="FillAndExpand"
-         HeightRequest="120"  VerticalOptions="FillAndExpand"
-    Markdown="{Binding Description}"></views:MarkdownView>
+           VerticalOptions="FillAndExpand"
+    Markdown="{Binding Description}"
+             RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent,
+                                                                             Property=Height,
+                                                                             Factor=.4}"
+                      RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent,
+                                                                            Property=Width,
+                                                                            Factor=1}"
+                        ></views:MarkdownView>
 
-    <ListView HeightRequest="160">
+    <ListView 
+              RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent,
+                                                                             Property=Height,
+                                                                             Factor=.4}"
+                      RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent,
+                                                                            Property=Width,
+                                                                            Factor=1}"
+              >
       <ListView.ItemTemplate>
         <DataTemplate>
           <ViewCell>
diff --git a/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs
index b48bd88c..48449d0a 100644
--- a/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs
@@ -52,7 +52,7 @@ namespace BookAStar.Pages
         protected void OnNewCommanLine(object sender, EventArgs e)
         {
             var com = new CommandLine();
-            App.CurrentApp.EditCommandLine(com);
+            App.CurrentApp.EditCommandLine(this,com);
         }
        
     }
diff --git a/BookAStar/BookAStar/Pages/SettingsPage.xaml b/BookAStar/BookAStar/Pages/SettingsPage.xaml
index 9301f215..1489e944 100644
--- a/BookAStar/BookAStar/Pages/SettingsPage.xaml
+++ b/BookAStar/BookAStar/Pages/SettingsPage.xaml
@@ -1,66 +1,63 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ContentPage xmlns="http://xamarin.com/schemas/2014/forms" 
+<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
              xmlns:local="clr-namespace:BookAStar;assembly=BookAStar"
-xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
-x:Class="BookAStar.SettingsPage" 
+xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+x:Class="BookAStar.SettingsPage"
 Title="Paramètres Booking star"
-BindingContext="." >
-<ContentPage.Resources>
-  <ResourceDictionary>
-      
-</ResourceDictionary>
-  </ContentPage.Resources> 
-  
-<StackLayout>
-      <Label Text="Compte utilisateur" StyleClass="Header"/>
-  
-      <ListView x:Name="AccountListView"
-                SeparatorVisibility="Default"
-                VerticalOptions="FillAndExpand"
+             Style="{StaticResource PageStyle}">
+
+  <StackLayout>
+    <Label Text="Compte utilisateur" StyleClass="Header"/>
+
+    <ListView x:Name="AccountListView"
+              SeparatorVisibility="Default"
+              VerticalOptions="FillAndExpand"
         >
-        <ListView.Header>
-    <StackLayout Orientation="Horizontal">
-      <Button x:Name="RemoveAccountBouton" 
-      Text="Supprimer cette identité" />
-      <Button x:Name="AddAccountBtn" Text="s'inscrire ou se connecter avec un nouveau compte" />
+      <ListView.Header>
+        <StackLayout Orientation="Horizontal">
+          <Button x:Name="RemoveAccountBouton"
+          Text="Supprimer cette identité" />
+          <Button x:Name="AddAccountBtn" Text="s'inscrire ou se connecter avec un nouveau compte" />
 
+        </StackLayout>
+      </ListView.Header>
+
+      <ListView.ItemTemplate HeightRequest="60" VerticalOptions="StartAndExpand">
+        <DataTemplate>
+          <ViewCell>
+            <Grid Padding="5"
+                      ColumnSpacing="10"
+                      RowSpacing="2">
+              <Image Source="{Binding Avatar}" HeightRequest="80" />
+              <Label Grid.Column="0" Text="{Binding UserName}" />
+            </Grid>
+          </ViewCell>
+        </DataTemplate>
+      </ListView.ItemTemplate>
+      <ListView.Footer>
+        <StackLayout></StackLayout>
+      </ListView.Footer>
+
+    </ListView>
+
+
+
+    <StackLayout Orientation="Horizontal" VerticalOptions="Start">
+      <Label Text="Recevoir les notifications push" />
+      <Switch x:Name="pushstatus" />
     </StackLayout>
-</ListView.Header>
 
-        <ListView.ItemTemplate HeightRequest="60" VerticalOptions="StartAndExpand">
-          <DataTemplate>
-            <ViewCell>
-                <Grid Padding="5"
-                          ColumnSpacing="10"
-                          RowSpacing="2">
-                  <Image Source="{Binding Avatar}" HeightRequest="80" />
-                  <Label Grid.Column="0" Text="{Binding UserName}" />
-                </Grid>
-            </ViewCell>
-          </DataTemplate>
-        </ListView.ItemTemplate>
-        <ListView.Footer><StackLayout></StackLayout></ListView.Footer>
+    <StackLayout Orientation="Horizontal">
+      <Label Text="Utiliser ma position" />
+      <Switch x:Name="use_my_pos" HorizontalOptions="End" />
+    </StackLayout>
 
-      </ListView>
-      
-  
-  
-      <StackLayout Orientation="Horizontal" VerticalOptions="Start">
-        <Label Text="Recevoir les notifications push" />
-        <Switch x:Name="pushstatus" />
-      </StackLayout>
 
-  <StackLayout Orientation="Horizontal">
-    <Label Text="Utiliser ma position" />
-    <Switch x:Name="use_my_pos" HorizontalOptions="End" />
+    <StackLayout Orientation="Horizontal" VerticalOptions="Start">
+      <Label Text="Recevoir les demandes de devis de la part de professionnels uniquement"
+             StyleClass="Header"/>
+      <Switch x:Name="restrictToPro" />
+    </StackLayout>
+
   </StackLayout>
-  
-  
-  <StackLayout Orientation="Horizontal" VerticalOptions="Start">
-    <Label Text="Recevoir les demandes de devis de la part de professionnels uniquement"
-           StyleClass="Header"/>
-    <Switch x:Name="restrictToPro" />
-  </StackLayout>
-
-</StackLayout>
 </ContentPage>
diff --git a/BookAStar/BookAStar/ViewModels/BookQueriesViewModel.cs b/BookAStar/BookAStar/ViewModels/BookQueriesViewModel.cs
new file mode 100644
index 00000000..744a4c25
--- /dev/null
+++ b/BookAStar/BookAStar/ViewModels/BookQueriesViewModel.cs
@@ -0,0 +1,22 @@
+using BookAStar.Helpers;
+using BookAStar.Model;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BookAStar.ViewModels
+{
+    class BookQueriesViewModel : XLabs.Forms.Mvvm.ViewModel
+    {
+        public ObservableCollection<BookQueryData> Queries
+        {
+            get
+            {
+                return DataManager.Current.BookQueries;
+            }
+        }
+    }
+}
diff --git a/BookAStar/BookAStar/ViewModels/BookQueryViewModel.cs b/BookAStar/BookAStar/ViewModels/BookQueryViewModel.cs
new file mode 100644
index 00000000..daf82519
--- /dev/null
+++ b/BookAStar/BookAStar/ViewModels/BookQueryViewModel.cs
@@ -0,0 +1,32 @@
+using BookAStar.Model;
+using BookAStar.Model.Social;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BookAStar.ViewModels
+{
+    class BookQueryViewModel : XLabs.Forms.Mvvm.ViewModel
+    {
+        public BookQueryViewModel()
+        {
+
+        }
+        public BookQueryViewModel(BookQueryData data)
+        {
+            Debug.Assert(data != null);
+            Client=data.Client;
+            Location = data.Location;
+            EventDate = data.EventDate;
+            Previsionnal = data.Previsionnal;
+        }
+        public ClientProviderInfo Client { get; set; }
+        public Location Location { get; set; }
+        public long Id { get; set; }
+        public DateTime EventDate { get; set; }
+        public decimal? Previsionnal { get; set; }
+    }
+}
diff --git a/BookAStar/BookAStar/ViewModels/SettingsViewModel.cs b/BookAStar/BookAStar/ViewModels/SettingsViewModel.cs
new file mode 100644
index 00000000..4941d6c1
--- /dev/null
+++ b/BookAStar/BookAStar/ViewModels/SettingsViewModel.cs
@@ -0,0 +1,11 @@
+using System;
+using XLabs.Forms.Mvvm;
+using XLabs.Platform.Services;
+
+namespace BookAStar.ViewModels
+{
+    internal class SettingsViewModel : XLabs.Forms.Mvvm.ViewModel
+    {
+
+    }
+}
\ No newline at end of file
diff --git a/BookAStar/BookAStar/ViewModels/ViewModelBase.cs b/BookAStar/BookAStar/ViewModels/ViewModelBase.cs
new file mode 100644
index 00000000..d9902e2b
--- /dev/null
+++ b/BookAStar/BookAStar/ViewModels/ViewModelBase.cs
@@ -0,0 +1,45 @@
+using BookAStar.Helpers;
+using BookAStar.Interfaces;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Runtime.CompilerServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BookAStar.ViewModels
+{
+    public class ViewModelBase : IModelViewModel
+    {
+        public string Title { get; set; }
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        public void SetState<T>(Action<T> action) where T : class, IModelViewModel
+        {
+            action(this as T);
+        }
+
+        protected virtual bool SetProperty<T>(ref T storage, T value, [CallerMemberName] string propertyName = null)
+        {
+            if (object.Equals(storage, value)) return false;
+
+            storage = value;
+            OnPropertyChanged(propertyName);
+
+            return true;
+        }
+
+        protected void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        {
+            PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+        }
+
+        protected void OnPropertyChanged<T>(Expression<Func<T>> propertyExpression)
+        {
+            OnPropertyChanged( PropertySupport.ExtractPropertyName<T>( propertyExpression)); 
+        }
+    }
+}
diff --git a/BookAStar/BookAStar/app.config b/BookAStar/BookAStar/app.config
index 701f8675..179d6818 100644
--- a/BookAStar/BookAStar/app.config
+++ b/BookAStar/BookAStar/app.config
@@ -6,6 +6,10 @@
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="XLabs.Serialization" publicKeyToken="d65109b36e5040e4" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.5782.15703" newVersion="2.0.5782.15703" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
diff --git a/BookAStar/BookAStar/packages.config b/BookAStar/BookAStar/packages.config
index 90698890..1577477c 100644
--- a/BookAStar/BookAStar/packages.config
+++ b/BookAStar/BookAStar/packages.config
@@ -1,9 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="ExifLib.PCL" version="1.0.1" targetFramework="portable45-net45+win8+wpa81" />
   <package id="Json.NET.Web" version="1.0.49" targetFramework="portable45-net45+win8+wpa81" />
   <package id="MarkdownDeep.NET" version="1.5" targetFramework="portable45-net45+win8+wpa81" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="portable45-net45+win8+wpa81" />
-  <package id="Xam.Plugins.Settings" version="2.1.0" targetFramework="portable45-net45+win8+wpa81" />
-  <package id="Xamarin.Forms" version="2.3.0.107" targetFramework="portable45-net45+win8+wpa81" />
-  <package id="Xamarin.Forms.Maps" version="2.3.0.107" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="SQLite.Net.Core-PCL" version="3.1.1" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="SQLite.Net-PCL" version="3.1.1" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="Xam.Plugins.Settings" version="2.5.1.0" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="Xamarin.Forms" version="2.3.2.127" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="Xamarin.Forms.Maps" version="2.3.2.127" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="XLabs.Core" version="2.2.0-pre05" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="XLabs.Forms" version="2.2.0-pre05" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="XLabs.IoC" version="2.2.0-pre05" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="XLabs.Platform" version="2.2.0-pre05" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="XLabs.Serialization" version="2.2.0-pre05" targetFramework="portable45-net45+win8+wpa81" />
 </packages>
\ No newline at end of file
diff --git a/Yavsc.Client/project.json b/Yavsc.Client/project.json
index 6204fd2a..a0f1f521 100644
--- a/Yavsc.Client/project.json
+++ b/Yavsc.Client/project.json
@@ -12,7 +12,9 @@
   "tooling": {
     "defaultNamespace": "Yavsc"
   },
-  "dependencies": {},
+  "dependencies": {
+    "Xamarin.Forms": "2.3.2.127"
+  },
   "frameworks": {
     "net451": {},
     ".NETPortable,Version=v4.5,Profile=Profile111": {}
diff --git a/Yavsc.Client/project.lock.json b/Yavsc.Client/project.lock.json
index ec5815d6..397ee3d5 100644
--- a/Yavsc.Client/project.lock.json
+++ b/Yavsc.Client/project.lock.json
@@ -2,13 +2,251 @@
   "locked": false,
   "version": 2,
   "targets": {
-    ".NETFramework,Version=v4.5.1": {},
-    ".NETPortable,Version=v4.5,Profile=Profile111": {}
+    ".NETFramework,Version=v4.5.1": {
+      "Xamarin.Forms/2.3.2.127": {
+        "type": "package",
+        "compile": {
+          "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Core.dll": {},
+          "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Platform.dll": {},
+          "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Xaml.dll": {}
+        },
+        "runtime": {
+          "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Core.dll": {},
+          "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Platform.dll": {},
+          "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Xaml.dll": {}
+        }
+      }
+    },
+    ".NETPortable,Version=v4.5,Profile=Profile111": {
+      "Xamarin.Forms/2.3.2.127": {
+        "type": "package",
+        "compile": {
+          "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Core.dll": {},
+          "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Platform.dll": {},
+          "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Xaml.dll": {}
+        },
+        "runtime": {
+          "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Core.dll": {},
+          "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Platform.dll": {},
+          "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Xaml.dll": {}
+        }
+      }
+    }
+  },
+  "libraries": {
+    "Xamarin.Forms/2.3.2.127": {
+      "sha512": "NYH2p6Z2QGrRZpRXSiLqtapqlsx11pkViEIjDUQFDvsMCZbvsipDXOWjV9sXTrruXTdkNZ24Nsw0lEG0jVRMjA==",
+      "type": "package",
+      "path": "Xamarin.Forms/2.3.2.127",
+      "files": [
+        "Xamarin.Forms.2.3.2.127.nupkg.sha512",
+        "Xamarin.Forms.nuspec",
+        "build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/ICSharpCode.Decompiler.dll",
+        "build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/ICSharpCode.NRefactory.CSharp.dll",
+        "build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/ICSharpCode.NRefactory.Cecil.dll",
+        "build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/ICSharpCode.NRefactory.Xml.dll",
+        "build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/ICSharpCode.NRefactory.dll",
+        "build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Mono.Cecil.Mdb.dll",
+        "build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Mono.Cecil.Pdb.dll",
+        "build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Mono.Cecil.Rocks.dll",
+        "build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Mono.Cecil.dll",
+        "build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Build.Tasks.dll",
+        "build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Core.dll",
+        "build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Xaml.dll",
+        "build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.targets",
+        "lib/MonoAndroid10/Design/Xamarin.Forms.Core.Design.dll",
+        "lib/MonoAndroid10/Design/Xamarin.Forms.Xaml.Design.dll",
+        "lib/MonoAndroid10/FormsViewGroup.dll",
+        "lib/MonoAndroid10/FormsViewGroup.pdb",
+        "lib/MonoAndroid10/Xamarin.Forms.Core.dll",
+        "lib/MonoAndroid10/Xamarin.Forms.Core.pdb",
+        "lib/MonoAndroid10/Xamarin.Forms.Core.xml",
+        "lib/MonoAndroid10/Xamarin.Forms.Platform.Android.dll",
+        "lib/MonoAndroid10/Xamarin.Forms.Platform.Android.pdb",
+        "lib/MonoAndroid10/Xamarin.Forms.Platform.dll",
+        "lib/MonoAndroid10/Xamarin.Forms.Xaml.dll",
+        "lib/MonoAndroid10/Xamarin.Forms.Xaml.pdb",
+        "lib/MonoAndroid10/Xamarin.Forms.Xaml.xml",
+        "lib/MonoTouch10/Design/Xamarin.Forms.Core.Design.dll",
+        "lib/MonoTouch10/Design/Xamarin.Forms.Xaml.Design.dll",
+        "lib/MonoTouch10/Xamarin.Forms.Core.dll",
+        "lib/MonoTouch10/Xamarin.Forms.Core.dll.mdb",
+        "lib/MonoTouch10/Xamarin.Forms.Core.pdb",
+        "lib/MonoTouch10/Xamarin.Forms.Core.xml",
+        "lib/MonoTouch10/Xamarin.Forms.Platform.dll",
+        "lib/MonoTouch10/Xamarin.Forms.Platform.iOS.Classic.dll",
+        "lib/MonoTouch10/Xamarin.Forms.Xaml.dll",
+        "lib/MonoTouch10/Xamarin.Forms.Xaml.dll.mdb",
+        "lib/MonoTouch10/Xamarin.Forms.Xaml.pdb",
+        "lib/MonoTouch10/Xamarin.Forms.Xaml.xml",
+        "lib/MonoTouch10/ar/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
+        "lib/MonoTouch10/ca/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
+        "lib/MonoTouch10/cs/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
+        "lib/MonoTouch10/da/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
+        "lib/MonoTouch10/de/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
+        "lib/MonoTouch10/el/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
+        "lib/MonoTouch10/es/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
+        "lib/MonoTouch10/fi/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
+        "lib/MonoTouch10/fr/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
+        "lib/MonoTouch10/he/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
+        "lib/MonoTouch10/hi/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
+        "lib/MonoTouch10/hr/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
+        "lib/MonoTouch10/hu/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
+        "lib/MonoTouch10/id/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
+        "lib/MonoTouch10/it/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
+        "lib/MonoTouch10/ja/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
+        "lib/MonoTouch10/ko/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
+        "lib/MonoTouch10/ms/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
+        "lib/MonoTouch10/nb/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
+        "lib/MonoTouch10/nl/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
+        "lib/MonoTouch10/pl/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
+        "lib/MonoTouch10/pt-BR/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
+        "lib/MonoTouch10/pt/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
+        "lib/MonoTouch10/ro/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
+        "lib/MonoTouch10/ru/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
+        "lib/MonoTouch10/sk/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
+        "lib/MonoTouch10/sv/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
+        "lib/MonoTouch10/th/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
+        "lib/MonoTouch10/tr/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
+        "lib/MonoTouch10/uk/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
+        "lib/MonoTouch10/vi/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
+        "lib/MonoTouch10/zh-HK/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
+        "lib/MonoTouch10/zh-Hans/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
+        "lib/MonoTouch10/zh-Hant/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
+        "lib/WP80/Design/Xamarin.Forms.Core.Design.dll",
+        "lib/WP80/Design/Xamarin.Forms.Xaml.Design.dll",
+        "lib/WP80/Xamarin.Forms.Core.dll",
+        "lib/WP80/Xamarin.Forms.Core.pdb",
+        "lib/WP80/Xamarin.Forms.Core.xml",
+        "lib/WP80/Xamarin.Forms.Platform.WP8.dll",
+        "lib/WP80/Xamarin.Forms.Platform.WP8.pdb",
+        "lib/WP80/Xamarin.Forms.Platform.dll",
+        "lib/WP80/Xamarin.Forms.Xaml.dll",
+        "lib/WP80/Xamarin.Forms.Xaml.pdb",
+        "lib/WP80/Xamarin.Forms.Xaml.xml",
+        "lib/Xamarin.iOS10/Design/Xamarin.Forms.Core.Design.dll",
+        "lib/Xamarin.iOS10/Design/Xamarin.Forms.Xaml.Design.dll",
+        "lib/Xamarin.iOS10/Xamarin.Forms.Core.dll",
+        "lib/Xamarin.iOS10/Xamarin.Forms.Core.dll.mdb",
+        "lib/Xamarin.iOS10/Xamarin.Forms.Core.pdb",
+        "lib/Xamarin.iOS10/Xamarin.Forms.Core.xml",
+        "lib/Xamarin.iOS10/Xamarin.Forms.Platform.dll",
+        "lib/Xamarin.iOS10/Xamarin.Forms.Platform.iOS.dll",
+        "lib/Xamarin.iOS10/Xamarin.Forms.Platform.iOS.dll.mdb",
+        "lib/Xamarin.iOS10/Xamarin.Forms.Platform.iOS.pdb",
+        "lib/Xamarin.iOS10/Xamarin.Forms.Xaml.dll",
+        "lib/Xamarin.iOS10/Xamarin.Forms.Xaml.dll.mdb",
+        "lib/Xamarin.iOS10/Xamarin.Forms.Xaml.pdb",
+        "lib/Xamarin.iOS10/Xamarin.Forms.Xaml.xml",
+        "lib/Xamarin.iOS10/ar/Xamarin.Forms.Platform.iOS.resources.dll",
+        "lib/Xamarin.iOS10/ca/Xamarin.Forms.Platform.iOS.resources.dll",
+        "lib/Xamarin.iOS10/cs/Xamarin.Forms.Platform.iOS.resources.dll",
+        "lib/Xamarin.iOS10/da/Xamarin.Forms.Platform.iOS.resources.dll",
+        "lib/Xamarin.iOS10/de/Xamarin.Forms.Platform.iOS.resources.dll",
+        "lib/Xamarin.iOS10/el/Xamarin.Forms.Platform.iOS.resources.dll",
+        "lib/Xamarin.iOS10/es/Xamarin.Forms.Platform.iOS.resources.dll",
+        "lib/Xamarin.iOS10/fi/Xamarin.Forms.Platform.iOS.resources.dll",
+        "lib/Xamarin.iOS10/fr/Xamarin.Forms.Platform.iOS.resources.dll",
+        "lib/Xamarin.iOS10/he/Xamarin.Forms.Platform.iOS.resources.dll",
+        "lib/Xamarin.iOS10/hi/Xamarin.Forms.Platform.iOS.resources.dll",
+        "lib/Xamarin.iOS10/hr/Xamarin.Forms.Platform.iOS.resources.dll",
+        "lib/Xamarin.iOS10/hu/Xamarin.Forms.Platform.iOS.resources.dll",
+        "lib/Xamarin.iOS10/id/Xamarin.Forms.Platform.iOS.resources.dll",
+        "lib/Xamarin.iOS10/it/Xamarin.Forms.Platform.iOS.resources.dll",
+        "lib/Xamarin.iOS10/ja/Xamarin.Forms.Platform.iOS.resources.dll",
+        "lib/Xamarin.iOS10/ko/Xamarin.Forms.Platform.iOS.resources.dll",
+        "lib/Xamarin.iOS10/ms/Xamarin.Forms.Platform.iOS.resources.dll",
+        "lib/Xamarin.iOS10/nb/Xamarin.Forms.Platform.iOS.resources.dll",
+        "lib/Xamarin.iOS10/nl/Xamarin.Forms.Platform.iOS.resources.dll",
+        "lib/Xamarin.iOS10/pl/Xamarin.Forms.Platform.iOS.resources.dll",
+        "lib/Xamarin.iOS10/pt-BR/Xamarin.Forms.Platform.iOS.resources.dll",
+        "lib/Xamarin.iOS10/pt/Xamarin.Forms.Platform.iOS.resources.dll",
+        "lib/Xamarin.iOS10/ro/Xamarin.Forms.Platform.iOS.resources.dll",
+        "lib/Xamarin.iOS10/ru/Xamarin.Forms.Platform.iOS.resources.dll",
+        "lib/Xamarin.iOS10/sk/Xamarin.Forms.Platform.iOS.resources.dll",
+        "lib/Xamarin.iOS10/sv/Xamarin.Forms.Platform.iOS.resources.dll",
+        "lib/Xamarin.iOS10/th/Xamarin.Forms.Platform.iOS.resources.dll",
+        "lib/Xamarin.iOS10/tr/Xamarin.Forms.Platform.iOS.resources.dll",
+        "lib/Xamarin.iOS10/uk/Xamarin.Forms.Platform.iOS.resources.dll",
+        "lib/Xamarin.iOS10/vi/Xamarin.Forms.Platform.iOS.resources.dll",
+        "lib/Xamarin.iOS10/zh-HK/Xamarin.Forms.Platform.iOS.resources.dll",
+        "lib/Xamarin.iOS10/zh-Hans/Xamarin.Forms.Platform.iOS.resources.dll",
+        "lib/Xamarin.iOS10/zh-Hant/Xamarin.Forms.Platform.iOS.resources.dll",
+        "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Design/Xamarin.Forms.Core.Design.dll",
+        "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Design/Xamarin.Forms.Xaml.Design.dll",
+        "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Core.dll",
+        "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Core.dll.mdb",
+        "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Core.pdb",
+        "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Core.xml",
+        "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Platform.dll",
+        "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Platform.dll.mdb",
+        "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Platform.pdb",
+        "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Xaml.dll",
+        "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Xaml.dll.mdb",
+        "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Xaml.pdb",
+        "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Xaml.xml",
+        "lib/uap10.0/Design/Xamarin.Forms.Core.Design.dll",
+        "lib/uap10.0/Design/Xamarin.Forms.Xaml.Design.dll",
+        "lib/uap10.0/Xamarin.Forms.Core.dll",
+        "lib/uap10.0/Xamarin.Forms.Core.xml",
+        "lib/uap10.0/Xamarin.Forms.Platform.UAP.dll",
+        "lib/uap10.0/Xamarin.Forms.Platform.UAP.pri",
+        "lib/uap10.0/Xamarin.Forms.Platform.UAP/AutoSuggestStyle.xbf",
+        "lib/uap10.0/Xamarin.Forms.Platform.UAP/FormsTextBoxStyle.xbf",
+        "lib/uap10.0/Xamarin.Forms.Platform.UAP/PageControl.xbf",
+        "lib/uap10.0/Xamarin.Forms.Platform.UAP/Properties/Xamarin.Forms.Platform.UAP.rd.xml",
+        "lib/uap10.0/Xamarin.Forms.Platform.UAP/Resources.xbf",
+        "lib/uap10.0/Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.xr.xml",
+        "lib/uap10.0/Xamarin.Forms.Platform.dll",
+        "lib/uap10.0/Xamarin.Forms.Xaml.dll",
+        "lib/uap10.0/Xamarin.Forms.Xaml.xml",
+        "lib/win81/Design/Xamarin.Forms.Core.Design.dll",
+        "lib/win81/Design/Xamarin.Forms.Xaml.Design.dll",
+        "lib/win81/Xamarin.Forms.Core.dll",
+        "lib/win81/Xamarin.Forms.Core.xml",
+        "lib/win81/Xamarin.Forms.Platform.WinRT.Tablet.dll",
+        "lib/win81/Xamarin.Forms.Platform.WinRT.Tablet.pri",
+        "lib/win81/Xamarin.Forms.Platform.WinRT.Tablet/FormsTextBoxStyle.xbf",
+        "lib/win81/Xamarin.Forms.Platform.WinRT.Tablet/Resources.xbf",
+        "lib/win81/Xamarin.Forms.Platform.WinRT.Tablet/TabletResources.xbf",
+        "lib/win81/Xamarin.Forms.Platform.WinRT.Tablet/Xamarin.Forms.Platform.WinRT.Tablet.xr.xml",
+        "lib/win81/Xamarin.Forms.Platform.WinRT.dll",
+        "lib/win81/Xamarin.Forms.Platform.WinRT.pri",
+        "lib/win81/Xamarin.Forms.Platform.WinRT/PageControl.xbf",
+        "lib/win81/Xamarin.Forms.Platform.WinRT/StepperControl.xbf",
+        "lib/win81/Xamarin.Forms.Platform.WinRT/Xamarin.Forms.Platform.WinRT.xr.xml",
+        "lib/win81/Xamarin.Forms.Platform.dll",
+        "lib/win81/Xamarin.Forms.Xaml.dll",
+        "lib/win81/Xamarin.Forms.Xaml.xml",
+        "lib/wpa81/Design/Xamarin.Forms.Core.Design.dll",
+        "lib/wpa81/Design/Xamarin.Forms.Xaml.Design.dll",
+        "lib/wpa81/Xamarin.Forms.Core.dll",
+        "lib/wpa81/Xamarin.Forms.Core.xml",
+        "lib/wpa81/Xamarin.Forms.Platform.WinRT.Phone.dll",
+        "lib/wpa81/Xamarin.Forms.Platform.WinRT.Phone.pri",
+        "lib/wpa81/Xamarin.Forms.Platform.WinRT.Phone/FormsTextBoxStyle.xbf",
+        "lib/wpa81/Xamarin.Forms.Platform.WinRT.Phone/PhoneResources.xbf",
+        "lib/wpa81/Xamarin.Forms.Platform.WinRT.Phone/Resources.xbf",
+        "lib/wpa81/Xamarin.Forms.Platform.WinRT.Phone/SearchBox.xbf",
+        "lib/wpa81/Xamarin.Forms.Platform.WinRT.Phone/Xamarin.Forms.Platform.WinRT.Phone.xr.xml",
+        "lib/wpa81/Xamarin.Forms.Platform.WinRT.dll",
+        "lib/wpa81/Xamarin.Forms.Platform.WinRT.pri",
+        "lib/wpa81/Xamarin.Forms.Platform.WinRT/PageControl.xbf",
+        "lib/wpa81/Xamarin.Forms.Platform.WinRT/StepperControl.xbf",
+        "lib/wpa81/Xamarin.Forms.Platform.WinRT/Xamarin.Forms.Platform.WinRT.xr.xml",
+        "lib/wpa81/Xamarin.Forms.Platform.dll",
+        "lib/wpa81/Xamarin.Forms.Xaml.dll",
+        "lib/wpa81/Xamarin.Forms.Xaml.xml"
+      ]
+    }
   },
-  "libraries": {},
   "projectFileDependencyGroups": {
-    "": [],
+    "": [
+      "Xamarin.Forms >= 2.3.2.127"
+    ],
     ".NETFramework,Version=v4.5.1": [],
     ".NETPortable,Version=v4.5,Profile=Profile111": []
-  }
+  },
+  "tools": {},
+  "projectFileToolGroups": {}
 }
\ No newline at end of file

From d4365cef2b8d51d2f3bf99332ddfc5cb0b9e5cf7 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Tue, 27 Sep 2016 09:30:36 +0200
Subject: [PATCH 10/59] code format

---
 BookAStar/BookAStar.Droid/Helpers/SimpleJsonPostMethod.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/BookAStar/BookAStar.Droid/Helpers/SimpleJsonPostMethod.cs b/BookAStar/BookAStar.Droid/Helpers/SimpleJsonPostMethod.cs
index 7f36b4ea..064e900d 100644
--- a/BookAStar/BookAStar.Droid/Helpers/SimpleJsonPostMethod.cs
+++ b/BookAStar/BookAStar.Droid/Helpers/SimpleJsonPostMethod.cs
@@ -41,8 +41,7 @@ namespace Yavsc.Helpers
 		/// <param name="pathToMethod">Path to method.</param>
 		public SimpleJsonPostMethod (string pathToMethod, string authorizationHeader = null)
 		{
-			request = (HttpWebRequest) WebRequest.Create (
-                BasePath + pathToMethod);
+			request = (HttpWebRequest) WebRequest.Create (BasePath + pathToMethod);
 			request.Method = "POST";
 			request.Accept = "application/json";
 			request.ContentType = "application/json";
@@ -104,10 +103,10 @@ namespace Yavsc.Helpers
             }
             catch (WebException ex)
             {
+                // TODO err logging
                 Debug.Print($"Web request failed: {request.ToString()}\n" + ex.ToString());
             }
 			return jsonDoc;
 		}
 	}
 }
-

From f3a6a7f8f2dcd8f6b11db4370da4f33617728327 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Thu, 29 Sep 2016 04:52:40 +0200
Subject: [PATCH 11/59] =?UTF-8?q?ic=C3=B4nes=20utilisateur=20ronds?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Icon-set-users.svg | 114 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 114 insertions(+)
 create mode 100644 Assets/Icon-set-users.svg

diff --git a/Assets/Icon-set-users.svg b/Assets/Icon-set-users.svg
new file mode 100644
index 00000000..0d51c712
--- /dev/null
+++ b/Assets/Icon-set-users.svg
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:svg="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:ns1="http://sozi.baierouge.fr" xmlns:xlink="http://www.w3.org/1999/xlink" id="svg4140" viewBox="0 0 414.01 271.02" version="1.1" inkscape:version="0.91 r13725">
+  <g id="layer1" transform="translate(-19.56 -19.797)">
+    <g id="g4514" transform="translate(19.571 162.83)">
+      <g id="layer2">
+        <path id="path3954" style="fill:#4d4d4d" d="m65 22c-14.73 0-24.656 8.3273-24.656 28.469 0 7.7904 3.7693 23.012 6.8125 28.938-16.313 2.3561-33.595 3.3837-40.906 9.8125 0.71788 1.6416 1.4936 3.2475 2.3438 4.8125 0.97009 1.7858 2.0238 3.5113 3.1562 5.1875s2.3408 3.3189 3.625 4.875 2.6371 3.0433 4.0625 4.4688c1.4254 1.4254 2.9126 2.7783 4.4688 4.0625 1.5561 1.2842 3.1988 2.4926 4.875 3.625s3.4017 2.1862 5.1875 3.1562c1.7858 0.97009 3.6152 1.8591 5.5 2.6562 1.8848 0.79719 3.8081 1.5113 5.7812 2.125 1.9732 0.61373 4.0114 1.1428 6.0625 1.5625 2.0511 0.41971 4.1316 0.72237 6.25 0.9375 2.117 0.22 4.261 0.32 6.436 0.32 2.1752 0 4.3191-0.0974 6.4375-0.3125 2.1184-0.21513 4.1989-0.51779 6.25-0.9375s4.0893-0.94877 6.0625-1.5625 3.8965-1.3278 5.7812-2.125c1.8848-0.79719 3.7142-1.6862 5.5-2.6562 1.7858-0.97009 3.5113-2.0238 5.1875-3.1562s3.3189-2.3408 4.875-3.625 3.0433-2.6371 4.4688-4.0625c1.4254-1.4254 2.7783-2.9126 4.0625-4.4688 1.2842-1.5561 2.4926-3.1988 3.625-4.875s2.1862-3.4017 3.1562-5.1875c0.85018-1.565 1.6259-3.1709 2.3438-4.8125-7.0332-6.1842-23.566-7.1014-39.031-9.5625 3.1223-5.9718 6.9375-21.287 6.9375-29.188 0-20.141-9.926-28.468-24.656-28.468z"/>
+        <g id="text3986" style="fill:#cccccc">
+          <path id="path3991" d="m69.608 26.493v28.491h28.491v8.6956h-28.491v28.491h-8.5933v-28.491h-28.491v-8.6956h28.491v-28.491h8.5933"/>
+        </g>
+      </g>
+      <g id="layer1-0" transform="translate(0 -924.36)">
+        <path id="path3160" style="stroke-linejoin:round;stroke:#000000;stroke-linecap:round;stroke-width:1.9947;fill:none" d="m128.29 64.865c0 35.287-28.549 63.892-63.766 63.892s-63.766-28.605-63.766-63.892 28.549-63.892 63.766-63.892 63.766 28.605 63.766 63.892z" transform="matrix(.98823 0 0 .98628 .23592 924.39)"/>
+      </g>
+    </g>
+    <g id="g4917" transform="translate(-2.1429 -2.8451)">
+      <g id="layer2-8" transform="translate(21.714 22.648)">
+        <path id="path3954-4" style="fill:#4d4d4d" d="m65 22c-14.73 0-24.656 8.3273-24.656 28.469 0 7.7904 3.7693 23.012 6.8125 28.938-16.313 2.3561-33.595 3.3837-40.906 9.8125 0.71788 1.6416 1.4936 3.2475 2.3438 4.8125 0.97009 1.7858 2.0238 3.5113 3.1562 5.1875s2.3408 3.3189 3.625 4.875 2.6371 3.0433 4.0625 4.4688c1.4254 1.4254 2.9126 2.7783 4.4688 4.0625 1.5561 1.2842 3.1988 2.4926 4.875 3.625s3.4017 2.1862 5.1875 3.1562c1.7858 0.97009 3.6152 1.8591 5.5 2.6562 1.8848 0.79719 3.8081 1.5113 5.7812 2.125 1.9732 0.61373 4.0114 1.1428 6.0625 1.5625 2.0511 0.41971 4.1316 0.72237 6.25 0.9375 2.117 0.22 4.261 0.32 6.436 0.32 2.1752 0 4.3191-0.0974 6.4375-0.3125 2.1184-0.21513 4.1989-0.51779 6.25-0.9375s4.0893-0.94877 6.0625-1.5625 3.8965-1.3278 5.7812-2.125c1.8848-0.79719 3.7142-1.6862 5.5-2.6562 1.7858-0.97009 3.5113-2.0238 5.1875-3.1562s3.3189-2.3408 4.875-3.625 3.0433-2.6371 4.4688-4.0625c1.4254-1.4254 2.7783-2.9126 4.0625-4.4688 1.2842-1.5561 2.4926-3.1988 3.625-4.875s2.1862-3.4017 3.1562-5.1875c0.85018-1.565 1.6259-3.1709 2.3438-4.8125-7.0332-6.1842-23.566-7.1014-39.031-9.5625 3.1223-5.9718 6.9375-21.287 6.9375-29.188 0-20.141-9.926-28.468-24.656-28.468z"/>
+      </g>
+      <g id="layer1-9" transform="translate(21.714 -901.71)">
+        <path id="path3160-2" style="stroke-linejoin:round;stroke:#000000;stroke-linecap:round;stroke-width:1.9947;fill:none" d="m128.29 64.865a63.766 63.892 0 1 1 -127.53 0 63.766 63.892 0 1 1 127.53 0z" transform="matrix(.98823 0 0 .98628 .23592 924.39)"/>
+      </g>
+    </g>
+    <g id="g4664" transform="translate(162.57 162.83)">
+      <g id="layer2-2">
+        <path id="path3954-48" style="fill:#4d4d4d" d="m65 22c-14.73 0-24.656 8.3273-24.656 28.469 0 7.7904 3.7693 23.012 6.8125 28.938-16.313 2.3561-33.595 3.3837-40.906 9.8125 0.71788 1.6416 1.4936 3.2475 2.3438 4.8125 0.97009 1.7858 2.0238 3.5113 3.1562 5.1875s2.3408 3.3189 3.625 4.875 2.6371 3.0433 4.0625 4.4688c1.4254 1.4254 2.9126 2.7783 4.4688 4.0625 1.5561 1.2842 3.1988 2.4926 4.875 3.625s3.4017 2.1862 5.1875 3.1562c1.7858 0.97009 3.6152 1.8591 5.5 2.6562 1.8848 0.79719 3.8081 1.5113 5.7812 2.125 1.9732 0.61373 4.0114 1.1428 6.0625 1.5625 2.0511 0.41971 4.1316 0.72237 6.25 0.9375 2.117 0.22 4.261 0.32 6.436 0.32 2.1752 0 4.3191-0.0974 6.4375-0.3125 2.1184-0.21513 4.1989-0.51779 6.25-0.9375s4.0893-0.94877 6.0625-1.5625 3.8965-1.3278 5.7812-2.125c1.8848-0.79719 3.7142-1.6862 5.5-2.6562 1.7858-0.97009 3.5113-2.0238 5.1875-3.1562s3.3189-2.3408 4.875-3.625 3.0433-2.6371 4.4688-4.0625c1.4254-1.4254 2.7783-2.9126 4.0625-4.4688 1.2842-1.5561 2.4926-3.1988 3.625-4.875s2.1862-3.4017 3.1562-5.1875c0.85018-1.565 1.6259-3.1709 2.3438-4.8125-7.0332-6.1842-23.566-7.1014-39.031-9.5625 3.1223-5.9718 6.9375-21.287 6.9375-29.188 0-20.141-9.926-28.468-24.656-28.468z"/>
+        <g id="text4013" style="color:#000000;fill:#cccccc" transform="scale(1.6107 .62084)">
+          <path id="path4037" d="m20.17 89.3h40.589v12.35h-40.589v-12.35"/>
+        </g>
+      </g>
+      <g id="layer1-4" transform="translate(0 -924.36)">
+        <path id="path3160-6" style="stroke-linejoin:round;stroke:#000000;stroke-linecap:round;stroke-width:1.9947;fill:none" d="m128.29 64.865c0 35.287-28.549 63.892-63.766 63.892s-63.766-28.605-63.766-63.892 28.549-63.892 63.766-63.892 63.766 28.605 63.766 63.892z" transform="matrix(.98823 0 0 .98628 .23592 924.39)"/>
+      </g>
+    </g>
+    <g id="g4745" transform="translate(162.57 19.803)">
+      <g id="layer2-7">
+        <path id="path3954-8" style="fill:#4d4d4d" d="m65 22c-14.73 0-24.656 8.3273-24.656 28.469 0 7.7904 3.7693 23.012 6.8125 28.938-16.313 2.3561-33.595 3.3837-40.906 9.8125 0.71788 1.6416 1.4936 3.2475 2.3438 4.8125 0.97009 1.7858 2.0238 3.5113 3.1562 5.1875s2.3408 3.3189 3.625 4.875 2.6371 3.0433 4.0625 4.4688c1.4254 1.4254 2.9126 2.7783 4.4688 4.0625 1.5561 1.2842 3.1988 2.4926 4.875 3.625s3.4017 2.1862 5.1875 3.1562c1.7858 0.97009 3.6152 1.8591 5.5 2.6562 1.8848 0.79719 3.8081 1.5113 5.7812 2.125 1.9732 0.61373 4.0114 1.1428 6.0625 1.5625 2.0511 0.41971 4.1316 0.72237 6.25 0.9375 2.117 0.22 4.261 0.32 6.436 0.32 2.1752 0 4.3191-0.0974 6.4375-0.3125 2.1184-0.21513 4.1989-0.51779 6.25-0.9375s4.0893-0.94877 6.0625-1.5625 3.8965-1.3278 5.7812-2.125c1.8848-0.79719 3.7142-1.6862 5.5-2.6562 1.7858-0.97009 3.5113-2.0238 5.1875-3.1562s3.3189-2.3408 4.875-3.625 3.0433-2.6371 4.4688-4.0625c1.4254-1.4254 2.7783-2.9126 4.0625-4.4688 1.2842-1.5561 2.4926-3.1988 3.625-4.875s2.1862-3.4017 3.1562-5.1875c0.85018-1.565 1.6259-3.1709 2.3438-4.8125-7.0332-6.1842-23.566-7.1014-39.031-9.5625 3.1223-5.9718 6.9375-21.287 6.9375-29.188 0-20.141-9.926-28.468-24.656-28.468z"/>
+        <g id="text4114" style="fill:#cccccc">
+          <path id="path4119" d="m60.157 86.063h7.3991v9.2579h-7.3991v-9.2579m7.1804-5.3579h-6.9617v-5.6131c-0.000015-2.4542 0.34017-4.471 1.0206-6.0505 0.68036-1.5794 2.114-3.414 4.3009-5.5037l3.2804-3.2439c1.385-1.2878 2.3813-2.5028 2.9888-3.6449 0.63175-1.142 0.94764-2.3084 0.94766-3.4991-0.000027-2.1626-0.80189-3.9121-2.4056-5.2486-1.5795-1.3364-3.6813-2.0046-6.3056-2.0047-1.9196 0.00005-3.9729 0.42528-6.1598 1.2757-2.1626 0.85051-4.4224 2.0898-6.7794 3.7178v-6.8523c2.2841-1.385 4.5925-2.4177 6.9252-3.0981 2.357-0.68032 4.7869-1.0205 7.2897-1.0206 4.471 0.000055 8.0551 1.1786 10.752 3.5355 2.7215 2.3571 4.0822 5.4673 4.0822 9.3308-0.000034 1.8468-0.43742 3.6084-1.3121 5.285-0.8748 1.6524-2.4056 3.5234-4.5925 5.6131l-3.2075 3.1346c-1.1421 1.1421-1.9561 2.0411-2.4421 2.6972-0.4617 0.6318-0.78974 1.2514-0.98411 1.8589-0.14582 0.5103-0.25516 1.1299-0.32804 1.8589-0.07292 0.72899-0.10937 1.7253-0.10935 2.9888v4.4832"/>
+        </g>
+      </g>
+      <g id="layer1-6" transform="translate(0 -924.36)">
+        <path id="path3160-4" style="stroke-linejoin:round;stroke:#000000;stroke-linecap:round;stroke-width:1.9947;fill:none" d="m128.29 64.865c0 35.287-28.549 63.892-63.766 63.892s-63.766-28.605-63.766-63.892 28.549-63.892 63.766-63.892 63.766 28.605 63.766 63.892z" transform="matrix(.98823 0 0 .98628 .23592 924.39)"/>
+      </g>
+    </g>
+    <g id="g4825" transform="translate(305.57 19.803)">
+      <g id="layer2-3">
+        <path id="path3954-1" style="fill:#4d4d4d" d="m65 22c-14.73 0-24.656 8.3273-24.656 28.469 0 7.7904 3.7693 23.012 6.8125 28.938-16.313 2.3561-33.595 3.3837-40.906 9.8125 0.71788 1.6416 1.4936 3.2475 2.3438 4.8125 0.97009 1.7858 2.0238 3.5113 3.1562 5.1875s2.3408 3.3189 3.625 4.875 2.6371 3.0433 4.0625 4.4688c1.4254 1.4254 2.9126 2.7783 4.4688 4.0625 1.5561 1.2842 3.1988 2.4926 4.875 3.625s3.4017 2.1862 5.1875 3.1562c1.7858 0.97009 3.6152 1.8591 5.5 2.6562 1.8848 0.79719 3.8081 1.5113 5.7812 2.125 1.9732 0.61373 4.0114 1.1428 6.0625 1.5625 2.0511 0.41971 4.1316 0.72237 6.25 0.9375 2.117 0.22 4.261 0.32 6.436 0.32 2.1752 0 4.3191-0.0974 6.4375-0.3125 2.1184-0.21513 4.1989-0.51779 6.25-0.9375s4.0893-0.94877 6.0625-1.5625 3.8965-1.3278 5.7812-2.125c1.8848-0.79719 3.7142-1.6862 5.5-2.6562 1.7858-0.97009 3.5113-2.0238 5.1875-3.1562s3.3189-2.3408 4.875-3.625 3.0433-2.6371 4.4688-4.0625c1.4254-1.4254 2.7783-2.9126 4.0625-4.4688 1.2842-1.5561 2.4926-3.1988 3.625-4.875s2.1862-3.4017 3.1562-5.1875c0.85018-1.565 1.6259-3.1709 2.3438-4.8125-7.0332-6.1842-23.566-7.1014-39.031-9.5625 3.1223-5.9718 6.9375-21.287 6.9375-29.188 0-20.141-9.926-28.468-24.656-28.468z"/>
+        <path id="path4090" style="stroke-linejoin:round;color:#000000;stroke:#5b5b5b;stroke-linecap:round;stroke-width:.87614;fill:#cccccc" d="m57.205 59.382s-0.76436-0.79113-1.2808-2.7854c0.74138-0.68154 1.5246-1.3175 2.3438-1.9032 1.8458 0.91487 2.4632 1.8253 2.4632 1.8253l1.5811 2.4275c1.1016-0.71748 2.2785-1.3192 3.5052-1.7919l-1.0418-2.7032s-0.37649-1.0336-0.03717-3.0656c0.95449-0.32107 1.9287-0.58352 2.9153-0.78536 1.3141 1.5865 1.5078 2.6694 1.5078 2.6694l0.45705 2.8607c1.2982-0.2074 2.6181-0.27836 3.931-0.21132l0.14772-2.8933s0.07647-1.0974 1.2129-2.8157c1.0026 0.09491 1.9993 0.2514 2.9827 0.4683 0.55521 1.9839 0.2917 3.0519 0.2917 3.0519l-0.74603 2.7993c1.2703 0.33854 2.505 0.81058 3.6771 1.4058l1.3117-2.583s0.51621-0.97142 2.2533-2.0789c0.87728 0.49449 1.7242 1.0429 2.5344 1.641-0.2997 2.0382-0.97484 2.9067-0.97484 2.9067l-1.8201 2.2539c1.0228 0.82594 1.9587 1.7594 2.7874 2.7799l2.2489-1.8262s0.86669-0.67747 2.9041-0.98266c0.60031 0.80856 1.151 1.654 1.6478 2.5299-1.1028 1.7401-2.0728 2.2589-2.0728 2.2589l-2.5795 1.3187c0.5984 1.1705 1.0738 2.4039 1.4157 3.6733l2.797-0.754s1.0673-0.26639 3.0527 0.28348c0.21954 0.98282 0.37872 1.9791 0.47633 2.9814-1.7152 1.1411-2.8124 1.2205-2.8124 1.2205l-2.8928 0.15552c0.07057 1.3127 0.0032 2.6328-0.20073 3.9316l2.862 0.44934s1.0834 0.19076 2.6735 1.5006c-0.19919 0.98715-0.45901 1.9621-0.77751 2.9174-2.031 0.3448-3.0657-0.02891-3.0657-0.02891l-2.706-1.035c-0.46947 1.2279-1.068 2.4065-1.7825 3.51l2.4318 1.5746s0.91214 0.61492 1.832 2.4583c-0.58348 0.82079-1.2174 1.6057-1.8969 2.349-1.9957-0.51111-2.7889-1.2733-2.7889-1.2733l-2.0513-2.0457c-0.92833 0.93083-1.9545 1.7641-3.056 2.4815l1.5811 2.4275s0.58317 0.93276 0.67372 2.9909c-0.86688 0.51251-1.7652 0.97176-2.6883 1.3743-1.6153-1.2786-2.0299-2.2976-2.0299-2.2976l-1.0418-2.7032c-1.2267 0.47277-2.503 0.8166-3.8012 1.024l0.45705 2.8607s0.15336 1.0893-0.60102 3.0063c-1.0004 0.1156-2.0079 0.16977-3.0149 0.16208-0.95555-1.8251-0.91986-2.9246-0.91986-2.9246l0.14772-2.8933c-1.3129-0.06703-2.6187-0.27205-3.889-0.61059l-0.74603 2.7993s-0.30296 1.0575-1.7718 2.502c-0.96092-0.30128-1.9033-0.66159-2.8202-1.0782-0.13061-2.056 0.3492-3.0459 0.3492-3.0459l1.3117-2.583c-1.1721-0.59525-2.2817-1.3137-3.3045-2.1396l-1.8201 2.2539s-0.7069 0.84286-2.6363 1.565c-0.7553-0.66608-1.4697-1.3785-2.1378-2.132 0.71692-1.9313 1.5579-2.6405 1.5579-2.6405l2.2489-1.8262c-0.831-1.022-1.552-2.129-2.151-3.3l-2.5795 1.3187s-0.98861 0.48247-3.0449 0.3574c-0.41908-0.9157-0.78192-1.8571-1.0858-2.8172 1.4405-1.4728 2.4972-1.7786 2.4972-1.7786l2.7973-0.75357c-0.34196-1.2694-0.5505-2.5746-0.62107-3.8874l-2.8928 0.15552s-1.0994 0.03866-2.927-0.91197c-0.0104-1.007 0.04104-2.0146 0.15395-3.0153 1.915-0.75954 3.0047-0.60912 3.0047-0.60912l2.862 0.44934c0.205-1.3 0.546-2.577 1.015-3.805l-2.706-1.0346s-1.0201-0.41184-2.303-2.0237c0.40008-0.92416 0.85692-1.8238 1.3671-2.692 2.0583 0.08501 2.9927 0.66566 2.9927 0.66566l2.4318 1.5746c0.71451-1.1035 1.545-2.1319 2.4733-3.0627l-2.051-2.045m-11.351 13.763s0.18288 1.3888-1.4001 3.0816c-0.74037 0.01726-1.4826-0.04691-2.209-0.191-1.2689-1.9394-0.85039-3.2761-0.85039-3.2761l1.1292-2.6679c-0.83814-0.35476-1.5592-0.98025-2.0287-1.7599l-2.4817 1.4946s-1.2643 0.60309-3.3634-0.3793c-0.2452-0.6988-0.41354-1.4245-0.50098-2.1599 1.4523-1.8061 2.853-1.8212 2.853-1.8212l2.8863 0.24955c0.0784-0.90674 0.45046-1.7858 1.0469-2.4733l-2.1883-1.8984s-0.96425-1.016-0.6786-3.316c0.58883-0.44914 1.227-0.8335 1.8994-1.1439 2.1665 0.82313 2.6136 2.1506 2.6136 2.1506l0.65457 2.8221c0.88659-0.20564 1.8376-0.12342 2.6757 0.23134l1.1292-2.6679s0.66834-1.231 2.944-1.6701c0.60912 0.42121 1.1719 0.90941 1.6749 1.453-0.11335 2.3148-1.2377 3.1503-1.2377 3.1503l-2.4817 1.4946c0.46954 0.77965 0.68521 1.7095 0.60682 2.6162l2.8863 0.24955s1.3773 0.25522 2.4981 2.2838c-0.21237 0.70947-0.50277 1.3956-0.86428 2.0419-2.2366 0.60752-3.3786-0.20361-3.3786-0.20361l-2.1883-1.8984c-0.5964 0.68749-1.4141 1.1799-2.3007 1.3856l0.65457 2.8221m16.178-20.747s1.1274 0.48315 2.0994 2.4264c-0.38792 0.77612-0.84575 1.5173-1.3661 2.2116-2.1728 0.000646-3.1094-0.79125-3.1094-0.79125l-2.1203-1.9741c-0.77522 0.83264-1.7157 1.5108-2.7506 1.9834l1.2035 2.6352s0.45556 1.1388-0.23123 3.2002c-0.8231 0.2745-1.6709 0.47484-2.5298 0.5978-1.5368-1.5359-1.6392-2.7582-1.6392-2.7582l-0.10339-2.8952c-1.1369 0.0406-2.2815-0.14488-3.3474-0.54245l-1.0124 2.7144s-0.48315 1.1274-2.4264 2.0994c-0.77612-0.38792-1.5173-0.84575-2.2116-1.3661-0.000646-2.1728 0.79125-3.1094 0.79125-3.1094l1.9741-2.1203c-0.83264-0.77522-1.5108-1.7157-1.9834-2.7506l-2.6352 1.2035s-1.1388 0.45556-3.2002-0.23123c-0.2745-0.8231-0.47484-1.6709-0.5978-2.5298 1.5359-1.5368 2.7582-1.6392 2.7582-1.6392l2.8952-0.10339c-0.0406-1.1369 0.14488-2.2815 0.54245-3.3474l-2.7144-1.0124s-1.1274-0.48315-2.0994-2.4264c0.38792-0.77612 0.84575-1.5173 1.3661-2.2116 2.1728-0.000646 3.1094 0.79125 3.1094 0.79125l2.1203 1.9741c0.77522-0.83264 1.7157-1.5108 2.7506-1.9834l-1.2035-2.6352s-0.45556-1.1388 0.23123-3.2002c0.8231-0.2745 1.6709-0.47484 2.5298-0.5978 1.5368 1.5359 1.6392 2.7582 1.6392 2.7582l0.10339 2.8952c1.1369-0.0406 2.2815 0.14488 3.3474 0.54245l1.0124-2.7144s0.48315-1.1274 2.4264-2.0994c0.77612 0.38792 1.5173 0.84575 2.2116 1.3661 0.000646 2.1728-0.79125 3.1094-0.79125 3.1094l-1.9741 2.1203c0.83264 0.77522 1.5108 1.7157 1.9834 2.7506l2.634-1.206s1.1388-0.45556 3.2002 0.23123c0.2745 0.8231 0.47484 1.6709 0.5978 2.5298-1.5359 1.5368-2.7582 1.6392-2.7582 1.6392l-2.8952 0.10339c0.0406 1.1369-0.14488 2.2815-0.54245 3.3474l2.7144 1.0124"/>
+      </g>
+      <g id="layer1-45" transform="translate(0 -924.36)">
+        <path id="path3160-42" style="stroke-linejoin:round;stroke:#000000;stroke-linecap:round;stroke-width:1.9947;fill:none" d="m128.29 64.865c0 35.287-28.549 63.892-63.766 63.892s-63.766-28.605-63.766-63.892 28.549-63.892 63.766-63.892 63.766 28.605 63.766 63.892z" transform="matrix(.98823 0 0 .98628 .23592 924.39)"/>
+      </g>
+    </g>
+    <g id="g4903" transform="translate(305.57 162.83)">
+      <g id="layer2-77">
+        <path id="path3954-9" style="fill:#4d4d4d" d="m65 22c-14.73 0-24.656 8.3273-24.656 28.469 0 7.7904 3.7693 23.012 6.8125 28.938-16.313 2.3561-33.595 3.3837-40.906 9.8125 0.71788 1.6416 1.4936 3.2475 2.3438 4.8125 0.97009 1.7858 2.0238 3.5113 3.1562 5.1875s2.3408 3.3189 3.625 4.875 2.6371 3.0433 4.0625 4.4688c1.4254 1.4254 2.9126 2.7783 4.4688 4.0625 1.5561 1.2842 3.1988 2.4926 4.875 3.625s3.4017 2.1862 5.1875 3.1562c1.7858 0.97009 3.6152 1.8591 5.5 2.6562 1.8848 0.79719 3.8081 1.5113 5.7812 2.125 1.9732 0.61373 4.0114 1.1428 6.0625 1.5625 2.0511 0.41971 4.1316 0.72237 6.25 0.9375 2.117 0.22 4.261 0.32 6.436 0.32 2.1752 0 4.3191-0.0974 6.4375-0.3125 2.1184-0.21513 4.1989-0.51779 6.25-0.9375s4.0893-0.94877 6.0625-1.5625 3.8965-1.3278 5.7812-2.125c1.8848-0.79719 3.7142-1.6862 5.5-2.6562 1.7858-0.97009 3.5113-2.0238 5.1875-3.1562s3.3189-2.3408 4.875-3.625 3.0433-2.6371 4.4688-4.0625c1.4254-1.4254 2.7783-2.9126 4.0625-4.4688 1.2842-1.5561 2.4926-3.1988 3.625-4.875s2.1862-3.4017 3.1562-5.1875c0.85018-1.565 1.6259-3.1709 2.3438-4.8125-7.0332-6.1842-23.566-7.1014-39.031-9.5625 3.1223-5.9718 6.9375-21.287 6.9375-29.188 0-20.141-9.926-28.468-24.656-28.468z"/>
+        <g id="g4061">
+          <g id="text4013-6" style="color:#000000;fill:#cccccc" transform="matrix(1.1717 -1.1052 0.426 .45163 -22.908 60.878)">
+            <path id="path4037-2" d="m20.17 89.3h40.589v12.35h-40.589v-12.35"/>
+          </g>
+          <path id="path4058" style="color:#000000;stroke:#cccccc;stroke-width:7.3112;fill:none" d="m97.857 58.357c0 19.527-14.591 35.357-32.589 35.357-17.999 0-32.589-15.83-32.589-35.357s14.59-35.357 32.589-35.357c17.998 0 32.589 15.83 32.589 35.357z" transform="matrix(.99726 0 0 .91919 .44667 5.7872)"/>
+        </g>
+      </g>
+      <g id="layer1-5" transform="translate(0 -924.36)">
+        <path id="path3160-5" style="stroke-linejoin:round;stroke:#000000;stroke-linecap:round;stroke-width:1.9947;fill:none" d="m128.29 64.865c0 35.287-28.549 63.892-63.766 63.892s-63.766-28.605-63.766-63.892 28.549-63.892 63.766-63.892 63.766 28.605 63.766 63.892z" transform="matrix(.98823 0 0 .98628 .23592 924.39)"/>
+      </g>
+    </g>
+  </g>
+  <metadata>
+    <rdf:RDF>
+      <cc:Work>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <cc:license rdf:resource="http://creativecommons.org/licenses/publicdomain/"/>
+        <dc:publisher>
+          <cc:Agent rdf:about="http://openclipart.org/">
+            <dc:title>Openclipart</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:title>Users Icon Set</dc:title>
+        <dc:date>2012-09-06T18:37:31</dc:date>
+        <dc:description>Check others icons on my "Minimal Icon Set" collection.\nSet of six simple icons for user management, useful for applications and user interface design</dc:description>
+        <dc:source>https://openclipart.org/detail/172195/users-icon-set-by-mi_brami-172195</dc:source>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>mi_brami</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>User</rdf:li>
+            <rdf:li>b&amp;w</rdf:li>
+            <rdf:li>black</rdf:li>
+            <rdf:li>grey</rdf:li>
+            <rdf:li>icon</rdf:li>
+            <rdf:li>icons</rdf:li>
+            <rdf:li>round</rdf:li>
+            <rdf:li>set</rdf:li>
+            <rdf:li>simple</rdf:li>
+            <rdf:li>transparent</rdf:li>
+            <rdf:li>users</rdf:li>
+            <rdf:li>white</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+      <cc:License rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction"/>
+        <cc:permits rdf:resource="http://creativecommons.org/ns#Distribution"/>
+        <cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks"/>
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+</svg>
\ No newline at end of file

From 0e281a35790e5c0e19555d9a99928bd4a189b75a Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Thu, 29 Sep 2016 04:54:14 +0200
Subject: [PATCH 12/59] WIP

---
 .../BookAStar.Droid/BookAStar.Droid.csproj    |  14 +-
 BookAStar/BookAStar.Droid/MainActivity.cs     |  28 ++--
 BookAStar/BookAStar.Droid/packages.config     |   3 +-
 BookAStar/BookAStar/App.xaml                  |   3 +-
 BookAStar/BookAStar/App.xaml.cs               | 126 ++++++++++------
 BookAStar/BookAStar/BookAStar.csproj          |  78 +++++++---
 BookAStar/BookAStar/Constants.cs              |  26 ----
 .../BookAStar/Helpers/AvatarImageSource.cs    |  30 ----
 BookAStar/BookAStar/Helpers/DataManager.cs    |   6 +-
 BookAStar/BookAStar/Helpers/MainSettings.cs   |  39 ++++-
 BookAStar/BookAStar/Helpers/PageHelpers.cs    |  20 +++
 BookAStar/BookAStar/Helpers/UserHelpers.cs    |  28 ++++
 BookAStar/BookAStar/Images/icon_add_user.png  | Bin 0 -> 4702 bytes
 BookAStar/BookAStar/Images/icon_anon_user.png | Bin 0 -> 5372 bytes
 .../BookAStar/Images/icon_block_user.png      | Bin 0 -> 7195 bytes
 .../BookAStar/Images/icon_remove_user.png     | Bin 0 -> 4628 bytes
 BookAStar/BookAStar/Images/icon_user.png      | Bin 0 -> 4535 bytes
 .../BookAStar/Images/icon_user_settings.png   | Bin 0 -> 8437 bytes
 .../BookAStar/Interfaces/IBillingLine.cs      |  12 ++
 .../BookAStar/Interfaces/IBookQueryData.cs    |  15 ++
 BookAStar/BookAStar/Interfaces/IEstimate.cs   |  20 +++
 BookAStar/BookAStar/Model/Auth/User.cs        |  12 +-
 BookAStar/BookAStar/Model/BookQueryData.cs    |   5 +-
 .../BookAStar/Model/ClientProviderInfo.cs     |   9 +-
 .../{CommandLine.cs => BillingLine.cs}        |   5 +-
 .../BookAStar/Model/Workflow/Estimate.cs      |   5 +-
 .../BookAStar/Pages/AccountChooserPage.xaml   |  53 +++++++
 ...age.xaml.cs => AccountChooserPage.xaml.cs} |  45 +++---
 .../BookAStar/Pages/BookQueriesPage.xaml      |  12 +-
 .../BookAStar/Pages/BookQueriesPage.xaml.cs   |   4 +-
 BookAStar/BookAStar/Pages/BookQueryPage.xaml  |   3 +-
 .../BookAStar/Pages/BookQueryPage.xaml.cs     |   5 +-
 BookAStar/BookAStar/Pages/DashboardPage.xaml  |  53 +++++++
 .../BookAStar/Pages/DashboardPage.xaml.cs     |  45 ++++++
 ...itorPage.xaml => EditBillingLinePage.xaml} |  12 +-
 ...ge.xaml.cs => EditBillingLinePage.xaml.cs} |   5 +-
 .../BookAStar/Pages/EditEstimatePage.xaml     |  13 +-
 .../BookAStar/Pages/EditEstimatePage.xaml.cs  |   2 +-
 BookAStar/BookAStar/Pages/EventDetail.xaml    |  12 +-
 BookAStar/BookAStar/Pages/HomePage.xaml       |  17 +++
 BookAStar/BookAStar/Pages/HomePage.xaml.cs    |  18 +++
 BookAStar/BookAStar/Pages/SearchPage.xaml     |  12 +-
 BookAStar/BookAStar/Pages/SettingsPage.xaml   |  63 --------
 .../ViewModels/BillingLineViewModel.cs        |  78 ++++++++++
 .../ViewModels/BookQueryViewModel.cs          |   5 +-
 .../ViewModels/DashboardViewModel.cs          | 137 ++++++++++++++++++
 .../BookAStar/ViewModels/EstimateViewModel.cs |  91 ++++++++++++
 .../BookAStar/ViewModels/SettingsViewModel.cs |  11 --
 .../ViewModels/UserLoginViewModel.cs          |  14 ++
 .../BookAStar/ViewModels/ViewModelBase.cs     |   1 +
 BookAStar/BookAStar/icon-anon.png             | Bin 1031 -> 0 bytes
 BookAStar/BookAStar/packages.config           |   6 +-
 52 files changed, 920 insertions(+), 281 deletions(-)
 delete mode 100644 BookAStar/BookAStar/Helpers/AvatarImageSource.cs
 create mode 100644 BookAStar/BookAStar/Helpers/PageHelpers.cs
 create mode 100644 BookAStar/BookAStar/Helpers/UserHelpers.cs
 create mode 100644 BookAStar/BookAStar/Images/icon_add_user.png
 create mode 100644 BookAStar/BookAStar/Images/icon_anon_user.png
 create mode 100644 BookAStar/BookAStar/Images/icon_block_user.png
 create mode 100644 BookAStar/BookAStar/Images/icon_remove_user.png
 create mode 100644 BookAStar/BookAStar/Images/icon_user.png
 create mode 100644 BookAStar/BookAStar/Images/icon_user_settings.png
 create mode 100644 BookAStar/BookAStar/Interfaces/IBillingLine.cs
 create mode 100644 BookAStar/BookAStar/Interfaces/IBookQueryData.cs
 create mode 100644 BookAStar/BookAStar/Interfaces/IEstimate.cs
 rename BookAStar/BookAStar/Model/Workflow/{CommandLine.cs => BillingLine.cs} (64%)
 create mode 100644 BookAStar/BookAStar/Pages/AccountChooserPage.xaml
 rename BookAStar/BookAStar/Pages/{SettingsPage.xaml.cs => AccountChooserPage.xaml.cs} (67%)
 create mode 100644 BookAStar/BookAStar/Pages/DashboardPage.xaml
 create mode 100644 BookAStar/BookAStar/Pages/DashboardPage.xaml.cs
 rename BookAStar/BookAStar/Pages/{CommandLineEditorPage.xaml => EditBillingLinePage.xaml} (80%)
 rename BookAStar/BookAStar/Pages/{CommandLineEditorPage.xaml.cs => EditBillingLinePage.xaml.cs} (67%)
 create mode 100644 BookAStar/BookAStar/Pages/HomePage.xaml
 create mode 100644 BookAStar/BookAStar/Pages/HomePage.xaml.cs
 delete mode 100644 BookAStar/BookAStar/Pages/SettingsPage.xaml
 create mode 100644 BookAStar/BookAStar/ViewModels/BillingLineViewModel.cs
 create mode 100644 BookAStar/BookAStar/ViewModels/DashboardViewModel.cs
 create mode 100644 BookAStar/BookAStar/ViewModels/EstimateViewModel.cs
 delete mode 100644 BookAStar/BookAStar/ViewModels/SettingsViewModel.cs
 create mode 100644 BookAStar/BookAStar/ViewModels/UserLoginViewModel.cs
 delete mode 100644 BookAStar/BookAStar/icon-anon.png

diff --git a/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj b/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj
index 52765a5e..cf995dc5 100644
--- a/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj
+++ b/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj
@@ -71,7 +71,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="FormsViewGroup, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.34-pre1\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="GoogleMediaFramework">
@@ -202,7 +202,7 @@
       <HintPath>..\..\Components\xamarin.auth-1.2.3.1\lib\android\Xamarin.Auth.Android.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.34-pre1\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Labs, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
@@ -218,15 +218,15 @@
       <HintPath>..\..\..\..\Visual Studio 2015\Projects\App2\packages\Xamarin.Forms.Maps.2.3.0.107\lib\MonoAndroid10\Xamarin.Forms.Maps.Android.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.34-pre1\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform.Android, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.34-pre1\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.34-pre1\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.GooglePlayServices.Ads, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -444,11 +444,11 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.2\build\Xamarin.GooglePlayServices.Basement.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.2\build\Xamarin.GooglePlayServices.Basement.targets'))" />
     <Error Condition="!Exists('..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.0.34-pre1\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.0.34-pre1\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
   </Target>
   <Import Project="..\..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.2\build\Xamarin.GooglePlayServices.Basement.targets" Condition="Exists('..\..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.2\build\Xamarin.GooglePlayServices.Basement.targets')" />
   <Import Project="..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" />
-  <Import Project="..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
+  <Import Project="..\..\packages\Xamarin.Forms.2.3.0.34-pre1\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.0.34-pre1\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
      Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/BookAStar/BookAStar.Droid/MainActivity.cs b/BookAStar/BookAStar.Droid/MainActivity.cs
index 2f049a1a..ebbab814 100644
--- a/BookAStar/BookAStar.Droid/MainActivity.cs
+++ b/BookAStar/BookAStar.Droid/MainActivity.cs
@@ -41,7 +41,7 @@ using XLabs.Caching;
 
 namespace BookAStar.Droid
 {
-    [Activity(Name="fr.pschneider.bas.MainActivity", Label = "BookAStar", Icon = "@drawable/icon", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
+    [Activity(Name="fr.pschneider.bas.MainActivity", Label = "BookAStar", Theme = "@style/MainTheme", Icon = "@drawable/icon", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
     public class MainActivity :
         XFormsApplicationDroid,
         // was global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity,
@@ -51,23 +51,23 @@ namespace BookAStar.Droid
         {
             base.OnCreate(bundle);
 
-           // Window.RequestFeature(Android.Views.WindowFeatures.ActionBar);
-
             if (Build.VERSION.SdkInt >= BuildVersionCodes.Kitkat)
             {
                 Android.Webkit.WebView.SetWebContentsDebuggingEnabled(true);
             }
 
-            // no Resolver.IsSet
+            IXFormsApp<XFormsApplicationDroid> app =null;
             if (!Resolver.IsSet)
             {
                 this.SetIoc();
             }
             else
             {
-                var app = Resolver.Resolve<IXFormsApp>() as IXFormsApp<XFormsApplicationDroid>;
-                if (app != null) app.AppContext = this;
+                app = Resolver.Resolve<IXFormsApp>() as IXFormsApp<XFormsApplicationDroid>;
+                if (app != null)
+                    app.AppContext = this;
             }
+
             global::Xamarin.Forms.Forms.Init(this, bundle);
             global::Xamarin.FormsMaps.Init(this, bundle);
 
@@ -86,14 +86,14 @@ namespace BookAStar.Droid
             // Theme.ApplyStyle(Resource.Style.MainTheme, false);
 
             // XmlREader tb = Resources.GetLayout(Resource.Layout.Toolbar);
-            var tb = new Toolbar(this.BaseContext);
-
-            this.SetActionBar(tb);
+            // FIXME Why does Forms try to theme this toolbar?
+             var tb = new Toolbar(this.BaseContext);
+             this.SetActionBar(tb);
             
             LoadApplication(new BookAStar.App(this));
-            /*
             // TabLayoutResource = Resource.Layout.Tabbar;
             // ToolbarResource = Resource.Layout.Toolbar;
+            /*
             base.OnCreate(bundle);
             global::Xamarin.Forms.Forms.Init(this, bundle);
             global::Xamarin.FormsMaps.Init(this, bundle);
@@ -112,8 +112,8 @@ namespace BookAStar.Droid
 
             app.Init(this);
 
-            var documents = app.AppDataDirectory;
-            var pathToDatabase = Path.Combine(documents, "xforms.db");
+           var documents = app.AppDataDirectory;
+           var pathToDatabase = Path.Combine(documents, "xforms.db");
 
             resolverContainer.Register<IDevice>(t => AndroidDevice.CurrentDevice)
                 .Register<IDisplay>(t => t.Resolve<IDevice>().Display)
@@ -127,8 +127,6 @@ namespace BookAStar.Droid
                 .Register<ICacheProvider>(
                     t => new SQLiteSimpleCache(new SQLitePlatformAndroid(),
                         new SQLiteConnectionString(pathToDatabase, true), t.Resolve<IJsonSerializer>()));
-
-
             Resolver.SetResolver(resolverContainer.GetResolver());
         }
 
@@ -199,7 +197,7 @@ namespace BookAStar.Droid
             {
                 Task.Run(async () =>
                 {
-                    App.CurrentApp.ShowBookQuery(
+                    App.ShowBookQuery(
                        await DataManager.Current.BookQueries.Get(queryId));
                 });
             }
diff --git a/BookAStar/BookAStar.Droid/packages.config b/BookAStar/BookAStar.Droid/packages.config
index b25e9b63..44911c6e 100644
--- a/BookAStar/BookAStar.Droid/packages.config
+++ b/BookAStar/BookAStar.Droid/packages.config
@@ -5,7 +5,6 @@
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="monoandroid60" />
   <package id="Plugin.CurrentActivity" version="1.0.1" targetFramework="monoandroid70" />
   <package id="Plugin.Permissions" version="1.1.7" targetFramework="monoandroid70" />
-  <package id="Scorchio.NinjaCoder.Xamarin.Forms.Labs" version="2.0.0" targetFramework="monoandroid70" />
   <package id="SQLite.Net.Async-PCL" version="3.1.1" targetFramework="monoandroid70" />
   <package id="SQLite.Net.Core-PCL" version="3.1.1" targetFramework="monoandroid70" />
   <package id="SQLite.Net-PCL" version="3.1.1" targetFramework="monoandroid70" />
@@ -23,7 +22,7 @@
   <package id="Xamarin.Android.Support.v7.RecyclerView" version="23.3.0" targetFramework="monoandroid60" />
   <package id="Xamarin.Android.Support.Vector.Drawable" version="23.3.0" targetFramework="monoandroid60" />
   <package id="Xamarin.Controls.SignaturePad" version="1.4.0" targetFramework="monoandroid70" />
-  <package id="Xamarin.Forms" version="2.3.2.127" targetFramework="monoandroid70" />
+  <package id="Xamarin.Forms" version="2.3.0.34-pre1" targetFramework="monoandroid70" />
   <package id="Xamarin.Forms.Labs" version="1.0.1.0" targetFramework="monoandroid70" />
   <package id="Xamarin.GooglePlayServices.Ads" version="29.0.0.2" targetFramework="monoandroid41" />
   <package id="Xamarin.GooglePlayServices.Analytics" version="29.0.0.2" targetFramework="monoandroid41" />
diff --git a/BookAStar/BookAStar/App.xaml b/BookAStar/BookAStar/App.xaml
index 9b6d74a0..23898b58 100644
--- a/BookAStar/BookAStar/App.xaml
+++ b/BookAStar/BookAStar/App.xaml
@@ -40,14 +40,13 @@
         <Setter Property="FontAttributes" Value="Italic" />
         <Setter Property="HorizontalOptions" Value="Center" />
         <Setter Property="TextColor" Value="{StaticResource GroupingTextColor}" />
+        <Setter Property="VerticalOptions" Value="Start" />
       </Style>
       
       <Style x:Key="LabelStyle" TargetType="Label">
         <Setter Property="TextColor" Value="{StaticResource TextColor}" />
         <Setter Property="FontAttributes" Value="Bold" />
         <Setter Property="FontSize" Value="{StaticResource MediumFontSize}" />
-        <Setter Property="VerticalOptions" Value="Start" />
-        <Setter Property="HorizontalOptions" Value="Start" />
         <Setter Property="LineBreakMode" Value="WordWrap" />
       </Style>
 
diff --git a/BookAStar/BookAStar/App.xaml.cs b/BookAStar/BookAStar/App.xaml.cs
index 40882687..b8de6756 100644
--- a/BookAStar/BookAStar/App.xaml.cs
+++ b/BookAStar/BookAStar/App.xaml.cs
@@ -11,7 +11,9 @@ using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
 using Xamarin.Forms;
+using XLabs.Forms.Controls;
 using XLabs.Forms.Mvvm;
+using XLabs.Forms.Pages;
 using XLabs.Forms.Services;
 using XLabs.Ioc;
 using XLabs.Platform.Mvvm;
@@ -30,16 +32,30 @@ namespace BookAStar
     {
         public static IPlatform PlatformSpecificInstance { get; set; }
         public static string AppName { get; set; }
+
+        public void ShowQueries()
+        {
+            masterDetail.Detail = bQueriesPage;
+            masterDetail.SendBackButtonPressed();
+        }
+        public void ShowAccounts()
+        {
+            masterDetail.Detail = accChooserPage;
+            masterDetail.SendBackButtonPressed();
+        }
+        // Exists in order to dispose of a static instance strongly typed
+        // TODO : replace all references to this field
+        // by Views resolution, and then, drop it
         public static App CurrentApp { get { return Current as App; } }
-        public DataManager DataManager { get; set; } = new DataManager();
+
         public static void Init()
         {
             var app = Resolver.Resolve<IXFormsApp>();
+            
             if (app == null)
             {
                 return;
             }
-            // navigation registration
 
             app.Closing += (o, e) => Debug.WriteLine("Application Closing");
             app.Error += (o, e) => Debug.WriteLine("Application Error");
@@ -48,42 +64,56 @@ namespace BookAStar
             app.Rotation += (o, e) => Debug.WriteLine("Application Rotated");
             app.Startup += (o, e) => Debug.WriteLine("Application Startup");
             app.Suspended += (o, e) => Debug.WriteLine("Application Suspended");
-            
+
         }
+        public void Configure(IXFormsApp app)
+        {
+            ViewFactory.EnableCache = true;
+            ViewFactory.Register<DashboardPage, DashboardViewModel>(
+                 resolver => new DashboardViewModel());
+            ViewFactory.Register<BookQueryPage, BookQueryViewModel>();
+            ViewFactory.Register<EditBillingLinePage, BillingLineViewModel>();
+            ViewFactory.Register<EditEstimatePage, EstimateViewModel>();
+        }
+
+
+        ExtendedMasterDetailPage masterDetail;
 
         public App(IPlatform instance)
         {
             PlatformSpecificInstance = instance;
             InitializeComponent();
             Init();
-            MainPage = GetMainPage();
+            BuildMainPage();
         }
+        BookQueriesPage bQueriesPage;
+        AccountChooserPage accChooserPage;
+        HomePage home;
 
-        public static Page GetMainPage()
+        private void BuildMainPage()
         {
-            ViewFactory.Register<SettingsPage,SettingsViewModel>();
-            ViewFactory.Register<BookQueryPage, BookQueryViewModel>(
-                resolver => new BookQueryViewModel ()
-                );
-           
-            var bQueriesPage = new BookQueriesPage
+            accChooserPage = new AccountChooserPage();
+
+            bQueriesPage = new BookQueriesPage
             {
                 BindingContext = DataManager.Current.BookQueries,
                 Title = "Demandes"
             };
 
-            //  var mainPage = new NavigationPage(bQueriesPage);
+            home = new HomePage() { Title = "Accueil" };
 
-            var mainPage = new XLabs.Forms.Pages.ExtendedMasterDetailPage() {
+            // var mainPage = new NavigationPage(bQueriesPage);
+            /*
+            masterDetail = new ExtendedMasterDetailPage() {
                 Title="MainPAge"
             };
 
-            mainPage.Master = bQueriesPage;
-            mainPage.Detail = new SettingsPage();
-            
-            Resolver.Resolve<IDependencyContainer>()
-                .Register<INavigationService>(t => new NavigationService(mainPage.Navigation));
+            masterDetail.Master = new DashboardPage {
+                Title = "Bookingstar",
+                BindingContext = new DashboardViewModel() };
+            masterDetail.Detail = new HomePage { Title = "Accueil" };
 
+            */
             ToolbarItem tiSetts = new ToolbarItem()
             {
                 Text = "Paramètres",
@@ -95,9 +125,11 @@ namespace BookAStar
                 Text = "Accueil",
                 Icon = "icon.png"
             };
-            mainPage.ToolbarItems.Add(tiHome);
-            mainPage.ToolbarItems.Add(tiSetts);
-            return mainPage;
+
+          
+
+
+
 
             /*     searchPage = new SearchPage
                  {
@@ -161,13 +193,33 @@ namespace BookAStar
                  };
                  MainPage = Navigation;
                  */
+            var mainTab = new ExtendedTabbedPage()
+            {
+                Title = "XLabs",
+                SwipeEnabled = true,
+                TintColor = Color.White,
+                BarTintColor = Color.Blue,
+                Badges = { "1", "2", "3" },
+                TabBarBackgroundImage = "visuel_sexion.png",
+                TabBarSelectedImage = "icon.png",
+            };
 
+            var navPage = new NavigationPage(bQueriesPage);
+            //var navPage = new NavigationPage(mainTab);
+            
+            navPage.ToolbarItems.Add(tiHome);
+            navPage.ToolbarItems.Add(tiSetts);
 
+            this.MainPage = navPage;
+
+            Resolver.Resolve<IDependencyContainer>()
+                .Register<INavigationService>(t => new NavigationService(navPage.Navigation))
+                ;
         }
 
-        internal void EditCommandLine(Page parentPage, CommandLine com)
+        internal void EditCommandLine(Page parentPage, BillingLine com)
         {
-            CommandLineEditorPage editCommandLine = new CommandLineEditorPage
+            EditBillingLinePage editCommandLine = new EditBillingLinePage
             {
                 Title = "Edition d'une ligne de facture",
                 BindingContext = com
@@ -181,26 +233,12 @@ namespace BookAStar
                 "gcm/register",
                 PlatformSpecificInstance.GetDeviceInfo());
         }
-
-        public void ShowBookQuery(BookQueryData data)
+        
+        public static void ShowBookQuery (BookQueryData query)
         {
-            BookQueryPage bookQueryPage = new BookQueryPage
-            {
-                Title = "Demande de devis",
-                BindingContext = data
-            };
-           ShowPage(bookQueryPage);
-        }
-
-        public void EditEstimate(Estimate data)
-        {
-            throw new NotImplementedException();
-            EditEstimatePage editEstimate = new EditEstimatePage
-            {
-                Title = "Création d'un devis"
-            };
-            editEstimate.Estimate = data;
-            // ShowPage(editEstimate);
+           var page = ViewFactory.CreatePage<BookQueryViewModel
+                , BookQueryPage>(null, new BookQueryViewModel(query));
+           App.Current.MainPage.Navigation.PushAsync(page as Page);
         }
 
         // TODO système de persistance de l'état de l'appli
@@ -212,12 +250,12 @@ namespace BookAStar
         /// <param name="parentPage">Parent Page</param>
         /// <param name="pageType">Type of page to show</param>
         /// <returns></returns>
-        private static async Task ShowPage(VisualElement parentPage, Type pageType)
+        public static async Task ShowPage(VisualElement parentPage, Type pageType)
         {
             // Get all the constructors of the page type.
             var constructors = pageType.GetTypeInfo().DeclaredConstructors;
 
-            foreach ( var page in
+            foreach (var page in
                     from constructor in constructors
                     where constructor.GetParameters().Length == 0
                     select (Page)constructor.Invoke(null))
diff --git a/BookAStar/BookAStar/BookAStar.csproj b/BookAStar/BookAStar/BookAStar.csproj
index b2216ffc..f75de879 100644
--- a/BookAStar/BookAStar/BookAStar.csproj
+++ b/BookAStar/BookAStar/BookAStar.csproj
@@ -42,16 +42,20 @@
     </Compile>
     <Compile Include="Constants.cs" />
     <Compile Include="Factories\ViewFactory.cs" />
-    <Compile Include="Helpers\AvatarImageSource.cs" />
     <Compile Include="Helpers\DataManager.cs" />
+    <Compile Include="Helpers\PageHelpers.cs" />
     <Compile Include="Helpers\PropertySupport.cs" />
     <Compile Include="Helpers\RemoteEntityRO.cs" />
     <Compile Include="Helpers\Settings.cs" />
+    <Compile Include="Helpers\UserHelpers.cs" />
     <Compile Include="Interfaces\IComponentContext.cs" />
     <Compile Include="Interfaces\IMDEditor.cs" />
     <Compile Include="Interfaces\IModelViewModel.cs" />
     <Compile Include="Interfaces\IViewFactory.cs" />
     <Compile Include="Model\ClientProviderInfo.cs" />
+    <Compile Include="Interfaces\IBookQueryData.cs" />
+    <Compile Include="Interfaces\IBillingLine.cs" />
+    <Compile Include="Interfaces\IEstimate.cs" />
     <Compile Include="Pages\BlogPage.cs" />
     <Compile Include="Pages\BookQueriesPage.xaml.cs">
       <DependentUpon>BookQueriesPage.xaml</DependentUpon>
@@ -59,8 +63,11 @@
     <Compile Include="Pages\BookQueryPage.xaml.cs">
       <DependentUpon>BookQueryPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Pages\CommandLineEditorPage.xaml.cs">
-      <DependentUpon>CommandLineEditorPage.xaml</DependentUpon>
+    <Compile Include="Pages\EditBillingLinePage.xaml.cs">
+      <DependentUpon>EditBillingLinePage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Pages\DashboardPage.xaml.cs">
+      <DependentUpon>DashboardPage.xaml</DependentUpon>
     </Compile>
     <Compile Include="Pages\EventDetail.xaml.cs">
       <DependentUpon>EventDetail.xaml</DependentUpon>
@@ -72,7 +79,7 @@
     <Compile Include="Model\Blog\BlogTag.cs" />
     <Compile Include="Model\BookQueryData.cs" />
     <Compile Include="Model\Market\BaseProduct.cs" />
-    <Compile Include="Model\Workflow\CommandLine.cs" />
+    <Compile Include="Model\Workflow\BillingLine.cs" />
     <Compile Include="Model\Manager.cs" />
     <Compile Include="Model\Auth\MobileAppDeclaration.cs" />
     <Compile Include="Model\Auth\passwrecovery.cs" />
@@ -110,10 +117,16 @@
     <Compile Include="Pages\EditEstimatePage.xaml.cs">
       <DependentUpon>EditEstimatePage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Pages\HomePage.xaml.cs">
+      <DependentUpon>HomePage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Pages\PinPage.cs" />
     <Compile Include="ViewModels\BookQueriesViewModel.cs" />
     <Compile Include="ViewModels\BookQueryViewModel.cs" />
-    <Compile Include="ViewModels\SettingsViewModel.cs" />
+    <Compile Include="ViewModels\BillingLineViewModel.cs" />
+    <Compile Include="ViewModels\DashboardViewModel.cs" />
+    <Compile Include="ViewModels\EstimateViewModel.cs" />
+    <Compile Include="ViewModels\UserLoginViewModel.cs" />
     <Compile Include="ViewModels\ViewModelBase.cs" />
     <Compile Include="Views\CommandLineEditor.xaml.cs">
       <DependentUpon>CommandLineEditor.xaml</DependentUpon>
@@ -123,8 +136,8 @@
     <Compile Include="Pages\SearchPage.xaml.cs">
       <DependentUpon>SearchPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Pages\SettingsPage.xaml.cs">
-      <DependentUpon>SettingsPage.xaml</DependentUpon>
+    <Compile Include="Pages\AccountChooserPage.xaml.cs">
+      <DependentUpon>AccountChooserPage.xaml</DependentUpon>
     </Compile>
     <Compile Include="Model\Tag.cs" />
   </ItemGroup>
@@ -137,7 +150,9 @@
   <ItemGroup>
     <None Include="app.config" />
     <None Include="GettingStarted.Xamarin" />
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Pages\EventDetail.xaml">
@@ -148,7 +163,7 @@
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Pages\SettingsPage.xaml">
+    <EmbeddedResource Include="Pages\AccountChooserPage.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
       <SubType>Designer</SubType>
     </EmbeddedResource>
@@ -186,19 +201,23 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.34-pre1\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Maps, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.Maps.2.3.2.127\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Maps.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.Maps.2.3.0.34-pre1\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Maps.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.34-pre1\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.34-pre1\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="XLabs.Caching, Version=2.2.0.38182, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Caching.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Caching.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="XLabs.Core, Version=2.2.0.38178, Culture=neutral, processorArchitecture=MSIL">
@@ -221,6 +240,10 @@
       <HintPath>..\..\packages\XLabs.Serialization.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Serialization.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="XLabs.Serialization.Json.NET, Version=2.2.0.38187, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Serialization.JSON.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Serialization.Json.NET.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Pages\BookQueryPage.xaml">
@@ -246,9 +269,6 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="icon-anon.png" />
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Views\CommandLineEditor.xaml">
       <SubType>Designer</SubType>
@@ -256,18 +276,38 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Pages\CommandLineEditorPage.xaml">
+    <EmbeddedResource Include="Pages\EditBillingLinePage.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Pages\DashboardPage.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Images\icon_add_user.png" />
+    <EmbeddedResource Include="Images\icon_anon_user.png" />
+    <EmbeddedResource Include="Images\icon_block_user.png" />
+    <EmbeddedResource Include="Images\icon_remove_user.png" />
+    <EmbeddedResource Include="Images\icon_user.png" />
+    <EmbeddedResource Include="Images\icon_user_settings.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Pages\HomePage.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <Import Project="..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
+  <Import Project="..\..\packages\Xamarin.Forms.2.3.0.34-pre1\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.0.34-pre1\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>Ce projet fait référence à des packages NuGet qui sont manquants sur cet ordinateur. Utilisez l'option de restauration des packages NuGet pour les télécharger. Pour plus d'informations, consultez http://go.microsoft.com/fwlink/?LinkID=322105. Le fichier manquant est : {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.0.34-pre1\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.0.34-pre1\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/BookAStar/BookAStar/Constants.cs b/BookAStar/BookAStar/Constants.cs
index 078b40f3..c0f23f2c 100644
--- a/BookAStar/BookAStar/Constants.cs
+++ b/BookAStar/BookAStar/Constants.cs
@@ -21,31 +21,5 @@ namespace BookAStar
 
         #endregion
 
-        #region Colors & sizes
-        [Obsolete]
-        public static readonly Thickness PagePadding =
-            new Thickness(5, Device.OnPlatform(20, 20, 20), 5, 5);
-
-        [Obsolete]
-        public static readonly Thickness DefaultPadding =
-            new Thickness(5, Device.OnPlatform(20, 20, 20), 3, 3);
-
-        [Obsolete]
-        public static readonly Font TitleFont =
-            Font.SystemFontOfSize(Device.OnPlatform(50, 50, 50), FontAttributes.Bold);
-
-        [Obsolete]
-        public static readonly Color OddBackgroundColor =
-            Device.OnPlatform(Color.Aqua, Color.Aqua, Color.Aqua);
-
-        [Obsolete]
-        public static readonly Color ForegroundColor =
-            Device.OnPlatform(Color.White, Color.White, Color.White);
-
-        [Obsolete]
-        public static readonly Color BackgroundColor =
-            Device.OnPlatform(Color.Black, Color.White, Color.White);
-
-        #endregion
     }
 }
diff --git a/BookAStar/BookAStar/Helpers/AvatarImageSource.cs b/BookAStar/BookAStar/Helpers/AvatarImageSource.cs
deleted file mode 100644
index 6b511b87..00000000
--- a/BookAStar/BookAStar/Helpers/AvatarImageSource.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Xamarin.Forms;
-using Xamarin.Forms.Xaml;
-
-namespace BookAStar
-{
-    [ContentProperty("Source")]
-    public class MyExtension : IMarkupExtension
-    {
-        public string Source { get; set; }
-
-        public object ProvideValue(IServiceProvider serviceProvider)
-        {
-            
-            // Do your translation lookup here, using whatever method you require
-            
-            if (Source != null)
-            {
-                if (Source.StartsWith("res://"))
-                    return ImageSource.FromResource(Source.Substring(6));
-                return ImageSource.FromUri(new Uri(Source));
-            }
-            return ImageSource.FromResource("BookAStar.icon-anon.png");
-        }
-    }
-}
diff --git a/BookAStar/BookAStar/Helpers/DataManager.cs b/BookAStar/BookAStar/Helpers/DataManager.cs
index 66a73427..14c7f9ca 100644
--- a/BookAStar/BookAStar/Helpers/DataManager.cs
+++ b/BookAStar/BookAStar/Helpers/DataManager.cs
@@ -17,12 +17,12 @@ namespace BookAStar.Helpers
         public RemoteEntity<Estimate, long> Estimates { get; set; }
         public RemoteEntity<Blog, long> Blogspot { get; set; }
         public LocalEntity<ClientProviderInfo,string> Contacts { get; set; }
-        
-        public static DataManager Current
+        protected static DataManager current = new DataManager();
+        public static DataManager Current 
         {
             get
             {
-                return App.CurrentApp.DataManager;
+                return current;
             }
         }
 
diff --git a/BookAStar/BookAStar/Helpers/MainSettings.cs b/BookAStar/BookAStar/Helpers/MainSettings.cs
index 974f33ee..63151925 100644
--- a/BookAStar/BookAStar/Helpers/MainSettings.cs
+++ b/BookAStar/BookAStar/Helpers/MainSettings.cs
@@ -31,9 +31,10 @@ namespace BookAStar
 
 		private const string userNameKey = "user_id";
 		private const string PushNotificationsKey = "pushNotifs";
+        private const string AllowGPSUsageKey = "allowGPSUsage";
         private const string UserListsKey = "userList";
         private const string GoogleRegIdKey = "googleRedId";
-
+        private const string AllowProBookingOnlyKey = "allowProBookingOnly";
         
 
         private static readonly string UserIdDefault = 
@@ -149,7 +150,7 @@ namespace BookAStar
                         App.CurrentApp.PostDeviceInfo();
                     }
                 }
-                // TODO else Unregister the device
+                // TODO else Unregister this device
             }
         }
 
@@ -175,13 +176,45 @@ namespace BookAStar
 					PushNotificationsDefault);
 			}
 			set { 
+                // TODO Stop Broadcast receiver
 				AppSettings.AddOrUpdateValue<bool> (
 					PushNotificationsKey,
 					value);
             }
 		}
 
-		public static void SetMusical (string key, double value)
+        public static bool AllowGPSUsage
+        {
+            get
+            {
+                return AppSettings.GetValueOrDefault<bool>(
+                    AllowGPSUsageKey,
+                    PushNotificationsDefault);
+            }
+            set
+            {
+                AppSettings.AddOrUpdateValue<bool>(
+                    AllowGPSUsageKey,
+                    value);
+            }
+        }
+        // TODO make it a server side user's parameter
+        public static bool AllowProBookingOnly
+        {
+            get
+            {
+                return AppSettings.GetValueOrDefault<bool>(
+                    AllowProBookingOnlyKey,
+                    PushNotificationsDefault);
+            }
+            set
+            {
+                AppSettings.AddOrUpdateValue<bool>(
+                    AllowProBookingOnlyKey,
+                    value);
+            }
+        }
+        public static void SetMusical (string key, double value)
 		{
 			AppSettings.AddOrUpdateValue <double> (MusicalKey + key, value);
 		}
diff --git a/BookAStar/BookAStar/Helpers/PageHelpers.cs b/BookAStar/BookAStar/Helpers/PageHelpers.cs
new file mode 100644
index 00000000..194dbac8
--- /dev/null
+++ b/BookAStar/BookAStar/Helpers/PageHelpers.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Xamarin.Forms;
+
+namespace BookAStar.Helpers
+{
+    public  static class PageHelpers
+    {
+        public static async Task<bool> Confirm(this Page page, string title, string procedure)
+        {
+            string yes = "Oui", no = "Non";
+            var answer = await page.DisplayAlert(title,
+               procedure, yes, no);
+            return answer;
+        }
+    }
+}
diff --git a/BookAStar/BookAStar/Helpers/UserHelpers.cs b/BookAStar/BookAStar/Helpers/UserHelpers.cs
new file mode 100644
index 00000000..f1d43366
--- /dev/null
+++ b/BookAStar/BookAStar/Helpers/UserHelpers.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Xamarin.Forms;
+
+namespace BookAStar.Helpers
+{
+    public static class UserHelpers
+    {
+        public static ImageSource Avatar(string avatarPath)
+        {
+            /*foreach (var r in App.Current.Resources)
+            {
+                Debug.WriteLine($"#R# {r.Key} : {r.GetType().Name}");
+            }*/
+            var result = avatarPath == null ?
+                ImageSource.FromResource(/* "BookAStar.icon_user.png" */ "BookAStar.Images.icon_user.png") :
+                avatarPath.StartsWith("res://") ?
+                 ImageSource.FromResource(avatarPath.Substring(6)) :
+                 ImageSource.FromUri(new Uri(avatarPath));
+            var test = ImageSource.FromResource("none.resource.png");
+            return result;
+        }
+    }
+}
diff --git a/BookAStar/BookAStar/Images/icon_add_user.png b/BookAStar/BookAStar/Images/icon_add_user.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c0a43cc5f5f66a6cdfd530610c4ef75d05a264c
GIT binary patch
literal 4702
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

literal 0
HcmV?d00001

diff --git a/BookAStar/BookAStar/Images/icon_anon_user.png b/BookAStar/BookAStar/Images/icon_anon_user.png
new file mode 100644
index 0000000000000000000000000000000000000000..43ce1300377cb3c676f57dc4005e0d4a339e30ef
GIT binary patch
literal 5372
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
a>i+>#D-De}v*$+u0000<MNUMnLSTYUGInPG

literal 0
HcmV?d00001

diff --git a/BookAStar/BookAStar/Images/icon_block_user.png b/BookAStar/BookAStar/Images/icon_block_user.png
new file mode 100644
index 0000000000000000000000000000000000000000..50566f2be19a6a42490dc7c60313d1839f4fc130
GIT binary patch
literal 7195
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
Q-*_M;d3Cum8KWQn16mvtfB*mh

literal 0
HcmV?d00001

diff --git a/BookAStar/BookAStar/Images/icon_remove_user.png b/BookAStar/BookAStar/Images/icon_remove_user.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb463901d261ff525da28b83cd1fc3695ef23b9c
GIT binary patch
literal 4628
zcmV+v66@`WP)<h;3K|Lk000e1NJLTq004jh004jp1^@s6!#-il00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy000McNliru;0YTK1ubK2?7#p35ur&$
zK~#9!?VW#cT-9~QKX-SfwJak`a<Jqd@(&3RCQuM4t^s3G1IAcLP*Pe_5}Hf`v@=ZH
zNm`nL1e}yiNHHPqv@<P%Nd}S@N)oVS;qWW=5M$XEwlLIK68dck%WG`evTRBF>-LX(
zA9@v%z52E9zSaBA>^!Zs+IR0c=bd}bx#yfKNKGsRih(7z*Bl@ZI3Jib%K!BNA^kcA
zwAo$_Kxe8EN~FLX&IeWktAJAAQXqSZ?$rZ)2-E^^13Q4Do&Y2lX~4C>Ex<a>@Zspt
zjB3(PZ>xTyPv}=Ka0VFEpAP~vfh;XN*;->P)!O3%;1Xcb2>1E`coo<R>;xism~;ey
z8-br|MoQc3lqUYeS_{mc!g0*j_jnliy}q}7ES~^R12^a~dzc`W0*?V*!w6jq`~bL4
zYXm2?(JJ7FdQA2)b^-sa=ip(CSPfJIaT`HD1Res43?6rp9^*mVxTC<YfXh6#CdT;P
z!_@op`bl@2ZM8~|{j{D-9H<1Y@!0%XtOVY&G5!$nk5jy!Cku1*QqW_Y-*(`O9@}97
z@Pdsn9|I2n=_xqZ+1hwKYMbx>0E?$1<I{kD(C(PjPsew(E0*e*1$<k33{tzJ8&Xv0
zN5u8O|Jt5{{{r%-;X{xM{Hrz+rKZV>RGzRO_z@7(6K>GH{d7kuuvgP0rrlnDs!ej9
zHhd%y1|CI4-#jP;fCo`gL<wxuG)oDT+19&8;7X6*qvA^7BZi`i>)bpU0es)K#=Q*W
zcsx$XHh6`hAkz16;hs$Zct%fR0QeTEvGbVBhiAQ}okZ<{xW+EXuu1SIsczX$F|M{P
zpRZ`z8jbUTJ+}4U+X$IBmTFo`P22NLw)Ee(`Lqi?-c1@7G88*`-$V}~$Hx43v?1eR
z@{PlHG>tzn$)L^v{%B+VOpjMnhM6`Y_@fCnL6D(cyuGNDDi2eOEMT9e`I}5Ipf(ZL
z%m@4$xJw%;D={=d^442#y-)~I0+a|LE|5|#LFM-i&nAkX@(EjkW+B8rpsupAvdKVW
zdk1h4@ZZ2!Q27Q)6@U$>knSg_gpGQ`n0~ns;w!+PGx02<X5eKZ#PgMvmG2ue#btUK
zn4|gd!(<A;&8SS+2x@n4w?T|wCxm!Vk83Kh9r%~3s;aGq#0j=(O|}+zBN+m)RIm3r
zz<sDFmE*YWw%aa=#bTR;5XstMd?Ox@udlAIKIrh&?+5+^l~ZvgDh)nij5WNNj!MBU
zLM1wW&j8+wii(Q$Qp(>5AudYdeT#$;-@N$Zi%&H)G&rdN_W~CJ%Tf7;&!M)Jr$hiY
z0$<YW{cWhNT}PQ;US9q)y#_jwhaUje78e(1H#RoD?jRjr*L=Ag$kgvAeF?ZmTb>bZ
z@z)x_{AYo$8)AO^qN=Lu8`?c{0?V~gn5KEPYce%}AJ~ivL4F^2(EwxbCqjq^401e5
zii?Ybjg5_OIdp%kc;*Ie3p|^MFeWMh-v;gh_5)uVug^JIsHmv81K5OlTg=xM7Z>ku
zY;1JOC9VN(2d+TXK%P?zBtpQ2sH&V<sA7j5PEvT?x^?+}zyAQ{?l&A0LVUimvhs*S
z_g{&sT<+7cg08cD*q6W;{uDS*TbDbWrfwh**ofJiO>?A_PdIr09oj=X4|sB-8elal
z-h2wU7&z=CWy{OUzku2kHyu(+S+Zrzmi-Rhf4=tAW@(#X+jum903O%ZA2`i?jeo)&
z5JHHD9K8R>sL-$gemq_ca0l>PRAi~xX`jEWtgO)I^EKg~+`>4pw5qDA!=d{JQ5nVs
zsQr*v#;O6Vr)?w72Ym4R{deQ8#8RJ>@*W58KL|W=F3ssXizT^StCD97SyaD_%OHgK
zYlnyMv|hSbpxWvrEC80oJjGBS9mjC{?Y9?cm&R>arpNB27I^AxT3{prC_+`F^r50j
zjw2R}-Hb~SkH^<IJcMU7FUuGqFJdGCxL^PNIn)-T3Ao;^0wASydh9)#mp;_?{aFPd
z4fv}5`4<M!u>|+x3IoRQOMU$+!*)%F3&3hrt$rQwt_jpDFE5{o*^Qyjg$wi?oJ1{Z
zA7`HC@u&h|S=!GVWJwp3SjgH``1Kr|#&g4X{22jA2P#loh`%$4fCac8Cd}b?nzt3$
zvY~y$eE%G+`r8d6-hvbm02AiWhDsmH)x7?U0F>!#wP9AY>-z^8GzW{f>qZiQwfef%
zF#4rJwUH@vcx@Q3KNWy^sBYNDwVE&nLWmhDAONP+_1B^@g)Rl=+6BN`6Lv6$l;R|*
z&s1n8Wr`3-8A|H8&Mp8}|JoV@iI<iF0$|b{-qF`<?E+wR?%HJ_@lL0J0Q4C&7K_JM
zSppzX;Yx`rJ2nlcQa}JqnuAqZemNj~s3TFbw4d1P5pPP+YuH%YP|d3s`%uZA00&H@
zoDd=vPU`A1Y&;+8>%{?}P`_z*#4o9>y$QH!w7-W!p+!wiO|IsCQBl#FM;>{k_$)$x
zthBWBCrKQV#p|MgUIJi@WyO>Dgs(&$4lyF~^76>b%X7O1_{($ry%k8N0JQ4s5+6fH
zp>^P4y1?S~A|E;;1RU|`GHqb-dae)EV+K^O9}m+57O&^{7^<^7?$Kr1z~XhTkD-l<
z(;i)>4XnuIOdmss6@@*zOdEW9W^zCaKpeGGlyvz0{-;PF19{V?P1|Cz*b+BU+3)wa
zuV26ZiwU^G$v$w};&*xgwHM%2UmHqFN~{yT&x(qQinn!#PuD;Qv7@A<q|M|p`m{Rm
zWB6&;Qp(-93{px{dl^{#4*P6tzv%}T{=sbm5Rb=A9ka#jK_BW|8c_Y^j73#dRXyfy
zs+<jntE;OI7&^9D`r7XUj_Eg_a{*DexoG|WgOj$^IbiYnm|XzoxPY$PU9|q2EUa_v
z0&vtV8Xyn|RN-)s!bF#UA;cDg$7k{SsE?s-VB=k^mtTH4g!3(G6G5$meF77K#p_ld
zLuFuY@v*C1Fvd#5$7dbq*KXGUg)T9!j28f(&u97=Enc_zP)Cpf{D~U`Kp)w%-{2v>
zzj^cK4-6-x#p@4zz#&v9b`g;6l4amm29ND|!)cd|Dpx-N9P(*j^#E#5;8Hhm-{<qa
zh+!pcmh~TvMqe<Te3xooAAq6CAS-6Q(hUNzdGqE&h8lyfZr!@o^fY#h$GhzUVAYFV
z?UE$`A;d-l$Ml2?NM|*S+yO(aSLdO+f*wURi83<SQc+QnC#77f-Izk)VazGLJ}iVN
z3kHK9z4X#ceTFjM2ZT_Oz<l6{z4vZCswwmraHd0;C@U*l8VCdmrIdwI%0ghilyaUB
zqEH(yZmASLA%tj_QnmmsLWmY2L`yUpZK<xVZgFs2%eCtN5coX&{~Um7EdXUxDFEf=
z<)4ek<IDVhf1#AJPzX_^nOz9v#pCheY84kETS|Eqx&l{9iIftb&qsNA`Nya(-c3N0
zl(H!vk2hszW;P{3b6BlmUj3B5wm;qs{2o<4JYielzWeS=JAC-?WkQI{q?DIw-}5r9
zdOVDbZlGQWQ7@%DD1<mDgs9g>?_^*X@TZ#BuMZc1bUlD<y~ZZoDQv@r4ZeN*_FW2;
zN-0Z$QqAz7$J5DKQh*vEM2(d4of$J`>=}o)SOT=5s)O^;iJ`;w>(ju!z;`)Et=gS;
z-Z^V<aBxjL9xoF@l<6<^kQ_vTIw@tflyXaTb+uLVe>Qv<b$ZCNz&A%)0_@8`9YbA1
z>`eC$3=EWOA-TbO!i~YlLWt^kJpN*7Y3a5N8#avO#l44W3bB@<ZegDhfHYL$V7}cO
zxaF2xveMGh?v+x0i=kpt4`$+!5aP++-roP*zJ0ru?q?mgby)K+YWEB6h%j_Q$ls!l
zXZ>0r5NMH7ZuFS%3KU2wf0mV%^-)Dd#hv<h_v`C346FYb$;T?vZpxW8Yu4-x27@<w
zG<7e+;c)e9uf4Vkl?Zwv!y18%)P=hlby`?vYip~=e3zrWy}b-|h~ySV=mIlZ8}=sv
z+S=NPMx!1TU5a=-PFq`>^>))ppBYU6_5g20A`#l#+dWFU6rG)&3=9l_Y7O_+SOfsz
zQGn*=W@53JM@^R@7K_o)&|tlNc(l)*O#o_uor8mebaZ&_gIwne9y(+_{ku`IoiPgl
zz+(W7jg2xAiFj0X2_lh*{po-7Y@a=s0Bi-egu`Lc*x2Y%)+K0YXdoO818l|?^&5`>
zfa>8FX=`hfy}i92bqz;vZ?9$fhk*yr_4z~updQ#1kH^LS{rizpdQ>(PQcB)??>&o0
zPXXst+x`T<`yJq}fq{YCKp;SFZmvgd1JT^vOlM~&sAQA7NTBUcqUZ6QK^;3P>+9<|
zapHtWZNqTl#0ksrlbTokiTs~`4EJaS(xjBDLZJ`^1qJy1evk47ARG>}bLUR9r}h|Q
zIQDm}9NZ3E7mY@jo;r1kg$oyY)HeX{zWXjGPo4x7?fV8}XiPEIBU$6XJ;1S0C`3z3
zi${F}*8NZ@1gih<-Hb7%e>`XMc3Dz(@Zdq&)6?T|!6EeY^iW@4FZC0DFXL$VJ>EsU
z0mzb4Uen#(O@4kp>FMbnN0NxXzCL#C+C?-P6~L3gzm4a6CSt|C0W68dVpnu`cQbF^
zJkrwAJkBHmXU?2q=gyrB4h{nR5_n*|-!)M)z8WZvMxz&oLLuhQpHCnV@HjMu7#tj=
zrlyAe{(exQ`n#DxrSwDvAdafiT^or+=JoXSuwcOgd_JGYsVP7#7GuwzJ?M~p9dK)+
z{{Co~th%c_RJG{^xw*M4U%uR14kj6qNQ6Cm_Hg|8aZssU*D?vGyi8Uk=QJwk?AHGN
z{@f!+j*y?9?=1(Dgn@wpYHDgMU%wf3%G#v#A(-sS%N#8T*93z>R;*Y-R#ukB!3m(Z
zx0hYJc3B4BPN1AgJl$ooW4QysZ-5oCSZwLx!-wUZIdeotMux}9ar*hYckh<ra9E(4
zWtWpcYkemL094W83&65iEOtp}XD8|D>11bTdmJ4D+S=OKw{M^2=f4E}1!_|c(**$S
zmi!i&C8b;u3WY>pUmtVl&h<Qmb08XxQdd_;b8|CNZS4OPRoOEo`T5D{zOWkjHISc?
zk-=40T}4h#j>qXyRQ}$*do3ToTl@G^dgeef_H$dc3R@nHMi+H<cFI5?AhNTw-P-+Q
z(jld!wY8PHx;hz&L<A}UXDvx+h?%Sn{gc3RK)RIj+M`F0itg@iva+(6?grwiQ>Un{
zt)-)*!&3Q=1AjBw#-5W)z;Ij-{5!fyQ9(fg%a$!87@S_M2CUTWwzf7Yr4*=w+`nU#
z3Ldv>06W@&pQBopT;1E-8|>)lkbyuz%$_|v<(CC1B^@0d)YjI@W5<pOZ7@F$d|3-Y
zQsFeU7ofH>{|X>8Gn3-tV&>1EpK^jArKGE?i^j%APM`ktkk&VWzel%ibpobP`9@Sv
zqALMr%$Px8VIhkaEpq*yf>mJK+S+QBY60v89>LbGZMqA9HI_Sohb%z|1OgNk6tH;l
zV$M77Jl7d_?d|OxI&{chV!s#o5%3Cz94KX~o?Q)mN4r8kfSjBh7A#mmety2Oo<o0s
zKi%Ekbai!MOO=bGiZeH2;HhV(FSJWh`G;Qz=3Bqa&dw%3KcBgC=Q4ZtY)1!p^5jWE
zp%C5O-NWl8x=`ua&oXo>3!VUs-&^@JZ7hBXwd)8#Fc>5^H<z589CC7U$jZu^vTf*C
zEXK)`C+X?wp{J*Z<HwI%yL1+gqe9>>qEhIMZ>-=(Q#(yB4L9o7GW$G)5M*X%GHcc>
zGBPsA$jD&k%$Wp(L4v^`>FMdC8kUhrgm5^_;NT#GgM*wobB6x@e){|S>Fev`^y$;X
zYa=CaP+RkFYE|#5I{H-bwa!N!g0KqJ4f}GY?ik$DsPOC_;B8bE)KNDRFBPLMe&8Zh
zq;ZLUEk^Y~&PE-YI9kK%Zr~GC81@7zXw`<=&p3dpwvDF}vHlM<d9)@LRUmKx0000<
KMNUMnLSTZ;<i|z;

literal 0
HcmV?d00001

diff --git a/BookAStar/BookAStar/Images/icon_user.png b/BookAStar/BookAStar/Images/icon_user.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1ffbf1e7b544fdebf707a0507a85d821d9afdce
GIT binary patch
literal 4535
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
Vv73JOc_sh=002ovPDHLkV1kSl$1eZ?

literal 0
HcmV?d00001

diff --git a/BookAStar/BookAStar/Images/icon_user_settings.png b/BookAStar/BookAStar/Images/icon_user_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..3de9e7cfe078e39e29655ea47843b099357f0aa2
GIT binary patch
literal 8437
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
WMMSWb!tn}R0R*9<q5MJ7GVFgBaa@l8

literal 0
HcmV?d00001

diff --git a/BookAStar/BookAStar/Interfaces/IBillingLine.cs b/BookAStar/BookAStar/Interfaces/IBillingLine.cs
new file mode 100644
index 00000000..929a7f67
--- /dev/null
+++ b/BookAStar/BookAStar/Interfaces/IBillingLine.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace BookAStar.Interfaces
+{
+    public interface IBillingLine
+    {
+        int Count { get; set; }
+        string Description { get; set; }
+        TimeSpan Duration { get; set; }
+        decimal UnitaryCost { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/BookAStar/BookAStar/Interfaces/IBookQueryData.cs b/BookAStar/BookAStar/Interfaces/IBookQueryData.cs
new file mode 100644
index 00000000..8728fa36
--- /dev/null
+++ b/BookAStar/BookAStar/Interfaces/IBookQueryData.cs
@@ -0,0 +1,15 @@
+using System;
+using BookAStar.Model.Social;
+using BookAStar.Model;
+
+namespace BookAStar.Interfaces
+{
+    public interface IBookQueryData
+    {
+        ClientProviderInfo Client { get; set; }
+        DateTime EventDate { get; set; }
+        long Id { get; set; }
+        Location Location { get; set; }
+        decimal? Previsionnal { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/BookAStar/BookAStar/Interfaces/IEstimate.cs b/BookAStar/BookAStar/Interfaces/IEstimate.cs
new file mode 100644
index 00000000..23726fdc
--- /dev/null
+++ b/BookAStar/BookAStar/Interfaces/IEstimate.cs
@@ -0,0 +1,20 @@
+using BookAStar.Model.Workflow;
+using System.Collections.Generic;
+
+namespace BookAStar.Model.Interfaces
+{
+    public interface IEstimate
+    {
+        List<string> AttachedFiles { get; set; }
+        List<string> AttachedGraphicList { get; }
+        List<BillingLine> Bill { get; set; }
+        string ClientId { get; set; }
+        long? CommandId { get; set; }
+        string CommandType { get; set; }
+        string Description { get; set; }
+        long Id { get; set; }
+        string OwnerId { get; set; }
+        int? Status { get; set; }
+        string Title { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/BookAStar/BookAStar/Model/Auth/User.cs b/BookAStar/BookAStar/Model/Auth/User.cs
index a22ef519..78de9113 100644
--- a/BookAStar/BookAStar/Model/Auth/User.cs
+++ b/BookAStar/BookAStar/Model/Auth/User.cs
@@ -1,11 +1,12 @@
-using System;
+using BookAStar.Helpers;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-
+using Xamarin.Forms;
 
 namespace BookAStar.Model.Auth.Account
 { 
@@ -79,6 +80,13 @@ namespace BookAStar.Model.Auth.Account
                 OnPropertyChanged("Avatar");
             }
         }
+        public ImageSource AvatarSource
+        {
+            get
+            {
+                return UserHelpers.Avatar(avatar);
+            }
+        }
         private Tokens yavscTokens;
         public Tokens YavscTokens
         {
diff --git a/BookAStar/BookAStar/Model/BookQueryData.cs b/BookAStar/BookAStar/Model/BookQueryData.cs
index 37d43a02..6f5ee97b 100644
--- a/BookAStar/BookAStar/Model/BookQueryData.cs
+++ b/BookAStar/BookAStar/Model/BookQueryData.cs
@@ -1,9 +1,10 @@
-using BookAStar.Model.Social;
+using BookAStar.Interfaces;
+using BookAStar.Model.Social;
 using System;
 
 namespace BookAStar.Model
 {
-    public class BookQueryData
+    public class BookQueryData : IBookQueryData
     {
         public ClientProviderInfo Client { get; set; }
         public Location Location { get; set; }
diff --git a/BookAStar/BookAStar/Model/ClientProviderInfo.cs b/BookAStar/BookAStar/Model/ClientProviderInfo.cs
index a684dc65..604beaae 100644
--- a/BookAStar/BookAStar/Model/ClientProviderInfo.cs
+++ b/BookAStar/BookAStar/Model/ClientProviderInfo.cs
@@ -1,4 +1,5 @@
-using BookAStar.Model.Social;
+using BookAStar.Helpers;
+using BookAStar.Model.Social;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -13,18 +14,18 @@ namespace BookAStar.Model
         public string UserName { get; set; }
         
         public string Avatar { get; set; }
-        // private string avatar;
-        //  public string Avatar { get { return avatar ?? "icon-anon.png"; }  set { avatar = value; } }
         public string UserId { get; set; }
         public int Rate { get; set; }
         public string EMail { get; set; }
         public string Phone { get; set; }
         public Location BillingAddress { get; set; }
+        // TODO Get User Professional status existence as a boolean
+        // And hack the avatar with
         public ImageSource AvatarOrNot
         {
             get
             {
-                return Avatar ?? ImageSource.FromResource("BookAStar.icon-anon.png");
+                return UserHelpers.Avatar(Avatar);
             }
         }
     }
diff --git a/BookAStar/BookAStar/Model/Workflow/CommandLine.cs b/BookAStar/BookAStar/Model/Workflow/BillingLine.cs
similarity index 64%
rename from BookAStar/BookAStar/Model/Workflow/CommandLine.cs
rename to BookAStar/BookAStar/Model/Workflow/BillingLine.cs
index 65ef4cdd..ee47feed 100644
--- a/BookAStar/BookAStar/Model/Workflow/CommandLine.cs
+++ b/BookAStar/BookAStar/Model/Workflow/BillingLine.cs
@@ -1,13 +1,14 @@
 
+using BookAStar.Interfaces;
 using System;
 
 namespace BookAStar.Model.Workflow
 {
-    public class CommandLine
+    public class BillingLine : IBillingLine
     {
         public string Description { get; set; }
         public TimeSpan Duration { get; set; }
-        public int Count { get; set; }
+        public int Count { get; set; } = 1;
         public decimal UnitaryCost { get; set; }
     }
 }
diff --git a/BookAStar/BookAStar/Model/Workflow/Estimate.cs b/BookAStar/BookAStar/Model/Workflow/Estimate.cs
index d9bb5f3b..58b8cffc 100644
--- a/BookAStar/BookAStar/Model/Workflow/Estimate.cs
+++ b/BookAStar/BookAStar/Model/Workflow/Estimate.cs
@@ -1,4 +1,5 @@
 using BookAStar.Helpers;
+using BookAStar.Model.Interfaces;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -7,7 +8,7 @@ using Xamarin.Forms;
 
 namespace BookAStar.Model.Workflow
 {
-    public partial class Estimate
+    public partial class Estimate : IEstimate
     {
         public long Id { get; set; }
         public long? CommandId { get; set; }
@@ -16,7 +17,7 @@ namespace BookAStar.Model.Workflow
         public string Description { get; set; }
         public int? Status { get; set; }
         public string Title { get; set; }
-        public List<CommandLine> Bill { get; set; }
+        public List<BillingLine> Bill { get; set; }
         /// <summary>
         /// List of attached graphic files
         /// to this estimate, as relative pathes to
diff --git a/BookAStar/BookAStar/Pages/AccountChooserPage.xaml b/BookAStar/BookAStar/Pages/AccountChooserPage.xaml
new file mode 100644
index 00000000..48608c3e
--- /dev/null
+++ b/BookAStar/BookAStar/Pages/AccountChooserPage.xaml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
+             xmlns:local="clr-namespace:BookAStar;assembly=BookAStar"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="BookAStar.Pages.AccountChooserPage"
+             Title="Paramètres Booking star" Style="{StaticResource PageStyle}"
+             xmlns:lc="clr-namespace:XLabs.Forms.Controls;assembly=XLabs.Forms"
+             xmlns:lb="clr-namespace:XLabs.Forms.Behaviors;assembly=XLabs.Forms">
+
+  <StackLayout>
+    <Label Text="Compte utilisateur" StyleClass="Header"/>
+
+    <ListView x:Name="AccountListView"
+              SeparatorVisibility="Default"
+              VerticalOptions="FillAndExpand"
+        >
+      <ListView.Header>
+        <StackLayout Orientation="Horizontal">
+
+          <Button x:Name="AddAccountBtn" Text="Connection, ou création d'un compte" />
+        </StackLayout>
+      </ListView.Header>
+
+      <ListView.ItemTemplate HeightRequest="60" VerticalOptions="StartAndExpand">
+        <DataTemplate>
+          <ViewCell>
+            <lc:GesturesContentView>
+              <Grid Padding="5"
+                        ColumnSpacing="10"
+                        RowSpacing="2" >
+                <Image Source="{Binding AvatarSource}" HeightRequest="80"
+                       x:Name="avatarImage"/>
+                <Label Grid.Column="0" Text="{Binding UserName}" >
+
+                </Label>
+              </Grid>
+              <lb:Gestures.Interests>
+                <lb:GestureCollection>
+                  <lb:GestureInterest GestureType="Swipe" Direction="Left" GestureCommand="{Binding DumpParam}" GestureParameter="{Binding UserName}"/>
+                </lb:GestureCollection>
+              </lb:Gestures.Interests>
+            </lc:GesturesContentView>
+          </ViewCell>
+        </DataTemplate>
+      </ListView.ItemTemplate>
+      <ListView.Footer>
+        <StackLayout></StackLayout>
+      </ListView.Footer>
+
+    </ListView>
+
+  </StackLayout>
+</ContentPage>
diff --git a/BookAStar/BookAStar/Pages/SettingsPage.xaml.cs b/BookAStar/BookAStar/Pages/AccountChooserPage.xaml.cs
similarity index 67%
rename from BookAStar/BookAStar/Pages/SettingsPage.xaml.cs
rename to BookAStar/BookAStar/Pages/AccountChooserPage.xaml.cs
index 1a47a79b..b41e7be6 100644
--- a/BookAStar/BookAStar/Pages/SettingsPage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/AccountChooserPage.xaml.cs
@@ -6,17 +6,19 @@ using System.Windows.Input;
 using System.Collections.ObjectModel;
 using System.Collections.Generic;
 using System.ComponentModel;
+using BookAStar.Helpers;
+using XLabs.Forms.Behaviors;
+using System.Diagnostics;
+using XLabs.Forms.Controls;
 
-namespace BookAStar
+namespace BookAStar.Pages
 {
    
-    public partial class SettingsPage : ContentPage
+    public partial class AccountChooserPage : ContentPage
 	{
-        
-
         public ICommand RemoteSettingsRefreshCommand { get; private set; }
 
-        public SettingsPage ()
+        public AccountChooserPage ()
 		{
 			InitializeComponent ();
 
@@ -28,19 +30,20 @@ namespace BookAStar
 
             AddAccountBtn.Clicked += AddAccountBtn_Clicked;
 
-            RemoveAccountBouton.Clicked += RemoveAccountBouton_Clicked;
+             // avatarImage.
+            //RemoveAccountBouton.Clicked += RemoveAccountBouton_Clicked;
 
             AccountListView.ItemSelected += Accounts_ItemSelected;
-           
-            pushstatus.Toggled += Pushstatus_Toggled;
-            
-        }
-
-        protected void Pushstatus_Toggled(object sender, ToggledEventArgs e)
-        {
-            MainSettings.PushNotifications = pushstatus.IsToggled;
+            DumpParam = new RelayGesture((g, x) =>
+            {
+                if (g.GestureType == GestureType.Swipe && g.Direction == Directionality.Left)
+                {
+                    RemoveAccount();
+                }
+            }); 
         }
 
+        public RelayGesture DumpParam { get; set; }
         public ObservableCollection<User> Accounts { get; private set; }
         public Dictionary<string, double> Musical { get; private set; }
         public Dictionary<string, double> Environ { get; private set; }
@@ -49,31 +52,25 @@ namespace BookAStar
         {
             var user = e.SelectedItem as User;
             // should later invoke IdentificationChanged
+            // FIXME don't do it when it's not from the user action
             MainSettings.CurrentUser = user;
         }
 
-        private async void RemoveAccountBouton_Clicked(object sender, EventArgs e)
+        private async void RemoveAccount()
         {
             User user = AccountListView.SelectedItem as User;
-            var doIt = await Confirm("Suppression de l'identification",
+            var doIt = await this.Confirm("Suppression de l'identification",
                 $"Vous êtes sur le point de supprimer votre identification pour ce compte : {user.UserName}\nContinuer ?");
             if (doIt)
                 App.PlatformSpecificInstance.RevokeAccount(user.UserName);
         }
 
-        async Task<bool> Confirm(string title, string procedure)
-        {
-            string yes = "Oui", no = "Non";
-            var answer = await DisplayAlert(title,
-               procedure, yes, no);
-            return answer;
-        }
+        
 
         protected override void OnAppearing()
         {
             base.OnAppearing();
             AccountListView.SelectedItem = MainSettings.CurrentUser;
-            pushstatus.IsToggled = MainSettings.PushNotifications;
         }
 
         private void AddAccountBtn_Clicked(object sender, EventArgs e)
diff --git a/BookAStar/BookAStar/Pages/BookQueriesPage.xaml b/BookAStar/BookAStar/Pages/BookQueriesPage.xaml
index bda36a88..30388796 100644
--- a/BookAStar/BookAStar/Pages/BookQueriesPage.xaml
+++ b/BookAStar/BookAStar/Pages/BookQueriesPage.xaml
@@ -3,8 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:local="clr-namespace:BookAStar;assembly=BookAStar"
              x:Class="BookAStar.Pages.BookQueriesPage"
-             Padding="{x:Static local:Constants.PagePadding}"
-             BackgroundColor="{x:Static local:Constants.BackgroundColor}"
+             Style="{StaticResource PageStyle}"
              >
   <ContentPage.Resources>
     <ResourceDictionary>
@@ -17,7 +16,12 @@
         <Setter Property="LineBreakMode" Value="WordWrap" />
 
       </Style>
-
+          <Style TargetType="Label">
+            <Setter Property="Style" Value="{StaticResource ContentLabelStyle}" />
+          </Style>
+          <Style TargetType="Button">
+            <Setter Property="Style" Value="{StaticResource ButtonStyle}" />
+          </Style>
     </ResourceDictionary> 
   </ContentPage.Resources>
 
@@ -29,7 +33,7 @@
         <ViewCell>
           <ViewCell.View>
             <StackLayout Orientation="Horizontal" Padding="10,10,10,10" VerticalOptions="StartAndExpand">
-                <StackLayout Orientation="Vertical" BackgroundColor="{x:Static local:Constants.OddBackgroundColor}"
+                <StackLayout Orientation="Vertical" 
                              HeightRequest="80" VerticalOptions="StartAndExpand">
 
                   <StackLayout Orientation="Vertical" >
diff --git a/BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs b/BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs
index c5df63c8..55c6868c 100644
--- a/BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs
@@ -8,6 +8,8 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Input;
 using Xamarin.Forms;
+using XLabs.Ioc;
+using XLabs.Platform.Services;
 
 namespace BookAStar.Pages
 {
@@ -42,7 +44,7 @@ namespace BookAStar.Pages
         private void OnViewDetail(object sender, ItemTappedEventArgs e)
         {
             BookQueryData data = e.Item as BookQueryData;
-            App.CurrentApp.ShowBookQuery(data);
+            Resolver.Resolve<INavigationService>().NavigateTo<BookQueryPage>(true,data);
         }
     }
 }
diff --git a/BookAStar/BookAStar/Pages/BookQueryPage.xaml b/BookAStar/BookAStar/Pages/BookQueryPage.xaml
index b5c538c9..89181fd6 100644
--- a/BookAStar/BookAStar/Pages/BookQueryPage.xaml
+++ b/BookAStar/BookAStar/Pages/BookQueryPage.xaml
@@ -4,8 +4,7 @@
              xmlns:local="clr-namespace:BookAStar;assembly=BookAStar"
              xmlns:maps="clr-namespace:Xamarin.Forms.Maps;assembly=Xamarin.Forms.Maps.dll"
              x:Class="BookAStar.Pages.BookQueryPage"
-             BackgroundColor="{x:Static local:Constants.BackgroundColor}"
-             Padding="{x:Static local:Constants.PagePadding}"
+             Style ="{StaticResource PageStyle}"
              >
   <ContentPage.Resources>
     <ResourceDictionary>
diff --git a/BookAStar/BookAStar/Pages/BookQueryPage.xaml.cs b/BookAStar/BookAStar/Pages/BookQueryPage.xaml.cs
index d7078eb4..c271dc91 100644
--- a/BookAStar/BookAStar/Pages/BookQueryPage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/BookQueryPage.xaml.cs
@@ -10,6 +10,9 @@ namespace BookAStar.Pages
     using Model;
     using Model.Workflow;
     using System.Threading.Tasks;
+    using XLabs.Forms.Mvvm;
+    using XLabs.Ioc;
+    using XLabs.Platform.Services;
 
     public partial class BookQueryPage : ContentPage
     {
@@ -70,7 +73,7 @@ namespace BookAStar.Pages
                 Id = 0,
                 Description = "# **Hello Estimate!**"
             };
-            App.CurrentApp.EditEstimate(e);
+            Resolver.Resolve<INavigationService>().NavigateTo<EditEstimatePage>(true, e);
         }
         
     }
diff --git a/BookAStar/BookAStar/Pages/DashboardPage.xaml b/BookAStar/BookAStar/Pages/DashboardPage.xaml
new file mode 100644
index 00000000..7baa4393
--- /dev/null
+++ b/BookAStar/BookAStar/Pages/DashboardPage.xaml
@@ -0,0 +1,53 @@
+<?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="BookAStar.Pages.DashboardPage"
+             xmlns:lc="clr-namespace:XLabs.Forms.Controls;assembly=XLabs.Forms"
+             xmlns:lb="clr-namespace:XLabs.Forms.Behaviors;assembly=XLabs.Forms"
+             Style="{StaticResource PageStyle}">
+  <ContentPage.Resources>
+    <ResourceDictionary>
+      <Style TargetType="Label">
+        <Setter Property="Style" Value="{StaticResource ContentLabelStyle}" />
+      </Style>
+      <Style TargetType="Button">
+        <Setter Property="Style" Value="{StaticResource ButtonStyle}" />
+      </Style>
+    </ResourceDictionary>
+  </ContentPage.Resources>
+  <ScrollView>
+  <StackLayout Orientation="Vertical" >
+    <lc:GesturesContentView>
+    <Frame>
+    <Label Text="Compte utilisateur" StyleClass="Header">
+    </Label>
+    <lb:Gestures.Interests>
+      <lb:GestureCollection>
+      <lb:GestureInterest GestureType="LongPress" GestureCommand="{Binding UserNameGesture}" GestureParameter="LongPress" />
+      </lb:GestureCollection>
+    </lb:Gestures.Interests>
+      <Image Source="{Binding Avatar}" Aspect="AspectFit" VisualElement.HeightRequest="{StaticResource BigUserAvatarSize}" />
+    </Frame>
+    </lc:GesturesContentView>
+    <Label Text="{Binding UserName}" Style="{StaticResource LabelPageHeadingStyle}" 
+           HorizontalTextAlignment="Center"
+           LineBreakMode="WordWrap" XAlign="Center" 
+           ></Label>
+    <Button Text="{Binding PerformerStatus}" Clicked="OnViewPerformerStatus" />
+    <Button Text="{Binding UserQueries}" Clicked="OnViewUserQueries" />
+    <StackLayout Orientation="Horizontal" >
+      <Label Text="Recevoir les notifications push" StyleClass="Header" />
+      <Switch IsToggled="{Binding ReceivePushNotifications, Mode=TwoWay}" 
+              HorizontalOptions="End" />
+    </StackLayout>
+    <StackLayout Orientation="Horizontal">
+      <Label Text="Utiliser ma position" StyleClass="Header" />
+      <Switch HorizontalOptions="End" IsToggled="{Binding AllowUseMyPosition, Mode=TwoWay}"/>
+    </StackLayout>
+    <StackLayout Orientation="Horizontal" VerticalOptions="Start">
+      <Label Text="Ne recevoir de demande de devis que de la part de professionnels uniquement" StyleClass="Header"/>
+      <Switch HorizontalOptions="End" IsToggled="{Binding AllowProBookingOnly, Mode=TwoWay}"/>
+    </StackLayout>
+  </StackLayout>
+  </ScrollView>
+</ContentPage>
\ No newline at end of file
diff --git a/BookAStar/BookAStar/Pages/DashboardPage.xaml.cs b/BookAStar/BookAStar/Pages/DashboardPage.xaml.cs
new file mode 100644
index 00000000..658e2384
--- /dev/null
+++ b/BookAStar/BookAStar/Pages/DashboardPage.xaml.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using Xamarin.Forms;
+using XLabs.Forms.Behaviors;
+using XLabs.Forms.Controls;
+using XLabs.Forms.Mvvm;
+using XLabs.Ioc;
+using XLabs.Platform.Services;
+
+namespace BookAStar.Pages
+{
+    public partial class DashboardPage : ContentPage
+    {
+        public RelayGesture UserNameGesture { get; set; }
+
+        public DashboardPage()
+        {
+            InitializeComponent();
+            UserNameGesture = new RelayGesture((g, x) =>
+            {
+                if (g.GestureType == GestureType.LongPress)
+                {
+                    Resolver.Resolve<INavigationService>().NavigateTo<AccountChooserPage>(true);
+                }
+            });
+        }
+
+        public void OnViewPerformerStatus(object sender, EventArgs e)
+        {
+            App.CurrentApp.ShowAccounts();
+        }
+
+        public void OnViewUserQueries(object sender, EventArgs e)
+        {
+            App.CurrentApp.ShowQueries();
+
+        }
+
+
+    }
+}
diff --git a/BookAStar/BookAStar/Pages/CommandLineEditorPage.xaml b/BookAStar/BookAStar/Pages/EditBillingLinePage.xaml
similarity index 80%
rename from BookAStar/BookAStar/Pages/CommandLineEditorPage.xaml
rename to BookAStar/BookAStar/Pages/EditBillingLinePage.xaml
index 2b476be5..21ebbb68 100644
--- a/BookAStar/BookAStar/Pages/CommandLineEditorPage.xaml
+++ b/BookAStar/BookAStar/Pages/EditBillingLinePage.xaml
@@ -3,8 +3,18 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:local="clr-namespace:BookAStar;assembly=BookAStar"
              xmlns:views="clr-namespace:BookAStar.Views;assembly=BookAStar"
-             x:Class="BookAStar.Pages.CommandLineEditorPage"
+             x:Class="BookAStar.Pages.EditBillingLinePage"
              Style="{StaticResource PageStyle}">
+  <ContentPage.Resources>
+    <ResourceDictionary>
+      <Style TargetType="Label">
+        <Setter Property="Style" Value="{StaticResource ContentLabelStyle}" />
+      </Style>
+      <Style TargetType="Button">
+        <Setter Property="Style" Value="{StaticResource ButtonStyle}" />
+      </Style>
+    </ResourceDictionary>
+  </ContentPage.Resources>
   <StackLayout>
     <Label Text="Description de la ligne de facture" Style="{StaticResource InputLabelStyle}"></Label>
     <Editor VerticalOptions="FillAndExpand"></Editor>
diff --git a/BookAStar/BookAStar/Pages/CommandLineEditorPage.xaml.cs b/BookAStar/BookAStar/Pages/EditBillingLinePage.xaml.cs
similarity index 67%
rename from BookAStar/BookAStar/Pages/CommandLineEditorPage.xaml.cs
rename to BookAStar/BookAStar/Pages/EditBillingLinePage.xaml.cs
index 53ce3842..5c9e8915 100644
--- a/BookAStar/BookAStar/Pages/CommandLineEditorPage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/EditBillingLinePage.xaml.cs
@@ -8,12 +8,11 @@ using Xamarin.Forms;
 
 namespace BookAStar.Pages
 {
-    public partial class CommandLineEditorPage : ContentPage
+    public partial class EditBillingLinePage : ContentPage
     {
-        public CommandLineEditorPage()
+        public EditBillingLinePage()
         {
             InitializeComponent();
-            
         }
     }
 }
diff --git a/BookAStar/BookAStar/Pages/EditEstimatePage.xaml b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml
index f9f790cf..8de41415 100644
--- a/BookAStar/BookAStar/Pages/EditEstimatePage.xaml
+++ b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml
@@ -3,7 +3,18 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="BookAStar.Pages.EditEstimatePage"
              xmlns:views="clr-namespace:BookAStar.Views;assembly=BookAStar"
-             xmlns:local="clr-namespace:BookAStar;assembly=BookAStar">
+             xmlns:local="clr-namespace:BookAStar;assembly=BookAStar"
+             Style="{StaticResource PageStyle}">
+  <ContentPage.Resources>
+    <ResourceDictionary>
+      <Style TargetType="Label">
+        <Setter Property="Style" Value="{StaticResource ContentLabelStyle}" />
+      </Style>
+      <Style TargetType="Button">
+        <Setter Property="Style" Value="{StaticResource ButtonStyle}" />
+      </Style>
+    </ResourceDictionary>
+  </ContentPage.Resources>
   <StackLayout Padding="10,10,10,10" BindingContext="{Binding .}">
     <StackLayout Orientation="Horizontal" Padding="10,10,10,10">
       <Label Text="{Binding Client.UserName}" LineBreakMode="WordWrap"></Label>
diff --git a/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs
index 48449d0a..00ea16bc 100644
--- a/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs
@@ -51,7 +51,7 @@ namespace BookAStar.Pages
         }
         protected void OnNewCommanLine(object sender, EventArgs e)
         {
-            var com = new CommandLine();
+            var com = new BillingLine();
             App.CurrentApp.EditCommandLine(this,com);
         }
        
diff --git a/BookAStar/BookAStar/Pages/EventDetail.xaml b/BookAStar/BookAStar/Pages/EventDetail.xaml
index 030d6fae..edcda6cf 100644
--- a/BookAStar/BookAStar/Pages/EventDetail.xaml
+++ b/BookAStar/BookAStar/Pages/EventDetail.xaml
@@ -2,7 +2,17 @@
 <ContentPage xmlns="http://xamarin.com/schemas/2014/forms" 
 xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
 xmlns:local="clr-namespace:BookAStar;Assembly:BookAStar"
- x:Class="BookAStar.Pages.EventDetail">
+ x:Class="BookAStar.Pages.EventDetail" Style="{StaticResource PageStyle}">
+  <ContentPage.Resources>
+    <ResourceDictionary>
+      <Style TargetType="Label">
+        <Setter Property="Style" Value="{StaticResource ContentLabelStyle}" />
+      </Style>
+      <Style TargetType="Button">
+        <Setter Property="Style" Value="{StaticResource ButtonStyle}" />
+      </Style>
+    </ResourceDictionary>
+  </ContentPage.Resources>
 	<ContentPage.Content>
 	<ScrollView>
 	<StackLayout>
diff --git a/BookAStar/BookAStar/Pages/HomePage.xaml b/BookAStar/BookAStar/Pages/HomePage.xaml
new file mode 100644
index 00000000..0e0badb7
--- /dev/null
+++ b/BookAStar/BookAStar/Pages/HomePage.xaml
@@ -0,0 +1,17 @@
+<?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="BookAStar.Pages.HomePage"
+             Style="{StaticResource PageStyle}">
+  <ContentPage.Resources>
+    <ResourceDictionary>
+      <Style TargetType="Label">
+        <Setter Property="Style" Value="{StaticResource ContentLabelStyle}" />
+      </Style>
+      <Style TargetType="Button">
+        <Setter Property="Style" Value="{StaticResource ButtonStyle}" />
+      </Style>
+    </ResourceDictionary>
+  </ContentPage.Resources>
+  <Label Text="Blah" VerticalOptions="Center" HorizontalOptions="Center" />
+</ContentPage>
\ No newline at end of file
diff --git a/BookAStar/BookAStar/Pages/HomePage.xaml.cs b/BookAStar/BookAStar/Pages/HomePage.xaml.cs
new file mode 100644
index 00000000..d55d3c16
--- /dev/null
+++ b/BookAStar/BookAStar/Pages/HomePage.xaml.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using Xamarin.Forms;
+
+namespace BookAStar.Pages
+{
+    public partial class HomePage : ContentPage
+    {
+        public HomePage()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/BookAStar/BookAStar/Pages/SearchPage.xaml b/BookAStar/BookAStar/Pages/SearchPage.xaml
index 7a9cfccb..3ca1d71e 100644
--- a/BookAStar/BookAStar/Pages/SearchPage.xaml
+++ b/BookAStar/BookAStar/Pages/SearchPage.xaml
@@ -3,7 +3,17 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:local="clr-namespace:BookAStar;Assembly:BookAStar"
              x:Class="BookAStar.SearchPage" Title="Page de recherche"
-             Padding="10,40,10,10" >
+             Style="{StaticResource PageStyle}">
+  <ContentPage.Resources>
+    <ResourceDictionary>
+      <Style TargetType="Label">
+        <Setter Property="Style" Value="{StaticResource ContentLabelStyle}" />
+      </Style>
+      <Style TargetType="Button">
+        <Setter Property="Style" Value="{StaticResource ButtonStyle}" />
+      </Style>
+    </ResourceDictionary>
+  </ContentPage.Resources>
 	<ContentPage.Content>
 	<StackLayout>
 
diff --git a/BookAStar/BookAStar/Pages/SettingsPage.xaml b/BookAStar/BookAStar/Pages/SettingsPage.xaml
deleted file mode 100644
index 1489e944..00000000
--- a/BookAStar/BookAStar/Pages/SettingsPage.xaml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
-             xmlns:local="clr-namespace:BookAStar;assembly=BookAStar"
-xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-x:Class="BookAStar.SettingsPage"
-Title="Paramètres Booking star"
-             Style="{StaticResource PageStyle}">
-
-  <StackLayout>
-    <Label Text="Compte utilisateur" StyleClass="Header"/>
-
-    <ListView x:Name="AccountListView"
-              SeparatorVisibility="Default"
-              VerticalOptions="FillAndExpand"
-        >
-      <ListView.Header>
-        <StackLayout Orientation="Horizontal">
-          <Button x:Name="RemoveAccountBouton"
-          Text="Supprimer cette identité" />
-          <Button x:Name="AddAccountBtn" Text="s'inscrire ou se connecter avec un nouveau compte" />
-
-        </StackLayout>
-      </ListView.Header>
-
-      <ListView.ItemTemplate HeightRequest="60" VerticalOptions="StartAndExpand">
-        <DataTemplate>
-          <ViewCell>
-            <Grid Padding="5"
-                      ColumnSpacing="10"
-                      RowSpacing="2">
-              <Image Source="{Binding Avatar}" HeightRequest="80" />
-              <Label Grid.Column="0" Text="{Binding UserName}" />
-            </Grid>
-          </ViewCell>
-        </DataTemplate>
-      </ListView.ItemTemplate>
-      <ListView.Footer>
-        <StackLayout></StackLayout>
-      </ListView.Footer>
-
-    </ListView>
-
-
-
-    <StackLayout Orientation="Horizontal" VerticalOptions="Start">
-      <Label Text="Recevoir les notifications push" />
-      <Switch x:Name="pushstatus" />
-    </StackLayout>
-
-    <StackLayout Orientation="Horizontal">
-      <Label Text="Utiliser ma position" />
-      <Switch x:Name="use_my_pos" HorizontalOptions="End" />
-    </StackLayout>
-
-
-    <StackLayout Orientation="Horizontal" VerticalOptions="Start">
-      <Label Text="Recevoir les demandes de devis de la part de professionnels uniquement"
-             StyleClass="Header"/>
-      <Switch x:Name="restrictToPro" />
-    </StackLayout>
-
-  </StackLayout>
-</ContentPage>
diff --git a/BookAStar/BookAStar/ViewModels/BillingLineViewModel.cs b/BookAStar/BookAStar/ViewModels/BillingLineViewModel.cs
new file mode 100644
index 00000000..1512b559
--- /dev/null
+++ b/BookAStar/BookAStar/ViewModels/BillingLineViewModel.cs
@@ -0,0 +1,78 @@
+using BookAStar.Interfaces;
+using BookAStar.Model.Workflow;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using XLabs.Forms.Mvvm;
+
+namespace BookAStar.ViewModels
+{
+    class BillingLineViewModel : ViewModel, IBillingLine
+    {
+        public BillingLineViewModel(BillingLine data)
+        {
+            if (data == null) data = new BillingLine();
+            count = data.Count;
+            description = data.Description;
+            unitaryCost = data.UnitaryCost;
+            duration = data.Duration;
+        }
+
+        protected int count;
+        public int Count
+        {
+            get
+            {
+                return count;
+            }
+
+            set
+            {
+                SetProperty<int>(ref count, value, "Count");
+            }
+        }
+        protected string description;
+        public string Description
+        {
+            get
+            {
+                return description;
+            }
+
+            set
+            {
+                SetProperty<string>(ref description, value, "Description");
+            }
+        }
+        protected TimeSpan duration;
+        public TimeSpan Duration
+        {
+            get
+            {
+                return duration;
+            }
+
+            set
+            {
+                SetProperty<TimeSpan>(ref duration, value, "Duration");
+            }
+        }
+
+        protected decimal unitaryCost;
+        public decimal UnitaryCost
+        {
+            get
+            {
+                return unitaryCost;
+            }
+
+            set
+            {
+                SetProperty<decimal>(ref unitaryCost, value, "UnitaryCost");
+            }
+        }
+    }
+}
diff --git a/BookAStar/BookAStar/ViewModels/BookQueryViewModel.cs b/BookAStar/BookAStar/ViewModels/BookQueryViewModel.cs
index daf82519..d59f904f 100644
--- a/BookAStar/BookAStar/ViewModels/BookQueryViewModel.cs
+++ b/BookAStar/BookAStar/ViewModels/BookQueryViewModel.cs
@@ -1,4 +1,5 @@
-using BookAStar.Model;
+using BookAStar.Interfaces;
+using BookAStar.Model;
 using BookAStar.Model.Social;
 using System;
 using System.Collections.Generic;
@@ -9,7 +10,7 @@ using System.Threading.Tasks;
 
 namespace BookAStar.ViewModels
 {
-    class BookQueryViewModel : XLabs.Forms.Mvvm.ViewModel
+    class BookQueryViewModel : XLabs.Forms.Mvvm.ViewModel, IBookQueryData
     {
         public BookQueryViewModel()
         {
diff --git a/BookAStar/BookAStar/ViewModels/DashboardViewModel.cs b/BookAStar/BookAStar/ViewModels/DashboardViewModel.cs
new file mode 100644
index 00000000..03d1abf4
--- /dev/null
+++ b/BookAStar/BookAStar/ViewModels/DashboardViewModel.cs
@@ -0,0 +1,137 @@
+using BookAStar.Helpers;
+using BookAStar.Model.Auth.Account;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Xamarin.Forms;
+using XLabs.Forms.Mvvm;
+
+namespace BookAStar.ViewModels
+{
+    internal class DashboardViewModel : ViewModel
+    {
+        public string UserId
+        {
+            get
+            {
+                return User?.Id;
+            }
+        }
+
+        public bool AllowUseMyPosition
+        {
+            get
+            {
+                return MainSettings.AllowGPSUsage;
+            }
+            set
+            {
+                MainSettings.AllowGPSUsage = value;
+            }
+        }
+
+        public bool AllowProBookingOnly
+        {
+            get
+            {
+                return MainSettings.AllowProBookingOnly;
+            }
+            set
+            {
+                MainSettings.AllowProBookingOnly = value;
+            }
+        }
+
+        private long queryCount;
+        private User user;
+
+        public long QueryCount
+        {
+            get
+            {
+                return queryCount;
+            }
+        }
+
+        public User User
+        {
+            get { return user; }
+            protected set
+            {
+                SetProperty<User>(ref user, value, "User");
+                if (user!=null)
+                {
+                    user.PropertyChanged += User_PropertyChanged;
+
+                }
+
+                UpdateUserMeta();
+
+            }
+        }
+        private ImageSource avatar;
+        public ImageSource Avatar {  get {
+                return avatar;
+            } }
+
+        public ObservableCollection<User> Accounts { get; protected set; }
+        private string performerStatus;
+        public string PerformerStatus
+        {
+            get
+            {
+                return performerStatus;
+            }
+        }
+
+        public string UserName
+        {
+            get
+            {
+                return User?.UserName;
+            }
+        }
+
+        private bool userIsPro = false;
+
+        public DashboardViewModel()
+        {
+            Accounts = MainSettings.AccountList;
+            User = MainSettings.CurrentUser;
+            UpdateUserMeta();
+        }
+
+        private void UpdateUserMeta ()
+        {
+            string newStatusString;
+            long newQueryCount;
+            bool newUserIsPro;
+            ImageSource newAvatar;
+            if (user==null)
+            {
+                newQueryCount = 0;
+                newUserIsPro = false;
+                newStatusString = null;
+                newAvatar = null;
+            }
+            else
+            {
+                newUserIsPro = User.Roles?.Contains("Performer") ?? false;
+
+                newQueryCount = userIsPro ? DataManager.Current.BookQueries.Count : 0;
+
+                newStatusString = userIsPro ?
+                     $"Profile professionel renseigné,\n{newQueryCount} demandes valides en cours" :
+                    "Profile professionel non renseigné";
+                newAvatar = UserHelpers.Avatar(user.Avatar);
+            }
+            SetProperty<string>(ref performerStatus, newStatusString, "PerformerStatus");
+            SetProperty<long>(ref queryCount, newQueryCount, "QueryCount");
+            SetProperty<ImageSource>(ref avatar, newAvatar, "Avatar");
+        }
+
+        private void User_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            UpdateUserMeta();
+        }
+    }
+}
\ No newline at end of file
diff --git a/BookAStar/BookAStar/ViewModels/EstimateViewModel.cs b/BookAStar/BookAStar/ViewModels/EstimateViewModel.cs
new file mode 100644
index 00000000..ef2a5162
--- /dev/null
+++ b/BookAStar/BookAStar/ViewModels/EstimateViewModel.cs
@@ -0,0 +1,91 @@
+using BookAStar.Model.Interfaces;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using XLabs.Forms.Mvvm;
+using BookAStar.Model.Workflow;
+using System.Collections.ObjectModel;
+using BookAStar.Model;
+
+namespace BookAStar.ViewModels
+{
+    class EstimateViewModel : ViewModel
+    {
+        public EstimateViewModel(Estimate data)
+        {
+            estimate = data;
+            AttachedFiles = new ObservableCollection<string>(data.AttachedFiles);
+            AttachedGraphicList = new ObservableCollection<string>(data.AttachedGraphicList);
+            Bill = new ObservableCollection<BillingLine>(data.Bill);
+            description = data.Description;
+            title = data.Title;
+            status = data.Status;
+        }
+
+        Estimate estimate;
+        
+        public ObservableCollection<string> AttachedFiles
+        {
+            get; protected set;
+        }
+
+        public ObservableCollection<string> AttachedGraphicList
+        {
+            get; protected set;
+        }
+
+        public ObservableCollection<BillingLine> Bill
+        {
+            get; protected set;
+        }
+
+
+        private string description;
+        public string Description
+        {
+            get
+            {
+                return description;
+            }
+
+            set
+            {
+                SetProperty<string>(ref description, value, "Description");
+            }
+        }
+
+        private int? status;
+        public int? Status
+        {
+            get
+            {
+                return status;
+            }
+
+            set
+            {
+                SetProperty<int?>(ref status, value, "Status");
+            }
+        }
+        private string title;
+        public string Title
+        {
+            get
+            {
+                return title;
+            }
+
+            set
+            {
+                SetProperty<string>(ref title, value, "Title");
+            }
+        }
+
+        public ClientProviderInfo Client {  get { return estimate.Client; } }
+
+        public BookQueryData Query { get { return estimate.Query; } }
+
+    }
+}
diff --git a/BookAStar/BookAStar/ViewModels/SettingsViewModel.cs b/BookAStar/BookAStar/ViewModels/SettingsViewModel.cs
deleted file mode 100644
index 4941d6c1..00000000
--- a/BookAStar/BookAStar/ViewModels/SettingsViewModel.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using XLabs.Forms.Mvvm;
-using XLabs.Platform.Services;
-
-namespace BookAStar.ViewModels
-{
-    internal class SettingsViewModel : XLabs.Forms.Mvvm.ViewModel
-    {
-
-    }
-}
\ No newline at end of file
diff --git a/BookAStar/BookAStar/ViewModels/UserLoginViewModel.cs b/BookAStar/BookAStar/ViewModels/UserLoginViewModel.cs
new file mode 100644
index 00000000..a38ec1a6
--- /dev/null
+++ b/BookAStar/BookAStar/ViewModels/UserLoginViewModel.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using XLabs.Forms.Mvvm;
+
+namespace BookAStar.ViewModels
+{
+    class UserLoginViewModel : ViewModel
+    {
+
+    }
+}
diff --git a/BookAStar/BookAStar/ViewModels/ViewModelBase.cs b/BookAStar/BookAStar/ViewModels/ViewModelBase.cs
index d9902e2b..bc17cb71 100644
--- a/BookAStar/BookAStar/ViewModels/ViewModelBase.cs
+++ b/BookAStar/BookAStar/ViewModels/ViewModelBase.cs
@@ -11,6 +11,7 @@ using System.Threading.Tasks;
 
 namespace BookAStar.ViewModels
 {
+    [Obsolete("Use legacy XLabs ViewModel")]
     public class ViewModelBase : IModelViewModel
     {
         public string Title { get; set; }
diff --git a/BookAStar/BookAStar/icon-anon.png b/BookAStar/BookAStar/icon-anon.png
deleted file mode 100644
index 38d6db946724a8c9a2bac8cd7d2a08d7e1bacaac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1031
zcmV+i1o-=jP)<h;3K|Lk000e1NJLTq001BW0018d1ONa4EMEr)00002VoOIv0RM-N
z%)bBt010qNS#tmY3J3rI3J3vb2*g<c000McNliru;0YA~85}=GfvErh1DHufK~y-)
zg_T=qTvZf?zkknUCUIg~k~C>*YZ{1Bi=>U_!P|?qRLwLcD)yli#Gs-tQVEEt2#O%0
zNCd$f7Fw(LWWh8=TT+Bl+otJD2-Gw}bFq<FJ7zLYbD5d5d^nTL$xO8C<#1U4`uDo+
ze~VIcY@&v0w$Mx!kYbcyNpPJ>JZ@@RIl_LLs3nHW6UL~eiT!-d)?&C;{H@^yV!Vz0
z2f5=d(tOFx>h4y0sk>>0b@bA@nxlnJg1?Ufu*W?XS_RufOKIhYg5`7okMHO>6h9Nc
z5I-J&6`(y>_+jn}_MnQ-*casMDEHn~x8>ai<F@zsz;2EeAm8#Lvr7aobCk(~FOD5m
zCzcPFJmg)|y?wt2&e+70d<+g~W<xL>><;b3lOUr-<&ca}9q+6tW0LhW`xzYOCDK8H
z_GfiaHZQT=$~DcfRbxnV75(!8*e!g@GhrGyzcL(Lml5G9dq8PH1(P~R%8clJ{2YMY
zV1R}&)toLKiQNg6YUB%k!(%5q=(Nuj!y1c#r>SwQAyG1Ci6kE|L>A)+Gi*@>2E{w^
zH&u>GG9~e&Mh-_52b8g%zbpgTl_KCGw>oZPp`?WG0Aygm0a6@O$V6_i2)MuoN98J4
zbQolkvA{lB_>mF9@)9RfML3U2N0QQQAK_2K%;O2}<{SFWVW_7B7b5AnN~Gl0Ub8VI
zMXi}>hN(av8Gb4uh;Y@BChD(m!Fn_L9x$gEQNKcQxo@C=*zJF!q{AesVd81huD#5K
zZ7tii%UZM<AZsV(EwyN4{1j(7p-c7;S+aOQ4N0+%=Xfvv1`pFjJ+b90YC_rwOd6Qs
zmSrl*w8rdI-}}7AR{}oV)g8f1hVw6<A<U$Ry`mgFWD5f}VPGa{fs-H6?SMB&<}iU1
zLNb%TjF_&I2neK^ge086F3<D2znt03)Vj_HAPh;%%9LS{i+Fi)&XeX<BBjyiGZ&Wx
zr7ZT#BW<3U1;edWybYO|NlyJ2(hrg;$a;9~)cv)gWw=Sj>y7*d2+MIcF;h>@S9;&F
zGuzIOI|=jq=(lP)6GNCVL!LA+G1KCQuY6cSWrGiGi}`_m29kk)t{Em!nlnR-ZH2+O
z06{Ku&$+Il*|aNPYJef~Nnz#Oa6_qcU5l-OxuVscjmAAq_2G(;90ClFoMq>(OppJ-
zf&YISm#iv$d-djUgSA-$(v$|Xe<a4T6U>%E{{_x7U>*AxW0e2^002ovPDHLkV1oC>
B*){+G

diff --git a/BookAStar/BookAStar/packages.config b/BookAStar/BookAStar/packages.config
index 1577477c..25d993d0 100644
--- a/BookAStar/BookAStar/packages.config
+++ b/BookAStar/BookAStar/packages.config
@@ -7,11 +7,13 @@
   <package id="SQLite.Net.Core-PCL" version="3.1.1" targetFramework="portable45-net45+win8+wpa81" />
   <package id="SQLite.Net-PCL" version="3.1.1" targetFramework="portable45-net45+win8+wpa81" />
   <package id="Xam.Plugins.Settings" version="2.5.1.0" targetFramework="portable45-net45+win8+wpa81" />
-  <package id="Xamarin.Forms" version="2.3.2.127" targetFramework="portable45-net45+win8+wpa81" />
-  <package id="Xamarin.Forms.Maps" version="2.3.2.127" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="Xamarin.Forms" version="2.3.0.34-pre1" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="Xamarin.Forms.Maps" version="2.3.0.34-pre1" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="XLabs.Caching" version="2.2.0-pre05" targetFramework="portable45-net45+win8+wpa81" />
   <package id="XLabs.Core" version="2.2.0-pre05" targetFramework="portable45-net45+win8+wpa81" />
   <package id="XLabs.Forms" version="2.2.0-pre05" targetFramework="portable45-net45+win8+wpa81" />
   <package id="XLabs.IoC" version="2.2.0-pre05" targetFramework="portable45-net45+win8+wpa81" />
   <package id="XLabs.Platform" version="2.2.0-pre05" targetFramework="portable45-net45+win8+wpa81" />
   <package id="XLabs.Serialization" version="2.2.0-pre05" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="XLabs.Serialization.JSON" version="2.2.0-pre05" targetFramework="portable45-net45+win8+wpa81" />
 </packages>
\ No newline at end of file

From ac3b7ad2c9ede725c7864c202f76e552dcc5842f Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Fri, 30 Sep 2016 12:41:03 +0200
Subject: [PATCH 13/59] XLabs running an App Toolbar!!!

versions : latest stables Xamarin.Forms & XLabs.*

To got it running: a new base android implementation for XLabs usage:

        XFormsCompatApplicationDroid : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity

and the corresponding

        XFormsCompatAppDroid : XFormsApp<XFormsCompatApplicationDroid>

plus the Toolbar instacntiation fix.
---
 .../BookAStar.Droid/BookAStar.Droid.csproj    | 136 ++++---
 BookAStar/BookAStar.Droid/CompatXFormsApp.cs  | 353 ++++++++++++++++++
 BookAStar/BookAStar.Droid/MainActivity.cs     |  42 ++-
 BookAStar/BookAStar.Droid/packages.config     |  37 +-
 BookAStar/BookAStar.iOS/BookAStar.iOS.csproj  |  20 +
 BookAStar/BookAStar.iOS/packages.config       |   4 +
 BookAStar/BookAStar/App.xaml.cs               | 101 ++---
 BookAStar/BookAStar/BookAStar.csproj          |  44 ++-
 BookAStar/BookAStar/packages.config           |  19 +-
 9 files changed, 558 insertions(+), 198 deletions(-)
 create mode 100644 BookAStar/BookAStar.Droid/CompatXFormsApp.cs

diff --git a/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj b/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj
index cf995dc5..9719f770 100644
--- a/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj
+++ b/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj
@@ -33,7 +33,7 @@
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <WarningLevel>0</WarningLevel>
     <AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
     <AndroidLinkMode>None</AndroidLinkMode>
     <EmbedAssembliesIntoApk>False</EmbedAssembliesIntoApk>
@@ -43,6 +43,9 @@
     <Debugger>Xamarin</Debugger>
     <AndroidEnableMultiDex>False</AndroidEnableMultiDex>
     <CodeAnalysisRuleSet />
+    <AotAssemblies>False</AotAssemblies>
+    <EnableLLVM>False</EnableLLVM>
+    <EnableProguard>False</EnableProguard>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -71,7 +74,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="FormsViewGroup, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.34-pre1\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="GoogleMediaFramework">
@@ -81,8 +84,14 @@
       <HintPath>..\..\packages\MarkdownDeep-av.NET.1.5.2\lib\MonoAndroid10\MarkdownDeep.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Mono.Android, Version=0.0.0.0, Culture=neutral, PublicKeyToken=84e04ff9cfb79065, processorArchitecture=MSIL" />
-    <Reference Include="Mono.Android.Export, Version=1.0.6099.33544, Culture=neutral, PublicKeyToken=84e04ff9cfb79065, processorArchitecture=MSIL" />
+    <Reference Include="Mono.Android, Version=0.0.0.0, Culture=neutral, PublicKeyToken=84e04ff9cfb79065, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\MonoAndroid\v7.0\Mono.Android.dll</HintPath>
+    </Reference>
+    <Reference Include="Mono.Android.Export, Version=1.0.6110.33687, Culture=neutral, PublicKeyToken=84e04ff9cfb79065, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\MonoAndroid\v7.0\Mono.Android.Export.dll</HintPath>
+    </Reference>
     <Reference Include="Mono.Data.Sqlite" />
     <Reference Include="mscorlib" />
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -152,8 +161,8 @@
       <HintPath>..\..\packages\SQLite.Net.Async-PCL.3.1.1\lib\portable-win8+net45+wp8+wpa81+MonoAndroid1+MonoTouch1\SQLite.Net.Async.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="SQLite.Net.Platform.XamarinAndroid, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\SQLite.Net-PCL.3.1.1\lib\MonoAndroid\SQLite.Net.Platform.XamarinAndroid.dll</HintPath>
+    <Reference Include="SQLite.Net.Platform.XamarinAndroid, Version=2.5.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\SQLite.Net.Platform.XamarinAndroid.2.5.1\lib\MonoAndroid\SQLite.Net.Platform.XamarinAndroid.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -202,90 +211,99 @@
       <HintPath>..\..\Components\xamarin.auth-1.2.3.1\lib\android\Xamarin.Auth.Android.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.34-pre1\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xamarin.Forms.Labs, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.Labs.1.0.1.0\lib\portable-net45+win+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.Labs.dll</HintPath>
+    <Reference Include="Xamarin.Forms.Maps, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xamarin.Forms.Maps.2.3.2.127\lib\MonoAndroid10\Xamarin.Forms.Maps.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xamarin.Forms.Maps, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Visual Studio 2015\Projects\App2\packages\Xamarin.Forms.Maps.2.3.0.107\lib\MonoAndroid10\Xamarin.Forms.Maps.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Maps.Android, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Visual Studio 2015\Projects\App2\packages\Xamarin.Forms.Maps.2.3.0.107\lib\MonoAndroid10\Xamarin.Forms.Maps.Android.dll</HintPath>
+    <Reference Include="Xamarin.Forms.Maps.Android, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xamarin.Forms.Maps.2.3.2.127\lib\MonoAndroid10\Xamarin.Forms.Maps.Android.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.34-pre1\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform.Android, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.34-pre1\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.34-pre1\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.GooglePlayServices.Ads, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.GooglePlayServices.Ads.29.0.0.2\lib\MonoAndroid41\Xamarin.GooglePlayServices.Ads.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.GooglePlayServices.Ads.29.0.0.1\lib\MonoAndroid41\Xamarin.GooglePlayServices.Ads.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xamarin.GooglePlayServices.Analytics">
-      <HintPath>..\..\packages\Xamarin.GooglePlayServices.Analytics.29.0.0.2\lib\MonoAndroid41\Xamarin.GooglePlayServices.Analytics.dll</HintPath>
+    <Reference Include="Xamarin.GooglePlayServices.Analytics, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xamarin.GooglePlayServices.Analytics.29.0.0.1\lib\MonoAndroid41\Xamarin.GooglePlayServices.Analytics.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.GooglePlayServices.Base, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Xamarin.GooglePlayServices.Base.29.0.0.2\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.GooglePlayServices.Basement">
-      <HintPath>..\..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.2\lib\MonoAndroid41\Xamarin.GooglePlayServices.Basement.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.GooglePlayServices.Gcm">
-      <HintPath>..\..\packages\Xamarin.GooglePlayServices.Gcm.29.0.0.2\lib\MonoAndroid41\Xamarin.GooglePlayServices.Gcm.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.GooglePlayServices.Maps">
-      <HintPath>..\..\packages\Xamarin.GooglePlayServices.Maps.29.0.0.2\lib\MonoAndroid41\Xamarin.GooglePlayServices.Maps.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.GooglePlayServices.Measurement">
-      <HintPath>..\..\packages\Xamarin.GooglePlayServices.Measurement.29.0.0.2\lib\MonoAndroid41\Xamarin.GooglePlayServices.Measurement.dll</HintPath>
-    </Reference>
-    <Reference Include="XLabs.Caching, Version=2.2.0.38182, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XLabs.Caching.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Caching.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.GooglePlayServices.Base.29.0.0.1\lib\MonoAndroid41\Xamarin.GooglePlayServices.Base.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XLabs.Caching.Sqlite, Version=2.2.0.38187, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XLabs.Caching.SQLite.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Caching.Sqlite.dll</HintPath>
+    <Reference Include="Xamarin.GooglePlayServices.Basement, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.1\lib\MonoAndroid41\Xamarin.GooglePlayServices.Basement.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XLabs.Core, Version=2.2.0.38178, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XLabs.Core.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Core.dll</HintPath>
+    <Reference Include="Xamarin.GooglePlayServices.Gcm, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xamarin.GooglePlayServices.Gcm.29.0.0.1\lib\MonoAndroid41\Xamarin.GooglePlayServices.Gcm.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XLabs.Forms, Version=2.2.0.38180, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XLabs.Forms.2.2.0-pre05\lib\monoandroid\XLabs.Forms.dll</HintPath>
+    <Reference Include="Xamarin.GooglePlayServices.Maps, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xamarin.GooglePlayServices.Maps.29.0.0.1\lib\MonoAndroid41\Xamarin.GooglePlayServices.Maps.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XLabs.Forms.Droid, Version=2.2.0.38195, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XLabs.Forms.2.2.0-pre05\lib\monoandroid\XLabs.Forms.Droid.dll</HintPath>
+    <Reference Include="Xamarin.GooglePlayServices.Measurement, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xamarin.GooglePlayServices.Measurement.29.0.0.1\lib\MonoAndroid41\Xamarin.GooglePlayServices.Measurement.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XLabs.IOC, Version=2.2.0.38178, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XLabs.IoC.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.IOC.dll</HintPath>
+    <Reference Include="XLabs.Caching, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Caching.2.3.0-pre02\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Caching.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XLabs.Platform, Version=2.2.0.38179, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XLabs.Platform.2.2.0-pre05\lib\MonoAndroid\XLabs.Platform.dll</HintPath>
+    <Reference Include="XLabs.Caching.SQLite, Version=2.0.5653.32809, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Caching.SQLite.2.0.5653-pre2\lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\XLabs.Caching.SQLite.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XLabs.Platform.Droid, Version=2.2.0.38182, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XLabs.Platform.2.2.0-pre05\lib\MonoAndroid\XLabs.Platform.Droid.dll</HintPath>
+    <Reference Include="XLabs.Core, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Core.2.3.0-pre02\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XLabs.Serialization, Version=2.2.0.38178, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XLabs.Serialization.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Serialization.dll</HintPath>
+    <Reference Include="XLabs.Forms, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Forms.2.3.0-pre02\lib\monoandroid\XLabs.Forms.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="XLabs.Forms.Droid, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Forms.2.3.0-pre02\lib\monoandroid\XLabs.Forms.Droid.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="XLabs.IOC, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.IoC.2.3.0-pre02\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.IOC.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="XLabs.Platform, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Platform.2.3.0-pre02\lib\MonoAndroid\XLabs.Platform.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="XLabs.Platform.Droid, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Platform.2.3.0-pre02\lib\MonoAndroid\XLabs.Platform.Droid.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="XLabs.Serialization, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Serialization.2.3.0-pre02\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Serialization.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="XLabs.Settings, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Settings.2.3.0-pre02\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Settings.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="XLabs.Settings.XamSettings, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Settings.XamSettings.2.3.0-pre02\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Settings.XamSettings.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -295,7 +313,6 @@
     <Compile Include="Helpers\YavscHelpers.cs" />
     <Compile Include="Html.cs" />
     <Compile Include="MainActivity.cs" />
-    <Compile Include="MainApplication.cs" />
     <Compile Include="MarkdownEditor.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -310,6 +327,7 @@
     <Compile Include="Services\GcmRegistrationIntentService.cs" />
     <Compile Include="Services\MyGcmIntentService.cs" />
     <Compile Include="Services\MyInstanceIdListener.cs" />
+    <Compile Include="CompatXFormsApp.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config">
@@ -442,13 +460,11 @@
     <PropertyGroup>
       <ErrorText>Ce projet fait référence à des packages NuGet qui sont manquants sur cet ordinateur. Utilisez l'option de restauration des packages NuGet pour les télécharger. Pour plus d'informations, consultez http://go.microsoft.com/fwlink/?LinkID=322105. Le fichier manquant est : {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.2\build\Xamarin.GooglePlayServices.Basement.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.2\build\Xamarin.GooglePlayServices.Basement.targets'))" />
     <Error Condition="!Exists('..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.0.34-pre1\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.0.34-pre1\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
   </Target>
-  <Import Project="..\..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.2\build\Xamarin.GooglePlayServices.Basement.targets" Condition="Exists('..\..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.2\build\Xamarin.GooglePlayServices.Basement.targets')" />
   <Import Project="..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" />
-  <Import Project="..\..\packages\Xamarin.Forms.2.3.0.34-pre1\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.0.34-pre1\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
+  <Import Project="..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
      Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/BookAStar/BookAStar.Droid/CompatXFormsApp.cs b/BookAStar/BookAStar.Droid/CompatXFormsApp.cs
new file mode 100644
index 00000000..c8bdfb90
--- /dev/null
+++ b/BookAStar/BookAStar.Droid/CompatXFormsApp.cs
@@ -0,0 +1,353 @@
+// ***********************************************************************
+// Assembly         : XLabs.Forms.Droid
+// Author           : XLabs Team
+// Created          : 12-27-2015
+// 
+// Last Modified By : XLabs Team
+// Last Modified On : 01-04-2016
+// ***********************************************************************
+// <copyright file="XFormsApp.cs" company="XLabs Team">
+//     Copyright (c) XLabs Team. All rights reserved.
+// </copyright>
+// <summary>
+//       This project is licensed under the Apache 2.0 license
+//       https://github.com/XLabs/Xamarin-Forms-Labs/blob/master/LICENSE
+//       
+//       XLabs is a open source project that aims to provide a powerfull and cross 
+//       platform set of controls tailored to work with Xamarin Forms.
+// </summary>
+// ***********************************************************************
+// 
+
+using System;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Android;
+using XLabs.Platform.Device;
+using XLabs.Platform.Mvvm;
+using XLabs.Platform.Services;
+using XLabs.Platform.Services.Email;
+using XLabs.Platform.Services.Geolocation;
+using XLabs.Platform.Services.IO;
+using XLabs.Platform.Services.Media;
+using Environment = Android.OS.Environment;
+
+namespace XLabs.Forms
+{
+    /// <summary>
+    /// Class XFormsApplicationDroid.
+    /// </summary>
+    public class XFormsCompatApplicationDroid : 
+        global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity
+    {
+        /// <summary>
+        /// Gets or sets the destroy.
+        /// </summary>
+        /// <value>The destroy.</value>
+        public EventHandler<EventArgs> Destroy { get; set; }
+
+        /// <summary>
+        /// Gets or sets the pause.
+        /// </summary>
+        /// <value>The pause.</value>
+        public EventHandler<EventArgs> Pause { get; set; }
+
+        /// <summary>
+        /// Gets or sets the restart.
+        /// </summary>
+        /// <value>The restart.</value>
+        public EventHandler<EventArgs> Restart { get; set; }
+
+        /// <summary>
+        /// Gets or sets the resume.
+        /// </summary>
+        /// <value>The resume.</value>
+        public EventHandler<EventArgs> Resume { get; set; }
+
+        /// <summary>
+        /// Gets or sets the start.
+        /// </summary>
+        /// <value>The start.</value>
+        public EventHandler<EventArgs> Start { get; set; }
+
+        /// <summary>
+        /// Gets or sets the stop.
+        /// </summary>
+        /// <value>The stop event handler.</value>
+        public EventHandler<EventArgs> Stop { get; set; }
+
+        /// <summary>
+        /// Called when [destroy].
+        /// </summary>
+        protected override void OnDestroy()
+        {
+            var handler = this.Destroy;
+            if (handler != null)
+            {
+                handler(this, new EventArgs());
+            }
+
+            base.OnDestroy();
+        }
+
+        /// <summary>
+        /// Called as part of the activity lifecycle when an activity is going into
+        /// the background, but has not (yet) been killed.
+        /// </summary>
+        /// <since version="Added in API level 1" />
+        /// <altmember cref="M:Android.App.Activity.OnResume" />
+        /// <altmember cref="M:Android.App.Activity.OnSaveInstanceState(Android.OS.Bundle)" />
+        /// <altmember cref="M:Android.App.Activity.OnStop" />
+        /// <remarks><para tool="javadoc-to-mdoc">Called as part of the activity lifecycle when an activity is going into
+        /// the background, but has not (yet) been killed.  The counterpart to
+        /// <c><see cref="M:Android.App.Activity.OnResume" /></c>.
+        /// </para>
+        /// <para tool="javadoc-to-mdoc">When activity B is launched in front of activity A, this callback will
+        /// be invoked on A.  B will not be created until A's <c><see cref="M:Android.App.Activity.OnPause" /></c> returns,
+        /// so be sure to not do anything lengthy here.
+        /// </para>
+        /// <para tool="javadoc-to-mdoc">This callback is mostly used for saving any persistent state the
+        /// activity is editing, to present a "edit in place" model to the user and
+        /// making sure nothing is lost if there are not enough resources to start
+        /// the new activity without first killing this one.  This is also a good
+        /// place to do things like stop animations and other things that consume a
+        /// noticeable amount of CPU in order to make the switch to the next activity
+        /// as fast as possible, or to close resources that are exclusive access
+        /// such as the camera.
+        /// </para>
+        /// <para tool="javadoc-to-mdoc">In situations where the system needs more memory it may kill paused
+        /// processes to reclaim resources.  Because of this, you should be sure
+        /// that all of your state is saved by the time you return from
+        /// this function.  In general <c><see cref="M:Android.App.Activity.OnSaveInstanceState(Android.OS.Bundle)" /></c> is used to save
+        /// per-instance state in the activity and this method is used to store
+        /// global persistent data (in content providers, files, etc.)
+        /// </para>
+        /// <para tool="javadoc-to-mdoc">After receiving this call you will usually receive a following call
+        /// to <c><see cref="M:Android.App.Activity.OnStop" /></c> (after the next activity has been resumed and
+        /// displayed), however in some cases there will be a direct call back to
+        /// <c><see cref="M:Android.App.Activity.OnResume" /></c> without going through the stopped state.
+        /// </para>
+        /// <para tool="javadoc-to-mdoc">
+        ///   <i>Derived classes must call through to the super class's
+        /// implementation of this method.  If they do not, an exception will be
+        /// thrown.</i>
+        /// </para>
+        /// <para tool="javadoc-to-mdoc">
+        ///   <format type="text/html">
+        ///     <a href="http://developer.android.com/reference/android/app/Activity.html#onPause()" target="_blank">[Android Documentation]</a>
+        ///   </format>
+        /// </para></remarks>
+        protected override void OnPause()
+        {
+            var handler = this.Pause;
+            if (handler != null)
+            {
+                handler(this, new EventArgs());
+            }
+
+            base.OnPause();
+        }
+
+        /// <summary>
+        /// Called after <c><see cref="M:Android.App.Activity.OnStop" /></c> when the current activity is being
+        /// re-displayed to the user (the user has navigated back to it).
+        /// </summary>
+        /// <since version="Added in API level 1" />
+        /// <altmember cref="M:Android.App.Activity.OnStop" />
+        /// <altmember cref="M:Android.App.Activity.OnStart" />
+        /// <altmember cref="M:Android.App.Activity.OnResume" />
+        /// <remarks><para tool="javadoc-to-mdoc">Called after <c><see cref="M:Android.App.Activity.OnStop" /></c> when the current activity is being
+        /// re-displayed to the user (the user has navigated back to it).  It will
+        /// be followed by <c><see cref="M:Android.App.Activity.OnStart" /></c> and then <c><see cref="M:Android.App.Activity.OnResume" /></c>.
+        /// </para>
+        /// <para tool="javadoc-to-mdoc">For activities that are using raw <c><see cref="T:Android.Database.ICursor" /></c> objects (instead of
+        /// creating them through
+        /// <c><see cref="M:Android.App.Activity.ManagedQuery(Android.Net.Uri, System.String[], System.String[], System.String[], System.String[])" /></c>,
+        /// this is usually the place
+        /// where the cursor should be required (because you had deactivated it in
+        /// <c><see cref="M:Android.App.Activity.OnStop" /></c>.
+        /// </para>
+        /// <para tool="javadoc-to-mdoc">
+        ///   <i>Derived classes must call through to the super class's
+        /// implementation of this method.  If they do not, an exception will be
+        /// thrown.</i>
+        /// </para>
+        /// <para tool="javadoc-to-mdoc">
+        ///   <format type="text/html">
+        ///     <a href="http://developer.android.com/reference/android/app/Activity.html#onRestart()" target="_blank">[Android Documentation]</a>
+        ///   </format>
+        /// </para></remarks>
+        protected override void OnRestart()
+        {
+            var handler = this.Restart;
+            if (handler != null)
+            {
+                handler(this, new EventArgs());
+            }
+
+            base.OnRestart();
+        }
+
+        /// <summary>
+        /// Called after <c><see cref="M:Android.App.Activity.OnRestoreInstanceState(Android.OS.Bundle)" /></c>, <c><see cref="M:Android.App.Activity.OnRestart" /></c>, or
+        /// <c><see cref="M:Android.App.Activity.OnPause" /></c>, for your activity to start interacting with the user.
+        /// </summary>
+        /// <since version="Added in API level 1" />
+        /// <altmember cref="M:Android.App.Activity.OnRestoreInstanceState(Android.OS.Bundle)" />
+        /// <altmember cref="M:Android.App.Activity.OnRestart" />
+        /// <altmember cref="M:Android.App.Activity.OnPostResume" />
+        /// <altmember cref="M:Android.App.Activity.OnPause" />
+        /// <remarks><para tool="javadoc-to-mdoc">Called after <c><see cref="M:Android.App.Activity.OnRestoreInstanceState(Android.OS.Bundle)" /></c>, <c><see cref="M:Android.App.Activity.OnRestart" /></c>, or
+        /// <c><see cref="M:Android.App.Activity.OnPause" /></c>, for your activity to start interacting with the user.
+        /// This is a good place to begin animations, open exclusive-access devices
+        /// (such as the camera), etc.
+        /// </para>
+        /// <para tool="javadoc-to-mdoc">Keep in mind that onResume is not the best indicator that your activity
+        /// is visible to the user; a system window such as the key guard may be in
+        /// front.  Use <c><see cref="M:Android.App.Activity.OnWindowFocusChanged(System.Boolean)" /></c> to know for certain that your
+        /// activity is visible to the user (for example, to resume a game).
+        /// </para>
+        /// <para tool="javadoc-to-mdoc">
+        ///   <i>Derived classes must call through to the super class's
+        /// implementation of this method.  If they do not, an exception will be
+        /// thrown.</i>
+        /// </para>
+        /// <para tool="javadoc-to-mdoc">
+        ///   <format type="text/html">
+        ///     <a href="http://developer.android.com/reference/android/app/Activity.html#onResume()" target="_blank">[Android Documentation]</a>
+        ///   </format>
+        /// </para></remarks>
+        protected override void OnResume()
+        {
+            var handler = this.Resume;
+            if (handler != null)
+            {
+                handler(this, new EventArgs());
+            }
+
+            base.OnResume();
+        }
+
+        /// <summary>
+        /// Called after <c><see cref="M:Android.App.Activity.OnCreate(Android.OS.Bundle)" /></c> or after <c><see cref="M:Android.App.Activity.OnRestart" /></c> when
+        /// the activity had been stopped, but is now again being displayed to the
+        /// user.
+        /// </summary>
+        /// <since version="Added in API level 1" />
+        /// <altmember cref="M:Android.App.Activity.OnCreate(Android.OS.Bundle)" />
+        /// <altmember cref="M:Android.App.Activity.OnStop" />
+        /// <altmember cref="M:Android.App.Activity.OnResume" />
+        /// <remarks><para tool="javadoc-to-mdoc">Called after <c><see cref="M:Android.App.Activity.OnCreate(Android.OS.Bundle)" /></c> or after <c><see cref="M:Android.App.Activity.OnRestart" /></c> when
+        /// the activity had been stopped, but is now again being displayed to the
+        /// user.  It will be followed by <c><see cref="M:Android.App.Activity.OnResume" /></c>.
+        /// </para>
+        /// <para tool="javadoc-to-mdoc">
+        ///   <i>Derived classes must call through to the super class's
+        /// implementation of this method.  If they do not, an exception will be
+        /// thrown.</i>
+        /// </para>
+        /// <para tool="javadoc-to-mdoc">
+        ///   <format type="text/html">
+        ///     <a href="http://developer.android.com/reference/android/app/Activity.html#onStart()" target="_blank">[Android Documentation]</a>
+        ///   </format>
+        /// </para></remarks>
+        protected override void OnStart()
+        {
+            var handler = this.Start;
+            if (handler != null)
+            {
+                handler(this, new EventArgs());
+            }
+
+            base.OnStart();
+        }
+
+        /// <summary>
+        /// Called when you are no longer visible to the user.
+        /// </summary>
+        /// <since version="Added in API level 1" />
+        /// <altmember cref="M:Android.App.Activity.OnRestart" />
+        /// <altmember cref="M:Android.App.Activity.OnResume" />
+        /// <altmember cref="M:Android.App.Activity.OnSaveInstanceState(Android.OS.Bundle)" />
+        /// <altmember cref="M:Android.App.Activity.OnDestroy" />
+        /// <remarks><para tool="javadoc-to-mdoc">Called when you are no longer visible to the user.  You will next
+        /// receive either <c><see cref="M:Android.App.Activity.OnRestart" /></c>, <c><see cref="M:Android.App.Activity.OnDestroy" /></c>, or nothing,
+        /// depending on later user activity.
+        /// </para>
+        /// <para tool="javadoc-to-mdoc">Note that this method may never be called, in low memory situations
+        /// where the system does not have enough memory to keep your activity's
+        /// process running after its <c><see cref="M:Android.App.Activity.OnPause" /></c> method is called.
+        /// </para>
+        /// <para tool="javadoc-to-mdoc">
+        ///   <i>Derived classes must call through to the super class's
+        /// implementation of this method.  If they do not, an exception will be
+        /// thrown.</i>
+        /// </para>
+        /// <para tool="javadoc-to-mdoc">
+        ///   <format type="text/html">
+        ///     <a href="http://developer.android.com/reference/android/app/Activity.html#onStop()" target="_blank">[Android Documentation]</a>
+        ///   </format>
+        /// </para></remarks>
+        protected override void OnStop()
+        {
+            var handler = this.Stop;
+            if (handler != null)
+            {
+                handler(this, new EventArgs());
+            }
+
+            base.OnStop();
+        }
+    }
+
+    /// <summary>
+    /// Class XFormsAppDroid.
+    /// </summary>
+    public class XFormsCompatAppDroid : XFormsApp<XFormsCompatApplicationDroid>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="XFormsAppDroid"/> class.
+        /// </summary>
+        public XFormsCompatAppDroid() { }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="XFormsAppDroid"/> class.
+        /// </summary>
+        /// <param name="app">The application.</param>
+        public XFormsCompatAppDroid(XFormsCompatApplicationDroid app) : base(app) { }
+
+        /// <summary>
+        /// Raises the back press.
+        /// </summary>
+        public void RaiseBackPress()
+        {
+            this.OnBackPress();
+        }
+
+        /// <summary>
+        /// Called when [initialize].
+        /// </summary>
+        /// <param name="app">The application.</param>
+        /// <param name="initServices">Should initialize services.</param>
+        protected override void OnInit(XFormsCompatApplicationDroid app, bool initServices = true)
+        {
+            this.AppContext.Start += (o, e) => this.OnStartup();
+            this.AppContext.Stop += (o, e) => this.OnClosing();
+            this.AppContext.Pause += (o, e) => this.OnSuspended();
+            this.AppContext.Resume += (o, e) => this.OnResumed();
+            this.AppDataDirectory = Environment.ExternalStorageDirectory.AbsolutePath;
+
+            if (initServices)
+            {
+                DependencyService.Register<TextToSpeechService>();
+                DependencyService.Register<Geolocator>();
+                DependencyService.Register<MediaPicker>();
+                DependencyService.Register<SoundService>();
+                DependencyService.Register<EmailService>();
+                DependencyService.Register<FileManager>();
+                DependencyService.Register<AndroidDevice>();
+            }
+
+            base.OnInit(app);
+        }
+    }
+}
\ No newline at end of file
diff --git a/BookAStar/BookAStar.Droid/MainActivity.cs b/BookAStar/BookAStar.Droid/MainActivity.cs
index ebbab814..37d5ed43 100644
--- a/BookAStar/BookAStar.Droid/MainActivity.cs
+++ b/BookAStar/BookAStar.Droid/MainActivity.cs
@@ -38,17 +38,24 @@ using SQLite.Net;
 using XLabs.Ioc;
 using XLabs.Platform.Mvvm;
 using XLabs.Caching;
+using XLabs;
+using XLabs.Enums;
 
 namespace BookAStar.Droid
 {
     [Activity(Name="fr.pschneider.bas.MainActivity", Label = "BookAStar", Theme = "@style/MainTheme", Icon = "@drawable/icon", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
     public class MainActivity :
-        XFormsApplicationDroid,
-        // was global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity,
+
+        // global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity,
+        XFormsCompatApplicationDroid,
         IPlatform, IComponentContext
     {
         protected override void OnCreate(Bundle bundle)
         {
+
+            TabLayoutResource = Resource.Layout.Tabbar;
+            ToolbarResource = Resource.Layout.Toolbar;
+
             base.OnCreate(bundle);
 
             if (Build.VERSION.SdkInt >= BuildVersionCodes.Kitkat)
@@ -56,14 +63,14 @@ namespace BookAStar.Droid
                 Android.Webkit.WebView.SetWebContentsDebuggingEnabled(true);
             }
 
-            IXFormsApp<XFormsApplicationDroid> app =null;
+            IXFormsApp<XFormsCompatApplicationDroid> app =null;
             if (!Resolver.IsSet)
             {
                 this.SetIoc();
             }
             else
             {
-                app = Resolver.Resolve<IXFormsApp>() as IXFormsApp<XFormsApplicationDroid>;
+                app = Resolver.Resolve<IXFormsApp>() as IXFormsApp<XFormsCompatApplicationDroid>;
                 if (app != null)
                     app.AppContext = this;
             }
@@ -79,17 +86,15 @@ namespace BookAStar.Droid
                 }
             };
 
-            //TabLayoutResource = Resource.Layout.Tabbar;
-            //ToolbarResource = Resource.Layout.Toolbar;
 
             // Theme.Resources.FinishPreloading();
             // Theme.ApplyStyle(Resource.Style.MainTheme, false);
 
             // XmlREader tb = Resources.GetLayout(Resource.Layout.Toolbar);
             // FIXME Why does Forms try to theme this toolbar?
-             var tb = new Toolbar(this.BaseContext);
-             this.SetActionBar(tb);
-            
+            var tb = new Toolbar(this);
+            this.SetActionBar(tb);
+            // this.SetTheme(Resource.Style.MainTheme);
             LoadApplication(new BookAStar.App(this));
             // TabLayoutResource = Resource.Layout.Tabbar;
             // ToolbarResource = Resource.Layout.Toolbar;
@@ -108,7 +113,7 @@ namespace BookAStar.Droid
         {
             var resolverContainer = new SimpleContainer();
 
-            var app = new XFormsAppDroid();
+            var app = new XFormsCompatAppDroid();
 
             app.Init(this);
 
@@ -124,9 +129,14 @@ namespace BookAStar.Droid
                 .Register<IDependencyContainer>(resolverContainer)
                 .Register<IXFormsApp>(app)
                 .Register<ISecureStorage>(t => new KeyVaultStorage(t.Resolve<IDevice>().Id.ToCharArray()))
+               
+                /*
                 .Register<ICacheProvider>(
                     t => new SQLiteSimpleCache(new SQLitePlatformAndroid(),
-                        new SQLiteConnectionString(pathToDatabase, true), t.Resolve<IJsonSerializer>()));
+                        new SQLiteConnectionString(pathToDatabase, true), t.Resolve<IJsonSerializer>()))
+                        
+            */
+                        ;
             Resolver.SetResolver(resolverContainer.GetResolver());
         }
 
@@ -147,6 +157,11 @@ namespace BookAStar.Droid
             }
         }
 
+        public App AppContext
+        {
+            get;set;
+        }
+
         bool StartNotifications()
         {
             if (IsPlayServicesAvailable(out gCMStatusMessage))
@@ -423,6 +438,11 @@ namespace BookAStar.Droid
         {
             throw new NotImplementedException();
         }
+
+        public void Init(App context, bool initServices = true)
+        {
+            throw new NotImplementedException();
+        }
     }
 }
 
diff --git a/BookAStar/BookAStar.Droid/packages.config b/BookAStar/BookAStar.Droid/packages.config
index 44911c6e..22387ca9 100644
--- a/BookAStar/BookAStar.Droid/packages.config
+++ b/BookAStar/BookAStar.Droid/packages.config
@@ -7,6 +7,7 @@
   <package id="Plugin.Permissions" version="1.1.7" targetFramework="monoandroid70" />
   <package id="SQLite.Net.Async-PCL" version="3.1.1" targetFramework="monoandroid70" />
   <package id="SQLite.Net.Core-PCL" version="3.1.1" targetFramework="monoandroid70" />
+  <package id="SQLite.Net.Platform.XamarinAndroid" version="2.5.1" targetFramework="monoandroid70" />
   <package id="SQLite.Net-PCL" version="3.1.1" targetFramework="monoandroid70" />
   <package id="Xam.Plugin.Connectivity" version="2.2.12" targetFramework="monoandroid70" />
   <package id="Xam.Plugin.DeviceInfo" version="2.0.2" targetFramework="monoandroid70" />
@@ -22,22 +23,22 @@
   <package id="Xamarin.Android.Support.v7.RecyclerView" version="23.3.0" targetFramework="monoandroid60" />
   <package id="Xamarin.Android.Support.Vector.Drawable" version="23.3.0" targetFramework="monoandroid60" />
   <package id="Xamarin.Controls.SignaturePad" version="1.4.0" targetFramework="monoandroid70" />
-  <package id="Xamarin.Forms" version="2.3.0.34-pre1" targetFramework="monoandroid70" />
-  <package id="Xamarin.Forms.Labs" version="1.0.1.0" targetFramework="monoandroid70" />
-  <package id="Xamarin.GooglePlayServices.Ads" version="29.0.0.2" targetFramework="monoandroid41" />
-  <package id="Xamarin.GooglePlayServices.Analytics" version="29.0.0.2" targetFramework="monoandroid41" />
-  <package id="Xamarin.GooglePlayServices.Base" version="29.0.0.2" targetFramework="monoandroid41" />
-  <package id="Xamarin.GooglePlayServices.Basement" version="29.0.0.2" targetFramework="monoandroid41" />
-  <package id="Xamarin.GooglePlayServices.Gcm" version="29.0.0.2" targetFramework="monoandroid41" />
-  <package id="Xamarin.GooglePlayServices.Maps" version="29.0.0.2" targetFramework="monoandroid41" />
-  <package id="Xamarin.GooglePlayServices.Measurement" version="29.0.0.2" targetFramework="monoandroid41" />
-  <package id="XLabs.Caching" version="2.2.0-pre05" targetFramework="monoandroid70" />
-  <package id="XLabs.Caching.SQLite" version="2.2.0-pre05" targetFramework="monoandroid70" />
-  <package id="XLabs.Core" version="2.2.0-pre05" targetFramework="monoandroid70" />
-  <package id="XLabs.Forms" version="2.2.0-pre05" targetFramework="monoandroid70" />
-  <package id="XLabs.IoC" version="2.2.0-pre05" targetFramework="monoandroid70" />
-  <package id="XLabs.Platform" version="2.2.0-pre05" targetFramework="monoandroid70" />
-  <package id="XLabs.Serialization" version="2.2.0-pre05" targetFramework="monoandroid70" />
-  <package id="XLabs.Settings" version="2.0.5782" targetFramework="monoandroid70" />
-  <package id="XLabs.Settings.XamSettings" version="2.0.5782" targetFramework="monoandroid70" />
+  <package id="Xamarin.Forms" version="2.3.2.127" targetFramework="monoandroid70" />
+  <package id="Xamarin.Forms.Maps" version="2.3.2.127" targetFramework="monoandroid70" />
+  <package id="Xamarin.GooglePlayServices.Ads" version="29.0.0.1" targetFramework="monoandroid70" />
+  <package id="Xamarin.GooglePlayServices.Analytics" version="29.0.0.1" targetFramework="monoandroid70" />
+  <package id="Xamarin.GooglePlayServices.Base" version="29.0.0.1" targetFramework="monoandroid70" />
+  <package id="Xamarin.GooglePlayServices.Basement" version="29.0.0.1" targetFramework="monoandroid70" />
+  <package id="Xamarin.GooglePlayServices.Gcm" version="29.0.0.1" targetFramework="monoandroid70" />
+  <package id="Xamarin.GooglePlayServices.Maps" version="29.0.0.1" targetFramework="monoandroid70" />
+  <package id="Xamarin.GooglePlayServices.Measurement" version="29.0.0.1" targetFramework="monoandroid70" />
+  <package id="XLabs.Caching" version="2.3.0-pre02" targetFramework="monoandroid70" />
+  <package id="XLabs.Caching.SQLite" version="2.0.5653-pre2" targetFramework="monoandroid70" />
+  <package id="XLabs.Core" version="2.3.0-pre02" targetFramework="monoandroid70" />
+  <package id="XLabs.Forms" version="2.3.0-pre02" targetFramework="monoandroid70" />
+  <package id="XLabs.IoC" version="2.3.0-pre02" targetFramework="monoandroid70" />
+  <package id="XLabs.Platform" version="2.3.0-pre02" targetFramework="monoandroid70" />
+  <package id="XLabs.Serialization" version="2.3.0-pre02" targetFramework="monoandroid70" />
+  <package id="XLabs.Settings" version="2.3.0-pre02" targetFramework="monoandroid70" />
+  <package id="XLabs.Settings.XamSettings" version="2.3.0-pre02" targetFramework="monoandroid70" />
 </packages>
\ No newline at end of file
diff --git a/BookAStar/BookAStar.iOS/BookAStar.iOS.csproj b/BookAStar/BookAStar.iOS/BookAStar.iOS.csproj
index 0cce83b0..59e07669 100644
--- a/BookAStar/BookAStar.iOS/BookAStar.iOS.csproj
+++ b/BookAStar/BookAStar.iOS/BookAStar.iOS.csproj
@@ -136,6 +136,14 @@
       <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Xamarin.Forms.Maps, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xamarin.Forms.Maps.2.3.2.127\lib\Xamarin.iOS10\Xamarin.Forms.Maps.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Maps.iOS, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Xamarin.Forms.Maps.2.3.2.127\lib\Xamarin.iOS10\Xamarin.Forms.Maps.iOS.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
       <Private>True</Private>
@@ -149,6 +157,18 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.iOS" />
+    <Reference Include="XLabs.Caching, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Caching.2.3.0-pre02\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Caching.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="XLabs.Serialization, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Serialization.2.3.0-pre02\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Serialization.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="XLabs.Settings, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Settings.2.3.0-pre02\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Settings.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Yavsc.Client\Yavsc.Client.csproj">
diff --git a/BookAStar/BookAStar.iOS/packages.config b/BookAStar/BookAStar.iOS/packages.config
index b78e7945..fa5dcff1 100644
--- a/BookAStar/BookAStar.iOS/packages.config
+++ b/BookAStar/BookAStar.iOS/packages.config
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Xamarin.Forms" version="2.3.2.127" targetFramework="xamarinios10" />
+  <package id="Xamarin.Forms.Maps" version="2.3.2.127" targetFramework="xamarinios10" />
+  <package id="XLabs.Caching" version="2.3.0-pre02" targetFramework="xamarinios10" />
+  <package id="XLabs.Serialization" version="2.3.0-pre02" targetFramework="xamarinios10" />
+  <package id="XLabs.Settings" version="2.3.0-pre02" targetFramework="xamarinios10" />
 </packages>
\ No newline at end of file
diff --git a/BookAStar/BookAStar/App.xaml.cs b/BookAStar/BookAStar/App.xaml.cs
index b8de6756..0232ef16 100644
--- a/BookAStar/BookAStar/App.xaml.cs
+++ b/BookAStar/BookAStar/App.xaml.cs
@@ -48,7 +48,7 @@ namespace BookAStar
         // by Views resolution, and then, drop it
         public static App CurrentApp { get { return Current as App; } }
 
-        public static void Init()
+        public void Init()
         {
             var app = Resolver.Resolve<IXFormsApp>();
             
@@ -56,7 +56,7 @@ namespace BookAStar
             {
                 return;
             }
-
+            Configure(app);
             app.Closing += (o, e) => Debug.WriteLine("Application Closing");
             app.Error += (o, e) => Debug.WriteLine("Application Error");
             app.Initialize += (o, e) => Debug.WriteLine("Application Initialized");
@@ -64,9 +64,9 @@ namespace BookAStar
             app.Rotation += (o, e) => Debug.WriteLine("Application Rotated");
             app.Startup += (o, e) => Debug.WriteLine("Application Startup");
             app.Suspended += (o, e) => Debug.WriteLine("Application Suspended");
-
         }
-        public void Configure(IXFormsApp app)
+
+        private void Configure(IXFormsApp app)
         {
             ViewFactory.EnableCache = true;
             ViewFactory.Register<DashboardPage, DashboardViewModel>(
@@ -85,6 +85,9 @@ namespace BookAStar
             InitializeComponent();
             Init();
             BuildMainPage();
+
+            NavigationPage.SetHasNavigationBar(MainPage, true);
+            NavigationPage.SetHasBackButton(MainPage, true);
         }
         BookQueriesPage bQueriesPage;
         AccountChooserPage accChooserPage;
@@ -97,13 +100,14 @@ namespace BookAStar
             bQueriesPage = new BookQueriesPage
             {
                 BindingContext = DataManager.Current.BookQueries,
-                Title = "Demandes"
+                Title = "Demandes",
+                Icon = "icon.png"
             };
 
-            home = new HomePage() { Title = "Accueil" };
+            home = new HomePage() { Title = "Accueil", Icon = "icon.png" };
 
             // var mainPage = new NavigationPage(bQueriesPage);
-            /*
+            
             masterDetail = new ExtendedMasterDetailPage() {
                 Title="MainPAge"
             };
@@ -111,9 +115,10 @@ namespace BookAStar
             masterDetail.Master = new DashboardPage {
                 Title = "Bookingstar",
                 BindingContext = new DashboardViewModel() };
-            masterDetail.Detail = new HomePage { Title = "Accueil" };
 
-            */
+            masterDetail.Detail = home;
+
+            
             ToolbarItem tiSetts = new ToolbarItem()
             {
                 Text = "Paramètres",
@@ -125,75 +130,9 @@ namespace BookAStar
                 Text = "Accueil",
                 Icon = "icon.png"
             };
-
           
-
-
-
-
-            /*     searchPage = new SearchPage
-                 {
-                     Title = "Trouvez votre artiste",
-                     Icon = "glyphish_07_map_marker.png"
-                 };
-
-                  settingsPage = new SettingsPage
-                 {
-                     Title = "Paramètres",
-                     Icon = "ic_corp_icon.png"
-                 };
-
-                  pinPage = new PinPage
-                 {
-                     Title = "Carte",
-                     Icon = "glyphish_07_map_marker.png"
-                 };
-                 PlatformSpecificInstance = instance;
-                 Navigation = new NavigationPage(searchPage);
-
-                 //var hasLabelStyle = r.ContainsKey("labelStyle");
-                 // var stid = this.StyleId;
-                 // null var appsstyle = settingsPage.Style;
-                 // appsstyle.CanCascade = true;
-                 MainPage = Navigation;
-                 ToolbarItem tiSetts = new ToolbarItem()
-                 {
-                     Text = "Settings",
-                     Icon = "ic_corp_icon.png"
-                 };
-                 Navigation.ToolbarItems.Add(tiSetts);
-                 tiSetts.Clicked += (object sender, EventArgs e) =>
-                 {
-                     ShowPage (settingsPage);
-                 };
-                 ToolbarItem tiQueries = new ToolbarItem
-                 {
-                     Text = "Demandes"
-                 };
-
-                 tiQueries.Clicked += (object sender, EventArgs e) =>
-                 {
-                     BookQueriesPage bookQueriesPage = new BookQueriesPage
-                     {
-                         Title = "Demandes de devis"
-                     };
-                     bookQueriesPage.BindingContext = DataManager.BookQueries;
-                     ShowPage(bookQueriesPage);
-                 };
-                 Navigation.ToolbarItems.Add(tiQueries);
-                 ToolbarItem tiMap = new ToolbarItem
-                 {
-                     Text = "Carte",
-                     Icon = "glyphish_07_map_marker.png"
-                 };
-                 Navigation.ToolbarItems.Add(tiMap);
-                 tiMap.Clicked += (object sender, EventArgs e) =>
-                 {
-                     ShowPage(pinPage);
-                 };
-                 MainPage = Navigation;
-                 */
-            var mainTab = new ExtendedTabbedPage()
+          // FIXME  "Tabs not supported in this configuration"
+             var mainTab = new ExtendedTabbedPage()
             {
                 Title = "XLabs",
                 SwipeEnabled = true,
@@ -203,8 +142,10 @@ namespace BookAStar
                 TabBarBackgroundImage = "visuel_sexion.png",
                 TabBarSelectedImage = "icon.png",
             };
-
-            var navPage = new NavigationPage(bQueriesPage);
+            var navPage = new NavigationPage(masterDetail) {
+                Title = "Navigation",
+                Icon = "icon.png"
+            } ;
             //var navPage = new NavigationPage(mainTab);
             
             navPage.ToolbarItems.Add(tiHome);
@@ -237,7 +178,7 @@ namespace BookAStar
         public static void ShowBookQuery (BookQueryData query)
         {
            var page = ViewFactory.CreatePage<BookQueryViewModel
-                , BookQueryPage>(null, new BookQueryViewModel(query));
+                , BookQueryPage>((b,p)=> p.BindingContext = new BookQueryViewModel(query));
            App.Current.MainPage.Navigation.PushAsync(page as Page);
         }
 
diff --git a/BookAStar/BookAStar/BookAStar.csproj b/BookAStar/BookAStar/BookAStar.csproj
index f75de879..f476d5a0 100644
--- a/BookAStar/BookAStar/BookAStar.csproj
+++ b/BookAStar/BookAStar/BookAStar.csproj
@@ -201,47 +201,51 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.34-pre1\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Maps, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.Maps.2.3.0.34-pre1\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Maps.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.Maps.2.3.2.127\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Maps.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.34-pre1\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.34-pre1\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XLabs.Caching, Version=2.2.0.38182, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XLabs.Caching.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Caching.dll</HintPath>
+    <Reference Include="XLabs.Caching, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Caching.2.3.0-pre02\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Caching.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XLabs.Core, Version=2.2.0.38178, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XLabs.Core.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Core.dll</HintPath>
+    <Reference Include="XLabs.Core, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Core.2.3.0-pre02\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XLabs.Forms, Version=2.2.0.38180, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XLabs.Forms.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+monoandroid+MonoTouch+Xamarin.iOS10\XLabs.Forms.dll</HintPath>
+    <Reference Include="XLabs.Forms, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Forms.2.3.0-pre02\lib\portable-net45+netcore45+wpa81+monoandroid+MonoTouch+Xamarin.iOS10\XLabs.Forms.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XLabs.IOC, Version=2.2.0.38178, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XLabs.IoC.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.IOC.dll</HintPath>
+    <Reference Include="XLabs.IOC, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.IoC.2.3.0-pre02\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.IOC.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XLabs.Platform, Version=2.2.0.38179, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XLabs.Platform.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+monoandroid+MonoTouch+Xamarin.iOS10\XLabs.Platform.dll</HintPath>
+    <Reference Include="XLabs.Platform, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Platform.2.3.0-pre02\lib\portable-net45+netcore45+wpa81+monoandroid+MonoTouch+Xamarin.iOS10\XLabs.Platform.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XLabs.Serialization, Version=2.2.0.38178, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XLabs.Serialization.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Serialization.dll</HintPath>
+    <Reference Include="XLabs.Serialization, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Serialization.2.3.0-pre02\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Serialization.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XLabs.Serialization.Json.NET, Version=2.2.0.38187, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XLabs.Serialization.JSON.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Serialization.Json.NET.dll</HintPath>
+    <Reference Include="XLabs.Serialization.Json.NET, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Serialization.JSON.2.3.0-pre02\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Serialization.Json.NET.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="XLabs.Settings, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Settings.2.3.0-pre02\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Settings.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -302,12 +306,12 @@
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <Import Project="..\..\packages\Xamarin.Forms.2.3.0.34-pre1\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.0.34-pre1\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
+  <Import Project="..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>Ce projet fait référence à des packages NuGet qui sont manquants sur cet ordinateur. Utilisez l'option de restauration des packages NuGet pour les télécharger. Pour plus d'informations, consultez http://go.microsoft.com/fwlink/?LinkID=322105. Le fichier manquant est : {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.0.34-pre1\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.0.34-pre1\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/BookAStar/BookAStar/packages.config b/BookAStar/BookAStar/packages.config
index 25d993d0..ce4629e8 100644
--- a/BookAStar/BookAStar/packages.config
+++ b/BookAStar/BookAStar/packages.config
@@ -7,13 +7,14 @@
   <package id="SQLite.Net.Core-PCL" version="3.1.1" targetFramework="portable45-net45+win8+wpa81" />
   <package id="SQLite.Net-PCL" version="3.1.1" targetFramework="portable45-net45+win8+wpa81" />
   <package id="Xam.Plugins.Settings" version="2.5.1.0" targetFramework="portable45-net45+win8+wpa81" />
-  <package id="Xamarin.Forms" version="2.3.0.34-pre1" targetFramework="portable45-net45+win8+wpa81" />
-  <package id="Xamarin.Forms.Maps" version="2.3.0.34-pre1" targetFramework="portable45-net45+win8+wpa81" />
-  <package id="XLabs.Caching" version="2.2.0-pre05" targetFramework="portable45-net45+win8+wpa81" />
-  <package id="XLabs.Core" version="2.2.0-pre05" targetFramework="portable45-net45+win8+wpa81" />
-  <package id="XLabs.Forms" version="2.2.0-pre05" targetFramework="portable45-net45+win8+wpa81" />
-  <package id="XLabs.IoC" version="2.2.0-pre05" targetFramework="portable45-net45+win8+wpa81" />
-  <package id="XLabs.Platform" version="2.2.0-pre05" targetFramework="portable45-net45+win8+wpa81" />
-  <package id="XLabs.Serialization" version="2.2.0-pre05" targetFramework="portable45-net45+win8+wpa81" />
-  <package id="XLabs.Serialization.JSON" version="2.2.0-pre05" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="Xamarin.Forms" version="2.3.2.127" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="Xamarin.Forms.Maps" version="2.3.2.127" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="XLabs.Caching" version="2.3.0-pre02" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="XLabs.Core" version="2.3.0-pre02" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="XLabs.Forms" version="2.3.0-pre02" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="XLabs.IoC" version="2.3.0-pre02" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="XLabs.Platform" version="2.3.0-pre02" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="XLabs.Serialization" version="2.3.0-pre02" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="XLabs.Serialization.JSON" version="2.3.0-pre02" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="XLabs.Settings" version="2.3.0-pre02" targetFramework="portable45-net45+win8+wpa81" />
 </packages>
\ No newline at end of file

From d83c4013a910ef5c48018615b5a74221c7280ad4 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Fri, 30 Sep 2016 13:05:01 +0200
Subject: [PATCH 14/59] adds a default ctor, and fixes the estimate creation
 event

---
 BookAStar/BookAStar/Pages/BookQueryPage.xaml.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/BookAStar/BookAStar/Pages/BookQueryPage.xaml.cs b/BookAStar/BookAStar/Pages/BookQueryPage.xaml.cs
index c271dc91..77eb613e 100644
--- a/BookAStar/BookAStar/Pages/BookQueryPage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/BookQueryPage.xaml.cs
@@ -10,6 +10,7 @@ namespace BookAStar.Pages
     using Model;
     using Model.Workflow;
     using System.Threading.Tasks;
+    using ViewModels;
     using XLabs.Forms.Mvvm;
     using XLabs.Ioc;
     using XLabs.Platform.Services;
@@ -50,7 +51,10 @@ namespace BookAStar.Pages
             }
             
         }
-        
+        public BookQueryPage()
+        {
+            InitializeComponent();
+        }
         public BookQueryPage(BookQueryData bookQuery=null)
         {
             
@@ -73,7 +77,8 @@ namespace BookAStar.Pages
                 Id = 0,
                 Description = "# **Hello Estimate!**"
             };
-            Resolver.Resolve<INavigationService>().NavigateTo<EditEstimatePage>(true, e);
+            Resolver.Resolve<INavigationService>().NavigateTo<EditEstimatePage>(true,
+                new EstimateViewModel(e));
         }
         
     }

From 15239dba6f28191f1971c7f219fcaa0e49fac1df Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Fri, 30 Sep 2016 13:07:30 +0200
Subject: [PATCH 15/59] cleans dependencies

---
 Yavsc.Client/project.json      |   4 +-
 Yavsc.Client/project.lock.json | 244 +--------------------------------
 2 files changed, 5 insertions(+), 243 deletions(-)

diff --git a/Yavsc.Client/project.json b/Yavsc.Client/project.json
index a0f1f521..6204fd2a 100644
--- a/Yavsc.Client/project.json
+++ b/Yavsc.Client/project.json
@@ -12,9 +12,7 @@
   "tooling": {
     "defaultNamespace": "Yavsc"
   },
-  "dependencies": {
-    "Xamarin.Forms": "2.3.2.127"
-  },
+  "dependencies": {},
   "frameworks": {
     "net451": {},
     ".NETPortable,Version=v4.5,Profile=Profile111": {}
diff --git a/Yavsc.Client/project.lock.json b/Yavsc.Client/project.lock.json
index 397ee3d5..a7ebab43 100644
--- a/Yavsc.Client/project.lock.json
+++ b/Yavsc.Client/project.lock.json
@@ -2,248 +2,12 @@
   "locked": false,
   "version": 2,
   "targets": {
-    ".NETFramework,Version=v4.5.1": {
-      "Xamarin.Forms/2.3.2.127": {
-        "type": "package",
-        "compile": {
-          "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Core.dll": {},
-          "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Platform.dll": {},
-          "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Xaml.dll": {}
-        },
-        "runtime": {
-          "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Core.dll": {},
-          "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Platform.dll": {},
-          "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Xaml.dll": {}
-        }
-      }
-    },
-    ".NETPortable,Version=v4.5,Profile=Profile111": {
-      "Xamarin.Forms/2.3.2.127": {
-        "type": "package",
-        "compile": {
-          "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Core.dll": {},
-          "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Platform.dll": {},
-          "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Xaml.dll": {}
-        },
-        "runtime": {
-          "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Core.dll": {},
-          "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Platform.dll": {},
-          "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Xaml.dll": {}
-        }
-      }
-    }
-  },
-  "libraries": {
-    "Xamarin.Forms/2.3.2.127": {
-      "sha512": "NYH2p6Z2QGrRZpRXSiLqtapqlsx11pkViEIjDUQFDvsMCZbvsipDXOWjV9sXTrruXTdkNZ24Nsw0lEG0jVRMjA==",
-      "type": "package",
-      "path": "Xamarin.Forms/2.3.2.127",
-      "files": [
-        "Xamarin.Forms.2.3.2.127.nupkg.sha512",
-        "Xamarin.Forms.nuspec",
-        "build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/ICSharpCode.Decompiler.dll",
-        "build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/ICSharpCode.NRefactory.CSharp.dll",
-        "build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/ICSharpCode.NRefactory.Cecil.dll",
-        "build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/ICSharpCode.NRefactory.Xml.dll",
-        "build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/ICSharpCode.NRefactory.dll",
-        "build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Mono.Cecil.Mdb.dll",
-        "build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Mono.Cecil.Pdb.dll",
-        "build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Mono.Cecil.Rocks.dll",
-        "build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Mono.Cecil.dll",
-        "build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Build.Tasks.dll",
-        "build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Core.dll",
-        "build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Xaml.dll",
-        "build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.targets",
-        "lib/MonoAndroid10/Design/Xamarin.Forms.Core.Design.dll",
-        "lib/MonoAndroid10/Design/Xamarin.Forms.Xaml.Design.dll",
-        "lib/MonoAndroid10/FormsViewGroup.dll",
-        "lib/MonoAndroid10/FormsViewGroup.pdb",
-        "lib/MonoAndroid10/Xamarin.Forms.Core.dll",
-        "lib/MonoAndroid10/Xamarin.Forms.Core.pdb",
-        "lib/MonoAndroid10/Xamarin.Forms.Core.xml",
-        "lib/MonoAndroid10/Xamarin.Forms.Platform.Android.dll",
-        "lib/MonoAndroid10/Xamarin.Forms.Platform.Android.pdb",
-        "lib/MonoAndroid10/Xamarin.Forms.Platform.dll",
-        "lib/MonoAndroid10/Xamarin.Forms.Xaml.dll",
-        "lib/MonoAndroid10/Xamarin.Forms.Xaml.pdb",
-        "lib/MonoAndroid10/Xamarin.Forms.Xaml.xml",
-        "lib/MonoTouch10/Design/Xamarin.Forms.Core.Design.dll",
-        "lib/MonoTouch10/Design/Xamarin.Forms.Xaml.Design.dll",
-        "lib/MonoTouch10/Xamarin.Forms.Core.dll",
-        "lib/MonoTouch10/Xamarin.Forms.Core.dll.mdb",
-        "lib/MonoTouch10/Xamarin.Forms.Core.pdb",
-        "lib/MonoTouch10/Xamarin.Forms.Core.xml",
-        "lib/MonoTouch10/Xamarin.Forms.Platform.dll",
-        "lib/MonoTouch10/Xamarin.Forms.Platform.iOS.Classic.dll",
-        "lib/MonoTouch10/Xamarin.Forms.Xaml.dll",
-        "lib/MonoTouch10/Xamarin.Forms.Xaml.dll.mdb",
-        "lib/MonoTouch10/Xamarin.Forms.Xaml.pdb",
-        "lib/MonoTouch10/Xamarin.Forms.Xaml.xml",
-        "lib/MonoTouch10/ar/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
-        "lib/MonoTouch10/ca/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
-        "lib/MonoTouch10/cs/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
-        "lib/MonoTouch10/da/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
-        "lib/MonoTouch10/de/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
-        "lib/MonoTouch10/el/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
-        "lib/MonoTouch10/es/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
-        "lib/MonoTouch10/fi/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
-        "lib/MonoTouch10/fr/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
-        "lib/MonoTouch10/he/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
-        "lib/MonoTouch10/hi/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
-        "lib/MonoTouch10/hr/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
-        "lib/MonoTouch10/hu/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
-        "lib/MonoTouch10/id/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
-        "lib/MonoTouch10/it/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
-        "lib/MonoTouch10/ja/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
-        "lib/MonoTouch10/ko/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
-        "lib/MonoTouch10/ms/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
-        "lib/MonoTouch10/nb/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
-        "lib/MonoTouch10/nl/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
-        "lib/MonoTouch10/pl/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
-        "lib/MonoTouch10/pt-BR/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
-        "lib/MonoTouch10/pt/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
-        "lib/MonoTouch10/ro/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
-        "lib/MonoTouch10/ru/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
-        "lib/MonoTouch10/sk/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
-        "lib/MonoTouch10/sv/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
-        "lib/MonoTouch10/th/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
-        "lib/MonoTouch10/tr/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
-        "lib/MonoTouch10/uk/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
-        "lib/MonoTouch10/vi/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
-        "lib/MonoTouch10/zh-HK/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
-        "lib/MonoTouch10/zh-Hans/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
-        "lib/MonoTouch10/zh-Hant/Xamarin.Forms.Platform.iOS.Classic.resources.dll",
-        "lib/WP80/Design/Xamarin.Forms.Core.Design.dll",
-        "lib/WP80/Design/Xamarin.Forms.Xaml.Design.dll",
-        "lib/WP80/Xamarin.Forms.Core.dll",
-        "lib/WP80/Xamarin.Forms.Core.pdb",
-        "lib/WP80/Xamarin.Forms.Core.xml",
-        "lib/WP80/Xamarin.Forms.Platform.WP8.dll",
-        "lib/WP80/Xamarin.Forms.Platform.WP8.pdb",
-        "lib/WP80/Xamarin.Forms.Platform.dll",
-        "lib/WP80/Xamarin.Forms.Xaml.dll",
-        "lib/WP80/Xamarin.Forms.Xaml.pdb",
-        "lib/WP80/Xamarin.Forms.Xaml.xml",
-        "lib/Xamarin.iOS10/Design/Xamarin.Forms.Core.Design.dll",
-        "lib/Xamarin.iOS10/Design/Xamarin.Forms.Xaml.Design.dll",
-        "lib/Xamarin.iOS10/Xamarin.Forms.Core.dll",
-        "lib/Xamarin.iOS10/Xamarin.Forms.Core.dll.mdb",
-        "lib/Xamarin.iOS10/Xamarin.Forms.Core.pdb",
-        "lib/Xamarin.iOS10/Xamarin.Forms.Core.xml",
-        "lib/Xamarin.iOS10/Xamarin.Forms.Platform.dll",
-        "lib/Xamarin.iOS10/Xamarin.Forms.Platform.iOS.dll",
-        "lib/Xamarin.iOS10/Xamarin.Forms.Platform.iOS.dll.mdb",
-        "lib/Xamarin.iOS10/Xamarin.Forms.Platform.iOS.pdb",
-        "lib/Xamarin.iOS10/Xamarin.Forms.Xaml.dll",
-        "lib/Xamarin.iOS10/Xamarin.Forms.Xaml.dll.mdb",
-        "lib/Xamarin.iOS10/Xamarin.Forms.Xaml.pdb",
-        "lib/Xamarin.iOS10/Xamarin.Forms.Xaml.xml",
-        "lib/Xamarin.iOS10/ar/Xamarin.Forms.Platform.iOS.resources.dll",
-        "lib/Xamarin.iOS10/ca/Xamarin.Forms.Platform.iOS.resources.dll",
-        "lib/Xamarin.iOS10/cs/Xamarin.Forms.Platform.iOS.resources.dll",
-        "lib/Xamarin.iOS10/da/Xamarin.Forms.Platform.iOS.resources.dll",
-        "lib/Xamarin.iOS10/de/Xamarin.Forms.Platform.iOS.resources.dll",
-        "lib/Xamarin.iOS10/el/Xamarin.Forms.Platform.iOS.resources.dll",
-        "lib/Xamarin.iOS10/es/Xamarin.Forms.Platform.iOS.resources.dll",
-        "lib/Xamarin.iOS10/fi/Xamarin.Forms.Platform.iOS.resources.dll",
-        "lib/Xamarin.iOS10/fr/Xamarin.Forms.Platform.iOS.resources.dll",
-        "lib/Xamarin.iOS10/he/Xamarin.Forms.Platform.iOS.resources.dll",
-        "lib/Xamarin.iOS10/hi/Xamarin.Forms.Platform.iOS.resources.dll",
-        "lib/Xamarin.iOS10/hr/Xamarin.Forms.Platform.iOS.resources.dll",
-        "lib/Xamarin.iOS10/hu/Xamarin.Forms.Platform.iOS.resources.dll",
-        "lib/Xamarin.iOS10/id/Xamarin.Forms.Platform.iOS.resources.dll",
-        "lib/Xamarin.iOS10/it/Xamarin.Forms.Platform.iOS.resources.dll",
-        "lib/Xamarin.iOS10/ja/Xamarin.Forms.Platform.iOS.resources.dll",
-        "lib/Xamarin.iOS10/ko/Xamarin.Forms.Platform.iOS.resources.dll",
-        "lib/Xamarin.iOS10/ms/Xamarin.Forms.Platform.iOS.resources.dll",
-        "lib/Xamarin.iOS10/nb/Xamarin.Forms.Platform.iOS.resources.dll",
-        "lib/Xamarin.iOS10/nl/Xamarin.Forms.Platform.iOS.resources.dll",
-        "lib/Xamarin.iOS10/pl/Xamarin.Forms.Platform.iOS.resources.dll",
-        "lib/Xamarin.iOS10/pt-BR/Xamarin.Forms.Platform.iOS.resources.dll",
-        "lib/Xamarin.iOS10/pt/Xamarin.Forms.Platform.iOS.resources.dll",
-        "lib/Xamarin.iOS10/ro/Xamarin.Forms.Platform.iOS.resources.dll",
-        "lib/Xamarin.iOS10/ru/Xamarin.Forms.Platform.iOS.resources.dll",
-        "lib/Xamarin.iOS10/sk/Xamarin.Forms.Platform.iOS.resources.dll",
-        "lib/Xamarin.iOS10/sv/Xamarin.Forms.Platform.iOS.resources.dll",
-        "lib/Xamarin.iOS10/th/Xamarin.Forms.Platform.iOS.resources.dll",
-        "lib/Xamarin.iOS10/tr/Xamarin.Forms.Platform.iOS.resources.dll",
-        "lib/Xamarin.iOS10/uk/Xamarin.Forms.Platform.iOS.resources.dll",
-        "lib/Xamarin.iOS10/vi/Xamarin.Forms.Platform.iOS.resources.dll",
-        "lib/Xamarin.iOS10/zh-HK/Xamarin.Forms.Platform.iOS.resources.dll",
-        "lib/Xamarin.iOS10/zh-Hans/Xamarin.Forms.Platform.iOS.resources.dll",
-        "lib/Xamarin.iOS10/zh-Hant/Xamarin.Forms.Platform.iOS.resources.dll",
-        "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Design/Xamarin.Forms.Core.Design.dll",
-        "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Design/Xamarin.Forms.Xaml.Design.dll",
-        "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Core.dll",
-        "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Core.dll.mdb",
-        "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Core.pdb",
-        "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Core.xml",
-        "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Platform.dll",
-        "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Platform.dll.mdb",
-        "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Platform.pdb",
-        "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Xaml.dll",
-        "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Xaml.dll.mdb",
-        "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Xaml.pdb",
-        "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Xaml.xml",
-        "lib/uap10.0/Design/Xamarin.Forms.Core.Design.dll",
-        "lib/uap10.0/Design/Xamarin.Forms.Xaml.Design.dll",
-        "lib/uap10.0/Xamarin.Forms.Core.dll",
-        "lib/uap10.0/Xamarin.Forms.Core.xml",
-        "lib/uap10.0/Xamarin.Forms.Platform.UAP.dll",
-        "lib/uap10.0/Xamarin.Forms.Platform.UAP.pri",
-        "lib/uap10.0/Xamarin.Forms.Platform.UAP/AutoSuggestStyle.xbf",
-        "lib/uap10.0/Xamarin.Forms.Platform.UAP/FormsTextBoxStyle.xbf",
-        "lib/uap10.0/Xamarin.Forms.Platform.UAP/PageControl.xbf",
-        "lib/uap10.0/Xamarin.Forms.Platform.UAP/Properties/Xamarin.Forms.Platform.UAP.rd.xml",
-        "lib/uap10.0/Xamarin.Forms.Platform.UAP/Resources.xbf",
-        "lib/uap10.0/Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.xr.xml",
-        "lib/uap10.0/Xamarin.Forms.Platform.dll",
-        "lib/uap10.0/Xamarin.Forms.Xaml.dll",
-        "lib/uap10.0/Xamarin.Forms.Xaml.xml",
-        "lib/win81/Design/Xamarin.Forms.Core.Design.dll",
-        "lib/win81/Design/Xamarin.Forms.Xaml.Design.dll",
-        "lib/win81/Xamarin.Forms.Core.dll",
-        "lib/win81/Xamarin.Forms.Core.xml",
-        "lib/win81/Xamarin.Forms.Platform.WinRT.Tablet.dll",
-        "lib/win81/Xamarin.Forms.Platform.WinRT.Tablet.pri",
-        "lib/win81/Xamarin.Forms.Platform.WinRT.Tablet/FormsTextBoxStyle.xbf",
-        "lib/win81/Xamarin.Forms.Platform.WinRT.Tablet/Resources.xbf",
-        "lib/win81/Xamarin.Forms.Platform.WinRT.Tablet/TabletResources.xbf",
-        "lib/win81/Xamarin.Forms.Platform.WinRT.Tablet/Xamarin.Forms.Platform.WinRT.Tablet.xr.xml",
-        "lib/win81/Xamarin.Forms.Platform.WinRT.dll",
-        "lib/win81/Xamarin.Forms.Platform.WinRT.pri",
-        "lib/win81/Xamarin.Forms.Platform.WinRT/PageControl.xbf",
-        "lib/win81/Xamarin.Forms.Platform.WinRT/StepperControl.xbf",
-        "lib/win81/Xamarin.Forms.Platform.WinRT/Xamarin.Forms.Platform.WinRT.xr.xml",
-        "lib/win81/Xamarin.Forms.Platform.dll",
-        "lib/win81/Xamarin.Forms.Xaml.dll",
-        "lib/win81/Xamarin.Forms.Xaml.xml",
-        "lib/wpa81/Design/Xamarin.Forms.Core.Design.dll",
-        "lib/wpa81/Design/Xamarin.Forms.Xaml.Design.dll",
-        "lib/wpa81/Xamarin.Forms.Core.dll",
-        "lib/wpa81/Xamarin.Forms.Core.xml",
-        "lib/wpa81/Xamarin.Forms.Platform.WinRT.Phone.dll",
-        "lib/wpa81/Xamarin.Forms.Platform.WinRT.Phone.pri",
-        "lib/wpa81/Xamarin.Forms.Platform.WinRT.Phone/FormsTextBoxStyle.xbf",
-        "lib/wpa81/Xamarin.Forms.Platform.WinRT.Phone/PhoneResources.xbf",
-        "lib/wpa81/Xamarin.Forms.Platform.WinRT.Phone/Resources.xbf",
-        "lib/wpa81/Xamarin.Forms.Platform.WinRT.Phone/SearchBox.xbf",
-        "lib/wpa81/Xamarin.Forms.Platform.WinRT.Phone/Xamarin.Forms.Platform.WinRT.Phone.xr.xml",
-        "lib/wpa81/Xamarin.Forms.Platform.WinRT.dll",
-        "lib/wpa81/Xamarin.Forms.Platform.WinRT.pri",
-        "lib/wpa81/Xamarin.Forms.Platform.WinRT/PageControl.xbf",
-        "lib/wpa81/Xamarin.Forms.Platform.WinRT/StepperControl.xbf",
-        "lib/wpa81/Xamarin.Forms.Platform.WinRT/Xamarin.Forms.Platform.WinRT.xr.xml",
-        "lib/wpa81/Xamarin.Forms.Platform.dll",
-        "lib/wpa81/Xamarin.Forms.Xaml.dll",
-        "lib/wpa81/Xamarin.Forms.Xaml.xml"
-      ]
-    }
+    ".NETFramework,Version=v4.5.1": {},
+    ".NETPortable,Version=v4.5,Profile=Profile111": {}
   },
+  "libraries": {},
   "projectFileDependencyGroups": {
-    "": [
-      "Xamarin.Forms >= 2.3.2.127"
-    ],
+    "": [],
     ".NETFramework,Version=v4.5.1": [],
     ".NETPortable,Version=v4.5,Profile=Profile111": []
   },

From 04cf9943658e6c3dc9890ec1cc504a90663556cf Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Fri, 30 Sep 2016 18:17:44 +0200
Subject: [PATCH 16/59] Why not?

---
 BookAStar/BookAStar.Droid/BookAStar.Droid.csproj | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj b/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj
index 9719f770..879a8c8a 100644
--- a/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj
+++ b/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj
@@ -357,7 +357,9 @@
   <ItemGroup>
     <AndroidResource Include="Resources\layout\Tabbar.axml" />
     <AndroidResource Include="Resources\layout\Toolbar.axml" />
-    <AndroidResource Include="Resources\values\styles.xml" />
+    <AndroidResource Include="Resources\values\styles.xml">
+      <SubType>Designer</SubType>
+    </AndroidResource>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Yavsc.Client\Yavsc.Client.csproj">

From fe058284a2f5afc3f24d0f8640b2c3cddef809cf Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Fri, 30 Sep 2016 18:18:37 +0200
Subject: [PATCH 17/59] Two fixes, the Compat and legacy toolbars

---
 BookAStar/BookAStar.Droid/MainActivity.cs | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/BookAStar/BookAStar.Droid/MainActivity.cs b/BookAStar/BookAStar.Droid/MainActivity.cs
index 37d5ed43..647671dc 100644
--- a/BookAStar/BookAStar.Droid/MainActivity.cs
+++ b/BookAStar/BookAStar.Droid/MainActivity.cs
@@ -55,9 +55,18 @@ namespace BookAStar.Droid
 
             TabLayoutResource = Resource.Layout.Tabbar;
             ToolbarResource = Resource.Layout.Toolbar;
-
+            
             base.OnCreate(bundle);
 
+            global::Xamarin.Forms.Forms.SetTitleBarVisibility(Xamarin.Forms.AndroidTitleBarVisibility.Never);
+
+            //var tb = FindViewById<Android.Support.V7.Widget.Toolbar>(ToolbarResource);
+            // FIXME tb is null
+            var stb = new Android.Support.V7.Widget.Toolbar(this);
+            SetSupportActionBar(stb);
+            var tb = new Toolbar(this);
+            SetActionBar(tb);
+
             if (Build.VERSION.SdkInt >= BuildVersionCodes.Kitkat)
             {
                 Android.Webkit.WebView.SetWebContentsDebuggingEnabled(true);
@@ -87,14 +96,6 @@ namespace BookAStar.Droid
             };
 
 
-            // Theme.Resources.FinishPreloading();
-            // Theme.ApplyStyle(Resource.Style.MainTheme, false);
-
-            // XmlREader tb = Resources.GetLayout(Resource.Layout.Toolbar);
-            // FIXME Why does Forms try to theme this toolbar?
-            var tb = new Toolbar(this);
-            this.SetActionBar(tb);
-            // this.SetTheme(Resource.Style.MainTheme);
             LoadApplication(new BookAStar.App(this));
             // TabLayoutResource = Resource.Layout.Tabbar;
             // ToolbarResource = Resource.Layout.Toolbar;

From 521910a6ffbd0c2349d0775cd07a40a29e9f4b82 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Fri, 30 Sep 2016 18:19:37 +0200
Subject: [PATCH 18/59] trying to fix the binding

---
 .../BookAStar.Droid/MarkdownViewRenderer.cs   | 46 +++++++++++++------
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/BookAStar/BookAStar.Droid/MarkdownViewRenderer.cs b/BookAStar/BookAStar.Droid/MarkdownViewRenderer.cs
index b315bade..dd71776d 100644
--- a/BookAStar/BookAStar.Droid/MarkdownViewRenderer.cs
+++ b/BookAStar/BookAStar.Droid/MarkdownViewRenderer.cs
@@ -5,6 +5,7 @@ using Xamarin.Forms.Platform.Android;
 using BookAStar.Droid;
 using System;
 using Java.Interop;
+using System.ComponentModel;
 
 [assembly: Xamarin.Forms.ExportRenderer(typeof(MarkdownView), typeof(MarkdownViewRenderer))]
 namespace BookAStar.Droid
@@ -30,6 +31,7 @@ namespace BookAStar.Droid
             }
         }
     }
+
     public class MarkdownViewRenderer : ViewRenderer<MarkdownView, WebView>
     {
         private WebView editorView;
@@ -50,20 +52,7 @@ namespace BookAStar.Droid
             base.OnElementChanged(e);
             if (Control == null)
             {
-                editorView = new WebView(Context);
-                editorView.Settings.BuiltInZoomControls = true;
-                editorView.Settings.JavaScriptEnabled = true;
-                editorView.Settings.LoadsImagesAutomatically = true;
-                editorView.Settings.SetAppCacheEnabled(true);
-                editorView.Settings.AllowContentAccess = true;
-                editorView.Settings.AllowFileAccess = true;
-                editorView.Settings.AllowFileAccessFromFileURLs = true;
-                editorView.Settings.AllowUniversalAccessFromFileURLs = true;
-                editorView.Settings.BlockNetworkImage = false;
-                editorView.Settings.BlockNetworkLoads = false;
-                editorView.Settings.DomStorageEnabled = true;
-              //  editorView.SetMinimumHeight(300);
-                SetNativeControl(editorView);
+                SetNativeControl(CreateNativeControl());
             }
             if (e.OldElement != null)
             {
@@ -80,7 +69,6 @@ namespace BookAStar.Droid
                 InjectJS(JavaScriptFunction);
             }
         }
-        
 
         void InjectJS(string script)
         {
@@ -90,5 +78,33 @@ namespace BookAStar.Droid
             }
         }
 
+        private WebView CreateNativeControl()
+        {
+            editorView = new WebView(Context);
+            editorView.Settings.BuiltInZoomControls = true;
+            editorView.Settings.JavaScriptEnabled = true;
+            editorView.Settings.LoadsImagesAutomatically = true;
+            editorView.Settings.SetAppCacheEnabled(true);
+            editorView.Settings.AllowContentAccess = true;
+            editorView.Settings.AllowFileAccess = true;
+            editorView.Settings.AllowFileAccessFromFileURLs = true;
+            editorView.Settings.AllowUniversalAccessFromFileURLs = true;
+            editorView.Settings.BlockNetworkImage = false;
+            editorView.Settings.BlockNetworkLoads = false;
+            editorView.Settings.DomStorageEnabled = true;
+            //  editorView.SetMinimumHeight(300);
+            return editorView;
+        }
+
+        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == "Markdown")
+            {
+                SetMDEditorText(((MarkdownView)Element).Markdown);
+            }
+            base.OnElementPropertyChanged(sender, e);
+        }
+
+
     }
 }
\ No newline at end of file

From 50002fba4556f0945d03f12a573d9e2bb3fc02a0 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Sun, 2 Oct 2016 19:27:32 +0200
Subject: [PATCH 19/59] activates the full screen mode

---
 .../Resources/values/styles.xml               |  1 +
 BookAStar/BookAStar/App.xaml.cs               | 68 +++++++------------
 2 files changed, 24 insertions(+), 45 deletions(-)

diff --git a/BookAStar/BookAStar.Droid/Resources/values/styles.xml b/BookAStar/BookAStar.Droid/Resources/values/styles.xml
index 9fce3509..368c2f11 100644
--- a/BookAStar/BookAStar.Droid/Resources/values/styles.xml
+++ b/BookAStar/BookAStar.Droid/Resources/values/styles.xml
@@ -6,6 +6,7 @@
     <item name="android:windowNoTitle">true</item>
     <item name="android:statusBarColor">@color/primaryDark</item>
     <item name="android:colorPrimaryDark">@color/primaryDark</item>
+    <item name="android:windowFullscreen">true</item>
   </style>
   
   <!-- Base theme applied no matter what API -->
diff --git a/BookAStar/BookAStar/App.xaml.cs b/BookAStar/BookAStar/App.xaml.cs
index 0232ef16..c6f4676e 100644
--- a/BookAStar/BookAStar/App.xaml.cs
+++ b/BookAStar/BookAStar/App.xaml.cs
@@ -5,19 +5,18 @@ using BookAStar.Model.Workflow;
 using BookAStar.Pages;
 using BookAStar.ViewModels;
 using System;
-using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
 using Xamarin.Forms;
-using XLabs.Forms.Controls;
 using XLabs.Forms.Mvvm;
 using XLabs.Forms.Pages;
 using XLabs.Forms.Services;
 using XLabs.Ioc;
 using XLabs.Platform.Mvvm;
 using XLabs.Platform.Services;
+
 /*
 Glyphish icons from
 http://www.glyphish.com/
@@ -33,21 +32,19 @@ namespace BookAStar
         public static IPlatform PlatformSpecificInstance { get; set; }
         public static string AppName { get; set; }
 
-        public void ShowQueries()
-        {
-            masterDetail.Detail = bQueriesPage;
-            masterDetail.SendBackButtonPressed();
-        }
-        public void ShowAccounts()
-        {
-            masterDetail.Detail = accChooserPage;
-            masterDetail.SendBackButtonPressed();
-        }
+        
         // Exists in order to dispose of a static instance strongly typed
         // TODO : replace all references to this field
         // by Views resolution, and then, drop it
         public static App CurrentApp { get { return Current as App; } }
 
+        public static bool MasterPresented {
+            get
+            { return CurrentApp.masterDetail.IsPresented; }
+            internal set
+            { CurrentApp.masterDetail.IsPresented = value; }
+        }
+
         public void Init()
         {
             var app = Resolver.Resolve<IXFormsApp>();
@@ -72,11 +69,11 @@ namespace BookAStar
             ViewFactory.Register<DashboardPage, DashboardViewModel>(
                  resolver => new DashboardViewModel());
             ViewFactory.Register<BookQueryPage, BookQueryViewModel>();
+            ViewFactory.Register<BookQueriesPage, BookQueriesViewModel>();
             ViewFactory.Register<EditBillingLinePage, BillingLineViewModel>();
             ViewFactory.Register<EditEstimatePage, EstimateViewModel>();
         }
 
-
         ExtendedMasterDetailPage masterDetail;
 
         public App(IPlatform instance)
@@ -86,8 +83,8 @@ namespace BookAStar
             Init();
             BuildMainPage();
 
-            NavigationPage.SetHasNavigationBar(MainPage, true);
-            NavigationPage.SetHasBackButton(MainPage, true);
+            NavigationPage.SetHasNavigationBar(MainPage, false);
+            NavigationPage.SetHasBackButton(MainPage, false);
         }
         BookQueriesPage bQueriesPage;
         AccountChooserPage accChooserPage;
@@ -99,9 +96,9 @@ namespace BookAStar
 
             bQueriesPage = new BookQueriesPage
             {
-                BindingContext = DataManager.Current.BookQueries,
                 Title = "Demandes",
-                Icon = "icon.png"
+                Icon = "icon.png",
+                BindingContext = new BookQueriesViewModel()
             };
 
             home = new HomePage() { Title = "Accueil", Icon = "icon.png" };
@@ -109,16 +106,16 @@ namespace BookAStar
             // var mainPage = new NavigationPage(bQueriesPage);
             
             masterDetail = new ExtendedMasterDetailPage() {
-                Title="MainPAge"
+                Title="MainPage"
             };
 
             masterDetail.Master = new DashboardPage {
                 Title = "Bookingstar",
                 BindingContext = new DashboardViewModel() };
 
-            masterDetail.Detail = home;
+            // masterDetail.Detail = home;
 
-            
+            masterDetail.Detail = new NavigationPage(home);
             ToolbarItem tiSetts = new ToolbarItem()
             {
                 Text = "Paramètres",
@@ -131,17 +128,7 @@ namespace BookAStar
                 Icon = "icon.png"
             };
           
-          // FIXME  "Tabs not supported in this configuration"
-             var mainTab = new ExtendedTabbedPage()
-            {
-                Title = "XLabs",
-                SwipeEnabled = true,
-                TintColor = Color.White,
-                BarTintColor = Color.Blue,
-                Badges = { "1", "2", "3" },
-                TabBarBackgroundImage = "visuel_sexion.png",
-                TabBarSelectedImage = "icon.png",
-            };
+            /* 
             var navPage = new NavigationPage(masterDetail) {
                 Title = "Navigation",
                 Icon = "icon.png"
@@ -150,23 +137,14 @@ namespace BookAStar
             
             navPage.ToolbarItems.Add(tiHome);
             navPage.ToolbarItems.Add(tiSetts);
-
-            this.MainPage = navPage;
-
+            */
+            this.MainPage = masterDetail;
+            
             Resolver.Resolve<IDependencyContainer>()
-                .Register<INavigationService>(t => new NavigationService(navPage.Navigation))
-                ;
+                .Register<INavigationService>(t => new NavigationService(masterDetail.Detail.Navigation))
+                ; 
         }
 
-        internal void EditCommandLine(Page parentPage, BillingLine com)
-        {
-            EditBillingLinePage editCommandLine = new EditBillingLinePage
-            {
-                Title = "Edition d'une ligne de facture",
-                BindingContext = com
-            };
-            parentPage.Navigation.PushAsync(editCommandLine);
-        }
 
         public void PostDeviceInfo()
         {

From 26110e7a998fdc8e4432f38273414c56dcef7aa0 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Sun, 2 Oct 2016 19:28:33 +0200
Subject: [PATCH 20/59] Publishes the bill setter

---
 BookAStar/BookAStar/Model/Workflow/Estimate.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BookAStar/BookAStar/Model/Workflow/Estimate.cs b/BookAStar/BookAStar/Model/Workflow/Estimate.cs
index 58b8cffc..a9dd6f41 100644
--- a/BookAStar/BookAStar/Model/Workflow/Estimate.cs
+++ b/BookAStar/BookAStar/Model/Workflow/Estimate.cs
@@ -25,7 +25,7 @@ namespace BookAStar.Model.Workflow
         /// In db, they are separated by <c>:</c>
         /// </summary>
         /// <returns></returns>
-        public List<string> AttachedGraphicList { get; private set; }
+        public List<string> AttachedGraphicList { get; set; }
 
         public string AttachedGraphicsString
         {

From 1cc5a3c710372c76d0ee468b4f61f18c21f17d84 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Sun, 2 Oct 2016 19:32:28 +0200
Subject: [PATCH 21/59] Binds the refresh command, and titles the page

---
 BookAStar/BookAStar/Pages/BookQueriesPage.xaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/BookAStar/BookAStar/Pages/BookQueriesPage.xaml b/BookAStar/BookAStar/Pages/BookQueriesPage.xaml
index 30388796..497b5c2a 100644
--- a/BookAStar/BookAStar/Pages/BookQueriesPage.xaml
+++ b/BookAStar/BookAStar/Pages/BookQueriesPage.xaml
@@ -4,6 +4,7 @@
              xmlns:local="clr-namespace:BookAStar;assembly=BookAStar"
              x:Class="BookAStar.Pages.BookQueriesPage"
              Style="{StaticResource PageStyle}"
+             Page.Title="Les Demandes"
              >
   <ContentPage.Resources>
     <ResourceDictionary>
@@ -27,7 +28,8 @@
 
   <StackLayout Padding="10,10,10,10">
 
-  <ListView x:Name="list" ItemTapped="OnViewDetail" HasUnevenRows="true" RowHeight="80">
+  <ListView RefreshCommand="{Binding RefreshQueries}"  IsPullToRefreshEnabled="True"
+            ItemsSource="{Binding Queries}" x:Name="list" ItemTapped="OnViewDetail" HasUnevenRows="true" RowHeight="80">
     <ListView.ItemTemplate HeightRequest="80" VerticalOptions="StartAndExpand">
       <DataTemplate>
         <ViewCell>

From 5d030bf51f7a3d69a6a9e931e327cf24bfdd5412 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Sun, 2 Oct 2016 19:33:31 +0200
Subject: [PATCH 22/59] cleaning thanks to Xaml code

---
 .../BookAStar/Pages/BookQueriesPage.xaml.cs   | 34 +++----------------
 1 file changed, 4 insertions(+), 30 deletions(-)

diff --git a/BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs b/BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs
index 55c6868c..9e953465 100644
--- a/BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs
@@ -1,44 +1,18 @@
-using BookAStar.Helpers;
-using BookAStar.Model;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Input;
+using BookAStar.Model;
+using BookAStar.ViewModels;
 using Xamarin.Forms;
 using XLabs.Ioc;
 using XLabs.Platform.Services;
 
 namespace BookAStar.Pages
 {
+
     public partial class BookQueriesPage : ContentPage
     {
         public BookQueriesPage()
         {
             InitializeComponent();
-
-            BindingContext = DataManager.Current.BookQueries;
-        }
-        protected override void OnBindingContextChanged()
-        {
-            list.ItemsSource = BindingContext as ObservableCollection<BookQueryData>;
-            base.OnBindingContextChanged();
-        }
-
-        public RemoteEntity<BookQueryData,long> Queries
-        {
-            get
-            {
-                return BindingContext!=null? BindingContext as RemoteEntity<BookQueryData, long>:null;
-            }
-        }
-
-        protected override void OnAppearing()
-        {
-            base.OnAppearing();
-            if (Queries.CanExecute(null)) Queries.Execute(null);
+            BindingContext = new BookQueriesViewModel();
         }
 
         private void OnViewDetail(object sender, ItemTappedEventArgs e)

From ec546348d9f97dfb0a7e306a2f7db6d89503c27c Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Sun, 2 Oct 2016 19:33:54 +0200
Subject: [PATCH 23/59] cleanning

---
 BookAStar/BookAStar/Pages/DashboardPage.xaml.cs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/BookAStar/BookAStar/Pages/DashboardPage.xaml.cs b/BookAStar/BookAStar/Pages/DashboardPage.xaml.cs
index 658e2384..0d6bac9c 100644
--- a/BookAStar/BookAStar/Pages/DashboardPage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/DashboardPage.xaml.cs
@@ -1,4 +1,5 @@
-using System;
+using BookAStar.ViewModels;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -31,15 +32,19 @@ namespace BookAStar.Pages
 
         public void OnViewPerformerStatus(object sender, EventArgs e)
         {
-            App.CurrentApp.ShowAccounts();
+            ShowPage<AccountChooserPage>(null, true);
         }
 
         public void OnViewUserQueries(object sender, EventArgs e)
         {
-            App.CurrentApp.ShowQueries();
-
+            ShowPage<BookQueriesPage>(null, true);
         }
 
+        private void ShowPage<T>(object [] args, bool animate=false) where T:Page
+        {
+            Resolver.Resolve<INavigationService>().NavigateTo<T>(animate, args);
+            App.MasterPresented = false;
+        }
 
     }
 }

From 828772cd6f04680fb6786c66cbf725af008c028c Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Sun, 2 Oct 2016 19:35:53 +0200
Subject: [PATCH 24/59] makes the ctor dependent of its viewmodel

---
 .../Pages/EditBillingLinePage.xaml.cs         |  6 ++--
 .../BookAStar/Pages/EditEstimatePage.xaml.cs  | 34 ++++++++-----------
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/BookAStar/BookAStar/Pages/EditBillingLinePage.xaml.cs b/BookAStar/BookAStar/Pages/EditBillingLinePage.xaml.cs
index 5c9e8915..b5cb5d2d 100644
--- a/BookAStar/BookAStar/Pages/EditBillingLinePage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/EditBillingLinePage.xaml.cs
@@ -1,4 +1,5 @@
-using System;
+using BookAStar.ViewModels;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -10,9 +11,10 @@ namespace BookAStar.Pages
 {
     public partial class EditBillingLinePage : ContentPage
     {
-        public EditBillingLinePage()
+        public EditBillingLinePage(BillingLineViewModel model)
         {
             InitializeComponent();
+            BindingContext = model;
         }
     }
 }
diff --git a/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs
index 00ea16bc..aa4f3238 100644
--- a/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs
@@ -1,5 +1,6 @@
 using BookAStar.Model;
 using BookAStar.Model.Workflow;
+using BookAStar.ViewModels;
 using BookAStar.Views;
 using System;
 using System.Collections.Generic;
@@ -8,6 +9,9 @@ using System.Text;
 using System.Threading.Tasks;
 
 using Xamarin.Forms;
+using XLabs.Forms.Services;
+using XLabs.Ioc;
+using XLabs.Platform.Services;
 
 namespace BookAStar.Pages
 {
@@ -16,43 +20,33 @@ namespace BookAStar.Pages
         public Estimate Estimate { get { return BindingContext as Estimate;  } set {
                 BindingContext = value;
             } }
-        public static readonly BindableProperty TotalProperty =
-            BindableProperty.Create("Total", typeof(decimal), typeof(EditEstimatePage),
-               (decimal) 0, BindingMode.OneWay);
-        public static readonly BindableProperty DescriptionProperty =
-            BindableProperty.Create("Description", typeof(string), typeof(Estimate),
-                null, BindingMode.TwoWay);
-        public static readonly BindableProperty ClientProperty =
-            BindableProperty.Create("Client", typeof(ClientProviderInfo), typeof(Estimate),
-                null, BindingMode.OneWay);
-        public static readonly BindableProperty QueryProperty =
-            BindableProperty.Create("Query", typeof(BookQueryData), typeof(Estimate),
-                null, BindingMode.OneWay);
 
-        
-
-        public EditEstimatePage()
+        public EditEstimatePage(EstimateViewModel model)
         {
             InitializeComponent();
+            BindingContext = model;
         }
 
         protected override void OnBindingContextChanged()
         {
             base.OnBindingContextChanged();
-            // FIXME Why the Binding don't work?
-            mdview.Markdown = Estimate.Description;
-
+            // FIXME WAZA
+           if (BindingContext != null)
+                mdview.Markdown = ((EstimateViewModel)BindingContext).Description; 
         }
 
         protected void OnDescriptionChanged (object sender, EventArgs e)
         {
             // FIXME Why the Binding don't work?
-            Estimate.Description = mdview.Markdown;
+            ((EstimateViewModel)BindingContext).Description = mdview.Markdown;
         }
+
         protected void OnNewCommanLine(object sender, EventArgs e)
         {
             var com = new BillingLine();
-            App.CurrentApp.EditCommandLine(this,com);
+            Resolver.Resolve<INavigationService>().NavigateTo<EditBillingLinePage>(
+                true,
+                new object[] { new BillingLineViewModel(com) } );
         }
        
     }

From cb56d5e5235250151c3d108268e3e67087dcd856 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Sun, 2 Oct 2016 19:39:22 +0200
Subject: [PATCH 25/59] makes public the ViewModel's

---
 .../BookAStar/ViewModels/BillingLineViewModel.cs    |  7 +------
 .../BookAStar/ViewModels/BookQueriesViewModel.cs    | 13 ++++++++++++-
 BookAStar/BookAStar/ViewModels/EstimateViewModel.cs | 13 ++++++-------
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/BookAStar/BookAStar/ViewModels/BillingLineViewModel.cs b/BookAStar/BookAStar/ViewModels/BillingLineViewModel.cs
index 1512b559..da39a0a0 100644
--- a/BookAStar/BookAStar/ViewModels/BillingLineViewModel.cs
+++ b/BookAStar/BookAStar/ViewModels/BillingLineViewModel.cs
@@ -1,16 +1,11 @@
 using BookAStar.Interfaces;
 using BookAStar.Model.Workflow;
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using XLabs.Forms.Mvvm;
 
 namespace BookAStar.ViewModels
 {
-    class BillingLineViewModel : ViewModel, IBillingLine
+    public class BillingLineViewModel : ViewModel, IBillingLine
     {
         public BillingLineViewModel(BillingLine data)
         {
diff --git a/BookAStar/BookAStar/ViewModels/BookQueriesViewModel.cs b/BookAStar/BookAStar/ViewModels/BookQueriesViewModel.cs
index 744a4c25..5c22076f 100644
--- a/BookAStar/BookAStar/ViewModels/BookQueriesViewModel.cs
+++ b/BookAStar/BookAStar/ViewModels/BookQueriesViewModel.cs
@@ -6,11 +6,17 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Input;
 
 namespace BookAStar.ViewModels
 {
-    class BookQueriesViewModel : XLabs.Forms.Mvvm.ViewModel
+    public class BookQueriesViewModel : XLabs.Forms.Mvvm.ViewModel
     {
+        public BookQueriesViewModel()
+        {
+
+        }
+
         public ObservableCollection<BookQueryData> Queries
         {
             get
@@ -18,5 +24,10 @@ namespace BookAStar.ViewModels
                 return DataManager.Current.BookQueries;
             }
         }
+
+        public ICommand RefreshQueries
+        {
+            get { return DataManager.Current.BookQueries; }
+        }
     }
 }
diff --git a/BookAStar/BookAStar/ViewModels/EstimateViewModel.cs b/BookAStar/BookAStar/ViewModels/EstimateViewModel.cs
index ef2a5162..51e42836 100644
--- a/BookAStar/BookAStar/ViewModels/EstimateViewModel.cs
+++ b/BookAStar/BookAStar/ViewModels/EstimateViewModel.cs
@@ -1,9 +1,4 @@
-using BookAStar.Model.Interfaces;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 using XLabs.Forms.Mvvm;
 using BookAStar.Model.Workflow;
 using System.Collections.ObjectModel;
@@ -11,11 +6,15 @@ using BookAStar.Model;
 
 namespace BookAStar.ViewModels
 {
-    class EstimateViewModel : ViewModel
+    public class EstimateViewModel : ViewModel
     {
         public EstimateViewModel(Estimate data)
         {
             estimate = data;
+            
+            if (data.AttachedFiles == null) data.AttachedFiles = new List<string>();
+            if (data.AttachedGraphicList == null) data.AttachedGraphicList = new List<string>();
+            if (data.Bill == null) data.Bill = new List<BillingLine>();
             AttachedFiles = new ObservableCollection<string>(data.AttachedFiles);
             AttachedGraphicList = new ObservableCollection<string>(data.AttachedGraphicList);
             Bill = new ObservableCollection<BillingLine>(data.Bill);

From 144412f64b1f90b3a99734ccda749f00abaf738e Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Sun, 2 Oct 2016 20:20:01 +0200
Subject: [PATCH 26/59] re-activates the cache provider

---
 BookAStar/BookAStar.Droid/BookAStar.Droid.csproj | 4 ++--
 BookAStar/BookAStar.Droid/MainActivity.cs        | 7 ++-----
 BookAStar/BookAStar.Droid/packages.config        | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj b/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj
index 879a8c8a..f8606fc6 100644
--- a/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj
+++ b/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj
@@ -266,8 +266,8 @@
       <HintPath>..\..\packages\XLabs.Caching.2.3.0-pre02\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Caching.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="XLabs.Caching.SQLite, Version=2.0.5653.32809, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XLabs.Caching.SQLite.2.0.5653-pre2\lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\XLabs.Caching.SQLite.dll</HintPath>
+    <Reference Include="XLabs.Caching.Sqlite, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Caching.SQLite.2.3.0-pre02\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Caching.Sqlite.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="XLabs.Core, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
diff --git a/BookAStar/BookAStar.Droid/MainActivity.cs b/BookAStar/BookAStar.Droid/MainActivity.cs
index 647671dc..b4c9380c 100644
--- a/BookAStar/BookAStar.Droid/MainActivity.cs
+++ b/BookAStar/BookAStar.Droid/MainActivity.cs
@@ -131,13 +131,10 @@ namespace BookAStar.Droid
                 .Register<IXFormsApp>(app)
                 .Register<ISecureStorage>(t => new KeyVaultStorage(t.Resolve<IDevice>().Id.ToCharArray()))
                
-                /*
+             
                 .Register<ICacheProvider>(
                     t => new SQLiteSimpleCache(new SQLitePlatformAndroid(),
-                        new SQLiteConnectionString(pathToDatabase, true), t.Resolve<IJsonSerializer>()))
-                        
-            */
-                        ;
+                        new SQLiteConnectionString(pathToDatabase, true), t.Resolve<IJsonSerializer>()));
             Resolver.SetResolver(resolverContainer.GetResolver());
         }
 
diff --git a/BookAStar/BookAStar.Droid/packages.config b/BookAStar/BookAStar.Droid/packages.config
index 22387ca9..b25003a3 100644
--- a/BookAStar/BookAStar.Droid/packages.config
+++ b/BookAStar/BookAStar.Droid/packages.config
@@ -33,7 +33,7 @@
   <package id="Xamarin.GooglePlayServices.Maps" version="29.0.0.1" targetFramework="monoandroid70" />
   <package id="Xamarin.GooglePlayServices.Measurement" version="29.0.0.1" targetFramework="monoandroid70" />
   <package id="XLabs.Caching" version="2.3.0-pre02" targetFramework="monoandroid70" />
-  <package id="XLabs.Caching.SQLite" version="2.0.5653-pre2" targetFramework="monoandroid70" />
+  <package id="XLabs.Caching.SQLite" version="2.3.0-pre02" targetFramework="monoandroid70" />
   <package id="XLabs.Core" version="2.3.0-pre02" targetFramework="monoandroid70" />
   <package id="XLabs.Forms" version="2.3.0-pre02" targetFramework="monoandroid70" />
   <package id="XLabs.IoC" version="2.3.0-pre02" targetFramework="monoandroid70" />

From b149fa56f2289a291ff10628c29a7435422d5ab5 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Sun, 2 Oct 2016 20:20:38 +0200
Subject: [PATCH 27/59] Fixes the layout

---
 .../BookAStar/Pages/EditEstimatePage.xaml     | 19 +++++++------------
 BookAStar/BookAStar/Views/MarkdownView.cs     | 14 ++++++++++++++
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/BookAStar/BookAStar/Pages/EditEstimatePage.xaml b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml
index 8de41415..3f407899 100644
--- a/BookAStar/BookAStar/Pages/EditEstimatePage.xaml
+++ b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml
@@ -15,7 +15,7 @@
       </Style>
     </ResourceDictionary>
   </ContentPage.Resources>
-  <StackLayout Padding="10,10,10,10" BindingContext="{Binding .}">
+  <StackLayout Padding="10,10,10,10">
     <StackLayout Orientation="Horizontal" Padding="10,10,10,10">
       <Label Text="{Binding Client.UserName}" LineBreakMode="WordWrap"></Label>
       <Label Text="{Binding Query.Location.Address}" LineBreakMode="WordWrap"></Label>
@@ -23,9 +23,10 @@
     </StackLayout>
 
     <views:MarkdownView x:Name="mdview"
-                        Edited="OnDescriptionChanged" HorizontalOptions="FillAndExpand"
-           VerticalOptions="FillAndExpand"
-    Markdown="{Binding Description}"
+                        Edited="OnDescriptionChanged"
+                        HorizontalOptions="FillAndExpand"
+           VerticalOptions="FillAndExpand" MinimumHeightRequest="160" HeightRequest="250"
+    Markdown="{Binding Description, Mode=TwoWay}"
              RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent,
                                                                              Property=Height,
                                                                              Factor=.4}"
@@ -34,14 +35,8 @@
                                                                             Factor=1}"
                         ></views:MarkdownView>
 
-    <ListView 
-              RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent,
-                                                                             Property=Height,
-                                                                             Factor=.4}"
-                      RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent,
-                                                                            Property=Width,
-                                                                            Factor=1}"
-              >
+    <ListView RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=.2}"
+          RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=1}">
       <ListView.ItemTemplate>
         <DataTemplate>
           <ViewCell>
diff --git a/BookAStar/BookAStar/Views/MarkdownView.cs b/BookAStar/BookAStar/Views/MarkdownView.cs
index b00195ac..3875e68f 100644
--- a/BookAStar/BookAStar/Views/MarkdownView.cs
+++ b/BookAStar/BookAStar/Views/MarkdownView.cs
@@ -38,6 +38,20 @@ namespace BookAStar.Views
         
         public event EventHandler<EventArgs> Edited;
         
+        protected override SizeRequest OnMeasure(double widthConstraint, double heightConstraint)
+        {
+            double width = widthConstraint;
+            double height = heightConstraint;
+
+            if (MinimumWidthRequest>0)
+                width = widthConstraint > 80 ? widthConstraint < double.MaxValue ? widthConstraint : MinimumWidthRequest : MinimumWidthRequest;
+
+            if (MinimumHeightRequest > 0)
+                height = heightConstraint > 160 ? heightConstraint < double.MaxValue ? heightConstraint : MinimumHeightRequest : MinimumHeightRequest;
+
+            return base.OnMeasure(width, height);
+        }
+
     }
 
 }

From 541f61688d3142de50827ad3ed94eca1277c2d95 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Mon, 3 Oct 2016 18:06:52 +0200
Subject: [PATCH 28/59] implements some internal web exception

---
 BookAStar/BookAStar/Helpers/NotIdentifiedException.cs | 10 ++++++++++
 BookAStar/BookAStar/Helpers/ServiceNotAvailable1.cs   | 10 ++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 BookAStar/BookAStar/Helpers/NotIdentifiedException.cs
 create mode 100644 BookAStar/BookAStar/Helpers/ServiceNotAvailable1.cs

diff --git a/BookAStar/BookAStar/Helpers/NotIdentifiedException.cs b/BookAStar/BookAStar/Helpers/NotIdentifiedException.cs
new file mode 100644
index 00000000..537143ce
--- /dev/null
+++ b/BookAStar/BookAStar/Helpers/NotIdentifiedException.cs
@@ -0,0 +1,10 @@
+using System;
+
+namespace BookAStar
+{
+    public class NotIdentifiedException : Exception
+    {
+        public NotIdentifiedException(string message) : base(message) { }
+    }
+}
+
diff --git a/BookAStar/BookAStar/Helpers/ServiceNotAvailable1.cs b/BookAStar/BookAStar/Helpers/ServiceNotAvailable1.cs
new file mode 100644
index 00000000..a723cf32
--- /dev/null
+++ b/BookAStar/BookAStar/Helpers/ServiceNotAvailable1.cs
@@ -0,0 +1,10 @@
+using System;
+
+namespace BookAStar
+{
+    public class ServiceNotAvailable : Exception
+    {
+        public ServiceNotAvailable(string message, Exception innerException) : base(message, innerException) { }
+
+    }
+}
\ No newline at end of file

From 312d953da640e2345897933de1e7dd5a8198f368 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Mon, 3 Oct 2016 18:07:51 +0200
Subject: [PATCH 29/59] fixes the XLabs.Serialization.Json.NET reference

---
 BookAStar/BookAStar.Droid/BookAStar.Droid.csproj | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj b/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj
index f8606fc6..063681b9 100644
--- a/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj
+++ b/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj
@@ -298,6 +298,10 @@
       <HintPath>..\..\packages\XLabs.Serialization.2.3.0-pre02\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Serialization.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="XLabs.Serialization.Json.NET, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Serialization.JSON.2.3.0-pre02\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Serialization.Json.NET.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="XLabs.Settings, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\XLabs.Settings.2.3.0-pre02\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Settings.dll</HintPath>
       <Private>True</Private>

From e28f858c51540cde99fe7329f112a361c421fc40 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Mon, 3 Oct 2016 18:08:53 +0200
Subject: [PATCH 30/59] refactoring

---
 BookAStar/BookAStar/Helpers/LocaLEntity.cs  | 34 ++++++++++++++
 BookAStar/BookAStar/Helpers/RemoteEntity.cs | 50 +--------------------
 2 files changed, 36 insertions(+), 48 deletions(-)
 create mode 100644 BookAStar/BookAStar/Helpers/LocaLEntity.cs

diff --git a/BookAStar/BookAStar/Helpers/LocaLEntity.cs b/BookAStar/BookAStar/Helpers/LocaLEntity.cs
new file mode 100644
index 00000000..2f86ecdb
--- /dev/null
+++ b/BookAStar/BookAStar/Helpers/LocaLEntity.cs
@@ -0,0 +1,34 @@
+
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+
+namespace BookAStar
+{
+    public class LocalEntity<V, K> : ObservableCollection<V> where K : IEquatable<K>
+    {
+        public V CurrentItem { get; protected set; }
+        protected Func<V, K> GetKey { get; set; }
+        public LocalEntity(Func<V, K> getKey) : base()
+        {
+            if (getKey == null) throw new InvalidOperationException();
+            GetKey = getKey;
+        }
+        public virtual void Merge(V item)
+        {
+            var key = GetKey(item);
+            if (this.Any(x => GetKey(x).Equals(key)))
+            {
+                Remove(LocalGet(key));
+            }
+            Add(item);
+            CurrentItem = item;
+        }
+        public V LocalGet(K key)
+        {
+            CurrentItem = this.Single(x => GetKey(x).Equals(key));
+            return CurrentItem;
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/BookAStar/BookAStar/Helpers/RemoteEntity.cs b/BookAStar/BookAStar/Helpers/RemoteEntity.cs
index 16c48352..0245dcc9 100644
--- a/BookAStar/BookAStar/Helpers/RemoteEntity.cs
+++ b/BookAStar/BookAStar/Helpers/RemoteEntity.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Windows.Input;
-using System.Linq;
 using System.Net.Http;
 using Newtonsoft.Json;
 using System.Threading.Tasks;
@@ -11,42 +9,6 @@ using System.Net;
 namespace BookAStar
 {
 
-    public class NotIdentifiedException : Exception {
-        public NotIdentifiedException(string message) : base(message) { }
-    }
-
-    public class ServiceNotAvailable : Exception
-    {
-        public ServiceNotAvailable(string message, Exception innerException) : base(message, innerException) { }
-
-    }
-
-    public class LocalEntity<V, K> : ObservableCollection<V> where K : IEquatable<K>
-    {
-        public V CurrentItem { get; protected set; }
-        protected Func<V, K> GetKey { get; set; }
-        public LocalEntity(Func<V, K> getKey) : base()
-        {
-            if (getKey == null) throw new InvalidOperationException();
-            GetKey = getKey;
-        }
-        public virtual void Merge(V item)
-        {
-            var key = GetKey(item);
-            if (this.Any(x => GetKey(x).Equals(key)))
-            {
-                Remove(LocalGet(key));
-            }
-            Add(item);
-            CurrentItem = item;
-        }
-        public V LocalGet(K key)
-        {
-            CurrentItem = this.Single(x => GetKey(x).Equals(key));
-            return CurrentItem;
-        }
-    }
-
     public class RemoteEntity<V,K> : LocalEntity<V, K>, ICommand where K : IEquatable<K>
     {
         private string _controller;
@@ -75,8 +37,6 @@ namespace BookAStar
             if (CanExecuteChanged != null)
                 CanExecuteChanged.Invoke(this, new EventArgs());
         }
-        
-       
 
         /// <summary>
         /// Refresh the collection
@@ -85,12 +45,8 @@ namespace BookAStar
         public async void Execute(object parameter)
         {
             BeforeExecute();
-            using (HttpClient client = new HttpClient())
+            using (HttpClient client = CreateClient())
             {
-
-                // Update credentials 
-                client.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue(
-                    "Bearer", MainSettings.CurrentUser.YavscTokens.AccessToken);
                 // Get the whole data
                 try
                 {
@@ -116,14 +72,13 @@ namespace BookAStar
             AfterExecuting();
         }
 
-        
-
         private void AfterExecuting()
         {
             IsExecuting = false;
             if (CanExecuteChanged != null)
                 CanExecuteChanged.Invoke(this, new EventArgs());
         }
+
         public async Task<V> Get(K key)
         {
             var item = LocalGet(key);
@@ -147,7 +102,6 @@ namespace BookAStar
                     {
                         var content = await response.Content.ReadAsStringAsync();
                         item = JsonConvert.DeserializeObject<V>(content);
-                        // LocalData.Clear();
                         Merge(item);
                     }
                 }

From a3a1c4ec917e84967babee823547dbe8366f7282 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Mon, 3 Oct 2016 18:09:16 +0200
Subject: [PATCH 31/59] inits the Json service

---
 BookAStar/BookAStar.Droid/MainActivity.cs | 63 +++++++++++------------
 1 file changed, 30 insertions(+), 33 deletions(-)

diff --git a/BookAStar/BookAStar.Droid/MainActivity.cs b/BookAStar/BookAStar.Droid/MainActivity.cs
index b4c9380c..b410b27f 100644
--- a/BookAStar/BookAStar.Droid/MainActivity.cs
+++ b/BookAStar/BookAStar.Droid/MainActivity.cs
@@ -1,45 +1,43 @@
-using System;
-
-using Android.App;
-using Android.Content.PM;
-using Android.Widget;
-using Android.OS;
+using Android.App;
 using Android.Content;
+using Android.Content.PM;
 using Android.Gms.Common;
+using Android.OS;
+using Android.Speech.Tts;
 using Android.Util;
-
+using Android.Widget;
+using BookAStar.Droid.OAuth;
+using BookAStar.Helpers;
+using BookAStar.Interfaces;
+using BookAStar.Model.Auth.Account;
+using Newtonsoft.Json.Linq;
+using Plugin.DeviceInfo;
+using SQLite.Net;
+using SQLite.Net.Platform.XamarinAndroid;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
 using Xamarin.Auth;
+using XLabs;
+using XLabs.Caching;
+using XLabs.Caching.SQLite;
+using XLabs.Enums;
 using XLabs.Forms;
-using XLabs.Platform.Device;
 using XLabs.Forms.Services;
+using XLabs.Ioc;
+using XLabs.Platform.Device;
+using XLabs.Platform.Mvvm;
+using XLabs.Platform.Services;
 using XLabs.Platform.Services.Email;
 using XLabs.Platform.Services.Media;
 using XLabs.Serialization;
-
-using Newtonsoft.Json.Linq;
-using System.Net;
-using System.IO;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Net.Http;
-using BookAStar.Model.Auth.Account;
-using BookAStar.Droid.OAuth;
+using XLabs.Serialization.JsonNET;
 using Yavsc.Helpers;
 using Yavsc.Models.Identity;
-using BookAStar.Helpers;
-using BookAStar.Interfaces;
-using Plugin.DeviceInfo;
-using Android.Speech.Tts;
-using XLabs.Platform.Services;
-using XLabs.Caching.SQLite;
-using SQLite.Net.Platform.XamarinAndroid;
-using SQLite.Net;
-using XLabs.Ioc;
-using XLabs.Platform.Mvvm;
-using XLabs.Caching;
-using XLabs;
-using XLabs.Enums;
 
 namespace BookAStar.Droid
 {
@@ -130,8 +128,7 @@ namespace BookAStar.Droid
                 .Register<IDependencyContainer>(resolverContainer)
                 .Register<IXFormsApp>(app)
                 .Register<ISecureStorage>(t => new KeyVaultStorage(t.Resolve<IDevice>().Id.ToCharArray()))
-               
-             
+                .Register<IJsonSerializer, JsonSerializer>()
                 .Register<ICacheProvider>(
                     t => new SQLiteSimpleCache(new SQLitePlatformAndroid(),
                         new SQLiteConnectionString(pathToDatabase, true), t.Resolve<IJsonSerializer>()));

From ffad59c513d8d7a048ad843f05dbc8fb30870b73 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Mon, 3 Oct 2016 18:10:06 +0200
Subject: [PATCH 32/59] adds the XLabs Json reference

---
 BookAStar/BookAStar.Droid/packages.config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/BookAStar/BookAStar.Droid/packages.config b/BookAStar/BookAStar.Droid/packages.config
index b25003a3..a196ada6 100644
--- a/BookAStar/BookAStar.Droid/packages.config
+++ b/BookAStar/BookAStar.Droid/packages.config
@@ -39,6 +39,7 @@
   <package id="XLabs.IoC" version="2.3.0-pre02" targetFramework="monoandroid70" />
   <package id="XLabs.Platform" version="2.3.0-pre02" targetFramework="monoandroid70" />
   <package id="XLabs.Serialization" version="2.3.0-pre02" targetFramework="monoandroid70" />
+  <package id="XLabs.Serialization.JSON" version="2.3.0-pre02" targetFramework="monoandroid70" />
   <package id="XLabs.Settings" version="2.3.0-pre02" targetFramework="monoandroid70" />
   <package id="XLabs.Settings.XamSettings" version="2.3.0-pre02" targetFramework="monoandroid70" />
 </packages>
\ No newline at end of file

From 9f6105de2376b7c6101f63989c594864e7b65aa6 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Mon, 3 Oct 2016 18:10:39 +0200
Subject: [PATCH 33/59] refactoring

---
 .../BookAStar/ViewModels/EstimateViewModel.cs | 49 +++++++++++++------
 1 file changed, 35 insertions(+), 14 deletions(-)

diff --git a/BookAStar/BookAStar/ViewModels/EstimateViewModel.cs b/BookAStar/BookAStar/ViewModels/EstimateViewModel.cs
index 51e42836..1ad3dffb 100644
--- a/BookAStar/BookAStar/ViewModels/EstimateViewModel.cs
+++ b/BookAStar/BookAStar/ViewModels/EstimateViewModel.cs
@@ -3,6 +3,7 @@ using XLabs.Forms.Mvvm;
 using BookAStar.Model.Workflow;
 using System.Collections.ObjectModel;
 using BookAStar.Model;
+using Xamarin.Forms;
 
 namespace BookAStar.ViewModels
 {
@@ -10,21 +11,17 @@ namespace BookAStar.ViewModels
     {
         public EstimateViewModel(Estimate data)
         {
-            estimate = data;
-            
+            Data = data;
             if (data.AttachedFiles == null) data.AttachedFiles = new List<string>();
             if (data.AttachedGraphicList == null) data.AttachedGraphicList = new List<string>();
             if (data.Bill == null) data.Bill = new List<BillingLine>();
             AttachedFiles = new ObservableCollection<string>(data.AttachedFiles);
             AttachedGraphicList = new ObservableCollection<string>(data.AttachedGraphicList);
             Bill = new ObservableCollection<BillingLine>(data.Bill);
-            description = data.Description;
-            title = data.Title;
-            status = data.Status;
         }
 
-        Estimate estimate;
-        
+        public Estimate Data { get; protected set; }
+
         public ObservableCollection<string> AttachedFiles
         {
             get; protected set;
@@ -41,17 +38,18 @@ namespace BookAStar.ViewModels
         }
 
 
-        private string description;
+        string newDesc;
         public string Description
         {
             get
             {
-                return description;
+                return Data.Description;
             }
 
             set
             {
-                SetProperty<string>(ref description, value, "Description");
+                SetProperty<string>(ref newDesc, value, "Description");
+                Data.Description = newDesc;
             }
         }
 
@@ -60,12 +58,13 @@ namespace BookAStar.ViewModels
         {
             get
             {
-                return status;
+                return Data.Status;
             }
 
             set
             {
                 SetProperty<int?>(ref status, value, "Status");
+                Data.Status = status;
             }
         }
         private string title;
@@ -73,18 +72,40 @@ namespace BookAStar.ViewModels
         {
             get
             {
-                return title;
+                return Data.Title;
             }
 
             set
             {
                 SetProperty<string>(ref title, value, "Title");
+                Data.Title = title;
             }
         }
 
-        public ClientProviderInfo Client {  get { return estimate.Client; } }
+        public ClientProviderInfo Client {  get { return Data.Client; } }
 
-        public BookQueryData Query { get { return estimate.Query; } }
+        public BookQueryData Query { get { return Data.Query; } }
 
+        public FormattedString FormattedTotal
+        {
+            get
+            {
+                OnPlatform<Font> lfs = (OnPlatform<Font>)App.Current.Resources["LargeFontSize"];
+                OnPlatform<Color> etc = (OnPlatform<Color>)App.Current.Resources["EmphasisTextColor"];
+
+                return new FormattedString
+                {
+
+                    Spans = {
+                        new Span { Text = "Total TTC: " },
+                        new Span { Text = Data.Total.ToString(),
+                            ForegroundColor = etc.Android  ,
+                            FontSize = (double) lfs.Android.FontSize },
+                        new Span { Text = "€", FontSize = (double) lfs.Android.FontSize }
+                    }
+                };
+            }
+            set { }
+        }
     }
 }

From 49a04fb6d23af44a3c1a8ad6c635a19bf1d64481 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Mon, 3 Oct 2016 18:31:57 +0200
Subject: [PATCH 34/59] PickerStyle

---
 BookAStar/BookAStar/App.xaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/BookAStar/BookAStar/App.xaml b/BookAStar/BookAStar/App.xaml
index 23898b58..737b90fa 100644
--- a/BookAStar/BookAStar/App.xaml
+++ b/BookAStar/BookAStar/App.xaml
@@ -56,13 +56,14 @@
       <Style x:Key="ContentLabelStyle"  BasedOn="{StaticResource LabelStyle}" TargetType="Label">
         <Setter Property="FontSize" Value="{StaticResource MediumFontSize}" />
         <Setter Property="HorizontalOptions" Value="CenterAndExpand" />
+        <Setter Property="VerticalOptions" Value="CenterAndExpand" />
       </Style>
       
       <Style x:Key="EntryStyle" TargetType="Entry">
         <Setter Property="HorizontalOptions" Value="CenterAndExpand"/>
       </Style>
       <Style x:Key="PickerStyle" TargetType="Picker">
-        <Setter Property="HorizontalOptions" Value="CenterAndExpand"/>
+        <Setter Property="HorizontalOptions" Value="FillAndExpand"/>
       </Style>
       <Style x:Key="BigEntry" TargetType="Entry" BasedOn="{StaticResource EntryStyle}">
         <Setter Property="FontSize" Value="{StaticResource LargeFontSize}" />

From 86c1ee1ad20521265dbb446cf8793d3874b21f94 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Mon, 3 Oct 2016 18:32:37 +0200
Subject: [PATCH 35/59] inits an Xlabs cfg mgr

---
 BookAStar/BookAStar/App.xaml.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/BookAStar/BookAStar/App.xaml.cs b/BookAStar/BookAStar/App.xaml.cs
index c6f4676e..add3d1df 100644
--- a/BookAStar/BookAStar/App.xaml.cs
+++ b/BookAStar/BookAStar/App.xaml.cs
@@ -16,6 +16,7 @@ using XLabs.Forms.Services;
 using XLabs.Ioc;
 using XLabs.Platform.Mvvm;
 using XLabs.Platform.Services;
+using XLabs.Settings;
 
 /*
 Glyphish icons from
@@ -62,6 +63,7 @@ namespace BookAStar
             app.Startup += (o, e) => Debug.WriteLine("Application Startup");
             app.Suspended += (o, e) => Debug.WriteLine("Application Suspended");
         }
+        public static GenericConfigSettingsMgr ConfigManager { protected set; get; }
 
         private void Configure(IXFormsApp app)
         {
@@ -72,8 +74,11 @@ namespace BookAStar
             ViewFactory.Register<BookQueriesPage, BookQueriesViewModel>();
             ViewFactory.Register<EditBillingLinePage, BillingLineViewModel>();
             ViewFactory.Register<EditEstimatePage, EstimateViewModel>();
-        }
 
+            ConfigManager = new XLabs.Settings.GenericConfigSettingsMgr(s =>
+               Settings.AppSettings.GetValueOrDefault<string>(s, Settings.SettingsDefault), null);
+        }
+         
         ExtendedMasterDetailPage masterDetail;
 
         public App(IPlatform instance)
@@ -86,6 +91,7 @@ namespace BookAStar
             NavigationPage.SetHasNavigationBar(MainPage, false);
             NavigationPage.SetHasBackButton(MainPage, false);
         }
+
         BookQueriesPage bQueriesPage;
         AccountChooserPage accChooserPage;
         HomePage home;

From 7ff5411cb2e9805e4b4c5b8136ccd93034b0db2a Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Mon, 3 Oct 2016 18:33:19 +0200
Subject: [PATCH 36/59] references the recent web ex adds

---
 BookAStar/BookAStar/BookAStar.csproj | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/BookAStar/BookAStar/BookAStar.csproj b/BookAStar/BookAStar/BookAStar.csproj
index f476d5a0..9bd62926 100644
--- a/BookAStar/BookAStar/BookAStar.csproj
+++ b/BookAStar/BookAStar/BookAStar.csproj
@@ -43,9 +43,12 @@
     <Compile Include="Constants.cs" />
     <Compile Include="Factories\ViewFactory.cs" />
     <Compile Include="Helpers\DataManager.cs" />
+    <Compile Include="Helpers\LocaLEntity.cs" />
+    <Compile Include="Helpers\NotIdentifiedException.cs" />
     <Compile Include="Helpers\PageHelpers.cs" />
     <Compile Include="Helpers\PropertySupport.cs" />
     <Compile Include="Helpers\RemoteEntityRO.cs" />
+    <Compile Include="Helpers\ServiceNotAvailable1.cs" />
     <Compile Include="Helpers\Settings.cs" />
     <Compile Include="Helpers\UserHelpers.cs" />
     <Compile Include="Interfaces\IComponentContext.cs" />

From 6c81683601d9295f9b90c70b14b62f1c9fb6e7a7 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Mon, 3 Oct 2016 18:34:14 +0200
Subject: [PATCH 37/59] an Validate command

---
 .../ViewModels/BillingLineViewModel.cs        | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/BookAStar/BookAStar/ViewModels/BillingLineViewModel.cs b/BookAStar/BookAStar/ViewModels/BillingLineViewModel.cs
index da39a0a0..fb2feb5c 100644
--- a/BookAStar/BookAStar/ViewModels/BillingLineViewModel.cs
+++ b/BookAStar/BookAStar/ViewModels/BillingLineViewModel.cs
@@ -1,19 +1,27 @@
 using BookAStar.Interfaces;
 using BookAStar.Model.Workflow;
 using System;
+using System.Windows.Input;
+using Xamarin.Forms;
 using XLabs.Forms.Mvvm;
 
 namespace BookAStar.ViewModels
 {
     public class BillingLineViewModel : ViewModel, IBillingLine
     {
-        public BillingLineViewModel(BillingLine data)
+        BillingLine data;
+        public Estimate Billing { protected set; get; }
+
+        public BillingLineViewModel(Estimate billing, BillingLine data)
         {
-            if (data == null) data = new BillingLine();
-            count = data.Count;
-            description = data.Description;
-            unitaryCost = data.UnitaryCost;
-            duration = data.Duration;
+            this.data = (data == null) ? new BillingLine() : data;
+            Billing = billing;
+            ValidateCommand = 
+                new Command(
+                () => {
+                    Billing.Bill.Add(data);
+                    Validated.Invoke(this, new EventArgs());
+                });
         }
 
         protected int count;
@@ -69,5 +77,10 @@ namespace BookAStar.ViewModels
                 SetProperty<decimal>(ref unitaryCost, value, "UnitaryCost");
             }
         }
+
+        public ICommand ValidateCommand { protected set; get; }
+
+        public event EventHandler<EventArgs> Validated;
+
     }
 }

From 3a673c6a455c7aef9315012f734d5e6aaf81571d Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Mon, 3 Oct 2016 18:34:52 +0200
Subject: [PATCH 38/59] fs api url impl

---
 BookAStar/BookAStar/Constants.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/BookAStar/BookAStar/Constants.cs b/BookAStar/BookAStar/Constants.cs
index c0f23f2c..1d3c02fe 100644
--- a/BookAStar/BookAStar/Constants.cs
+++ b/BookAStar/BookAStar/Constants.cs
@@ -18,6 +18,7 @@ namespace BookAStar
         public static readonly string MobileRegistrationUrl = YavscApiUrl + "/gcm/register";
         public static readonly string UserInfoUrl = YavscApiUrl + "/me";
         public static readonly string BlogUrl = YavscApiUrl + "/blogs";
+        public static readonly string FsUrl = YavscApiUrl + "/fs";
 
         #endregion
 

From f9fba42308a6bd7af92276b70bdc4eadb4589be6 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Mon, 3 Oct 2016 18:35:28 +0200
Subject: [PATCH 39/59] gives the Picker a Title

---
 BookAStar/BookAStar/Pages/EditBillingLinePage.xaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/BookAStar/BookAStar/Pages/EditBillingLinePage.xaml b/BookAStar/BookAStar/Pages/EditBillingLinePage.xaml
index 21ebbb68..0fcd3597 100644
--- a/BookAStar/BookAStar/Pages/EditBillingLinePage.xaml
+++ b/BookAStar/BookAStar/Pages/EditBillingLinePage.xaml
@@ -15,14 +15,14 @@
       </Style>
     </ResourceDictionary>
   </ContentPage.Resources>
-  <StackLayout>
+  <StackLayout x:Name="mainStackLayout">
     <Label Text="Description de la ligne de facture" Style="{StaticResource InputLabelStyle}"></Label>
     <Editor VerticalOptions="FillAndExpand"></Editor>
     <Label Text="Durée de la prestation" 
            Style="{StaticResource InputLabelStyle}"></Label>
     <StackLayout Orientation="Horizontal">
-      <Entry Placeholder="Durée" Keyboard="Numeric" Style="{StaticResource BigEntry}"/>
-      <Picker SelectedIndex="1" Style="{StaticResource PickerStyle}">
+      <Entry Placeholder="Durée" Keyboard="Numeric" Style="{StaticResource BigEntry}" />
+      <Picker x:Name="picker" SelectedIndex="1" Style="{StaticResource PickerStyle}" Title="Unité de temps">
         <Picker.Items>
           <x:String>Heures</x:String>
           <x:String>Jours</x:String>
@@ -37,6 +37,6 @@
       <Entry Placeholder="Prix" Keyboard="Numeric" Style="{StaticResource BigEntry}"></Entry>
       <Label Text="€" Style="{StaticResource BigLabel}" HorizontalTextAlignment="Start"/>
     </StackLayout>
-    <Button Text="Valider cette ligne de facture"></Button>
+    <Button Text="Valider cette ligne de facture" Command="{Binding ValidateCommand}"></Button>
   </StackLayout>
 </ContentPage>
\ No newline at end of file

From df32a4cb455fe75213cd74cf81148158197e0b2d Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Mon, 3 Oct 2016 18:35:59 +0200
Subject: [PATCH 40/59] Invalidates mesure at modification

---
 BookAStar/BookAStar/Pages/EditBillingLinePage.xaml.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/BookAStar/BookAStar/Pages/EditBillingLinePage.xaml.cs b/BookAStar/BookAStar/Pages/EditBillingLinePage.xaml.cs
index b5cb5d2d..47d11877 100644
--- a/BookAStar/BookAStar/Pages/EditBillingLinePage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/EditBillingLinePage.xaml.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-
+using System.Windows.Input;
 using Xamarin.Forms;
 
 namespace BookAStar.Pages
@@ -15,6 +15,7 @@ namespace BookAStar.Pages
         {
             InitializeComponent();
             BindingContext = model;
+            InvalidateMeasure();
         }
     }
 }

From 829e33563e99474eea15d36753572fff69de3f82 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Mon, 3 Oct 2016 18:36:24 +0200
Subject: [PATCH 41/59] yalayout

---
 BookAStar/BookAStar/Pages/EditEstimatePage.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BookAStar/BookAStar/Pages/EditEstimatePage.xaml b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml
index 3f407899..d3027868 100644
--- a/BookAStar/BookAStar/Pages/EditEstimatePage.xaml
+++ b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml
@@ -29,7 +29,7 @@
     Markdown="{Binding Description, Mode=TwoWay}"
              RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent,
                                                                              Property=Height,
-                                                                             Factor=.4}"
+                                                                             Factor=.6}"
                       RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent,
                                                                             Property=Width,
                                                                             Factor=1}"

From 5ab7eab780fcac31d33ae1daa924fc4d88e6db61 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Mon, 3 Oct 2016 18:37:42 +0200
Subject: [PATCH 42/59] fixes the line edtion action

---
 BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs
index aa4f3238..57fe8aaa 100644
--- a/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs
@@ -17,9 +17,6 @@ namespace BookAStar.Pages
 {
     public partial class EditEstimatePage : ContentPage
     {
-        public Estimate Estimate { get { return BindingContext as Estimate;  } set {
-                BindingContext = value;
-            } }
 
         public EditEstimatePage(EstimateViewModel model)
         {
@@ -46,7 +43,7 @@ namespace BookAStar.Pages
             var com = new BillingLine();
             Resolver.Resolve<INavigationService>().NavigateTo<EditBillingLinePage>(
                 true,
-                new object[] { new BillingLineViewModel(com) } );
+                new object[] { new BillingLineViewModel((Estimate)this.BindingContext,com) } );
         }
        
     }

From 50e10e89ad67f0dbc2abfc15b203f2d9ae15fd88 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Mon, 3 Oct 2016 18:39:14 +0200
Subject: [PATCH 43/59] fixes the FormattedString location

---
 .../BookAStar/Model/Workflow/Estimate.cs      | 25 +------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/BookAStar/BookAStar/Model/Workflow/Estimate.cs b/BookAStar/BookAStar/Model/Workflow/Estimate.cs
index a9dd6f41..3b1e4174 100644
--- a/BookAStar/BookAStar/Model/Workflow/Estimate.cs
+++ b/BookAStar/BookAStar/Model/Workflow/Estimate.cs
@@ -1,10 +1,7 @@
 using BookAStar.Helpers;
 using BookAStar.Model.Interfaces;
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
-using Xamarin.Forms;
 
 namespace BookAStar.Model.Workflow
 {
@@ -70,27 +67,7 @@ namespace BookAStar.Model.Workflow
             }
         }
 
-        public FormattedString FormattedTotal
-        {
-            get
-            {
-                OnPlatform<Font> lfs = (OnPlatform < Font >) App.Current.Resources["LargeFontSize"];
-                OnPlatform<Color> etc = (OnPlatform<Color>)App.Current.Resources["EmphasisTextColor"];
-                
-                return new FormattedString
-                {
-
-                    Spans = {
-                        new Span { Text = "Total TTC: " },
-                        new Span { Text = Total.ToString(),
-                            ForegroundColor = etc.Android  ,
-                            FontSize = (double) lfs.Android.FontSize },
-                        new Span { Text = "€", FontSize = (double) lfs.Android.FontSize }
-                    }
-                };
-            }
-            set { }
-        }
+        
         public decimal Total { get
             {
                 return Bill?.Aggregate((decimal)0, (t, l) => t + l.Count * l.UnitaryCost) ?? (decimal)0;

From 0a8b4adb76e4a9bf14c6db439f946a86d0cdc50a Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Mon, 3 Oct 2016 18:39:58 +0200
Subject: [PATCH 44/59] publishes access on settings manager

---
 BookAStar/BookAStar/Helpers/Settings.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/BookAStar/BookAStar/Helpers/Settings.cs b/BookAStar/BookAStar/Helpers/Settings.cs
index 0025c2a4..5d03245f 100644
--- a/BookAStar/BookAStar/Helpers/Settings.cs
+++ b/BookAStar/BookAStar/Helpers/Settings.cs
@@ -11,7 +11,7 @@ namespace BookAStar.Helpers
   /// </summary>
   public static class Settings
   {
-    private static ISettings AppSettings
+    public static ISettings AppSettings
     {
       get
       {
@@ -22,12 +22,13 @@ namespace BookAStar.Helpers
     #region Setting Constants
 
     private const string SettingsKey = "settings_key";
-    private static readonly string SettingsDefault = string.Empty;
+    public static readonly string SettingsDefault = string.Empty;
+        public static readonly string XLabsSettingsPrefix = "_XLABS_";
 
-    #endregion
+        #endregion
 
 
-    public static string GeneralSettings
+        public static string GeneralSettings
     {
       get
       {

From b36c67f870db0079843e6008eb31d114ea7d8a96 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Mon, 3 Oct 2016 18:40:22 +0200
Subject: [PATCH 45/59] implements an upload

---
 BookAStar/BookAStar/Helpers/UserHelpers.cs | 46 +++++++++++++++++++---
 1 file changed, 41 insertions(+), 5 deletions(-)

diff --git a/BookAStar/BookAStar/Helpers/UserHelpers.cs b/BookAStar/BookAStar/Helpers/UserHelpers.cs
index f1d43366..d57b4f65 100644
--- a/BookAStar/BookAStar/Helpers/UserHelpers.cs
+++ b/BookAStar/BookAStar/Helpers/UserHelpers.cs
@@ -1,8 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Globalization;
+using System.IO;
 using System.Linq;
+using System.Net.Http;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Xamarin.Forms;
 
@@ -12,17 +16,49 @@ namespace BookAStar.Helpers
     {
         public static ImageSource Avatar(string avatarPath)
         {
-            /*foreach (var r in App.Current.Resources)
-            {
-                Debug.WriteLine($"#R# {r.Key} : {r.GetType().Name}");
-            }*/
             var result = avatarPath == null ?
-                ImageSource.FromResource(/* "BookAStar.icon_user.png" */ "BookAStar.Images.icon_user.png") :
+                ImageSource.FromResource( "BookAStar.Images.icon_user.png") :
                 avatarPath.StartsWith("res://") ?
                  ImageSource.FromResource(avatarPath.Substring(6)) :
                  ImageSource.FromUri(new Uri(avatarPath));
             var test = ImageSource.FromResource("none.resource.png");
             return result;
         }
+
+        public static HttpClient CreateClient()
+        {
+            var client = new HttpClient();
+            client.DefaultRequestHeaders.Authorization =
+                new System.Net.Http.Headers.AuthenticationHeaderValue(
+                    "Bearer", MainSettings.CurrentUser.YavscTokens.AccessToken);
+            return client;
+        }
+
+        /// <summary>
+        /// Uploads the given stream to
+        /// /api/fs, in order to be saved under the given file name
+        /// </summary>
+        /// <param name="inputStream"></param>
+        /// <param name="fileName"></param>
+        /// <returns></returns>
+        public static async Task<bool> Upload(Stream inputStream, string fileName)
+        {
+            using (var client = CreateClient())
+            {
+                using (var content =
+                    new MultipartFormDataContent("Upload----" + DateTime.Now.ToString(CultureInfo.InvariantCulture)))
+                {
+                    content.Add(new StreamContent(inputStream), "Files", fileName);
+
+                    using (
+                       var message =
+                           await client.PostAsync(Constants.FsUrl, content))
+                    {
+                        return (message.IsSuccessStatusCode);
+                    }
+                }
+            }
+        }
+
     }
 }

From 3da9d7834d4a872cdcd2e8c0490215314527f948 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Mon, 3 Oct 2016 20:15:04 +0200
Subject: [PATCH 46/59] cleanning

---
 BookAStar/BookAStar/Helpers/UserHelpers.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/BookAStar/BookAStar/Helpers/UserHelpers.cs b/BookAStar/BookAStar/Helpers/UserHelpers.cs
index d57b4f65..db43c9b4 100644
--- a/BookAStar/BookAStar/Helpers/UserHelpers.cs
+++ b/BookAStar/BookAStar/Helpers/UserHelpers.cs
@@ -1,12 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
 using System.Globalization;
 using System.IO;
-using System.Linq;
 using System.Net.Http;
-using System.Text;
-using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Xamarin.Forms;
 

From d785e5e8267ed46769e9efe82c00ef5e5d4e377d Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Tue, 4 Oct 2016 02:42:23 +0200
Subject: [PATCH 47/59] Fixes Json Serialization

---
 BookAStar/BookAStar/Model/ClientProviderInfo.cs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/BookAStar/BookAStar/Model/ClientProviderInfo.cs b/BookAStar/BookAStar/Model/ClientProviderInfo.cs
index 604beaae..21991bfa 100644
--- a/BookAStar/BookAStar/Model/ClientProviderInfo.cs
+++ b/BookAStar/BookAStar/Model/ClientProviderInfo.cs
@@ -1,10 +1,6 @@
 using BookAStar.Helpers;
 using BookAStar.Model.Social;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Newtonsoft.Json;
 using Xamarin.Forms;
 
 namespace BookAStar.Model
@@ -21,6 +17,7 @@ namespace BookAStar.Model
         public Location BillingAddress { get; set; }
         // TODO Get User Professional status existence as a boolean
         // And hack the avatar with
+        [JsonIgnore]
         public ImageSource AvatarOrNot
         {
             get

From f42b66383aec40cc987ee6902b628889fbc4f160 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Tue, 4 Oct 2016 02:44:44 +0200
Subject: [PATCH 48/59] refactoring

---
 BookAStar/BookAStar/BookAStar.csproj          |  2 ++
 BookAStar/BookAStar/Helpers/LocaLEntity.cs    | 13 ++++++++++--
 .../BookAStar/Interfaces/ILocalEntity.cs      | 21 +++++++++++++++++++
 3 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 BookAStar/BookAStar/Interfaces/ILocalEntity.cs

diff --git a/BookAStar/BookAStar/BookAStar.csproj b/BookAStar/BookAStar/BookAStar.csproj
index 9bd62926..908d00f0 100644
--- a/BookAStar/BookAStar/BookAStar.csproj
+++ b/BookAStar/BookAStar/BookAStar.csproj
@@ -43,6 +43,8 @@
     <Compile Include="Constants.cs" />
     <Compile Include="Factories\ViewFactory.cs" />
     <Compile Include="Helpers\DataManager.cs" />
+    <Compile Include="Helpers\ObservableString.cs" />
+    <Compile Include="Interfaces\ILocalEntity.cs" />
     <Compile Include="Helpers\LocaLEntity.cs" />
     <Compile Include="Helpers\NotIdentifiedException.cs" />
     <Compile Include="Helpers\PageHelpers.cs" />
diff --git a/BookAStar/BookAStar/Helpers/LocaLEntity.cs b/BookAStar/BookAStar/Helpers/LocaLEntity.cs
index 2f86ecdb..6ec0f775 100644
--- a/BookAStar/BookAStar/Helpers/LocaLEntity.cs
+++ b/BookAStar/BookAStar/Helpers/LocaLEntity.cs
@@ -1,19 +1,23 @@
 
+using BookAStar.Interfaces;
 using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 
 namespace BookAStar
 {
-    public class LocalEntity<V, K> : ObservableCollection<V> where K : IEquatable<K>
+    public class LocalEntity<V, K> : ObservableCollection<V>, ILocalEntity<V, K> where K : IEquatable<K>
     {
         public V CurrentItem { get; protected set; }
-        protected Func<V, K> GetKey { get; set; }
+        public Func<V, K> GetKey { get; set; }
         public LocalEntity(Func<V, K> getKey) : base()
         {
             if (getKey == null) throw new InvalidOperationException();
             GetKey = getKey;
+            IList<V> l = this;
         }
+
         public virtual void Merge(V item)
         {
             var key = GetKey(item);
@@ -29,6 +33,11 @@ namespace BookAStar
             CurrentItem = this.Single(x => GetKey(x).Equals(key));
             return CurrentItem;
         }
+
+        public void Load()
+        {
+            this.Populate<V>();
+        }
     }
 
 }
\ No newline at end of file
diff --git a/BookAStar/BookAStar/Interfaces/ILocalEntity.cs b/BookAStar/BookAStar/Interfaces/ILocalEntity.cs
new file mode 100644
index 00000000..38988e9f
--- /dev/null
+++ b/BookAStar/BookAStar/Interfaces/ILocalEntity.cs
@@ -0,0 +1,21 @@
+using System;
+
+namespace BookAStar
+{
+    public interface ILoadable
+    {
+        void Load();
+    }
+
+    public interface ILocalEntity<V, K> : ILoadable where K : IEquatable<K>
+    {
+        V CurrentItem { get; }
+
+        Func<V, K> GetKey { get; set; }
+
+        V LocalGet(K key);
+
+        void Merge(V item);
+
+    }
+}
\ No newline at end of file

From 10f8e9a7f5f87ec3028c82abefadeae69d91e14e Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Tue, 4 Oct 2016 02:46:24 +0200
Subject: [PATCH 49/59] settings as XLabs config manager

---
 BookAStar/BookAStar/App.xaml.cs             |  40 ++--
 BookAStar/BookAStar/Helpers/MainSettings.cs | 205 ++++++++++++--------
 BookAStar/BookAStar/Helpers/Settings.cs     |   9 +-
 3 files changed, 151 insertions(+), 103 deletions(-)

diff --git a/BookAStar/BookAStar/App.xaml.cs b/BookAStar/BookAStar/App.xaml.cs
index add3d1df..b0bbba9d 100644
--- a/BookAStar/BookAStar/App.xaml.cs
+++ b/BookAStar/BookAStar/App.xaml.cs
@@ -33,13 +33,14 @@ namespace BookAStar
         public static IPlatform PlatformSpecificInstance { get; set; }
         public static string AppName { get; set; }
 
-        
+
         // Exists in order to dispose of a static instance strongly typed
         // TODO : replace all references to this field
         // by Views resolution, and then, drop it
         public static App CurrentApp { get { return Current as App; } }
 
-        public static bool MasterPresented {
+        public static bool MasterPresented
+        {
             get
             { return CurrentApp.masterDetail.IsPresented; }
             internal set
@@ -49,7 +50,7 @@ namespace BookAStar
         public void Init()
         {
             var app = Resolver.Resolve<IXFormsApp>();
-            
+
             if (app == null)
             {
                 return;
@@ -74,11 +75,11 @@ namespace BookAStar
             ViewFactory.Register<BookQueriesPage, BookQueriesViewModel>();
             ViewFactory.Register<EditBillingLinePage, BillingLineViewModel>();
             ViewFactory.Register<EditEstimatePage, EstimateViewModel>();
-
             ConfigManager = new XLabs.Settings.GenericConfigSettingsMgr(s =>
-               Settings.AppSettings.GetValueOrDefault<string>(s, Settings.SettingsDefault), null);
+           MainSettings.AppSettings.GetValueOrDefault<string>(s, MainSettings.SettingsDefault), null);
+            
         }
-         
+
         ExtendedMasterDetailPage masterDetail;
 
         public App(IPlatform instance)
@@ -110,14 +111,17 @@ namespace BookAStar
             home = new HomePage() { Title = "Accueil", Icon = "icon.png" };
 
             // var mainPage = new NavigationPage(bQueriesPage);
-            
-            masterDetail = new ExtendedMasterDetailPage() {
-                Title="MainPage"
+
+            masterDetail = new ExtendedMasterDetailPage()
+            {
+                Title = "MainPage"
             };
 
-            masterDetail.Master = new DashboardPage {
+            masterDetail.Master = new DashboardPage
+            {
                 Title = "Bookingstar",
-                BindingContext = new DashboardViewModel() };
+                BindingContext = new DashboardViewModel()
+            };
 
             // masterDetail.Detail = home;
 
@@ -133,7 +137,7 @@ namespace BookAStar
                 Text = "Accueil",
                 Icon = "icon.png"
             };
-          
+
             /* 
             var navPage = new NavigationPage(masterDetail) {
                 Title = "Navigation",
@@ -145,10 +149,10 @@ namespace BookAStar
             navPage.ToolbarItems.Add(tiSetts);
             */
             this.MainPage = masterDetail;
-            
+
             Resolver.Resolve<IDependencyContainer>()
                 .Register<INavigationService>(t => new NavigationService(masterDetail.Detail.Navigation))
-                ; 
+                ;
         }
 
 
@@ -158,12 +162,12 @@ namespace BookAStar
                 "gcm/register",
                 PlatformSpecificInstance.GetDeviceInfo());
         }
-        
+
         public static void ShowBookQuery (BookQueryData query)
         {
-           var page = ViewFactory.CreatePage<BookQueryViewModel
-                , BookQueryPage>((b,p)=> p.BindingContext = new BookQueryViewModel(query));
-           App.Current.MainPage.Navigation.PushAsync(page as Page);
+            var page = ViewFactory.CreatePage<BookQueryViewModel
+                 , BookQueryPage>((b, p) => p.BindingContext = new BookQueryViewModel(query));
+            App.Current.MainPage.Navigation.PushAsync(page as Page);
         }
 
         // TODO système de persistance de l'état de l'appli
diff --git a/BookAStar/BookAStar/Helpers/MainSettings.cs b/BookAStar/BookAStar/Helpers/MainSettings.cs
index 63151925..71e871d0 100644
--- a/BookAStar/BookAStar/Helpers/MainSettings.cs
+++ b/BookAStar/BookAStar/Helpers/MainSettings.cs
@@ -4,6 +4,7 @@ using BookAStar.Model.Auth.Account;
 using Newtonsoft.Json;
 using Plugin.Settings;
 using Plugin.Settings.Abstractions;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
@@ -12,63 +13,68 @@ using Xamarin.Forms;
 
 namespace BookAStar
 {
-	
-	/// <summary>
-	/// This is the Settings static class that can be used in your Core solution or in any
-	/// of your client applications. All settings are laid out the same exact way with getters
-	/// and setters. 
-	/// </summary>
-	public static class MainSettings
-	{
-		
-		private static ISettings AppSettings {
-			get {
-				return CrossSettings.Current;
-			}
-		}
 
-		#region Setting Constants
+    /// <summary>
+    /// This is the Settings static class that can be used in your Core solution or in any
+    /// of your client applications. All settings are laid out the same exact way with getters
+    /// and setters. 
+    /// </summary>
+    public static class MainSettings
+    {
 
-		private const string userNameKey = "user_id";
-		private const string PushNotificationsKey = "pushNotifs";
+        public static ISettings AppSettings
+        {
+            get
+            {
+                return CrossSettings.Current;
+            }
+        }
+
+        #region Setting Constants
+        public static readonly string SettingsDefault = string.Empty;
+        public static readonly string EntityDataSettingsPrefix = "Ed";
+        public static readonly string EntityCursorSettingsPrefix = "Ec";
+        private const string userNameKey = "user_id";
+        private const string PushNotificationsKey = "pushNotifs";
         private const string AllowGPSUsageKey = "allowGPSUsage";
         private const string UserListsKey = "userList";
         private const string GoogleRegIdKey = "googleRedId";
         private const string AllowProBookingOnlyKey = "allowProBookingOnly";
-        
 
-        private static readonly string UserIdDefault = 
-			string.Empty;
-		private static readonly bool PushNotificationsDefault = false;
 
-		public static readonly string GoogleSenderId = "325408689282";
+        private static readonly string UserIdDefault =
+            string.Empty;
+        private static readonly bool PushNotificationsDefault = false;
 
-		private const string MusicalKey = "musical_prefs";
-		private const string EnvironKey = "environ_prefs";
-		private static readonly Dictionary<string,double> MusicalDefault =
-			new Dictionary<string, double> {
-				{ "Pop", 0.5 }, { "Hip Hop" , 0.5 }, { "Rock" , 0.5 }, { "Funk", 0.5 }, 
-				{ "R&B", 0.5 }, { "Jazz", 0.5 }
-			};
+        public static readonly string GoogleSenderId = "325408689282";
+
+        private const string MusicalKey = "musical_prefs";
+        private const string EnvironKey = "environ_prefs";
+        private static readonly Dictionary<string, double> MusicalDefault =
+            new Dictionary<string, double> {
+                { "Pop", 0.5 }, { "Hip Hop" , 0.5 }, { "Rock" , 0.5 }, { "Funk", 0.5 },
+                { "R&B", 0.5 }, { "Jazz", 0.5 }
+            };
         private static readonly Dictionary<string, double> musical = new Dictionary<string, double>();
-        private static readonly Dictionary<string,double> EnvironDefault =
-			new Dictionary<string, double> {
-				{ "Discothèque", 0.5 }, { "Salles de concert", 0.5 }, 
-				{ "Piano bar", 0.5 }, { "Bar", 0.5 }, { "Cinema", 0.5 }, 
-				{ "Théatre", 0.5 }, { "Salles des fêtes", 0.5 },
-				{ "Espace publique", 0.5 }
-			};
+        private static readonly Dictionary<string, double> EnvironDefault =
+            new Dictionary<string, double> {
+                { "Discothèque", 0.5 }, { "Salles de concert", 0.5 },
+                { "Piano bar", 0.5 }, { "Bar", 0.5 }, { "Cinema", 0.5 },
+                { "Théatre", 0.5 }, { "Salles des fêtes", 0.5 },
+                { "Espace publique", 0.5 }
+            };
         private static readonly Dictionary<string, double> environ = new Dictionary<string, double>();
 
 
-		#endregion
+        #endregion
 
-		public static string UserName
+        public static string UserName
         {
-			get {
-				return AppSettings.GetValueOrDefault<string>(userNameKey, null);
-			}
-		}
+            get
+            {
+                return AppSettings.GetValueOrDefault<string>(userNameKey, null);
+            }
+        }
         public const string bookQueryNotificationsKey = "BookQueryNotifications";
         public static BookQueryData[] GetBookQueryNotifications()
         {
@@ -76,7 +82,7 @@ namespace BookAStar
             var json = AppSettings.GetValueOrDefault<string>(bookQueryNotificationsKey);
             if (!string.IsNullOrWhiteSpace(json))
                 return JsonConvert.DeserializeObject<BookQueryData[]>(json);
-            return new BookQueryData[] {};
+            return new BookQueryData[] { };
         }
 
         public static BookQueryData[] AddBookQueryNotification(BookQueryData query)
@@ -89,9 +95,10 @@ namespace BookAStar
             return result;
         }
 
-        public  static string GoogleRegId
+        public static string GoogleRegId
         {
-             set {
+            set
+            {
                 var oldregid = GoogleRegId;
                 AppSettings.AddOrUpdateValue<string>(GoogleRegIdKey, value);
                 // TODO If it changed, and there's an identified user,
@@ -101,10 +108,10 @@ namespace BookAStar
                     App.CurrentApp.PostDeviceInfo();
                 }
             }
-            get { return AppSettings.GetValueOrDefault<string>(GoogleRegIdKey);  }
+            get { return AppSettings.GetValueOrDefault<string>(GoogleRegIdKey); }
         }
 
-        private static ObservableCollection<User> accountList=null;
+        private static ObservableCollection<User> accountList = null;
         public static ObservableCollection<User> AccountList
         {
             get
@@ -118,17 +125,19 @@ namespace BookAStar
                     {
                         var users = JsonConvert.DeserializeObject<User[]>(json);
                         if (users != null)
-                        foreach (User user in users)
-                        {
-                            accountList.Add(user);
-                        }
+                            foreach (User user in users)
+                            {
+                                accountList.Add(user);
+                            }
                     }
                 }
                 return accountList;
             }
         }
-        
-        public static User CurrentUser { get
+
+        public static User CurrentUser
+        {
+            get
             {
                 var uname = UserName;
                 if (uname == null) return null;
@@ -166,22 +175,25 @@ namespace BookAStar
 
         public static User GetUser(string username)
         {
-            return AccountList.FirstOrDefault(a=>a.UserName == username);
+            return AccountList.FirstOrDefault(a => a.UserName == username);
         }
 
-        public static bool PushNotifications { 
-			get { 
-				return AppSettings.GetValueOrDefault<bool>(
-					PushNotificationsKey,
-					PushNotificationsDefault);
-			}
-			set { 
-                // TODO Stop Broadcast receiver
-				AppSettings.AddOrUpdateValue<bool> (
-					PushNotificationsKey,
-					value);
+        public static bool PushNotifications
+        {
+            get
+            {
+                return AppSettings.GetValueOrDefault<bool>(
+                    PushNotificationsKey,
+                    PushNotificationsDefault);
             }
-		}
+            set
+            {
+                // TODO Stop Broadcast receiver
+                AppSettings.AddOrUpdateValue<bool>(
+                    PushNotificationsKey,
+                    value);
+            }
+        }
 
         public static bool AllowGPSUsage
         {
@@ -214,28 +226,61 @@ namespace BookAStar
                     value);
             }
         }
-        public static void SetMusical (string key, double value)
-		{
-			AppSettings.AddOrUpdateValue <double> (MusicalKey + key, value);
-		}
+        public static void SetMusical(string key, double value)
+        {
+            AppSettings.AddOrUpdateValue<double>(MusicalKey + key, value);
+        }
 
-		public static double GetMusical (string key)
-		{
-			return AppSettings.GetValueOrDefault <double> (MusicalKey + key, MusicalDefault [key]);
-		}
+        public static double GetMusical(string key)
+        {
+            return AppSettings.GetValueOrDefault<double>(MusicalKey + key, MusicalDefault[key]);
+        }
 
-		public static Dictionary<string,double> Musical {
-			get {
-				return musical;
-			}
-		}
+        public static Dictionary<string, double> Musical
+        {
+            get
+            {
+                return musical;
+            }
+        }
 
-		public static Dictionary<string, double> Environ
+        public static Dictionary<string, double> Environ
         {
             get
             {
                 return environ;
             }
         }
+        /// <summary>
+        /// Use a sub-key to make persist different tables with the same definition.
+        /// </summary>
+        /// <typeparam name="V"></typeparam>
+        /// <param name="collection"></param>
+        /// <param name="subKey"></param>
+        public static void Populate<V>(this IList<V> collection, string subKey = null)
+        {
+            var key = $"{EntityDataSettingsPrefix}/{subKey}/{typeof(V).FullName}";
+            var data = AppSettings.GetValueOrDefault<string>(key, null);
+            if (data != null)
+            {
+                var items = JsonConvert.DeserializeObject<IList<V>>(data);
+                if (items != null)
+                foreach (var item in items)
+                    collection.Add(item);
+            }
+        }
+
+        /// <summary>
+        /// Saves a list
+        /// </summary>
+        /// <typeparam name="V"></typeparam>
+        /// <param name="collection"></param>
+        /// <param name="subKey"></param>
+        public static void SaveCollection<V>(this IList<V> collection, string subKey=null)
+        {
+            if (collection == null) return;
+            var key = $"{EntityDataSettingsPrefix}/{subKey}/{typeof(V).FullName}";
+            AppSettings.AddOrUpdateValue(key, JsonConvert.SerializeObject(collection));
+        }
     }
 }
diff --git a/BookAStar/BookAStar/Helpers/Settings.cs b/BookAStar/BookAStar/Helpers/Settings.cs
index 5d03245f..248312af 100644
--- a/BookAStar/BookAStar/Helpers/Settings.cs
+++ b/BookAStar/BookAStar/Helpers/Settings.cs
@@ -1,6 +1,5 @@
 // Helpers/Settings.cs
-using Plugin.Settings;
-using Plugin.Settings.Abstractions;
+#if USELESS_but_makes_the_component_removable // this file must exist ^^
 
 namespace BookAStar.Helpers
 {
@@ -23,7 +22,6 @@ namespace BookAStar.Helpers
 
     private const string SettingsKey = "settings_key";
     public static readonly string SettingsDefault = string.Empty;
-        public static readonly string XLabsSettingsPrefix = "_XLABS_";
 
         #endregion
 
@@ -39,6 +37,7 @@ namespace BookAStar.Helpers
         AppSettings.AddOrUpdateValue<string>(SettingsKey, value);
       }
     }
-
   }
-}
\ No newline at end of file
+}
+
+#endif 
\ No newline at end of file

From 464e87284e39525c53a58777cf14fa6de890e58b Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Tue, 4 Oct 2016 02:47:02 +0200
Subject: [PATCH 50/59] Loads persistent data at startup

---
 BookAStar/BookAStar/Helpers/DataManager.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/BookAStar/BookAStar/Helpers/DataManager.cs b/BookAStar/BookAStar/Helpers/DataManager.cs
index 14c7f9ca..0e1ac78d 100644
--- a/BookAStar/BookAStar/Helpers/DataManager.cs
+++ b/BookAStar/BookAStar/Helpers/DataManager.cs
@@ -35,6 +35,10 @@ namespace BookAStar.Helpers
             Blogspot = new RemoteEntity<Blog, long>("blog", 
                 x=>x.Id);
             Contacts = new LocalEntity<ClientProviderInfo, string>(c => c.UserId);
+            BookQueries.Load();
+            Estimates.Load();
+            Blogspot.Load();
+            Contacts.Load();
         }
 
         public async Task<BookQueryData> GetBookQuery(long bookQueryId)

From 5066767efba77513eaaf24d1f45800b546191263 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Tue, 4 Oct 2016 02:47:35 +0200
Subject: [PATCH 51/59] fixes recent commit

---
 BookAStar/BookAStar/Helpers/RemoteEntity.cs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/BookAStar/BookAStar/Helpers/RemoteEntity.cs b/BookAStar/BookAStar/Helpers/RemoteEntity.cs
index 0245dcc9..06b20b38 100644
--- a/BookAStar/BookAStar/Helpers/RemoteEntity.cs
+++ b/BookAStar/BookAStar/Helpers/RemoteEntity.cs
@@ -6,7 +6,7 @@ using Newtonsoft.Json;
 using System.Threading.Tasks;
 using System.Net;
 
-namespace BookAStar
+namespace BookAStar.Helpers
 {
 
     public class RemoteEntity<V,K> : LocalEntity<V, K>, ICommand where K : IEquatable<K>
@@ -34,8 +34,7 @@ namespace BookAStar
             if (IsExecuting)
                 throw new InvalidOperationException("Already executing");
             IsExecuting = true;
-            if (CanExecuteChanged != null)
-                CanExecuteChanged.Invoke(this, new EventArgs());
+            CanExecuteChanged.Invoke(this, new EventArgs());
         }
 
         /// <summary>
@@ -45,7 +44,7 @@ namespace BookAStar
         public async void Execute(object parameter)
         {
             BeforeExecute();
-            using (HttpClient client = CreateClient())
+            using (HttpClient client = UserHelpers.CreateClient())
             {
                 // Get the whole data
                 try
@@ -61,6 +60,7 @@ namespace BookAStar
                             {
                                 Merge(item);
                             }
+                            this.SaveCollection();
                         }
                     }
                 }
@@ -75,8 +75,7 @@ namespace BookAStar
         private void AfterExecuting()
         {
             IsExecuting = false;
-            if (CanExecuteChanged != null)
-                CanExecuteChanged.Invoke(this, new EventArgs());
+            CanExecuteChanged.Invoke(this, new EventArgs());
         }
 
         public async Task<V> Get(K key)

From 80f2530fe48a8716f3e4e7e9d3db7b6655043e90 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Tue, 4 Oct 2016 02:47:54 +0200
Subject: [PATCH 52/59] to be tested

---
 .../BookAStar/Helpers/ObservableString.cs     | 59 +++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 BookAStar/BookAStar/Helpers/ObservableString.cs

diff --git a/BookAStar/BookAStar/Helpers/ObservableString.cs b/BookAStar/BookAStar/Helpers/ObservableString.cs
new file mode 100644
index 00000000..2049d950
--- /dev/null
+++ b/BookAStar/BookAStar/Helpers/ObservableString.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+
+namespace BookAStar
+{
+    public class ObservableString : IObservable<string>, IDisposable
+    {
+        public ObservableString(string data)
+        {
+            this.data = data;
+        }
+        private string data = null;
+        private List<IObserver<string>> observers = new List<IObserver<string>>();
+
+        public string Data
+        {
+            get
+            {
+                return data;
+            }
+
+            set
+            {
+                if (data != value)
+                {
+                    data = value;
+                    foreach (var obs in observers)
+                        obs.OnCompleted();
+                }
+            }
+        }
+
+        public override string ToString()
+        {
+            return data;
+        }
+
+        public static explicit operator ObservableString  (string data)
+        {
+            return new ObservableString(data);
+        }
+
+        public static explicit operator string (ObservableString observable)
+        {
+            return observable.ToString();
+        }
+
+        public void Dispose()
+        {
+            observers = null;
+        }
+
+        public IDisposable Subscribe(IObserver<string> observer)
+        {
+            observers.Add(observer);
+            return this;
+        }
+    }
+}
\ No newline at end of file

From 16999896f7e79fb6842cd0f485a2e36190b25302 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Tue, 4 Oct 2016 03:17:27 +0200
Subject: [PATCH 53/59] trying to get a better rendering ...

---
 BookAStar/BookAStar.Droid/MarkdownViewRenderer.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/BookAStar/BookAStar.Droid/MarkdownViewRenderer.cs b/BookAStar/BookAStar.Droid/MarkdownViewRenderer.cs
index dd71776d..217afc8c 100644
--- a/BookAStar/BookAStar.Droid/MarkdownViewRenderer.cs
+++ b/BookAStar/BookAStar.Droid/MarkdownViewRenderer.cs
@@ -105,6 +105,9 @@ namespace BookAStar.Droid
             base.OnElementPropertyChanged(sender, e);
         }
 
-
+        protected override void OnMeasure(int widthMeasureSpec, int heightMeasureSpec)
+        {
+            base.OnMeasure(widthMeasureSpec, editorView.ContentHeight);
+        }
     }
 }
\ No newline at end of file

From 33561902c6704905674eb56cc73f7b4da947b65e Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Tue, 4 Oct 2016 03:17:43 +0200
Subject: [PATCH 54/59] yastyle

---
 BookAStar/BookAStar/App.xaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/BookAStar/BookAStar/App.xaml b/BookAStar/BookAStar/App.xaml
index 737b90fa..8b32a8c3 100644
--- a/BookAStar/BookAStar/App.xaml
+++ b/BookAStar/BookAStar/App.xaml
@@ -45,8 +45,6 @@
       
       <Style x:Key="LabelStyle" TargetType="Label">
         <Setter Property="TextColor" Value="{StaticResource TextColor}" />
-        <Setter Property="FontAttributes" Value="Bold" />
-        <Setter Property="FontSize" Value="{StaticResource MediumFontSize}" />
         <Setter Property="LineBreakMode" Value="WordWrap" />
       </Style>
 
@@ -56,7 +54,6 @@
       <Style x:Key="ContentLabelStyle"  BasedOn="{StaticResource LabelStyle}" TargetType="Label">
         <Setter Property="FontSize" Value="{StaticResource MediumFontSize}" />
         <Setter Property="HorizontalOptions" Value="CenterAndExpand" />
-        <Setter Property="VerticalOptions" Value="CenterAndExpand" />
       </Style>
       
       <Style x:Key="EntryStyle" TargetType="Entry">

From 446207f17ba7542a89e5d5079f2365c2d10b6dcf Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Tue, 4 Oct 2016 19:20:25 +0200
Subject: [PATCH 55/59] layout

---
 BookAStar/BookAStar/Pages/BookQueryPage.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BookAStar/BookAStar/Pages/BookQueryPage.xaml b/BookAStar/BookAStar/Pages/BookQueryPage.xaml
index 89181fd6..935daf18 100644
--- a/BookAStar/BookAStar/Pages/BookQueryPage.xaml
+++ b/BookAStar/BookAStar/Pages/BookQueryPage.xaml
@@ -24,7 +24,7 @@
     <Label Text="{Binding EventDate, StringFormat='le {0:dddd d MMMM yyyy à hh:mm}'}"  />
     <Label Text="{Binding Location.Address}" />
     <Label Text="{Binding Previsional}" />
-    <maps:Map x:Name="map"></maps:Map>
+    <maps:Map x:Name="map" VerticalOptions="FillAndExpand"></maps:Map>
     <Button Text="Faire un devis" Clicked="MakeAnEstimate" />
   </StackLayout>
 </ContentPage>
\ No newline at end of file

From 435c084fe2607116b750e27784e3d896405e9c27 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Wed, 5 Oct 2016 01:20:06 +0200
Subject: [PATCH 56/59] Bug Fixes & Layout

---
 BookAStar/BookAStar.Droid/CompatXFormsApp.cs  |  5 +-
 BookAStar/BookAStar.Droid/MainActivity.cs     | 32 ++++---
 .../BookAStar.Droid/MarkdownViewRenderer.cs   | 82 +++++++++++------
 .../Resources/Resource.Designer.cs            |  7 +-
 .../Resources/layout/Toolbar.axml             | 11 ++-
 BookAStar/BookAStar/App.xaml.cs               | 87 ++++++++++++++-----
 BookAStar/BookAStar/Model/Auth/User.cs        |  2 +
 .../BookAStar/Pages/AccountChooserPage.xaml   |  7 --
 .../BookAStar/Pages/EditEstimatePage.xaml     | 18 ++--
 .../BookAStar/Pages/EditEstimatePage.xaml.cs  |  9 +-
 BookAStar/BookAStar/Views/MarkdownView.cs     | 15 ++--
 11 files changed, 182 insertions(+), 93 deletions(-)

diff --git a/BookAStar/BookAStar.Droid/CompatXFormsApp.cs b/BookAStar/BookAStar.Droid/CompatXFormsApp.cs
index c8bdfb90..e121c021 100644
--- a/BookAStar/BookAStar.Droid/CompatXFormsApp.cs
+++ b/BookAStar/BookAStar.Droid/CompatXFormsApp.cs
@@ -297,6 +297,7 @@ namespace XLabs.Forms
 
             base.OnStop();
         }
+
     }
 
     /// <summary>
@@ -334,8 +335,10 @@ namespace XLabs.Forms
             this.AppContext.Stop += (o, e) => this.OnClosing();
             this.AppContext.Pause += (o, e) => this.OnSuspended();
             this.AppContext.Resume += (o, e) => this.OnResumed();
+            
             this.AppDataDirectory = Environment.ExternalStorageDirectory.AbsolutePath;
-
+            this.Orientation = AppContext.RequestedOrientation == Android.Content.PM.ScreenOrientation.Portrait ?
+                Enums.Orientation.Portrait : Enums.Orientation.None;
             if (initServices)
             {
                 DependencyService.Register<TextToSpeechService>();
diff --git a/BookAStar/BookAStar.Droid/MainActivity.cs b/BookAStar/BookAStar.Droid/MainActivity.cs
index b410b27f..60b52570 100644
--- a/BookAStar/BookAStar.Droid/MainActivity.cs
+++ b/BookAStar/BookAStar.Droid/MainActivity.cs
@@ -55,8 +55,8 @@ namespace BookAStar.Droid
             ToolbarResource = Resource.Layout.Toolbar;
             
             base.OnCreate(bundle);
-
-            global::Xamarin.Forms.Forms.SetTitleBarVisibility(Xamarin.Forms.AndroidTitleBarVisibility.Never);
+            SetPersistent(true);
+            // global::Xamarin.Forms.Forms.SetTitleBarVisibility(Xamarin.Forms.AndroidTitleBarVisibility.Never);
 
             //var tb = FindViewById<Android.Support.V7.Widget.Toolbar>(ToolbarResource);
             // FIXME tb is null
@@ -73,7 +73,8 @@ namespace BookAStar.Droid
             IXFormsApp<XFormsCompatApplicationDroid> app =null;
             if (!Resolver.IsSet)
             {
-                this.SetIoc();
+                var xfapp = new XFormsCompatAppDroid();
+                this.SetIoc(xfapp);
             }
             else
             {
@@ -93,8 +94,8 @@ namespace BookAStar.Droid
                 }
             };
 
-
-            LoadApplication(new BookAStar.App(this));
+            var fapp = new BookAStar.App(this);
+            LoadApplication(fapp);
             // TabLayoutResource = Resource.Layout.Tabbar;
             // ToolbarResource = Resource.Layout.Toolbar;
             /*
@@ -108,11 +109,10 @@ namespace BookAStar.Droid
 
         }
 
-        private void SetIoc()
+        private SimpleContainer SetIoc(XFormsCompatAppDroid app)
         {
             var resolverContainer = new SimpleContainer();
 
-            var app = new XFormsCompatAppDroid();
 
             app.Init(this);
 
@@ -133,6 +133,7 @@ namespace BookAStar.Droid
                     t => new SQLiteSimpleCache(new SQLitePlatformAndroid(),
                         new SQLiteConnectionString(pathToDatabase, true), t.Resolve<IJsonSerializer>()));
             Resolver.SetResolver(resolverContainer.GetResolver());
+            return resolverContainer;
         }
 
         public bool EnablePushNotifications(bool enable)
@@ -425,18 +426,25 @@ namespace BookAStar.Droid
 
         public T Resolve<T>()
         {
-
-            throw new NotImplementedException();
+            return (T) Resolver.Resolve(typeof(T));
         }
 
         public object Resolve(Type t)
         {
-            throw new NotImplementedException();
+            return Resolver.Resolve(t);
         }
 
-        public void Init(App context, bool initServices = true)
+        protected override void OnSaveInstanceState(Bundle outState)
         {
-            throw new NotImplementedException();
+            base.OnSaveInstanceState(outState);
+        }
+        public override void OnStateNotSaved()
+        {
+            base.OnStateNotSaved();
+        }
+        public override void OnRestoreInstanceState(Bundle savedInstanceState, PersistableBundle persistentState)
+        {
+            base.OnRestoreInstanceState(savedInstanceState, persistentState);
         }
     }
 }
diff --git a/BookAStar/BookAStar.Droid/MarkdownViewRenderer.cs b/BookAStar/BookAStar.Droid/MarkdownViewRenderer.cs
index 217afc8c..f811ac02 100644
--- a/BookAStar/BookAStar.Droid/MarkdownViewRenderer.cs
+++ b/BookAStar/BookAStar.Droid/MarkdownViewRenderer.cs
@@ -6,6 +6,7 @@ using BookAStar.Droid;
 using System;
 using Java.Interop;
 using System.ComponentModel;
+using Android.Views;
 
 [assembly: Xamarin.Forms.ExportRenderer(typeof(MarkdownView), typeof(MarkdownViewRenderer))]
 namespace BookAStar.Droid
@@ -27,9 +28,13 @@ namespace BookAStar.Droid
 
             if (hybridWebViewRenderer != null && hybridWebViewRenderer.TryGetTarget(out hybridRenderer))
             {
-                hybridRenderer.Element.Markdown=data;
+                hybridRenderer.Element.Markdown = data;
+                MarkdownViewRenderer.OnPageFinished(hybridRenderer.Element,
+                    hybridRenderer.EditorView);
             }
         }
+
+
     }
 
     public class MarkdownViewRenderer : ViewRenderer<MarkdownView, WebView>
@@ -39,12 +44,30 @@ namespace BookAStar.Droid
         private MarkdownDeep.Markdown markdown = new MarkdownDeep.Markdown();
         const string JavaScriptFunction = "function invokeCSharpAction(data){jsBridge.invokeAction(data);}";
 
+        public WebView EditorView
+        {
+            get
+            {
+                return editorView;
+            }
+        }
+
+        public static async void OnPageFinished(MarkdownView xview, WebView view)
+        {
+            int i = 10;
+            while (view.ContentHeight == 0 && i-- > 0) // wait here till content is rendered
+                await System.Threading.Tasks.Task.Delay(100);
+            xview.BatchBegin();
+            xview.HeightRequest = view.ContentHeight;
+            xview.BatchCommit();
+        }
         private void SetMDEditorText(string text)
         {
             editorTemplate.Model = (text == null) ? null : markdown.Transform(text);
             var html = editorTemplate.GenerateString();
-            editorView.LoadDataWithBaseURL("file:///android_asset/",
+            EditorView.LoadDataWithBaseURL("file:///android_asset/",
             html, "text/html", "utf-8", null);
+            OnPageFinished(Element, editorView);
         }
 
         protected override void OnElementChanged(ElementChangedEventArgs<MarkdownView> e)
@@ -63,7 +86,7 @@ namespace BookAStar.Droid
                 // Subscribe
                 var viewclient = new MarkdownWebViewClient(
                 md => { e.NewElement.Markdown = md; });
-                editorView.SetWebViewClient(viewclient);
+                EditorView.SetWebViewClient(viewclient);
                 Control.AddJavascriptInterface(new JSBridge(this), "jsBridge");
                 SetMDEditorText(e.NewElement.Markdown);
                 InjectJS(JavaScriptFunction);
@@ -81,33 +104,40 @@ namespace BookAStar.Droid
         private WebView CreateNativeControl()
         {
             editorView = new WebView(Context);
-            editorView.Settings.BuiltInZoomControls = true;
-            editorView.Settings.JavaScriptEnabled = true;
-            editorView.Settings.LoadsImagesAutomatically = true;
-            editorView.Settings.SetAppCacheEnabled(true);
-            editorView.Settings.AllowContentAccess = true;
-            editorView.Settings.AllowFileAccess = true;
-            editorView.Settings.AllowFileAccessFromFileURLs = true;
-            editorView.Settings.AllowUniversalAccessFromFileURLs = true;
-            editorView.Settings.BlockNetworkImage = false;
-            editorView.Settings.BlockNetworkLoads = false;
-            editorView.Settings.DomStorageEnabled = true;
+            EditorView.Settings.BuiltInZoomControls = false;
+            EditorView.Settings.JavaScriptEnabled = true;
+            EditorView.Settings.LoadsImagesAutomatically = true;
+            EditorView.Settings.SetAppCacheEnabled(true);
+            EditorView.Settings.AllowContentAccess = true;
+            EditorView.Settings.AllowFileAccess = true;
+            EditorView.Settings.AllowFileAccessFromFileURLs = true;
+            EditorView.Settings.AllowUniversalAccessFromFileURLs = true;
+            EditorView.Settings.BlockNetworkImage = false;
+            EditorView.Settings.BlockNetworkLoads = false;
+            EditorView.Settings.DomStorageEnabled = true;
+            
             //  editorView.SetMinimumHeight(300);
-            return editorView;
+            return EditorView;
         }
-
-        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            if (e.PropertyName == "Markdown")
-            {
-                SetMDEditorText(((MarkdownView)Element).Markdown);
-            }
-            base.OnElementPropertyChanged(sender, e);
-        }
-
+        // FIXME no impact...
         protected override void OnMeasure(int widthMeasureSpec, int heightMeasureSpec)
         {
-            base.OnMeasure(widthMeasureSpec, editorView.ContentHeight);
+            MeasureSpecMode widthMode = MeasureSpec.GetMode(widthMeasureSpec);
+            MeasureSpecMode heightMode = MeasureSpec.GetMode(heightMeasureSpec);
+            int widthSize = MeasureSpec.GetSize(widthMeasureSpec);
+            int heightSize = MeasureSpec.GetSize(heightMeasureSpec);
+            int pxHeight = (int)ContextExtensions.ToPixels(Context, Element.HeightRequest);
+            int pxWidth = (int)ContextExtensions.ToPixels(Context, Element.WidthRequest);
+            var measuredWidth = widthMode != MeasureSpecMode.Exactly ? (widthMode != MeasureSpecMode.AtMost ? pxHeight : Math.Min(pxHeight, widthSize)) : widthSize;
+            var measuredHeight = heightMode != MeasureSpecMode.Exactly ? (heightMode != MeasureSpecMode.AtMost ? pxWidth : Math.Min(pxWidth, heightSize)) : heightSize;
+            SetMeasuredDimension(measuredWidth, measuredHeight< Element.HeightRequest ? (int) Element.HeightRequest : measuredHeight);
         }
+        /*
+        protected override void OnLayout(bool changed, int left, int top, int right, int bottom)
+        {
+            Element.Layout(new Xamarin.Forms.Rectangle(0, 0, ContextExtensions.FromPixels(Context, right - left), ContextExtensions.FromPixels(Context, bottom - top)));
+            base.OnLayout(changed, left, top, right, bottom);
+        }
+        */
     }
 }
\ No newline at end of file
diff --git a/BookAStar/BookAStar.Droid/Resources/Resource.Designer.cs b/BookAStar/BookAStar.Droid/Resources/Resource.Designer.cs
index b2617ce9..c68e3864 100644
--- a/BookAStar/BookAStar.Droid/Resources/Resource.Designer.cs
+++ b/BookAStar/BookAStar.Droid/Resources/Resource.Designer.cs
@@ -4952,8 +4952,8 @@ namespace BookAStar.Droid
 			// aapt resource value: 0x7f0c00b3
 			public const int subtitles = 2131493043;
 			
-			// aapt resource value: 0x7f0c00b6
-			public const int surface_view = 2131493046;
+			// aapt resource value: 0x7f0c00b5
+			public const int surface_view = 2131493045;
 			
 			// aapt resource value: 0x7f0c0019
 			public const int tabMode = 2131492889;
@@ -4985,9 +4985,6 @@ namespace BookAStar.Droid
 			// aapt resource value: 0x7f0c0053
 			public const int title_template = 2131492947;
 			
-			// aapt resource value: 0x7f0c00b5
-			public const int toolbar = 2131493045;
-			
 			// aapt resource value: 0x7f0c003d
 			public const int top = 2131492925;
 			
diff --git a/BookAStar/BookAStar.Droid/Resources/layout/Toolbar.axml b/BookAStar/BookAStar.Droid/Resources/layout/Toolbar.axml
index 8225229f..5e2b4cbb 100644
--- a/BookAStar/BookAStar.Droid/Resources/layout/Toolbar.axml
+++ b/BookAStar/BookAStar.Droid/Resources/layout/Toolbar.axml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/toolbar"
+<android.support.v7.widget.Toolbar 
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/colorPrimary"
     android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-    android:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
\ No newline at end of file
+    android:popupTheme="@style/ThemeOverlay.AppCompat.Light" 
+    tools:context=".MainActivity"
+    app:layout_scrollFlags="scroll|enterAlways" 
+/>
\ No newline at end of file
diff --git a/BookAStar/BookAStar/App.xaml.cs b/BookAStar/BookAStar/App.xaml.cs
index b0bbba9d..8f13c2ee 100644
--- a/BookAStar/BookAStar/App.xaml.cs
+++ b/BookAStar/BookAStar/App.xaml.cs
@@ -1,14 +1,8 @@
-using BookAStar.Helpers;
-using BookAStar.Interfaces;
+using BookAStar.Interfaces;
 using BookAStar.Model;
-using BookAStar.Model.Workflow;
 using BookAStar.Pages;
 using BookAStar.ViewModels;
 using System;
-using System.Diagnostics;
-using System.Linq;
-using System.Reflection;
-using System.Threading.Tasks;
 using Xamarin.Forms;
 using XLabs.Forms.Mvvm;
 using XLabs.Forms.Pages;
@@ -17,6 +11,8 @@ using XLabs.Ioc;
 using XLabs.Platform.Mvvm;
 using XLabs.Platform.Services;
 using XLabs.Settings;
+using XLabs;
+using XLabs.Enums;
 
 /*
 Glyphish icons from
@@ -56,14 +52,59 @@ namespace BookAStar
                 return;
             }
             Configure(app);
-            app.Closing += (o, e) => Debug.WriteLine("Application Closing");
-            app.Error += (o, e) => Debug.WriteLine("Application Error");
-            app.Initialize += (o, e) => Debug.WriteLine("Application Initialized");
-            app.Resumed += (o, e) => Debug.WriteLine("Application Resumed");
-            app.Rotation += (o, e) => Debug.WriteLine("Application Rotated");
-            app.Startup += (o, e) => Debug.WriteLine("Application Startup");
-            app.Suspended += (o, e) => Debug.WriteLine("Application Suspended");
+            app.Closing += OnClosing;
+            app.Error += OnError;
+            app.Initialize += OnInitialize;
+            app.Resumed += OnAppResumed;
+            app.Rotation += OnRotation;
+            app.Startup += OnStartup;
+            app.Suspended += OnSuspended;
         }
+
+        // omg
+        private void OnError(object sender, EventArgs e)
+        {
+            
+        }
+        
+        // Called on rotation after OnSuspended
+        private void OnClosing(object sender, EventArgs e)
+        {
+            
+        }
+
+        // FIXME Not called
+        private void OnInitialize(object sender, EventArgs e)
+        {
+           
+        }
+
+        // called on app startup, not on rotation
+        private void OnStartup(object sender, EventArgs e)
+        {
+            // TODO special starup pages as
+            // notification details or wizard setup page
+        }
+
+        // Called on rotation
+        private void OnSuspended(object sender, EventArgs e)
+        {
+            // TODO the navigation stack persistence (save)
+        }
+
+        // called on app startup, after OnStartup, not on rotation
+        private void OnAppResumed(object sender, EventArgs e)
+        {
+            // TODO the navigation stack persistence (restore)
+            base.OnResume();
+        }
+
+        // FIXME Not called ... see OnSuspended
+        private void OnRotation(object sender, EventArgs<Orientation> e)
+        {
+            // TODO the navigation stack persistence (restore?)
+        }
+
         public static GenericConfigSettingsMgr ConfigManager { protected set; get; }
 
         private void Configure(IXFormsApp app)
@@ -84,13 +125,19 @@ namespace BookAStar
 
         public App(IPlatform instance)
         {
+            // This declaration became obsolete by introduction
+            // of the XLabs App that 
+            // refers this instance with
+            // its application context property
+            // and is obtained using the `Resolver`
             PlatformSpecificInstance = instance;
+            // Xaml
             InitializeComponent();
+            // Static properties construction
             Init();
+            // Builds the Main page
             BuildMainPage();
-
-            NavigationPage.SetHasNavigationBar(MainPage, false);
-            NavigationPage.SetHasBackButton(MainPage, false);
+            
         }
 
         BookQueriesPage bQueriesPage;
@@ -149,13 +196,11 @@ namespace BookAStar
             navPage.ToolbarItems.Add(tiSetts);
             */
             this.MainPage = masterDetail;
-
             Resolver.Resolve<IDependencyContainer>()
                 .Register<INavigationService>(t => new NavigationService(masterDetail.Detail.Navigation))
                 ;
         }
 
-
         public void PostDeviceInfo()
         {
             var res = PlatformSpecificInstance.InvokeApi(
@@ -171,7 +216,7 @@ namespace BookAStar
         }
 
         // TODO système de persistance de l'état de l'appli
-
+        /*
         /// <summary>
         /// Shows a page asynchronously by locating the default constructor, creating the page,
         /// the pushing it onto the navigation stack.
@@ -192,7 +237,7 @@ namespace BookAStar
                 await parentPage.Navigation.PushAsync(page);
                 break;
             }
-        }
+        }*/
     }
 }
 
diff --git a/BookAStar/BookAStar/Model/Auth/User.cs b/BookAStar/BookAStar/Model/Auth/User.cs
index 78de9113..bc501e48 100644
--- a/BookAStar/BookAStar/Model/Auth/User.cs
+++ b/BookAStar/BookAStar/Model/Auth/User.cs
@@ -1,4 +1,5 @@
 using BookAStar.Helpers;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -80,6 +81,7 @@ namespace BookAStar.Model.Auth.Account
                 OnPropertyChanged("Avatar");
             }
         }
+        [JsonIgnore]
         public ImageSource AvatarSource
         {
             get
diff --git a/BookAStar/BookAStar/Pages/AccountChooserPage.xaml b/BookAStar/BookAStar/Pages/AccountChooserPage.xaml
index 48608c3e..14d8eac2 100644
--- a/BookAStar/BookAStar/Pages/AccountChooserPage.xaml
+++ b/BookAStar/BookAStar/Pages/AccountChooserPage.xaml
@@ -24,7 +24,6 @@
       <ListView.ItemTemplate HeightRequest="60" VerticalOptions="StartAndExpand">
         <DataTemplate>
           <ViewCell>
-            <lc:GesturesContentView>
               <Grid Padding="5"
                         ColumnSpacing="10"
                         RowSpacing="2" >
@@ -34,12 +33,6 @@
 
                 </Label>
               </Grid>
-              <lb:Gestures.Interests>
-                <lb:GestureCollection>
-                  <lb:GestureInterest GestureType="Swipe" Direction="Left" GestureCommand="{Binding DumpParam}" GestureParameter="{Binding UserName}"/>
-                </lb:GestureCollection>
-              </lb:Gestures.Interests>
-            </lc:GesturesContentView>
           </ViewCell>
         </DataTemplate>
       </ListView.ItemTemplate>
diff --git a/BookAStar/BookAStar/Pages/EditEstimatePage.xaml b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml
index d3027868..bf4d86fe 100644
--- a/BookAStar/BookAStar/Pages/EditEstimatePage.xaml
+++ b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml
@@ -15,18 +15,20 @@
       </Style>
     </ResourceDictionary>
   </ContentPage.Resources>
+  <ScrollView>
   <StackLayout Padding="10,10,10,10">
-    <StackLayout Orientation="Horizontal" Padding="10,10,10,10">
-      <Label Text="{Binding Client.UserName}" LineBreakMode="WordWrap"></Label>
-      <Label Text="{Binding Query.Location.Address}" LineBreakMode="WordWrap"></Label>
-      <Label Text="{Binding Query.EventDate, StringFormat='{0:dddd d MMMM yyyy à hh:mm}'}" LineBreakMode="WordWrap"></Label>
+    <StackLayout Orientation="Horizontal" Padding="10,10,10,10" View.VerticalOptions="CenterAndExpand">
+      <Label Text="{Binding Client.UserName}" LineBreakMode="WordWrap" View.VerticalOptions="CenterAndExpand"></Label>
+      <Label Text="{Binding Query.Location.Address}" LineBreakMode="WordWrap" View.VerticalOptions="CenterAndExpand"></Label>
+      <Label Text="{Binding Query.EventDate, StringFormat='{0:dddd d MMMM yyyy à hh:mm}'}" LineBreakMode="WordWrap" View.VerticalOptions="CenterAndExpand"></Label>
     </StackLayout>
 
     <views:MarkdownView x:Name="mdview"
-                        Edited="OnDescriptionChanged"
+                        Modified="OnDescriptionChanged"
                         HorizontalOptions="FillAndExpand"
-           VerticalOptions="FillAndExpand" MinimumHeightRequest="160" HeightRequest="250"
+                        View.VerticalOptions="CenterAndExpand"
     Markdown="{Binding Description, Mode=TwoWay}"
+                        MinimumHeightRequest="160"
              RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent,
                                                                              Property=Height,
                                                                              Factor=.6}"
@@ -35,8 +37,7 @@
                                                                             Factor=1}"
                         ></views:MarkdownView>
 
-    <ListView RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=.2}"
-          RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=1}">
+    <ListView HeightRequest="80" View.VerticalOptions="End">
       <ListView.ItemTemplate>
         <DataTemplate>
           <ViewCell>
@@ -50,4 +51,5 @@
     <Label FormattedText="{Binding FormattedTotal}"/>
     <Button Text="Valider ce devis"></Button>
   </StackLayout>
+    </ScrollView>
 </ContentPage>
\ No newline at end of file
diff --git a/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs
index 57fe8aaa..8bba1227 100644
--- a/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs
@@ -9,6 +9,7 @@ using System.Text;
 using System.Threading.Tasks;
 
 using Xamarin.Forms;
+using Xamarin.Forms.Internals;
 using XLabs.Forms.Services;
 using XLabs.Ioc;
 using XLabs.Platform.Services;
@@ -28,14 +29,16 @@ namespace BookAStar.Pages
         {
             base.OnBindingContextChanged();
             // FIXME WAZA
-           if (BindingContext != null)
-                mdview.Markdown = ((EstimateViewModel)BindingContext).Description; 
+           if (BindingContext != null) { 
+                mdview.Markdown = ((EstimateViewModel)BindingContext).Description;
+            }
         }
 
         protected void OnDescriptionChanged (object sender, EventArgs e)
         {
             // FIXME Why the Binding don't work?
             ((EstimateViewModel)BindingContext).Description = mdview.Markdown;
+            InvalidateMeasure();
         }
 
         protected void OnNewCommanLine(object sender, EventArgs e)
@@ -43,7 +46,7 @@ namespace BookAStar.Pages
             var com = new BillingLine();
             Resolver.Resolve<INavigationService>().NavigateTo<EditBillingLinePage>(
                 true,
-                new object[] { new BillingLineViewModel((Estimate)this.BindingContext,com) } );
+                new object[] { new BillingLineViewModel(((EstimateViewModel)this.BindingContext).Data,com) } );
         }
        
     }
diff --git a/BookAStar/BookAStar/Views/MarkdownView.cs b/BookAStar/BookAStar/Views/MarkdownView.cs
index 3875e68f..50417671 100644
--- a/BookAStar/BookAStar/Views/MarkdownView.cs
+++ b/BookAStar/BookAStar/Views/MarkdownView.cs
@@ -23,20 +23,21 @@ namespace BookAStar.Views
             {
                 return markdown;
             }
-            set {
+            set
+            {
                 if (markdown != value)
-                    if (Edited != null)
+                {
+                    markdown = value;
+                    if (Modified != null)
                     {
-                        markdown = value;
-                        Edited.Invoke(this, new EventArgs());
+                        Modified.Invoke(this, new EventArgs());
                         return;
                     }
-                
-                markdown = value;
+                }
             }
         }
         
-        public event EventHandler<EventArgs> Edited;
+        public event EventHandler<EventArgs> Modified;
         
         protected override SizeRequest OnMeasure(double widthConstraint, double heightConstraint)
         {

From 7b96137d745ae94978b27b852598c312712352c5 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Wed, 5 Oct 2016 03:48:59 +0200
Subject: [PATCH 57/59] Fixes User's dashboard

---
 BookAStar/BookAStar/Helpers/MainSettings.cs   |  9 +++++-
 .../BookAStar/Pages/DashboardPage.xaml.cs     |  9 +-----
 .../ViewModels/DashboardViewModel.cs          | 28 +++++++++++++++++--
 3 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/BookAStar/BookAStar/Helpers/MainSettings.cs b/BookAStar/BookAStar/Helpers/MainSettings.cs
index 71e871d0..8da30074 100644
--- a/BookAStar/BookAStar/Helpers/MainSettings.cs
+++ b/BookAStar/BookAStar/Helpers/MainSettings.cs
@@ -157,12 +157,19 @@ namespace BookAStar
                     if (olduserid != value.Id)
                     {
                         App.CurrentApp.PostDeviceInfo();
+                        UserChanged.Invoke(App.CurrentApp, new EventArgs());
                     }
                 }
-                // TODO else Unregister this device
+                else if (olduserid != null)
+                {
+                    UserChanged.Invoke(App.CurrentApp, new EventArgs());
+                    // TODO else Unregister this device
+                }
             }
         }
 
+        public static event EventHandler<EventArgs> UserChanged;
+
         public static void SaveUser(User user)
         {
             var existent = AccountList.FirstOrDefault(u => u.UserName == user.UserName);
diff --git a/BookAStar/BookAStar/Pages/DashboardPage.xaml.cs b/BookAStar/BookAStar/Pages/DashboardPage.xaml.cs
index 0d6bac9c..85290eb1 100644
--- a/BookAStar/BookAStar/Pages/DashboardPage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/DashboardPage.xaml.cs
@@ -16,18 +16,11 @@ namespace BookAStar.Pages
 {
     public partial class DashboardPage : ContentPage
     {
-        public RelayGesture UserNameGesture { get; set; }
+        
 
         public DashboardPage()
         {
             InitializeComponent();
-            UserNameGesture = new RelayGesture((g, x) =>
-            {
-                if (g.GestureType == GestureType.LongPress)
-                {
-                    Resolver.Resolve<INavigationService>().NavigateTo<AccountChooserPage>(true);
-                }
-            });
         }
 
         public void OnViewPerformerStatus(object sender, EventArgs e)
diff --git a/BookAStar/BookAStar/ViewModels/DashboardViewModel.cs b/BookAStar/BookAStar/ViewModels/DashboardViewModel.cs
index 03d1abf4..72549605 100644
--- a/BookAStar/BookAStar/ViewModels/DashboardViewModel.cs
+++ b/BookAStar/BookAStar/ViewModels/DashboardViewModel.cs
@@ -1,9 +1,14 @@
 using BookAStar.Helpers;
 using BookAStar.Model.Auth.Account;
+using BookAStar.Pages;
 using System.Collections.ObjectModel;
 using System.Linq;
 using Xamarin.Forms;
+using XLabs.Forms.Behaviors;
+using XLabs.Forms.Controls;
 using XLabs.Forms.Mvvm;
+using XLabs.Ioc;
+using XLabs.Platform.Services;
 
 namespace BookAStar.ViewModels
 {
@@ -98,6 +103,22 @@ namespace BookAStar.ViewModels
             Accounts = MainSettings.AccountList;
             User = MainSettings.CurrentUser;
             UpdateUserMeta();
+
+            UserNameGesture = new RelayGesture((g, x) =>
+            {
+                if (g.GestureType == GestureType.LongPress)
+                {
+                    Resolver.Resolve<INavigationService>().NavigateTo<AccountChooserPage>(true);
+                }
+            });
+            MainSettings.UserChanged += MainSettings_UserChanged;
+
+        }
+
+        private void MainSettings_UserChanged(object sender, System.EventArgs e)
+        {
+            User = MainSettings.CurrentUser;
+            UpdateUserMeta();
         }
 
         private void UpdateUserMeta ()
@@ -117,9 +138,9 @@ namespace BookAStar.ViewModels
             {
                 newUserIsPro = User.Roles?.Contains("Performer") ?? false;
 
-                newQueryCount = userIsPro ? DataManager.Current.BookQueries.Count : 0;
+                newQueryCount = newUserIsPro ? DataManager.Current.BookQueries.Count : 0;
 
-                newStatusString = userIsPro ?
+                newStatusString = newUserIsPro ?
                      $"Profile professionel renseigné,\n{newQueryCount} demandes valides en cours" :
                     "Profile professionel non renseigné";
                 newAvatar = UserHelpers.Avatar(user.Avatar);
@@ -133,5 +154,8 @@ namespace BookAStar.ViewModels
         {
             UpdateUserMeta();
         }
+
+        public RelayGesture UserNameGesture { get; set; }
+
     }
 }
\ No newline at end of file

From 2d6047b2cf26b7bf8e9f67cbc0ef7e852e0f7485 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Wed, 5 Oct 2016 18:45:03 +0200
Subject: [PATCH 58/59] Fix the "allow notifs" setting

---
 BookAStar/BookAStar/ViewModels/DashboardViewModel.cs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/BookAStar/BookAStar/ViewModels/DashboardViewModel.cs b/BookAStar/BookAStar/ViewModels/DashboardViewModel.cs
index 72549605..88e181e6 100644
--- a/BookAStar/BookAStar/ViewModels/DashboardViewModel.cs
+++ b/BookAStar/BookAStar/ViewModels/DashboardViewModel.cs
@@ -46,6 +46,17 @@ namespace BookAStar.ViewModels
             }
         }
 
+        public bool ReceivePushNotifications
+        {
+            get
+            {
+                return MainSettings.PushNotifications;
+            }
+            set
+            {
+                MainSettings.PushNotifications = value;
+            }
+        }
         private long queryCount;
         private User user;
 

From 0f0a20d462335d323aff9d4c16bb8b1220fbf47d Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Wed, 5 Oct 2016 18:45:45 +0200
Subject: [PATCH 59/59] Fixes navigation after app resume

---
 BookAStar/BookAStar/App.xaml.cs                    | 8 ++++----
 BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs  | 2 +-
 BookAStar/BookAStar/Pages/BookQueryPage.xaml.cs    | 2 +-
 BookAStar/BookAStar/Pages/DashboardPage.xaml.cs    | 2 +-
 BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/BookAStar/BookAStar/App.xaml.cs b/BookAStar/BookAStar/App.xaml.cs
index 8f13c2ee..e5e319b7 100644
--- a/BookAStar/BookAStar/App.xaml.cs
+++ b/BookAStar/BookAStar/App.xaml.cs
@@ -196,11 +196,11 @@ namespace BookAStar
             navPage.ToolbarItems.Add(tiSetts);
             */
             this.MainPage = masterDetail;
-            Resolver.Resolve<IDependencyContainer>()
-                .Register<INavigationService>(t => new NavigationService(masterDetail.Detail.Navigation))
-                ;
+            masterDetail.ToolbarItems.Add(tiHome);
+            masterDetail.ToolbarItems.Add(tiSetts);
+            NavigationService = new NavigationService(masterDetail.Detail.Navigation);
         }
-
+        public INavigationService NavigationService { protected set; get; }
         public void PostDeviceInfo()
         {
             var res = PlatformSpecificInstance.InvokeApi(
diff --git a/BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs b/BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs
index 9e953465..439438c7 100644
--- a/BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs
@@ -18,7 +18,7 @@ namespace BookAStar.Pages
         private void OnViewDetail(object sender, ItemTappedEventArgs e)
         {
             BookQueryData data = e.Item as BookQueryData;
-            Resolver.Resolve<INavigationService>().NavigateTo<BookQueryPage>(true,data);
+            App.CurrentApp.NavigationService.NavigateTo<BookQueryPage>(true,data);
         }
     }
 }
diff --git a/BookAStar/BookAStar/Pages/BookQueryPage.xaml.cs b/BookAStar/BookAStar/Pages/BookQueryPage.xaml.cs
index 77eb613e..8acfe73e 100644
--- a/BookAStar/BookAStar/Pages/BookQueryPage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/BookQueryPage.xaml.cs
@@ -77,7 +77,7 @@ namespace BookAStar.Pages
                 Id = 0,
                 Description = "# **Hello Estimate!**"
             };
-            Resolver.Resolve<INavigationService>().NavigateTo<EditEstimatePage>(true,
+            App.CurrentApp.NavigationService.NavigateTo<EditEstimatePage>(true,
                 new EstimateViewModel(e));
         }
         
diff --git a/BookAStar/BookAStar/Pages/DashboardPage.xaml.cs b/BookAStar/BookAStar/Pages/DashboardPage.xaml.cs
index 85290eb1..86cd2ca4 100644
--- a/BookAStar/BookAStar/Pages/DashboardPage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/DashboardPage.xaml.cs
@@ -35,7 +35,7 @@ namespace BookAStar.Pages
 
         private void ShowPage<T>(object [] args, bool animate=false) where T:Page
         {
-            Resolver.Resolve<INavigationService>().NavigateTo<T>(animate, args);
+            App.CurrentApp.NavigationService.NavigateTo<T>(animate, args);
             App.MasterPresented = false;
         }
 
diff --git a/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs
index 8bba1227..63ffd087 100644
--- a/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs
@@ -44,7 +44,7 @@ namespace BookAStar.Pages
         protected void OnNewCommanLine(object sender, EventArgs e)
         {
             var com = new BillingLine();
-            Resolver.Resolve<INavigationService>().NavigateTo<EditBillingLinePage>(
+            App.CurrentApp.NavigationService.NavigateTo<EditBillingLinePage>(
                 true,
                 new object[] { new BillingLineViewModel(((EstimateViewModel)this.BindingContext).Data,com) } );
         }