From 7f431dbd012288ee0766d22eb4c52f948525da70 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Fri, 22 Dec 2017 11:23:03 -0500
Subject: [PATCH] Deprecate XF.Context and give context to renderers

---
 src/Android/Controls/CustomButtonRenderer.cs  |    5 +
 src/Android/Controls/CustomLabelRenderer.cs   |    7 +-
 .../Controls/CustomSearchBarRenderer.cs       |    5 +
 .../Controls/ExtendedButtonRenderer.cs        |    5 +
 .../Controls/ExtendedEditorRenderer.cs        |    5 +
 src/Android/Controls/ExtendedEntryRenderer.cs |    8 +-
 .../Controls/ExtendedPickerRenderer.cs        |    5 +
 .../Controls/ExtendedTabbedPageRenderer.cs    |    5 +
 .../Controls/ExtendedTableViewRenderer.cs     |    4 +
 src/Android/Controls/HybridWebViewRenderer.cs |    8 +-
 src/Android/Resources/Resource.Designer.cs    | 1281 +++++++++--------
 .../Services/AndroidKeyStoreStorageService.cs |    6 +-
 src/Android/Services/AppInfoService.cs        |    5 +-
 src/Android/Services/DeviceActionService.cs   |   20 +-
 src/Android/Services/DeviceInfoService.cs     |   10 +-
 src/Android/Services/MemoryService.cs         |    5 +-
 16 files changed, 731 insertions(+), 653 deletions(-)

diff --git a/src/Android/Controls/CustomButtonRenderer.cs b/src/Android/Controls/CustomButtonRenderer.cs
index b6f736d84..18b681662 100644
--- a/src/Android/Controls/CustomButtonRenderer.cs
+++ b/src/Android/Controls/CustomButtonRenderer.cs
@@ -1,5 +1,6 @@
 using System;
 using System.ComponentModel;
+using Android.Content;
 using Bit.Android.Controls;
 using Xamarin.Forms;
 using Xamarin.Forms.Platform.Android;
@@ -9,6 +10,10 @@ namespace Bit.Android.Controls
 {
     public class CustomButtonRenderer : ButtonRenderer
     {
+        public CustomButtonRenderer(Context context)
+            : base(context)
+        { }
+
         protected override void OnElementChanged(ElementChangedEventArgs<Button> e)
         {
             base.OnElementChanged(e);
diff --git a/src/Android/Controls/CustomLabelRenderer.cs b/src/Android/Controls/CustomLabelRenderer.cs
index b504072ca..6ad0c846e 100644
--- a/src/Android/Controls/CustomLabelRenderer.cs
+++ b/src/Android/Controls/CustomLabelRenderer.cs
@@ -1,4 +1,5 @@
-using Bit.Android.Controls;
+using Android.Content;
+using Bit.Android.Controls;
 using Xamarin.Forms;
 using Xamarin.Forms.Platform.Android;
 
@@ -7,6 +8,10 @@ namespace Bit.Android.Controls
 {
     public class CustomLabelRenderer : LabelRenderer
     {
+        public CustomLabelRenderer(Context context)
+            : base(context)
+        { }
+
         protected override void OnElementChanged(ElementChangedEventArgs<Label> e)
         {
             base.OnElementChanged(e);
diff --git a/src/Android/Controls/CustomSearchBarRenderer.cs b/src/Android/Controls/CustomSearchBarRenderer.cs
index dd92711cd..62374d3a6 100644
--- a/src/Android/Controls/CustomSearchBarRenderer.cs
+++ b/src/Android/Controls/CustomSearchBarRenderer.cs
@@ -1,5 +1,6 @@
 using System;
 using System.ComponentModel;
+using Android.Content;
 using Bit.Android.Controls;
 using Xamarin.Forms;
 using Xamarin.Forms.Platform.Android;
@@ -9,6 +10,10 @@ namespace Bit.Android.Controls
 {
     public class CustomSearchBarRenderer : SearchBarRenderer
     {
+        public CustomSearchBarRenderer(Context context)
+            : base(context)
+        { }
+
         protected override void OnElementChanged(ElementChangedEventArgs<SearchBar> e)
         {
             base.OnElementChanged(e);
diff --git a/src/Android/Controls/ExtendedButtonRenderer.cs b/src/Android/Controls/ExtendedButtonRenderer.cs
index 038215f48..c81409838 100644
--- a/src/Android/Controls/ExtendedButtonRenderer.cs
+++ b/src/Android/Controls/ExtendedButtonRenderer.cs
@@ -1,5 +1,6 @@
 using System;
 using System.ComponentModel;
+using Android.Content;
 using Bit.Android.Controls;
 using Bit.App.Controls;
 using Xamarin.Forms;
@@ -10,6 +11,10 @@ namespace Bit.Android.Controls
 {
     public class ExtendedButtonRenderer : CustomButtonRenderer
     {
+        public ExtendedButtonRenderer(Context context)
+            : base(context)
+        { }
+
         protected override void OnElementChanged(ElementChangedEventArgs<Button> e)
         {
             base.OnElementChanged(e);
diff --git a/src/Android/Controls/ExtendedEditorRenderer.cs b/src/Android/Controls/ExtendedEditorRenderer.cs
index 2a4c4752d..cb7276949 100644
--- a/src/Android/Controls/ExtendedEditorRenderer.cs
+++ b/src/Android/Controls/ExtendedEditorRenderer.cs
@@ -6,12 +6,17 @@ using Xamarin.Forms;
 using Xamarin.Forms.Platform.Android;
 using Android.Text.Method;
 using Android.Views;
+using Android.Content;
 
 [assembly: ExportRenderer(typeof(ExtendedEditor), typeof(ExtendedEditorRenderer))]
 namespace Bit.Android.Controls
 {
     public class ExtendedEditorRenderer : EditorRenderer
     {
+        public ExtendedEditorRenderer(Context context)
+            : base(context)
+        { }
+
         protected override void OnElementChanged(ElementChangedEventArgs<Editor> e)
         {
             base.OnElementChanged(e);
diff --git a/src/Android/Controls/ExtendedEntryRenderer.cs b/src/Android/Controls/ExtendedEntryRenderer.cs
index c3a70d1d0..4cf1a1cde 100644
--- a/src/Android/Controls/ExtendedEntryRenderer.cs
+++ b/src/Android/Controls/ExtendedEntryRenderer.cs
@@ -1,5 +1,6 @@
 using System;
 using System.ComponentModel;
+using Android.Content;
 using Android.Graphics;
 using Android.Text;
 using Android.Text.Method;
@@ -8,6 +9,7 @@ using Android.Widget;
 using Bit.Android.Controls;
 using Bit.App.Controls;
 using Bit.App.Enums;
+using Plugin.CurrentActivity;
 using Xamarin.Forms;
 using Xamarin.Forms.Platform.Android;
 
@@ -16,6 +18,10 @@ namespace Bit.Android.Controls
 {
     public class ExtendedEntryRenderer : EntryRenderer
     {
+        public ExtendedEntryRenderer(Context context)
+            : base(context)
+        { }
+
         private bool _isPassword;
         private bool _toggledPassword;
         private bool _isDisposed;
@@ -96,7 +102,7 @@ namespace Bit.Android.Controls
             }
 
             // show keyboard
-            var imm = Forms.Context.GetSystemService(global::Android.Content.Context.InputMethodService) as InputMethodManager;
+            var imm = CrossCurrentActivity.Current.Activity.GetSystemService(Context.InputMethodService) as InputMethodManager;
             imm.ShowSoftInput(Control, ShowFlags.Forced);
             imm.ToggleSoftInput(ShowFlags.Forced, HideSoftInputFlags.ImplicitOnly);
 
diff --git a/src/Android/Controls/ExtendedPickerRenderer.cs b/src/Android/Controls/ExtendedPickerRenderer.cs
index 1272a8f15..8d7db0571 100644
--- a/src/Android/Controls/ExtendedPickerRenderer.cs
+++ b/src/Android/Controls/ExtendedPickerRenderer.cs
@@ -1,5 +1,6 @@
 using System;
 using System.ComponentModel;
+using Android.Content;
 using Bit.Android.Controls;
 using Bit.App.Controls;
 using Xamarin.Forms;
@@ -10,6 +11,10 @@ namespace Bit.Android.Controls
 {
     public class ExtendedPickerRenderer : PickerRenderer
     {
+        public ExtendedPickerRenderer(Context context)
+            : base(context)
+        { }
+
         protected override void OnElementChanged(ElementChangedEventArgs<Picker> e)
         {
             base.OnElementChanged(e);
diff --git a/src/Android/Controls/ExtendedTabbedPageRenderer.cs b/src/Android/Controls/ExtendedTabbedPageRenderer.cs
index 7d1bdc38a..846671128 100644
--- a/src/Android/Controls/ExtendedTabbedPageRenderer.cs
+++ b/src/Android/Controls/ExtendedTabbedPageRenderer.cs
@@ -7,6 +7,7 @@ using Android.Support.Design.Widget;
 using Xamarin.Forms.Platform.Android.AppCompat;
 using System.Reflection;
 using System.Linq;
+using Android.Content;
 
 [assembly: ExportRenderer(typeof(ExtendedTabbedPage), typeof(ExtendedTabbedPageRenderer))]
 namespace Bit.Android.Controls
@@ -15,6 +16,10 @@ namespace Bit.Android.Controls
     {
         private TabLayout _tabLayout;
 
+        public ExtendedTabbedPageRenderer(Context context)
+            : base(context)
+        { }
+
         protected override void OnElementChanged(ElementChangedEventArgs<TabbedPage> e)
         {
             base.OnElementChanged(e);
diff --git a/src/Android/Controls/ExtendedTableViewRenderer.cs b/src/Android/Controls/ExtendedTableViewRenderer.cs
index d6f0e2119..ab1224787 100644
--- a/src/Android/Controls/ExtendedTableViewRenderer.cs
+++ b/src/Android/Controls/ExtendedTableViewRenderer.cs
@@ -14,6 +14,10 @@ namespace Bit.Android.Controls
 {
     public class ExtendedTableViewRenderer : TableViewRenderer
     {
+        public ExtendedTableViewRenderer(Context context)
+            : base(context)
+        { }
+
         protected override void OnElementChanged(ElementChangedEventArgs<TableView> e)
         {
             base.OnElementChanged(e);
diff --git a/src/Android/Controls/HybridWebViewRenderer.cs b/src/Android/Controls/HybridWebViewRenderer.cs
index 776c6bc84..c5d84a0bf 100644
--- a/src/Android/Controls/HybridWebViewRenderer.cs
+++ b/src/Android/Controls/HybridWebViewRenderer.cs
@@ -6,6 +6,8 @@ using Xamarin.Forms.Platform.Android;
 using Android.Webkit;
 using AWebkit = Android.Webkit;
 using Java.Interop;
+using Android.Content;
+using Plugin.CurrentActivity;
 
 [assembly: ExportRenderer(typeof(HybridWebView), typeof(HybridWebViewRenderer))]
 namespace Bit.Android.Controls
@@ -14,13 +16,17 @@ namespace Bit.Android.Controls
     {
         private const string JSFunction = "function invokeCSharpAction(data){jsBridge.invokeAction(data);}";
 
+        public HybridWebViewRenderer(Context context)
+            : base(context)
+        { }
+
         protected override void OnElementChanged(ElementChangedEventArgs<HybridWebView> e)
         {
             base.OnElementChanged(e);
 
             if(Control == null)
             {
-                var webView = new AWebkit.WebView(Forms.Context);
+                var webView = new AWebkit.WebView(CrossCurrentActivity.Current.Activity);
                 webView.Settings.JavaScriptEnabled = true;
                 SetNativeControl(webView);
             }
diff --git a/src/Android/Resources/Resource.Designer.cs b/src/Android/Resources/Resource.Designer.cs
index ac078014c..cfc2115d4 100644
--- a/src/Android/Resources/Resource.Designer.cs
+++ b/src/Android/Resources/Resource.Designer.cs
@@ -1416,392 +1416,392 @@ namespace Bit.Android
 		public partial class Color
 		{
 			
-			// aapt resource value: 0x7f0a0065
-			public const int abc_background_cache_hint_selector_material_dark = 2131361893;
+			// aapt resource value: 0x7f080065
+			public const int abc_background_cache_hint_selector_material_dark = 2131230821;
 			
-			// aapt resource value: 0x7f0a0066
-			public const int abc_background_cache_hint_selector_material_light = 2131361894;
+			// aapt resource value: 0x7f080066
+			public const int abc_background_cache_hint_selector_material_light = 2131230822;
 			
-			// aapt resource value: 0x7f0a0067
-			public const int abc_btn_colored_borderless_text_material = 2131361895;
+			// aapt resource value: 0x7f080067
+			public const int abc_btn_colored_borderless_text_material = 2131230823;
 			
-			// aapt resource value: 0x7f0a0068
-			public const int abc_btn_colored_text_material = 2131361896;
+			// aapt resource value: 0x7f080068
+			public const int abc_btn_colored_text_material = 2131230824;
 			
-			// aapt resource value: 0x7f0a0069
-			public const int abc_color_highlight_material = 2131361897;
+			// aapt resource value: 0x7f080069
+			public const int abc_color_highlight_material = 2131230825;
 			
-			// aapt resource value: 0x7f0a006a
-			public const int abc_hint_foreground_material_dark = 2131361898;
+			// aapt resource value: 0x7f08006a
+			public const int abc_hint_foreground_material_dark = 2131230826;
 			
-			// aapt resource value: 0x7f0a006b
-			public const int abc_hint_foreground_material_light = 2131361899;
+			// aapt resource value: 0x7f08006b
+			public const int abc_hint_foreground_material_light = 2131230827;
 			
-			// aapt resource value: 0x7f0a000d
-			public const int abc_input_method_navigation_guard = 2131361805;
+			// aapt resource value: 0x7f08000d
+			public const int abc_input_method_navigation_guard = 2131230733;
 			
-			// aapt resource value: 0x7f0a006c
-			public const int abc_primary_text_disable_only_material_dark = 2131361900;
+			// aapt resource value: 0x7f08006c
+			public const int abc_primary_text_disable_only_material_dark = 2131230828;
 			
-			// aapt resource value: 0x7f0a006d
-			public const int abc_primary_text_disable_only_material_light = 2131361901;
+			// aapt resource value: 0x7f08006d
+			public const int abc_primary_text_disable_only_material_light = 2131230829;
 			
-			// aapt resource value: 0x7f0a006e
-			public const int abc_primary_text_material_dark = 2131361902;
+			// aapt resource value: 0x7f08006e
+			public const int abc_primary_text_material_dark = 2131230830;
 			
-			// aapt resource value: 0x7f0a006f
-			public const int abc_primary_text_material_light = 2131361903;
+			// aapt resource value: 0x7f08006f
+			public const int abc_primary_text_material_light = 2131230831;
 			
-			// aapt resource value: 0x7f0a0070
-			public const int abc_search_url_text = 2131361904;
+			// aapt resource value: 0x7f080070
+			public const int abc_search_url_text = 2131230832;
 			
-			// aapt resource value: 0x7f0a000e
-			public const int abc_search_url_text_normal = 2131361806;
+			// aapt resource value: 0x7f08000e
+			public const int abc_search_url_text_normal = 2131230734;
 			
-			// aapt resource value: 0x7f0a000f
-			public const int abc_search_url_text_pressed = 2131361807;
+			// aapt resource value: 0x7f08000f
+			public const int abc_search_url_text_pressed = 2131230735;
 			
-			// aapt resource value: 0x7f0a0010
-			public const int abc_search_url_text_selected = 2131361808;
+			// aapt resource value: 0x7f080010
+			public const int abc_search_url_text_selected = 2131230736;
 			
-			// aapt resource value: 0x7f0a0071
-			public const int abc_secondary_text_material_dark = 2131361905;
+			// aapt resource value: 0x7f080071
+			public const int abc_secondary_text_material_dark = 2131230833;
 			
-			// aapt resource value: 0x7f0a0072
-			public const int abc_secondary_text_material_light = 2131361906;
+			// aapt resource value: 0x7f080072
+			public const int abc_secondary_text_material_light = 2131230834;
 			
-			// aapt resource value: 0x7f0a0073
-			public const int abc_tint_btn_checkable = 2131361907;
+			// aapt resource value: 0x7f080073
+			public const int abc_tint_btn_checkable = 2131230835;
 			
-			// aapt resource value: 0x7f0a0074
-			public const int abc_tint_default = 2131361908;
+			// aapt resource value: 0x7f080074
+			public const int abc_tint_default = 2131230836;
 			
-			// aapt resource value: 0x7f0a0075
-			public const int abc_tint_edittext = 2131361909;
+			// aapt resource value: 0x7f080075
+			public const int abc_tint_edittext = 2131230837;
 			
-			// aapt resource value: 0x7f0a0076
-			public const int abc_tint_seek_thumb = 2131361910;
+			// aapt resource value: 0x7f080076
+			public const int abc_tint_seek_thumb = 2131230838;
 			
-			// aapt resource value: 0x7f0a0077
-			public const int abc_tint_spinner = 2131361911;
+			// aapt resource value: 0x7f080077
+			public const int abc_tint_spinner = 2131230839;
 			
-			// aapt resource value: 0x7f0a0078
-			public const int abc_tint_switch_thumb = 2131361912;
+			// aapt resource value: 0x7f080078
+			public const int abc_tint_switch_thumb = 2131230840;
 			
-			// aapt resource value: 0x7f0a0079
-			public const int abc_tint_switch_track = 2131361913;
+			// aapt resource value: 0x7f080079
+			public const int abc_tint_switch_track = 2131230841;
 			
-			// aapt resource value: 0x7f0a0063
-			public const int accent = 2131361891;
+			// aapt resource value: 0x7f080063
+			public const int accent = 2131230819;
 			
-			// aapt resource value: 0x7f0a0011
-			public const int accent_material_dark = 2131361809;
+			// aapt resource value: 0x7f080011
+			public const int accent_material_dark = 2131230737;
 			
-			// aapt resource value: 0x7f0a0012
-			public const int accent_material_light = 2131361810;
+			// aapt resource value: 0x7f080012
+			public const int accent_material_light = 2131230738;
 			
-			// aapt resource value: 0x7f0a0013
-			public const int background_floating_material_dark = 2131361811;
+			// aapt resource value: 0x7f080013
+			public const int background_floating_material_dark = 2131230739;
 			
-			// aapt resource value: 0x7f0a0014
-			public const int background_floating_material_light = 2131361812;
+			// aapt resource value: 0x7f080014
+			public const int background_floating_material_light = 2131230740;
 			
-			// aapt resource value: 0x7f0a0015
-			public const int background_material_dark = 2131361813;
+			// aapt resource value: 0x7f080015
+			public const int background_material_dark = 2131230741;
 			
-			// aapt resource value: 0x7f0a0016
-			public const int background_material_light = 2131361814;
+			// aapt resource value: 0x7f080016
+			public const int background_material_light = 2131230742;
 			
-			// aapt resource value: 0x7f0a005d
-			public const int black = 2131361885;
+			// aapt resource value: 0x7f08005d
+			public const int black = 2131230813;
 			
-			// aapt resource value: 0x7f0a0017
-			public const int bright_foreground_disabled_material_dark = 2131361815;
+			// aapt resource value: 0x7f080017
+			public const int bright_foreground_disabled_material_dark = 2131230743;
 			
-			// aapt resource value: 0x7f0a0018
-			public const int bright_foreground_disabled_material_light = 2131361816;
+			// aapt resource value: 0x7f080018
+			public const int bright_foreground_disabled_material_light = 2131230744;
 			
-			// aapt resource value: 0x7f0a0019
-			public const int bright_foreground_inverse_material_dark = 2131361817;
+			// aapt resource value: 0x7f080019
+			public const int bright_foreground_inverse_material_dark = 2131230745;
 			
-			// aapt resource value: 0x7f0a001a
-			public const int bright_foreground_inverse_material_light = 2131361818;
+			// aapt resource value: 0x7f08001a
+			public const int bright_foreground_inverse_material_light = 2131230746;
 			
-			// aapt resource value: 0x7f0a001b
-			public const int bright_foreground_material_dark = 2131361819;
+			// aapt resource value: 0x7f08001b
+			public const int bright_foreground_material_dark = 2131230747;
 			
-			// aapt resource value: 0x7f0a001c
-			public const int bright_foreground_material_light = 2131361820;
+			// aapt resource value: 0x7f08001c
+			public const int bright_foreground_material_light = 2131230748;
 			
-			// aapt resource value: 0x7f0a001d
-			public const int button_material_dark = 2131361821;
+			// aapt resource value: 0x7f08001d
+			public const int button_material_dark = 2131230749;
 			
-			// aapt resource value: 0x7f0a001e
-			public const int button_material_light = 2131361822;
+			// aapt resource value: 0x7f08001e
+			public const int button_material_light = 2131230750;
 			
-			// aapt resource value: 0x7f0a0008
-			public const int cardview_dark_background = 2131361800;
+			// aapt resource value: 0x7f080008
+			public const int cardview_dark_background = 2131230728;
 			
-			// aapt resource value: 0x7f0a0009
-			public const int cardview_light_background = 2131361801;
+			// aapt resource value: 0x7f080009
+			public const int cardview_light_background = 2131230729;
 			
-			// aapt resource value: 0x7f0a000a
-			public const int cardview_shadow_end_color = 2131361802;
+			// aapt resource value: 0x7f08000a
+			public const int cardview_shadow_end_color = 2131230730;
 			
-			// aapt resource value: 0x7f0a000b
-			public const int cardview_shadow_start_color = 2131361803;
+			// aapt resource value: 0x7f08000b
+			public const int cardview_shadow_start_color = 2131230731;
 			
-			// aapt resource value: 0x7f0a007a
-			public const int common_google_signin_btn_text_dark = 2131361914;
+			// aapt resource value: 0x7f08007a
+			public const int common_google_signin_btn_text_dark = 2131230842;
 			
-			// aapt resource value: 0x7f0a0000
-			public const int common_google_signin_btn_text_dark_default = 2131361792;
+			// aapt resource value: 0x7f080000
+			public const int common_google_signin_btn_text_dark_default = 2131230720;
 			
-			// aapt resource value: 0x7f0a0001
-			public const int common_google_signin_btn_text_dark_disabled = 2131361793;
+			// aapt resource value: 0x7f080001
+			public const int common_google_signin_btn_text_dark_disabled = 2131230721;
 			
-			// aapt resource value: 0x7f0a0002
-			public const int common_google_signin_btn_text_dark_focused = 2131361794;
+			// aapt resource value: 0x7f080002
+			public const int common_google_signin_btn_text_dark_focused = 2131230722;
 			
-			// aapt resource value: 0x7f0a0003
-			public const int common_google_signin_btn_text_dark_pressed = 2131361795;
+			// aapt resource value: 0x7f080003
+			public const int common_google_signin_btn_text_dark_pressed = 2131230723;
 			
-			// aapt resource value: 0x7f0a007b
-			public const int common_google_signin_btn_text_light = 2131361915;
+			// aapt resource value: 0x7f08007b
+			public const int common_google_signin_btn_text_light = 2131230843;
 			
-			// aapt resource value: 0x7f0a0004
-			public const int common_google_signin_btn_text_light_default = 2131361796;
+			// aapt resource value: 0x7f080004
+			public const int common_google_signin_btn_text_light_default = 2131230724;
 			
-			// aapt resource value: 0x7f0a0005
-			public const int common_google_signin_btn_text_light_disabled = 2131361797;
+			// aapt resource value: 0x7f080005
+			public const int common_google_signin_btn_text_light_disabled = 2131230725;
 			
-			// aapt resource value: 0x7f0a0006
-			public const int common_google_signin_btn_text_light_focused = 2131361798;
+			// aapt resource value: 0x7f080006
+			public const int common_google_signin_btn_text_light_focused = 2131230726;
 			
-			// aapt resource value: 0x7f0a0007
-			public const int common_google_signin_btn_text_light_pressed = 2131361799;
+			// aapt resource value: 0x7f080007
+			public const int common_google_signin_btn_text_light_pressed = 2131230727;
 			
-			// aapt resource value: 0x7f0a007c
-			public const int common_google_signin_btn_tint = 2131361916;
+			// aapt resource value: 0x7f08007c
+			public const int common_google_signin_btn_tint = 2131230844;
 			
-			// aapt resource value: 0x7f0a0062
-			public const int darkaccent = 2131361890;
+			// aapt resource value: 0x7f080062
+			public const int darkaccent = 2131230818;
 			
-			// aapt resource value: 0x7f0a005e
-			public const int darkgray = 2131361886;
+			// aapt resource value: 0x7f08005e
+			public const int darkgray = 2131230814;
 			
-			// aapt resource value: 0x7f0a0047
-			public const int design_bottom_navigation_shadow_color = 2131361863;
+			// aapt resource value: 0x7f080047
+			public const int design_bottom_navigation_shadow_color = 2131230791;
 			
-			// aapt resource value: 0x7f0a007d
-			public const int design_error = 2131361917;
+			// aapt resource value: 0x7f08007d
+			public const int design_error = 2131230845;
 			
-			// aapt resource value: 0x7f0a0048
-			public const int design_fab_shadow_end_color = 2131361864;
+			// aapt resource value: 0x7f080048
+			public const int design_fab_shadow_end_color = 2131230792;
 			
-			// aapt resource value: 0x7f0a0049
-			public const int design_fab_shadow_mid_color = 2131361865;
+			// aapt resource value: 0x7f080049
+			public const int design_fab_shadow_mid_color = 2131230793;
 			
-			// aapt resource value: 0x7f0a004a
-			public const int design_fab_shadow_start_color = 2131361866;
+			// aapt resource value: 0x7f08004a
+			public const int design_fab_shadow_start_color = 2131230794;
 			
-			// aapt resource value: 0x7f0a004b
-			public const int design_fab_stroke_end_inner_color = 2131361867;
+			// aapt resource value: 0x7f08004b
+			public const int design_fab_stroke_end_inner_color = 2131230795;
 			
-			// aapt resource value: 0x7f0a004c
-			public const int design_fab_stroke_end_outer_color = 2131361868;
+			// aapt resource value: 0x7f08004c
+			public const int design_fab_stroke_end_outer_color = 2131230796;
 			
-			// aapt resource value: 0x7f0a004d
-			public const int design_fab_stroke_top_inner_color = 2131361869;
+			// aapt resource value: 0x7f08004d
+			public const int design_fab_stroke_top_inner_color = 2131230797;
 			
-			// aapt resource value: 0x7f0a004e
-			public const int design_fab_stroke_top_outer_color = 2131361870;
+			// aapt resource value: 0x7f08004e
+			public const int design_fab_stroke_top_outer_color = 2131230798;
 			
-			// aapt resource value: 0x7f0a004f
-			public const int design_snackbar_background_color = 2131361871;
+			// aapt resource value: 0x7f08004f
+			public const int design_snackbar_background_color = 2131230799;
 			
-			// aapt resource value: 0x7f0a0050
-			public const int design_textinput_error_color_dark = 2131361872;
+			// aapt resource value: 0x7f080050
+			public const int design_textinput_error_color_dark = 2131230800;
 			
-			// aapt resource value: 0x7f0a0051
-			public const int design_textinput_error_color_light = 2131361873;
+			// aapt resource value: 0x7f080051
+			public const int design_textinput_error_color_light = 2131230801;
 			
-			// aapt resource value: 0x7f0a007e
-			public const int design_tint_password_toggle = 2131361918;
+			// aapt resource value: 0x7f08007e
+			public const int design_tint_password_toggle = 2131230846;
 			
-			// aapt resource value: 0x7f0a001f
-			public const int dim_foreground_disabled_material_dark = 2131361823;
+			// aapt resource value: 0x7f08001f
+			public const int dim_foreground_disabled_material_dark = 2131230751;
 			
-			// aapt resource value: 0x7f0a0020
-			public const int dim_foreground_disabled_material_light = 2131361824;
+			// aapt resource value: 0x7f080020
+			public const int dim_foreground_disabled_material_light = 2131230752;
 			
-			// aapt resource value: 0x7f0a0021
-			public const int dim_foreground_material_dark = 2131361825;
+			// aapt resource value: 0x7f080021
+			public const int dim_foreground_material_dark = 2131230753;
 			
-			// aapt resource value: 0x7f0a0022
-			public const int dim_foreground_material_light = 2131361826;
+			// aapt resource value: 0x7f080022
+			public const int dim_foreground_material_light = 2131230754;
 			
-			// aapt resource value: 0x7f0a0023
-			public const int foreground_material_dark = 2131361827;
+			// aapt resource value: 0x7f080023
+			public const int foreground_material_dark = 2131230755;
 			
-			// aapt resource value: 0x7f0a0024
-			public const int foreground_material_light = 2131361828;
+			// aapt resource value: 0x7f080024
+			public const int foreground_material_light = 2131230756;
 			
-			// aapt resource value: 0x7f0a005f
-			public const int gray = 2131361887;
+			// aapt resource value: 0x7f08005f
+			public const int gray = 2131230815;
 			
-			// aapt resource value: 0x7f0a0025
-			public const int highlighted_text_material_dark = 2131361829;
+			// aapt resource value: 0x7f080025
+			public const int highlighted_text_material_dark = 2131230757;
 			
-			// aapt resource value: 0x7f0a0026
-			public const int highlighted_text_material_light = 2131361830;
+			// aapt resource value: 0x7f080026
+			public const int highlighted_text_material_light = 2131230758;
 			
-			// aapt resource value: 0x7f0a0052
-			public const int hockeyapp_background_header = 2131361874;
+			// aapt resource value: 0x7f080052
+			public const int hockeyapp_background_header = 2131230802;
 			
-			// aapt resource value: 0x7f0a0053
-			public const int hockeyapp_background_light = 2131361875;
+			// aapt resource value: 0x7f080053
+			public const int hockeyapp_background_light = 2131230803;
 			
-			// aapt resource value: 0x7f0a0054
-			public const int hockeyapp_background_white = 2131361876;
+			// aapt resource value: 0x7f080054
+			public const int hockeyapp_background_white = 2131230804;
 			
-			// aapt resource value: 0x7f0a0055
-			public const int hockeyapp_button_background = 2131361877;
+			// aapt resource value: 0x7f080055
+			public const int hockeyapp_button_background = 2131230805;
 			
-			// aapt resource value: 0x7f0a0056
-			public const int hockeyapp_button_background_pressed = 2131361878;
+			// aapt resource value: 0x7f080056
+			public const int hockeyapp_button_background_pressed = 2131230806;
 			
-			// aapt resource value: 0x7f0a0057
-			public const int hockeyapp_button_background_selected = 2131361879;
+			// aapt resource value: 0x7f080057
+			public const int hockeyapp_button_background_selected = 2131230807;
 			
-			// aapt resource value: 0x7f0a0058
-			public const int hockeyapp_text_black = 2131361880;
+			// aapt resource value: 0x7f080058
+			public const int hockeyapp_text_black = 2131230808;
 			
-			// aapt resource value: 0x7f0a0059
-			public const int hockeyapp_text_light = 2131361881;
+			// aapt resource value: 0x7f080059
+			public const int hockeyapp_text_light = 2131230809;
 			
-			// aapt resource value: 0x7f0a005a
-			public const int hockeyapp_text_normal = 2131361882;
+			// aapt resource value: 0x7f08005a
+			public const int hockeyapp_text_normal = 2131230810;
 			
-			// aapt resource value: 0x7f0a005b
-			public const int hockeyapp_text_white = 2131361883;
+			// aapt resource value: 0x7f08005b
+			public const int hockeyapp_text_white = 2131230811;
 			
-			// aapt resource value: 0x7f0a0060
-			public const int lightgray = 2131361888;
+			// aapt resource value: 0x7f080060
+			public const int lightgray = 2131230816;
 			
-			// aapt resource value: 0x7f0a0027
-			public const int material_blue_grey_800 = 2131361831;
+			// aapt resource value: 0x7f080027
+			public const int material_blue_grey_800 = 2131230759;
 			
-			// aapt resource value: 0x7f0a0028
-			public const int material_blue_grey_900 = 2131361832;
+			// aapt resource value: 0x7f080028
+			public const int material_blue_grey_900 = 2131230760;
 			
-			// aapt resource value: 0x7f0a0029
-			public const int material_blue_grey_950 = 2131361833;
+			// aapt resource value: 0x7f080029
+			public const int material_blue_grey_950 = 2131230761;
 			
-			// aapt resource value: 0x7f0a002a
-			public const int material_deep_teal_200 = 2131361834;
+			// aapt resource value: 0x7f08002a
+			public const int material_deep_teal_200 = 2131230762;
 			
-			// aapt resource value: 0x7f0a002b
-			public const int material_deep_teal_500 = 2131361835;
+			// aapt resource value: 0x7f08002b
+			public const int material_deep_teal_500 = 2131230763;
 			
-			// aapt resource value: 0x7f0a002c
-			public const int material_grey_100 = 2131361836;
+			// aapt resource value: 0x7f08002c
+			public const int material_grey_100 = 2131230764;
 			
-			// aapt resource value: 0x7f0a002d
-			public const int material_grey_300 = 2131361837;
+			// aapt resource value: 0x7f08002d
+			public const int material_grey_300 = 2131230765;
 			
-			// aapt resource value: 0x7f0a002e
-			public const int material_grey_50 = 2131361838;
+			// aapt resource value: 0x7f08002e
+			public const int material_grey_50 = 2131230766;
 			
-			// aapt resource value: 0x7f0a002f
-			public const int material_grey_600 = 2131361839;
+			// aapt resource value: 0x7f08002f
+			public const int material_grey_600 = 2131230767;
 			
-			// aapt resource value: 0x7f0a0030
-			public const int material_grey_800 = 2131361840;
+			// aapt resource value: 0x7f080030
+			public const int material_grey_800 = 2131230768;
 			
-			// aapt resource value: 0x7f0a0031
-			public const int material_grey_850 = 2131361841;
+			// aapt resource value: 0x7f080031
+			public const int material_grey_850 = 2131230769;
 			
-			// aapt resource value: 0x7f0a0032
-			public const int material_grey_900 = 2131361842;
+			// aapt resource value: 0x7f080032
+			public const int material_grey_900 = 2131230770;
 			
-			// aapt resource value: 0x7f0a000c
-			public const int notification_action_color_filter = 2131361804;
+			// aapt resource value: 0x7f08000c
+			public const int notification_action_color_filter = 2131230732;
 			
-			// aapt resource value: 0x7f0a0033
-			public const int notification_icon_bg_color = 2131361843;
+			// aapt resource value: 0x7f080033
+			public const int notification_icon_bg_color = 2131230771;
 			
-			// aapt resource value: 0x7f0a0034
-			public const int notification_material_background_media_default_color = 2131361844;
+			// aapt resource value: 0x7f080034
+			public const int notification_material_background_media_default_color = 2131230772;
 			
-			// aapt resource value: 0x7f0a0061
-			public const int primary = 2131361889;
+			// aapt resource value: 0x7f080061
+			public const int primary = 2131230817;
 			
-			// aapt resource value: 0x7f0a0035
-			public const int primary_dark_material_dark = 2131361845;
+			// aapt resource value: 0x7f080035
+			public const int primary_dark_material_dark = 2131230773;
 			
-			// aapt resource value: 0x7f0a0036
-			public const int primary_dark_material_light = 2131361846;
+			// aapt resource value: 0x7f080036
+			public const int primary_dark_material_light = 2131230774;
 			
-			// aapt resource value: 0x7f0a0037
-			public const int primary_material_dark = 2131361847;
+			// aapt resource value: 0x7f080037
+			public const int primary_material_dark = 2131230775;
 			
-			// aapt resource value: 0x7f0a0038
-			public const int primary_material_light = 2131361848;
+			// aapt resource value: 0x7f080038
+			public const int primary_material_light = 2131230776;
 			
-			// aapt resource value: 0x7f0a0039
-			public const int primary_text_default_material_dark = 2131361849;
+			// aapt resource value: 0x7f080039
+			public const int primary_text_default_material_dark = 2131230777;
 			
-			// aapt resource value: 0x7f0a003a
-			public const int primary_text_default_material_light = 2131361850;
+			// aapt resource value: 0x7f08003a
+			public const int primary_text_default_material_light = 2131230778;
 			
-			// aapt resource value: 0x7f0a003b
-			public const int primary_text_disabled_material_dark = 2131361851;
+			// aapt resource value: 0x7f08003b
+			public const int primary_text_disabled_material_dark = 2131230779;
 			
-			// aapt resource value: 0x7f0a003c
-			public const int primary_text_disabled_material_light = 2131361852;
+			// aapt resource value: 0x7f08003c
+			public const int primary_text_disabled_material_light = 2131230780;
 			
-			// aapt resource value: 0x7f0a003d
-			public const int ripple_material_dark = 2131361853;
+			// aapt resource value: 0x7f08003d
+			public const int ripple_material_dark = 2131230781;
 			
-			// aapt resource value: 0x7f0a003e
-			public const int ripple_material_light = 2131361854;
+			// aapt resource value: 0x7f08003e
+			public const int ripple_material_light = 2131230782;
 			
-			// aapt resource value: 0x7f0a003f
-			public const int secondary_text_default_material_dark = 2131361855;
+			// aapt resource value: 0x7f08003f
+			public const int secondary_text_default_material_dark = 2131230783;
 			
-			// aapt resource value: 0x7f0a0040
-			public const int secondary_text_default_material_light = 2131361856;
+			// aapt resource value: 0x7f080040
+			public const int secondary_text_default_material_light = 2131230784;
 			
-			// aapt resource value: 0x7f0a0041
-			public const int secondary_text_disabled_material_dark = 2131361857;
+			// aapt resource value: 0x7f080041
+			public const int secondary_text_disabled_material_dark = 2131230785;
 			
-			// aapt resource value: 0x7f0a0042
-			public const int secondary_text_disabled_material_light = 2131361858;
+			// aapt resource value: 0x7f080042
+			public const int secondary_text_disabled_material_light = 2131230786;
 			
-			// aapt resource value: 0x7f0a0043
-			public const int switch_thumb_disabled_material_dark = 2131361859;
+			// aapt resource value: 0x7f080043
+			public const int switch_thumb_disabled_material_dark = 2131230787;
 			
-			// aapt resource value: 0x7f0a0044
-			public const int switch_thumb_disabled_material_light = 2131361860;
+			// aapt resource value: 0x7f080044
+			public const int switch_thumb_disabled_material_light = 2131230788;
 			
-			// aapt resource value: 0x7f0a007f
-			public const int switch_thumb_material_dark = 2131361919;
+			// aapt resource value: 0x7f08007f
+			public const int switch_thumb_material_dark = 2131230847;
 			
-			// aapt resource value: 0x7f0a0080
-			public const int switch_thumb_material_light = 2131361920;
+			// aapt resource value: 0x7f080080
+			public const int switch_thumb_material_light = 2131230848;
 			
-			// aapt resource value: 0x7f0a0045
-			public const int switch_thumb_normal_material_dark = 2131361861;
+			// aapt resource value: 0x7f080045
+			public const int switch_thumb_normal_material_dark = 2131230789;
 			
-			// aapt resource value: 0x7f0a0046
-			public const int switch_thumb_normal_material_light = 2131361862;
+			// aapt resource value: 0x7f080046
+			public const int switch_thumb_normal_material_light = 2131230790;
 			
-			// aapt resource value: 0x7f0a0064
-			public const int tabtext = 2131361892;
+			// aapt resource value: 0x7f080064
+			public const int tabtext = 2131230820;
 			
-			// aapt resource value: 0x7f0a005c
-			public const int white = 2131361884;
+			// aapt resource value: 0x7f08005c
+			public const int white = 2131230812;
 			
 			static Color()
 			{
@@ -4048,44 +4048,44 @@ namespace Bit.Android
 		public partial class Integer
 		{
 			
-			// aapt resource value: 0x7f090004
-			public const int abc_config_activityDefaultDur = 2131296260;
+			// aapt resource value: 0x7f0a0004
+			public const int abc_config_activityDefaultDur = 2131361796;
 			
-			// aapt resource value: 0x7f090005
-			public const int abc_config_activityShortDur = 2131296261;
+			// aapt resource value: 0x7f0a0005
+			public const int abc_config_activityShortDur = 2131361797;
 			
-			// aapt resource value: 0x7f090009
-			public const int app_bar_elevation_anim_duration = 2131296265;
+			// aapt resource value: 0x7f0a0009
+			public const int app_bar_elevation_anim_duration = 2131361801;
 			
-			// aapt resource value: 0x7f09000a
-			public const int bottom_sheet_slide_duration = 2131296266;
+			// aapt resource value: 0x7f0a000a
+			public const int bottom_sheet_slide_duration = 2131361802;
 			
-			// aapt resource value: 0x7f090006
-			public const int cancel_button_image_alpha = 2131296262;
+			// aapt resource value: 0x7f0a0006
+			public const int cancel_button_image_alpha = 2131361798;
 			
-			// aapt resource value: 0x7f090008
-			public const int design_snackbar_text_max_lines = 2131296264;
+			// aapt resource value: 0x7f0a0008
+			public const int design_snackbar_text_max_lines = 2131361800;
 			
-			// aapt resource value: 0x7f090000
-			public const int google_play_services_version = 2131296256;
+			// aapt resource value: 0x7f0a0000
+			public const int google_play_services_version = 2131361792;
 			
-			// aapt resource value: 0x7f09000b
-			public const int hide_password_duration = 2131296267;
+			// aapt resource value: 0x7f0a000b
+			public const int hide_password_duration = 2131361803;
 			
-			// aapt resource value: 0x7f090001
-			public const int mr_controller_volume_group_list_animation_duration_ms = 2131296257;
+			// aapt resource value: 0x7f0a0001
+			public const int mr_controller_volume_group_list_animation_duration_ms = 2131361793;
 			
-			// aapt resource value: 0x7f090002
-			public const int mr_controller_volume_group_list_fade_in_duration_ms = 2131296258;
+			// aapt resource value: 0x7f0a0002
+			public const int mr_controller_volume_group_list_fade_in_duration_ms = 2131361794;
 			
-			// aapt resource value: 0x7f090003
-			public const int mr_controller_volume_group_list_fade_out_duration_ms = 2131296259;
+			// aapt resource value: 0x7f0a0003
+			public const int mr_controller_volume_group_list_fade_out_duration_ms = 2131361795;
 			
-			// aapt resource value: 0x7f09000c
-			public const int show_password_duration = 2131296268;
+			// aapt resource value: 0x7f0a000c
+			public const int show_password_duration = 2131361804;
 			
-			// aapt resource value: 0x7f090007
-			public const int status_bar_notification_info_maxnum = 2131296263;
+			// aapt resource value: 0x7f0a0007
+			public const int status_bar_notification_info_maxnum = 2131361799;
 			
 			static Integer()
 			{
@@ -4372,524 +4372,545 @@ namespace Bit.Android
 		public partial class String
 		{
 			
-			// aapt resource value: 0x7f080051
-			public const int ApplicationName = 2131230801;
+			// aapt resource value: 0x7f090051
+			public const int ApplicationName = 2131296337;
 			
-			// aapt resource value: 0x7f0800ab
-			public const int AutoFillServiceDescription = 2131230891;
+			// aapt resource value: 0x7f0900b2
+			public const int AutoFillServiceDescription = 2131296434;
 			
-			// aapt resource value: 0x7f0800aa
-			public const int AutoFillServiceSummary = 2131230890;
+			// aapt resource value: 0x7f0900b1
+			public const int AutoFillServiceSummary = 2131296433;
 			
-			// aapt resource value: 0x7f080050
-			public const int Hello = 2131230800;
+			// aapt resource value: 0x7f090050
+			public const int Hello = 2131296336;
 			
-			// aapt resource value: 0x7f0800ac
-			public const int MyVault = 2131230892;
+			// aapt resource value: 0x7f0900b3
+			public const int MyVault = 2131296435;
 			
-			// aapt resource value: 0x7f080027
-			public const int abc_action_bar_home_description = 2131230759;
+			// aapt resource value: 0x7f090027
+			public const int abc_action_bar_home_description = 2131296295;
 			
-			// aapt resource value: 0x7f080028
-			public const int abc_action_bar_home_description_format = 2131230760;
+			// aapt resource value: 0x7f090028
+			public const int abc_action_bar_home_description_format = 2131296296;
 			
-			// aapt resource value: 0x7f080029
-			public const int abc_action_bar_home_subtitle_description_format = 2131230761;
+			// aapt resource value: 0x7f090029
+			public const int abc_action_bar_home_subtitle_description_format = 2131296297;
 			
-			// aapt resource value: 0x7f08002a
-			public const int abc_action_bar_up_description = 2131230762;
+			// aapt resource value: 0x7f09002a
+			public const int abc_action_bar_up_description = 2131296298;
 			
-			// aapt resource value: 0x7f08002b
-			public const int abc_action_menu_overflow_description = 2131230763;
+			// aapt resource value: 0x7f09002b
+			public const int abc_action_menu_overflow_description = 2131296299;
 			
-			// aapt resource value: 0x7f08002c
-			public const int abc_action_mode_done = 2131230764;
+			// aapt resource value: 0x7f09002c
+			public const int abc_action_mode_done = 2131296300;
 			
-			// aapt resource value: 0x7f08002d
-			public const int abc_activity_chooser_view_see_all = 2131230765;
+			// aapt resource value: 0x7f09002d
+			public const int abc_activity_chooser_view_see_all = 2131296301;
 			
-			// aapt resource value: 0x7f08002e
-			public const int abc_activitychooserview_choose_application = 2131230766;
+			// aapt resource value: 0x7f09002e
+			public const int abc_activitychooserview_choose_application = 2131296302;
 			
-			// aapt resource value: 0x7f08002f
-			public const int abc_capital_off = 2131230767;
+			// aapt resource value: 0x7f09002f
+			public const int abc_capital_off = 2131296303;
 			
-			// aapt resource value: 0x7f080030
-			public const int abc_capital_on = 2131230768;
+			// aapt resource value: 0x7f090030
+			public const int abc_capital_on = 2131296304;
 			
-			// aapt resource value: 0x7f08003c
-			public const int abc_font_family_body_1_material = 2131230780;
+			// aapt resource value: 0x7f09003c
+			public const int abc_font_family_body_1_material = 2131296316;
 			
-			// aapt resource value: 0x7f08003d
-			public const int abc_font_family_body_2_material = 2131230781;
+			// aapt resource value: 0x7f09003d
+			public const int abc_font_family_body_2_material = 2131296317;
 			
-			// aapt resource value: 0x7f08003e
-			public const int abc_font_family_button_material = 2131230782;
+			// aapt resource value: 0x7f09003e
+			public const int abc_font_family_button_material = 2131296318;
 			
-			// aapt resource value: 0x7f08003f
-			public const int abc_font_family_caption_material = 2131230783;
+			// aapt resource value: 0x7f09003f
+			public const int abc_font_family_caption_material = 2131296319;
 			
-			// aapt resource value: 0x7f080040
-			public const int abc_font_family_display_1_material = 2131230784;
+			// aapt resource value: 0x7f090040
+			public const int abc_font_family_display_1_material = 2131296320;
 			
-			// aapt resource value: 0x7f080041
-			public const int abc_font_family_display_2_material = 2131230785;
+			// aapt resource value: 0x7f090041
+			public const int abc_font_family_display_2_material = 2131296321;
 			
-			// aapt resource value: 0x7f080042
-			public const int abc_font_family_display_3_material = 2131230786;
+			// aapt resource value: 0x7f090042
+			public const int abc_font_family_display_3_material = 2131296322;
 			
-			// aapt resource value: 0x7f080043
-			public const int abc_font_family_display_4_material = 2131230787;
+			// aapt resource value: 0x7f090043
+			public const int abc_font_family_display_4_material = 2131296323;
 			
-			// aapt resource value: 0x7f080044
-			public const int abc_font_family_headline_material = 2131230788;
+			// aapt resource value: 0x7f090044
+			public const int abc_font_family_headline_material = 2131296324;
 			
-			// aapt resource value: 0x7f080045
-			public const int abc_font_family_menu_material = 2131230789;
+			// aapt resource value: 0x7f090045
+			public const int abc_font_family_menu_material = 2131296325;
 			
-			// aapt resource value: 0x7f080046
-			public const int abc_font_family_subhead_material = 2131230790;
+			// aapt resource value: 0x7f090046
+			public const int abc_font_family_subhead_material = 2131296326;
 			
-			// aapt resource value: 0x7f080047
-			public const int abc_font_family_title_material = 2131230791;
+			// aapt resource value: 0x7f090047
+			public const int abc_font_family_title_material = 2131296327;
 			
-			// aapt resource value: 0x7f080031
-			public const int abc_search_hint = 2131230769;
+			// aapt resource value: 0x7f090031
+			public const int abc_search_hint = 2131296305;
 			
-			// aapt resource value: 0x7f080032
-			public const int abc_searchview_description_clear = 2131230770;
+			// aapt resource value: 0x7f090032
+			public const int abc_searchview_description_clear = 2131296306;
 			
-			// aapt resource value: 0x7f080033
-			public const int abc_searchview_description_query = 2131230771;
+			// aapt resource value: 0x7f090033
+			public const int abc_searchview_description_query = 2131296307;
 			
-			// aapt resource value: 0x7f080034
-			public const int abc_searchview_description_search = 2131230772;
+			// aapt resource value: 0x7f090034
+			public const int abc_searchview_description_search = 2131296308;
 			
-			// aapt resource value: 0x7f080035
-			public const int abc_searchview_description_submit = 2131230773;
+			// aapt resource value: 0x7f090035
+			public const int abc_searchview_description_submit = 2131296309;
 			
-			// aapt resource value: 0x7f080036
-			public const int abc_searchview_description_voice = 2131230774;
+			// aapt resource value: 0x7f090036
+			public const int abc_searchview_description_voice = 2131296310;
 			
-			// aapt resource value: 0x7f080037
-			public const int abc_shareactionprovider_share_with = 2131230775;
+			// aapt resource value: 0x7f090037
+			public const int abc_shareactionprovider_share_with = 2131296311;
 			
-			// aapt resource value: 0x7f080038
-			public const int abc_shareactionprovider_share_with_application = 2131230776;
+			// aapt resource value: 0x7f090038
+			public const int abc_shareactionprovider_share_with_application = 2131296312;
 			
-			// aapt resource value: 0x7f080039
-			public const int abc_toolbar_collapse_description = 2131230777;
+			// aapt resource value: 0x7f090039
+			public const int abc_toolbar_collapse_description = 2131296313;
 			
-			// aapt resource value: 0x7f080048
-			public const int appbar_scrolling_view_behavior = 2131230792;
+			// aapt resource value: 0x7f090048
+			public const int appbar_scrolling_view_behavior = 2131296328;
 			
-			// aapt resource value: 0x7f080049
-			public const int bottom_sheet_behavior = 2131230793;
+			// aapt resource value: 0x7f090049
+			public const int bottom_sheet_behavior = 2131296329;
 			
-			// aapt resource value: 0x7f08004a
-			public const int character_counter_pattern = 2131230794;
+			// aapt resource value: 0x7f09004a
+			public const int character_counter_pattern = 2131296330;
 			
-			// aapt resource value: 0x7f080002
-			public const int common_google_play_services_enable_button = 2131230722;
+			// aapt resource value: 0x7f090000
+			public const int common_google_play_services_enable_button = 2131296256;
 			
-			// aapt resource value: 0x7f080003
-			public const int common_google_play_services_enable_text = 2131230723;
+			// aapt resource value: 0x7f090001
+			public const int common_google_play_services_enable_text = 2131296257;
 			
-			// aapt resource value: 0x7f080004
-			public const int common_google_play_services_enable_title = 2131230724;
+			// aapt resource value: 0x7f090002
+			public const int common_google_play_services_enable_title = 2131296258;
 			
-			// aapt resource value: 0x7f080005
-			public const int common_google_play_services_install_button = 2131230725;
+			// aapt resource value: 0x7f090003
+			public const int common_google_play_services_install_button = 2131296259;
 			
-			// aapt resource value: 0x7f080006
-			public const int common_google_play_services_install_text = 2131230726;
+			// aapt resource value: 0x7f090004
+			public const int common_google_play_services_install_text = 2131296260;
 			
-			// aapt resource value: 0x7f080007
-			public const int common_google_play_services_install_title = 2131230727;
+			// aapt resource value: 0x7f090005
+			public const int common_google_play_services_install_title = 2131296261;
 			
-			// aapt resource value: 0x7f080008
-			public const int common_google_play_services_notification_ticker = 2131230728;
+			// aapt resource value: 0x7f090006
+			public const int common_google_play_services_notification_ticker = 2131296262;
 			
-			// aapt resource value: 0x7f080001
-			public const int common_google_play_services_unknown_issue = 2131230721;
+			// aapt resource value: 0x7f090010
+			public const int common_google_play_services_unknown_issue = 2131296272;
 			
-			// aapt resource value: 0x7f080009
-			public const int common_google_play_services_unsupported_text = 2131230729;
+			// aapt resource value: 0x7f090007
+			public const int common_google_play_services_unsupported_text = 2131296263;
 			
-			// aapt resource value: 0x7f08000a
-			public const int common_google_play_services_update_button = 2131230730;
+			// aapt resource value: 0x7f090008
+			public const int common_google_play_services_update_button = 2131296264;
 			
-			// aapt resource value: 0x7f08000b
-			public const int common_google_play_services_update_text = 2131230731;
+			// aapt resource value: 0x7f090009
+			public const int common_google_play_services_update_text = 2131296265;
 			
-			// aapt resource value: 0x7f08000c
-			public const int common_google_play_services_update_title = 2131230732;
+			// aapt resource value: 0x7f09000a
+			public const int common_google_play_services_update_title = 2131296266;
 			
-			// aapt resource value: 0x7f08000d
-			public const int common_google_play_services_updating_text = 2131230733;
+			// aapt resource value: 0x7f09000b
+			public const int common_google_play_services_updating_text = 2131296267;
 			
-			// aapt resource value: 0x7f08000e
-			public const int common_google_play_services_wear_update_text = 2131230734;
+			// aapt resource value: 0x7f09000c
+			public const int common_google_play_services_wear_update_text = 2131296268;
 			
-			// aapt resource value: 0x7f08000f
-			public const int common_open_on_phone = 2131230735;
+			// aapt resource value: 0x7f09000d
+			public const int common_open_on_phone = 2131296269;
 			
-			// aapt resource value: 0x7f080010
-			public const int common_signin_button_text = 2131230736;
+			// aapt resource value: 0x7f09000e
+			public const int common_signin_button_text = 2131296270;
 			
-			// aapt resource value: 0x7f080011
-			public const int common_signin_button_text_long = 2131230737;
+			// aapt resource value: 0x7f09000f
+			public const int common_signin_button_text_long = 2131296271;
 			
-			// aapt resource value: 0x7f080052
-			public const int hockeyapp_crash_dialog_app_name_fallback = 2131230802;
+			// aapt resource value: 0x7f0900ac
+			public const int default_web_client_id = 2131296428;
 			
-			// aapt resource value: 0x7f080053
-			public const int hockeyapp_crash_dialog_message = 2131230803;
+			// aapt resource value: 0x7f0900ad
+			public const int firebase_database_url = 2131296429;
 			
-			// aapt resource value: 0x7f080054
-			public const int hockeyapp_crash_dialog_negative_button = 2131230804;
+			// aapt resource value: 0x7f0900aa
+			public const int gcm_defaultSenderId = 2131296426;
 			
-			// aapt resource value: 0x7f080055
-			public const int hockeyapp_crash_dialog_neutral_button = 2131230805;
+			// aapt resource value: 0x7f0900ae
+			public const int google_api_key = 2131296430;
 			
-			// aapt resource value: 0x7f080056
-			public const int hockeyapp_crash_dialog_positive_button = 2131230806;
+			// aapt resource value: 0x7f0900ab
+			public const int google_app_id = 2131296427;
 			
-			// aapt resource value: 0x7f080057
-			public const int hockeyapp_crash_dialog_title = 2131230807;
+			// aapt resource value: 0x7f0900af
+			public const int google_crash_reporting_api_key = 2131296431;
 			
-			// aapt resource value: 0x7f080058
-			public const int hockeyapp_dialog_error_message = 2131230808;
+			// aapt resource value: 0x7f0900b0
+			public const int google_storage_bucket = 2131296432;
 			
-			// aapt resource value: 0x7f080059
-			public const int hockeyapp_dialog_error_title = 2131230809;
+			// aapt resource value: 0x7f090052
+			public const int hockeyapp_crash_dialog_app_name_fallback = 2131296338;
 			
-			// aapt resource value: 0x7f08005a
-			public const int hockeyapp_dialog_negative_button = 2131230810;
+			// aapt resource value: 0x7f090053
+			public const int hockeyapp_crash_dialog_message = 2131296339;
 			
-			// aapt resource value: 0x7f08005b
-			public const int hockeyapp_dialog_positive_button = 2131230811;
+			// aapt resource value: 0x7f090054
+			public const int hockeyapp_crash_dialog_negative_button = 2131296340;
 			
-			// aapt resource value: 0x7f08005c
-			public const int hockeyapp_download_failed_dialog_message = 2131230812;
+			// aapt resource value: 0x7f090055
+			public const int hockeyapp_crash_dialog_neutral_button = 2131296341;
 			
-			// aapt resource value: 0x7f08005d
-			public const int hockeyapp_download_failed_dialog_negative_button = 2131230813;
+			// aapt resource value: 0x7f090056
+			public const int hockeyapp_crash_dialog_positive_button = 2131296342;
 			
-			// aapt resource value: 0x7f08005e
-			public const int hockeyapp_download_failed_dialog_positive_button = 2131230814;
+			// aapt resource value: 0x7f090057
+			public const int hockeyapp_crash_dialog_title = 2131296343;
 			
-			// aapt resource value: 0x7f08005f
-			public const int hockeyapp_download_failed_dialog_title = 2131230815;
+			// aapt resource value: 0x7f090058
+			public const int hockeyapp_dialog_error_message = 2131296344;
 			
-			// aapt resource value: 0x7f080060
-			public const int hockeyapp_error_install_form_unknown_sources_disabled = 2131230816;
+			// aapt resource value: 0x7f090059
+			public const int hockeyapp_dialog_error_title = 2131296345;
 			
-			// aapt resource value: 0x7f080061
-			public const int hockeyapp_error_no_external_storage_permission = 2131230817;
+			// aapt resource value: 0x7f09005a
+			public const int hockeyapp_dialog_negative_button = 2131296346;
 			
-			// aapt resource value: 0x7f080062
-			public const int hockeyapp_error_no_network_message = 2131230818;
+			// aapt resource value: 0x7f09005b
+			public const int hockeyapp_dialog_positive_button = 2131296347;
 			
-			// aapt resource value: 0x7f080063
-			public const int hockeyapp_expiry_info_text = 2131230819;
+			// aapt resource value: 0x7f09005c
+			public const int hockeyapp_download_failed_dialog_message = 2131296348;
 			
-			// aapt resource value: 0x7f080064
-			public const int hockeyapp_expiry_info_title = 2131230820;
+			// aapt resource value: 0x7f09005d
+			public const int hockeyapp_download_failed_dialog_negative_button = 2131296349;
 			
-			// aapt resource value: 0x7f080065
-			public const int hockeyapp_feedback_attach_file = 2131230821;
+			// aapt resource value: 0x7f09005e
+			public const int hockeyapp_download_failed_dialog_positive_button = 2131296350;
 			
-			// aapt resource value: 0x7f080066
-			public const int hockeyapp_feedback_attach_picture = 2131230822;
+			// aapt resource value: 0x7f09005f
+			public const int hockeyapp_download_failed_dialog_title = 2131296351;
 			
-			// aapt resource value: 0x7f080067
-			public const int hockeyapp_feedback_attachment_added = 2131230823;
+			// aapt resource value: 0x7f090060
+			public const int hockeyapp_error_install_form_unknown_sources_disabled = 2131296352;
 			
-			// aapt resource value: 0x7f080068
-			public const int hockeyapp_feedback_attachment_button_text = 2131230824;
+			// aapt resource value: 0x7f090061
+			public const int hockeyapp_error_no_external_storage_permission = 2131296353;
 			
-			// aapt resource value: 0x7f080069
-			public const int hockeyapp_feedback_attachment_error = 2131230825;
+			// aapt resource value: 0x7f090062
+			public const int hockeyapp_error_no_network_message = 2131296354;
 			
-			// aapt resource value: 0x7f08006a
-			public const int hockeyapp_feedback_attachment_loading = 2131230826;
+			// aapt resource value: 0x7f090063
+			public const int hockeyapp_expiry_info_text = 2131296355;
 			
-			// aapt resource value: 0x7f08006b
-			public const int hockeyapp_feedback_attachment_remove_description = 2131230827;
+			// aapt resource value: 0x7f090064
+			public const int hockeyapp_expiry_info_title = 2131296356;
 			
-			// aapt resource value: 0x7f08006c
-			public const int hockeyapp_feedback_attachment_removed = 2131230828;
+			// aapt resource value: 0x7f090065
+			public const int hockeyapp_feedback_attach_file = 2131296357;
 			
-			// aapt resource value: 0x7f08006d
-			public const int hockeyapp_feedback_email_hint = 2131230829;
+			// aapt resource value: 0x7f090066
+			public const int hockeyapp_feedback_attach_picture = 2131296358;
 			
-			// aapt resource value: 0x7f08006e
-			public const int hockeyapp_feedback_email_hint_required = 2131230830;
+			// aapt resource value: 0x7f090067
+			public const int hockeyapp_feedback_attachment_added = 2131296359;
 			
-			// aapt resource value: 0x7f08006f
-			public const int hockeyapp_feedback_fetching_feedback_text = 2131230831;
+			// aapt resource value: 0x7f090068
+			public const int hockeyapp_feedback_attachment_button_text = 2131296360;
 			
-			// aapt resource value: 0x7f080070
-			public const int hockeyapp_feedback_generic_error = 2131230832;
+			// aapt resource value: 0x7f090069
+			public const int hockeyapp_feedback_attachment_error = 2131296361;
 			
-			// aapt resource value: 0x7f080071
-			public const int hockeyapp_feedback_last_updated_text = 2131230833;
+			// aapt resource value: 0x7f09006a
+			public const int hockeyapp_feedback_attachment_loading = 2131296362;
 			
-			// aapt resource value: 0x7f080072
-			public const int hockeyapp_feedback_max_attachments_allowed = 2131230834;
+			// aapt resource value: 0x7f09006b
+			public const int hockeyapp_feedback_attachment_remove_description = 2131296363;
 			
-			// aapt resource value: 0x7f080073
-			public const int hockeyapp_feedback_message_hint = 2131230835;
+			// aapt resource value: 0x7f09006c
+			public const int hockeyapp_feedback_attachment_removed = 2131296364;
 			
-			// aapt resource value: 0x7f080074
-			public const int hockeyapp_feedback_message_hint_required = 2131230836;
+			// aapt resource value: 0x7f09006d
+			public const int hockeyapp_feedback_email_hint = 2131296365;
 			
-			// aapt resource value: 0x7f080075
-			public const int hockeyapp_feedback_name_hint = 2131230837;
+			// aapt resource value: 0x7f09006e
+			public const int hockeyapp_feedback_email_hint_required = 2131296366;
 			
-			// aapt resource value: 0x7f080076
-			public const int hockeyapp_feedback_name_hint_required = 2131230838;
+			// aapt resource value: 0x7f09006f
+			public const int hockeyapp_feedback_fetching_feedback_text = 2131296367;
 			
-			// aapt resource value: 0x7f080077
-			public const int hockeyapp_feedback_new_answer_notification_message = 2131230839;
+			// aapt resource value: 0x7f090070
+			public const int hockeyapp_feedback_generic_error = 2131296368;
 			
-			// aapt resource value: 0x7f0800a8
-			public const int hockeyapp_feedback_notification_channel = 2131230888;
+			// aapt resource value: 0x7f090071
+			public const int hockeyapp_feedback_last_updated_text = 2131296369;
 			
-			// aapt resource value: 0x7f080078
-			public const int hockeyapp_feedback_notification_title = 2131230840;
+			// aapt resource value: 0x7f090072
+			public const int hockeyapp_feedback_max_attachments_allowed = 2131296370;
 			
-			// aapt resource value: 0x7f080079
-			public const int hockeyapp_feedback_refresh_button_text = 2131230841;
+			// aapt resource value: 0x7f090073
+			public const int hockeyapp_feedback_message_hint = 2131296371;
 			
-			// aapt resource value: 0x7f08007a
-			public const int hockeyapp_feedback_response_button_text = 2131230842;
+			// aapt resource value: 0x7f090074
+			public const int hockeyapp_feedback_message_hint_required = 2131296372;
 			
-			// aapt resource value: 0x7f08007b
-			public const int hockeyapp_feedback_screenshot_fail = 2131230843;
+			// aapt resource value: 0x7f090075
+			public const int hockeyapp_feedback_name_hint = 2131296373;
 			
-			// aapt resource value: 0x7f08007c
-			public const int hockeyapp_feedback_screenshot_notification_message = 2131230844;
+			// aapt resource value: 0x7f090076
+			public const int hockeyapp_feedback_name_hint_required = 2131296374;
 			
-			// aapt resource value: 0x7f08007d
-			public const int hockeyapp_feedback_select_file = 2131230845;
+			// aapt resource value: 0x7f090077
+			public const int hockeyapp_feedback_new_answer_notification_message = 2131296375;
 			
-			// aapt resource value: 0x7f08007e
-			public const int hockeyapp_feedback_select_picture = 2131230846;
+			// aapt resource value: 0x7f0900a8
+			public const int hockeyapp_feedback_notification_channel = 2131296424;
 			
-			// aapt resource value: 0x7f08007f
-			public const int hockeyapp_feedback_send_button_text = 2131230847;
+			// aapt resource value: 0x7f090078
+			public const int hockeyapp_feedback_notification_title = 2131296376;
 			
-			// aapt resource value: 0x7f080080
-			public const int hockeyapp_feedback_send_generic_error = 2131230848;
+			// aapt resource value: 0x7f090079
+			public const int hockeyapp_feedback_refresh_button_text = 2131296377;
 			
-			// aapt resource value: 0x7f080081
-			public const int hockeyapp_feedback_send_network_error = 2131230849;
+			// aapt resource value: 0x7f09007a
+			public const int hockeyapp_feedback_response_button_text = 2131296378;
 			
-			// aapt resource value: 0x7f080082
-			public const int hockeyapp_feedback_sending_feedback_text = 2131230850;
+			// aapt resource value: 0x7f09007b
+			public const int hockeyapp_feedback_screenshot_fail = 2131296379;
 			
-			// aapt resource value: 0x7f080083
-			public const int hockeyapp_feedback_sent_toast = 2131230851;
+			// aapt resource value: 0x7f09007c
+			public const int hockeyapp_feedback_screenshot_notification_message = 2131296380;
 			
-			// aapt resource value: 0x7f080084
-			public const int hockeyapp_feedback_subject_hint = 2131230852;
+			// aapt resource value: 0x7f09007d
+			public const int hockeyapp_feedback_select_file = 2131296381;
 			
-			// aapt resource value: 0x7f080085
-			public const int hockeyapp_feedback_subject_hint_required = 2131230853;
+			// aapt resource value: 0x7f09007e
+			public const int hockeyapp_feedback_select_picture = 2131296382;
 			
-			// aapt resource value: 0x7f080086
-			public const int hockeyapp_feedback_title = 2131230854;
+			// aapt resource value: 0x7f09007f
+			public const int hockeyapp_feedback_send_button_text = 2131296383;
 			
-			// aapt resource value: 0x7f080087
-			public const int hockeyapp_feedback_validate_email_empty = 2131230855;
+			// aapt resource value: 0x7f090080
+			public const int hockeyapp_feedback_send_generic_error = 2131296384;
 			
-			// aapt resource value: 0x7f080088
-			public const int hockeyapp_feedback_validate_email_error = 2131230856;
+			// aapt resource value: 0x7f090081
+			public const int hockeyapp_feedback_send_network_error = 2131296385;
 			
-			// aapt resource value: 0x7f080089
-			public const int hockeyapp_feedback_validate_name_error = 2131230857;
+			// aapt resource value: 0x7f090082
+			public const int hockeyapp_feedback_sending_feedback_text = 2131296386;
 			
-			// aapt resource value: 0x7f08008a
-			public const int hockeyapp_feedback_validate_subject_error = 2131230858;
+			// aapt resource value: 0x7f090083
+			public const int hockeyapp_feedback_sent_toast = 2131296387;
 			
-			// aapt resource value: 0x7f08008b
-			public const int hockeyapp_feedback_validate_text_error = 2131230859;
+			// aapt resource value: 0x7f090084
+			public const int hockeyapp_feedback_subject_hint = 2131296388;
 			
-			// aapt resource value: 0x7f08008c
-			public const int hockeyapp_login_email_hint_required = 2131230860;
+			// aapt resource value: 0x7f090085
+			public const int hockeyapp_feedback_subject_hint_required = 2131296389;
 			
-			// aapt resource value: 0x7f08008d
-			public const int hockeyapp_login_headline_text = 2131230861;
+			// aapt resource value: 0x7f090086
+			public const int hockeyapp_feedback_title = 2131296390;
 			
-			// aapt resource value: 0x7f08008e
-			public const int hockeyapp_login_headline_text_email_only = 2131230862;
+			// aapt resource value: 0x7f090087
+			public const int hockeyapp_feedback_validate_email_empty = 2131296391;
 			
-			// aapt resource value: 0x7f08008f
-			public const int hockeyapp_login_login_button_text = 2131230863;
+			// aapt resource value: 0x7f090088
+			public const int hockeyapp_feedback_validate_email_error = 2131296392;
 			
-			// aapt resource value: 0x7f080090
-			public const int hockeyapp_login_missing_credentials_toast = 2131230864;
+			// aapt resource value: 0x7f090089
+			public const int hockeyapp_feedback_validate_name_error = 2131296393;
 			
-			// aapt resource value: 0x7f080091
-			public const int hockeyapp_login_password_hint_required = 2131230865;
+			// aapt resource value: 0x7f09008a
+			public const int hockeyapp_feedback_validate_subject_error = 2131296394;
 			
-			// aapt resource value: 0x7f080092
-			public const int hockeyapp_paint_dialog_message = 2131230866;
+			// aapt resource value: 0x7f09008b
+			public const int hockeyapp_feedback_validate_text_error = 2131296395;
 			
-			// aapt resource value: 0x7f080093
-			public const int hockeyapp_paint_dialog_negative_button = 2131230867;
+			// aapt resource value: 0x7f09008c
+			public const int hockeyapp_login_email_hint_required = 2131296396;
 			
-			// aapt resource value: 0x7f080094
-			public const int hockeyapp_paint_dialog_neutral_button = 2131230868;
+			// aapt resource value: 0x7f09008d
+			public const int hockeyapp_login_headline_text = 2131296397;
 			
-			// aapt resource value: 0x7f080095
-			public const int hockeyapp_paint_dialog_positive_button = 2131230869;
+			// aapt resource value: 0x7f09008e
+			public const int hockeyapp_login_headline_text_email_only = 2131296398;
 			
-			// aapt resource value: 0x7f080096
-			public const int hockeyapp_paint_indicator_toast = 2131230870;
+			// aapt resource value: 0x7f09008f
+			public const int hockeyapp_login_login_button_text = 2131296399;
 			
-			// aapt resource value: 0x7f080097
-			public const int hockeyapp_paint_menu_clear = 2131230871;
+			// aapt resource value: 0x7f090090
+			public const int hockeyapp_login_missing_credentials_toast = 2131296400;
 			
-			// aapt resource value: 0x7f080098
-			public const int hockeyapp_paint_menu_save = 2131230872;
+			// aapt resource value: 0x7f090091
+			public const int hockeyapp_login_password_hint_required = 2131296401;
 			
-			// aapt resource value: 0x7f080099
-			public const int hockeyapp_paint_menu_undo = 2131230873;
+			// aapt resource value: 0x7f090092
+			public const int hockeyapp_paint_dialog_message = 2131296402;
 			
-			// aapt resource value: 0x7f08009a
-			public const int hockeyapp_update_already_installed = 2131230874;
+			// aapt resource value: 0x7f090093
+			public const int hockeyapp_paint_dialog_negative_button = 2131296403;
 			
-			// aapt resource value: 0x7f08009b
-			public const int hockeyapp_update_button = 2131230875;
+			// aapt resource value: 0x7f090094
+			public const int hockeyapp_paint_dialog_neutral_button = 2131296404;
 			
-			// aapt resource value: 0x7f08009c
-			public const int hockeyapp_update_dialog_message = 2131230876;
+			// aapt resource value: 0x7f090095
+			public const int hockeyapp_paint_dialog_positive_button = 2131296405;
 			
-			// aapt resource value: 0x7f08009d
-			public const int hockeyapp_update_dialog_negative_button = 2131230877;
+			// aapt resource value: 0x7f090096
+			public const int hockeyapp_paint_indicator_toast = 2131296406;
 			
-			// aapt resource value: 0x7f08009e
-			public const int hockeyapp_update_dialog_positive_button = 2131230878;
+			// aapt resource value: 0x7f090097
+			public const int hockeyapp_paint_menu_clear = 2131296407;
 			
-			// aapt resource value: 0x7f08009f
-			public const int hockeyapp_update_dialog_title = 2131230879;
+			// aapt resource value: 0x7f090098
+			public const int hockeyapp_paint_menu_save = 2131296408;
 			
-			// aapt resource value: 0x7f0800a0
-			public const int hockeyapp_update_loading = 2131230880;
+			// aapt resource value: 0x7f090099
+			public const int hockeyapp_paint_menu_undo = 2131296409;
 			
-			// aapt resource value: 0x7f0800a1
-			public const int hockeyapp_update_mandatory_toast = 2131230881;
+			// aapt resource value: 0x7f09009a
+			public const int hockeyapp_update_already_installed = 2131296410;
 			
-			// aapt resource value: 0x7f0800a2
-			public const int hockeyapp_update_newest_version = 2131230882;
+			// aapt resource value: 0x7f09009b
+			public const int hockeyapp_update_button = 2131296411;
 			
-			// aapt resource value: 0x7f0800a3
-			public const int hockeyapp_update_no_info = 2131230883;
+			// aapt resource value: 0x7f09009c
+			public const int hockeyapp_update_dialog_message = 2131296412;
 			
-			// aapt resource value: 0x7f0800a4
-			public const int hockeyapp_update_restore = 2131230884;
+			// aapt resource value: 0x7f09009d
+			public const int hockeyapp_update_dialog_negative_button = 2131296413;
 			
-			// aapt resource value: 0x7f0800a5
-			public const int hockeyapp_update_title = 2131230885;
+			// aapt resource value: 0x7f09009e
+			public const int hockeyapp_update_dialog_positive_button = 2131296414;
 			
-			// aapt resource value: 0x7f0800a6
-			public const int hockeyapp_update_unknown_size = 2131230886;
+			// aapt resource value: 0x7f09009f
+			public const int hockeyapp_update_dialog_title = 2131296415;
 			
-			// aapt resource value: 0x7f0800a7
-			public const int hockeyapp_update_version = 2131230887;
+			// aapt resource value: 0x7f0900a0
+			public const int hockeyapp_update_loading = 2131296416;
 			
-			// aapt resource value: 0x7f0800a9
-			public const int hockeyapp_update_version_details_label = 2131230889;
+			// aapt resource value: 0x7f0900a1
+			public const int hockeyapp_update_mandatory_toast = 2131296417;
 			
-			// aapt resource value: 0x7f080000
-			public const int library_name = 2131230720;
+			// aapt resource value: 0x7f0900a2
+			public const int hockeyapp_update_newest_version = 2131296418;
 			
-			// aapt resource value: 0x7f080012
-			public const int mr_button_content_description = 2131230738;
+			// aapt resource value: 0x7f0900a3
+			public const int hockeyapp_update_no_info = 2131296419;
 			
-			// aapt resource value: 0x7f080013
-			public const int mr_cast_button_connected = 2131230739;
+			// aapt resource value: 0x7f0900a4
+			public const int hockeyapp_update_restore = 2131296420;
 			
-			// aapt resource value: 0x7f080014
-			public const int mr_cast_button_connecting = 2131230740;
+			// aapt resource value: 0x7f0900a5
+			public const int hockeyapp_update_title = 2131296421;
 			
-			// aapt resource value: 0x7f080015
-			public const int mr_cast_button_disconnected = 2131230741;
+			// aapt resource value: 0x7f0900a6
+			public const int hockeyapp_update_unknown_size = 2131296422;
 			
-			// aapt resource value: 0x7f080016
-			public const int mr_chooser_searching = 2131230742;
+			// aapt resource value: 0x7f0900a7
+			public const int hockeyapp_update_version = 2131296423;
 			
-			// aapt resource value: 0x7f080017
-			public const int mr_chooser_title = 2131230743;
+			// aapt resource value: 0x7f0900a9
+			public const int hockeyapp_update_version_details_label = 2131296425;
 			
-			// aapt resource value: 0x7f080018
-			public const int mr_controller_album_art = 2131230744;
+			// aapt resource value: 0x7f090011
+			public const int library_name = 2131296273;
 			
-			// aapt resource value: 0x7f080019
-			public const int mr_controller_casting_screen = 2131230745;
+			// aapt resource value: 0x7f090012
+			public const int mr_button_content_description = 2131296274;
 			
-			// aapt resource value: 0x7f08001a
-			public const int mr_controller_close_description = 2131230746;
+			// aapt resource value: 0x7f090013
+			public const int mr_cast_button_connected = 2131296275;
 			
-			// aapt resource value: 0x7f08001b
-			public const int mr_controller_collapse_group = 2131230747;
+			// aapt resource value: 0x7f090014
+			public const int mr_cast_button_connecting = 2131296276;
 			
-			// aapt resource value: 0x7f08001c
-			public const int mr_controller_disconnect = 2131230748;
+			// aapt resource value: 0x7f090015
+			public const int mr_cast_button_disconnected = 2131296277;
 			
-			// aapt resource value: 0x7f08001d
-			public const int mr_controller_expand_group = 2131230749;
+			// aapt resource value: 0x7f090016
+			public const int mr_chooser_searching = 2131296278;
 			
-			// aapt resource value: 0x7f08001e
-			public const int mr_controller_no_info_available = 2131230750;
+			// aapt resource value: 0x7f090017
+			public const int mr_chooser_title = 2131296279;
 			
-			// aapt resource value: 0x7f08001f
-			public const int mr_controller_no_media_selected = 2131230751;
+			// aapt resource value: 0x7f090018
+			public const int mr_controller_album_art = 2131296280;
 			
-			// aapt resource value: 0x7f080020
-			public const int mr_controller_pause = 2131230752;
+			// aapt resource value: 0x7f090019
+			public const int mr_controller_casting_screen = 2131296281;
 			
-			// aapt resource value: 0x7f080021
-			public const int mr_controller_play = 2131230753;
+			// aapt resource value: 0x7f09001a
+			public const int mr_controller_close_description = 2131296282;
 			
-			// aapt resource value: 0x7f080026
-			public const int mr_controller_stop = 2131230758;
+			// aapt resource value: 0x7f09001b
+			public const int mr_controller_collapse_group = 2131296283;
 			
-			// aapt resource value: 0x7f080022
-			public const int mr_controller_stop_casting = 2131230754;
+			// aapt resource value: 0x7f09001c
+			public const int mr_controller_disconnect = 2131296284;
 			
-			// aapt resource value: 0x7f080023
-			public const int mr_controller_volume_slider = 2131230755;
+			// aapt resource value: 0x7f09001d
+			public const int mr_controller_expand_group = 2131296285;
 			
-			// aapt resource value: 0x7f080024
-			public const int mr_system_route_name = 2131230756;
+			// aapt resource value: 0x7f09001e
+			public const int mr_controller_no_info_available = 2131296286;
 			
-			// aapt resource value: 0x7f080025
-			public const int mr_user_route_category_name = 2131230757;
+			// aapt resource value: 0x7f09001f
+			public const int mr_controller_no_media_selected = 2131296287;
 			
-			// aapt resource value: 0x7f08004b
-			public const int password_toggle_content_description = 2131230795;
+			// aapt resource value: 0x7f090020
+			public const int mr_controller_pause = 2131296288;
 			
-			// aapt resource value: 0x7f08004c
-			public const int path_password_eye = 2131230796;
+			// aapt resource value: 0x7f090021
+			public const int mr_controller_play = 2131296289;
 			
-			// aapt resource value: 0x7f08004d
-			public const int path_password_eye_mask_strike_through = 2131230797;
+			// aapt resource value: 0x7f090026
+			public const int mr_controller_stop = 2131296294;
 			
-			// aapt resource value: 0x7f08004e
-			public const int path_password_eye_mask_visible = 2131230798;
+			// aapt resource value: 0x7f090022
+			public const int mr_controller_stop_casting = 2131296290;
 			
-			// aapt resource value: 0x7f08004f
-			public const int path_password_strike_through = 2131230799;
+			// aapt resource value: 0x7f090023
+			public const int mr_controller_volume_slider = 2131296291;
 			
-			// aapt resource value: 0x7f08003a
-			public const int search_menu_title = 2131230778;
+			// aapt resource value: 0x7f090024
+			public const int mr_system_route_name = 2131296292;
 			
-			// aapt resource value: 0x7f08003b
-			public const int status_bar_notification_info_overflow = 2131230779;
+			// aapt resource value: 0x7f090025
+			public const int mr_user_route_category_name = 2131296293;
+			
+			// aapt resource value: 0x7f09004b
+			public const int password_toggle_content_description = 2131296331;
+			
+			// aapt resource value: 0x7f09004c
+			public const int path_password_eye = 2131296332;
+			
+			// aapt resource value: 0x7f09004d
+			public const int path_password_eye_mask_strike_through = 2131296333;
+			
+			// aapt resource value: 0x7f09004e
+			public const int path_password_eye_mask_visible = 2131296334;
+			
+			// aapt resource value: 0x7f09004f
+			public const int path_password_strike_through = 2131296335;
+			
+			// aapt resource value: 0x7f09003a
+			public const int search_menu_title = 2131296314;
+			
+			// aapt resource value: 0x7f09003b
+			public const int status_bar_notification_info_overflow = 2131296315;
 			
 			static String()
 			{
diff --git a/src/Android/Services/AndroidKeyStoreStorageService.cs b/src/Android/Services/AndroidKeyStoreStorageService.cs
index b082601dd..3b85ed594 100644
--- a/src/Android/Services/AndroidKeyStoreStorageService.cs
+++ b/src/Android/Services/AndroidKeyStoreStorageService.cs
@@ -89,7 +89,7 @@ namespace Bit.Android.Services
             {
                 return App.Utilities.Crypto.AesCbcDecrypt(new App.Models.CipherString(cs), aesKey);
             }
-            catch(Exception e)
+            catch
             {
                 Console.WriteLine("Failed to decrypt from secure storage.");
                 _settings.Remove(formattedKey);
@@ -120,7 +120,7 @@ namespace Bit.Android.Services
                 var cipherString = App.Utilities.Crypto.AesCbcEncrypt(dataBytes, aesKey);
                 _settings.AddOrUpdateValue(formattedKey, cipherString.EncryptedString);
             }
-            catch(Exception e)
+            catch
             {
                 Console.WriteLine("Failed to encrypt to secure storage.");
                 //Utilities.SendCrashEmail(e);
@@ -224,7 +224,7 @@ namespace Bit.Android.Services
                     return new App.Models.SymmetricCryptoKey(key);
                 }
             }
-            catch(Exception e)
+            catch
             {
                 Console.WriteLine("Cannot get AesKey.");
                 _keyStore.DeleteEntry(KeyAlias);
diff --git a/src/Android/Services/AppInfoService.cs b/src/Android/Services/AppInfoService.cs
index 137d7fd67..bc491939c 100644
--- a/src/Android/Services/AppInfoService.cs
+++ b/src/Android/Services/AppInfoService.cs
@@ -1,6 +1,7 @@
 using Android.App;
 using Android.Views.Autofill;
 using Bit.App.Abstractions;
+using Plugin.CurrentActivity;
 using System.Linq;
 using AndroidApp = Android.App.Application;
 
@@ -19,7 +20,7 @@ namespace Bit.Android.Services
 
         private bool AutofillAccessibilityRunning()
         {
-            var manager = ((ActivityManager)Xamarin.Forms.Forms.Context.GetSystemService("activity"));
+            var manager = ((ActivityManager)CrossCurrentActivity.Current.Activity.GetSystemService("activity"));
             var services = manager.GetRunningServices(int.MaxValue);
             return services.Any(s => s.Process.ToLowerInvariant().Contains("bitwarden") &&
                 s.Service.ClassName.ToLowerInvariant().Contains("autofill"));
@@ -32,7 +33,7 @@ namespace Bit.Android.Services
                 return false;
             }
 
-            var activity = (MainActivity)Xamarin.Forms.Forms.Context;
+            var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
             var afm = (AutofillManager)activity.GetSystemService(Java.Lang.Class.FromType(typeof(AutofillManager)));
             return afm.IsEnabled;
         }
diff --git a/src/Android/Services/DeviceActionService.cs b/src/Android/Services/DeviceActionService.cs
index db711bef3..ed7a8fec5 100644
--- a/src/Android/Services/DeviceActionService.cs
+++ b/src/Android/Services/DeviceActionService.cs
@@ -43,9 +43,11 @@ namespace Bit.Android.Services
             _userDialogs = userDialogs;
         }
 
+        private Context CurrentContext => CrossCurrentActivity.Current.Activity;
+
         public void CopyToClipboard(string text)
         {
-            var clipboardManager = (ClipboardManager)Forms.Context.GetSystemService(Context.ClipboardService);
+            var clipboardManager = (ClipboardManager)CurrentContext.GetSystemService(Context.ClipboardService);
             clipboardManager.Text = text;
         }
 
@@ -131,7 +133,7 @@ namespace Bit.Android.Services
             var hasStorageWritePermission = !_cameraPermissionsDenied && HasPermission(Manifest.Permission.WriteExternalStorage);
 
             var additionalIntents = new List<IParcelable>();
-            if(Forms.Context.PackageManager.HasSystemFeature(PackageManager.FeatureCamera))
+            if(CurrentContext.PackageManager.HasSystemFeature(PackageManager.FeatureCamera))
             {
                 var hasCameraPermission = !_cameraPermissionsDenied && HasPermission(Manifest.Permission.Camera);
 
@@ -181,7 +183,7 @@ namespace Bit.Android.Services
 
         public void Autofill(VaultListPageModel.Cipher cipher)
         {
-            var activity = (MainActivity)Forms.Context;
+            var activity = (MainActivity)CurrentContext;
             if(activity.Intent.GetBooleanExtra("autofillFramework", false))
             {
                 if(cipher == null)
@@ -259,7 +261,7 @@ namespace Bit.Android.Services
 
         public void Background()
         {
-            var activity = (MainActivity)Forms.Context;
+            var activity = (MainActivity)CurrentContext;
             if(activity.Intent.GetBooleanExtra("autofillFramework", false))
             {
                 activity.SetResult(Result.Canceled);
@@ -273,7 +275,7 @@ namespace Bit.Android.Services
 
         public void RateApp()
         {
-            var activity = (MainActivity)Forms.Context;
+            var activity = (MainActivity)CurrentContext;
             try
             {
                 var rateIntent = RateIntentForUrl("market://details", activity);
@@ -288,7 +290,7 @@ namespace Bit.Android.Services
 
         public void DismissKeyboard()
         {
-            var activity = (MainActivity)Forms.Context;
+            var activity = (MainActivity)CurrentContext;
             try
             {
                 var imm = (InputMethodManager)activity.GetSystemService(Context.InputMethodService);
@@ -299,14 +301,14 @@ namespace Bit.Android.Services
 
         public void OpenAccessibilitySettings()
         {
-            var activity = (MainActivity)Forms.Context;
+            var activity = (MainActivity)CurrentContext;
             var intent = new Intent(Settings.ActionAccessibilitySettings);
             activity.StartActivity(intent);
         }
 
         public void LaunchApp(string appName)
         {
-            var activity = (MainActivity)Forms.Context;
+            var activity = (MainActivity)CurrentContext;
             if(_lastAction.LastActionWasRecent())
             {
                 return;
@@ -410,7 +412,7 @@ namespace Bit.Android.Services
 
         public void OpenAutofillSettings()
         {
-            var activity = (MainActivity)Forms.Context;
+            var activity = (MainActivity)CurrentContext;
             var intent = new Intent(Settings.ActionRequestSetAutofillService);
             intent.SetData(global::Android.Net.Uri.Parse("package:com.x8bit.bitwarden"));
             activity.StartActivity(intent);
diff --git a/src/Android/Services/DeviceInfoService.cs b/src/Android/Services/DeviceInfoService.cs
index 1f12f0040..12fef2085 100644
--- a/src/Android/Services/DeviceInfoService.cs
+++ b/src/Android/Services/DeviceInfoService.cs
@@ -3,6 +3,7 @@ using Android.Content.PM;
 using Android.OS;
 using Android.Views.Autofill;
 using Bit.App.Abstractions;
+using Plugin.CurrentActivity;
 
 namespace Bit.Android.Services
 {
@@ -45,7 +46,8 @@ namespace Bit.Android.Services
             }
         }
         public bool NfcEnabled => Utilities.NfcEnabled();
-        public bool HasCamera => Xamarin.Forms.Forms.Context.PackageManager.HasSystemFeature(PackageManager.FeatureCamera);
+        public bool HasCamera => CrossCurrentActivity.Current.Activity.PackageManager.HasSystemFeature(
+            PackageManager.FeatureCamera);
         public bool AutofillServiceSupported => AutofillSupported();
         public bool HasFaceIdSupport => false;
         private bool AutofillSupported()
@@ -54,9 +56,9 @@ namespace Bit.Android.Services
             {
                 return false;
             }
-
-            var activity = (MainActivity)Xamarin.Forms.Forms.Context;
-            var afm = (AutofillManager)activity.GetSystemService(Java.Lang.Class.FromType(typeof(AutofillManager)));
+            
+            var afm = (AutofillManager)CrossCurrentActivity.Current.Activity.GetSystemService(
+                Java.Lang.Class.FromType(typeof(AutofillManager)));
             return afm.IsAutofillSupported;
         }
     }
diff --git a/src/Android/Services/MemoryService.cs b/src/Android/Services/MemoryService.cs
index 37f9ccc48..bf4c30b6c 100644
--- a/src/Android/Services/MemoryService.cs
+++ b/src/Android/Services/MemoryService.cs
@@ -1,6 +1,7 @@
 using System;
 using Android.Content;
 using Bit.App.Abstractions;
+using Plugin.CurrentActivity;
 using Xamarin.Forms;
 
 namespace Bit.Android.Services
@@ -9,12 +10,12 @@ namespace Bit.Android.Services
     {
         public MemoryInfo GetInfo()
         {
-            return MemoryHelper.GetMemoryInfo(Forms.Context);
+            return MemoryHelper.GetMemoryInfo(CrossCurrentActivity.Current.Activity);
         }
 
         public void Check()
         {
-            MemoryHelper.MemoryCheck(Forms.Context);
+            MemoryHelper.MemoryCheck(CrossCurrentActivity.Current.Activity);
         }
 
         public static class MemoryHelper