diff --git a/src/Android/MainApplication.cs b/src/Android/MainApplication.cs index 2eac9983f..889a24606 100644 --- a/src/Android/MainApplication.cs +++ b/src/Android/MainApplication.cs @@ -1,5 +1,4 @@ using System; -using Acr.UserDialogs; using Android.App; using Android.Content; using Android.OS; @@ -102,7 +101,6 @@ namespace Bit.Android public static void SetIoc(Application application) { - UserDialogs.Init(application); CachedImageRenderer.Init(); ZXing.Net.Mobile.Forms.Android.Platform.Init(); CrossFingerprint.SetCurrentActivityResolver(() => CrossCurrentActivity.Current.Activity); @@ -160,7 +158,6 @@ namespace Bit.Android // Other container.RegisterSingleton(CrossSettings.Current); container.RegisterSingleton(CrossConnectivity.Current); - container.RegisterSingleton(UserDialogs.Instance); container.RegisterSingleton(CrossFingerprint.Current); // Push diff --git a/src/Android/Resources/Resource.Designer.cs b/src/Android/Resources/Resource.Designer.cs index 8677cf1ee..10bb3b663 100644 --- a/src/Android/Resources/Resource.Designer.cs +++ b/src/Android/Resources/Resource.Designer.cs @@ -26,43 +26,6 @@ namespace Bit.Android public static void UpdateIdValues() { - global::AndroidHUD.Resource.Attribute.ahBarColor = global::Bit.Android.Resource.Attribute.ahBarColor; - global::AndroidHUD.Resource.Attribute.ahBarLength = global::Bit.Android.Resource.Attribute.ahBarLength; - global::AndroidHUD.Resource.Attribute.ahBarWidth = global::Bit.Android.Resource.Attribute.ahBarWidth; - global::AndroidHUD.Resource.Attribute.ahCircleColor = global::Bit.Android.Resource.Attribute.ahCircleColor; - global::AndroidHUD.Resource.Attribute.ahDelayMillis = global::Bit.Android.Resource.Attribute.ahDelayMillis; - global::AndroidHUD.Resource.Attribute.ahRadius = global::Bit.Android.Resource.Attribute.ahRadius; - global::AndroidHUD.Resource.Attribute.ahRimColor = global::Bit.Android.Resource.Attribute.ahRimColor; - global::AndroidHUD.Resource.Attribute.ahRimWidth = global::Bit.Android.Resource.Attribute.ahRimWidth; - global::AndroidHUD.Resource.Attribute.ahSpinSpeed = global::Bit.Android.Resource.Attribute.ahSpinSpeed; - global::AndroidHUD.Resource.Attribute.ahText = global::Bit.Android.Resource.Attribute.ahText; - global::AndroidHUD.Resource.Attribute.ahTextColor = global::Bit.Android.Resource.Attribute.ahTextColor; - global::AndroidHUD.Resource.Attribute.ahTextSize = global::Bit.Android.Resource.Attribute.ahTextSize; - global::AndroidHUD.Resource.Drawable.ic_errorstatus = global::Bit.Android.Resource.Drawable.ic_errorstatus; - global::AndroidHUD.Resource.Drawable.ic_successstatus = global::Bit.Android.Resource.Drawable.ic_successstatus; - global::AndroidHUD.Resource.Drawable.roundedbg = global::Bit.Android.Resource.Drawable.roundedbg; - global::AndroidHUD.Resource.Drawable.roundedbgdark = global::Bit.Android.Resource.Drawable.roundedbgdark; - global::AndroidHUD.Resource.Id.loadingImage = global::Bit.Android.Resource.Id.loadingImage; - global::AndroidHUD.Resource.Id.loadingProgressBar = global::Bit.Android.Resource.Id.loadingProgressBar; - global::AndroidHUD.Resource.Id.loadingProgressWheel = global::Bit.Android.Resource.Id.loadingProgressWheel; - global::AndroidHUD.Resource.Id.textViewStatus = global::Bit.Android.Resource.Id.textViewStatus; - global::AndroidHUD.Resource.Layout.loading = global::Bit.Android.Resource.Layout.loading; - global::AndroidHUD.Resource.Layout.loadingimage = global::Bit.Android.Resource.Layout.loadingimage; - global::AndroidHUD.Resource.Layout.loadingprogress = global::Bit.Android.Resource.Layout.loadingprogress; - global::AndroidHUD.Resource.String.library_name = global::Bit.Android.Resource.String.library_name; - global::AndroidHUD.Resource.Styleable.ProgressWheel = global::Bit.Android.Resource.Styleable.ProgressWheel; - global::AndroidHUD.Resource.Styleable.ProgressWheel_ahBarColor = global::Bit.Android.Resource.Styleable.ProgressWheel_ahBarColor; - global::AndroidHUD.Resource.Styleable.ProgressWheel_ahBarLength = global::Bit.Android.Resource.Styleable.ProgressWheel_ahBarLength; - global::AndroidHUD.Resource.Styleable.ProgressWheel_ahBarWidth = global::Bit.Android.Resource.Styleable.ProgressWheel_ahBarWidth; - global::AndroidHUD.Resource.Styleable.ProgressWheel_ahCircleColor = global::Bit.Android.Resource.Styleable.ProgressWheel_ahCircleColor; - global::AndroidHUD.Resource.Styleable.ProgressWheel_ahDelayMillis = global::Bit.Android.Resource.Styleable.ProgressWheel_ahDelayMillis; - global::AndroidHUD.Resource.Styleable.ProgressWheel_ahRadius = global::Bit.Android.Resource.Styleable.ProgressWheel_ahRadius; - global::AndroidHUD.Resource.Styleable.ProgressWheel_ahRimColor = global::Bit.Android.Resource.Styleable.ProgressWheel_ahRimColor; - global::AndroidHUD.Resource.Styleable.ProgressWheel_ahRimWidth = global::Bit.Android.Resource.Styleable.ProgressWheel_ahRimWidth; - global::AndroidHUD.Resource.Styleable.ProgressWheel_ahSpinSpeed = global::Bit.Android.Resource.Styleable.ProgressWheel_ahSpinSpeed; - global::AndroidHUD.Resource.Styleable.ProgressWheel_ahText = global::Bit.Android.Resource.Styleable.ProgressWheel_ahText; - global::AndroidHUD.Resource.Styleable.ProgressWheel_ahTextColor = global::Bit.Android.Resource.Styleable.ProgressWheel_ahTextColor; - global::AndroidHUD.Resource.Styleable.ProgressWheel_ahTextSize = global::Bit.Android.Resource.Styleable.ProgressWheel_ahTextSize; global::HockeyApp.Resource.Color.hockeyapp_background_header = global::Bit.Android.Resource.Color.hockeyapp_background_header; global::HockeyApp.Resource.Color.hockeyapp_background_light = global::Bit.Android.Resource.Color.hockeyapp_background_light; global::HockeyApp.Resource.Color.hockeyapp_background_white = global::Bit.Android.Resource.Color.hockeyapp_background_white; @@ -208,7 +171,6 @@ namespace Bit.Android global::Plugin.Fingerprint.Resource.Id.fingerprint_txtHelp = global::Bit.Android.Resource.Id.fingerprint_txtHelp; global::Plugin.Fingerprint.Resource.Id.fingerprint_txtReason = global::Bit.Android.Resource.Id.fingerprint_txtReason; global::Plugin.Fingerprint.Resource.Layout.FingerprintDialog = global::Bit.Android.Resource.Layout.FingerprintDialog; - global::Splat.Resource.String.library_name = global::Bit.Android.Resource.String.library_name; global::Xamarin.Forms.Platform.Android.Resource.Attribute.actionBarSize = global::Bit.Android.Resource.Attribute.actionBarSize; global::ZXing.Net.Mobile.Forms.Android.Resource.Layout.zxingscanneractivitylayout = global::Bit.Android.Resource.Layout.zxingscanneractivitylayout; global::ZXing.Net.Mobile.Forms.Android.Resource.Layout.zxingscannerfragmentlayout = global::Bit.Android.Resource.Layout.zxingscannerfragmentlayout; @@ -400,42 +362,6 @@ namespace Bit.Android // aapt resource value: 0x7f010088 public const int activityChooserViewStyle = 2130772104; - // aapt resource value: 0x7f01015e - public const int ahBarColor = 2130772318; - - // aapt resource value: 0x7f010166 - public const int ahBarLength = 2130772326; - - // aapt resource value: 0x7f010165 - public const int ahBarWidth = 2130772325; - - // aapt resource value: 0x7f010163 - public const int ahCircleColor = 2130772323; - - // aapt resource value: 0x7f010162 - public const int ahDelayMillis = 2130772322; - - // aapt resource value: 0x7f010164 - public const int ahRadius = 2130772324; - - // aapt resource value: 0x7f01015f - public const int ahRimColor = 2130772319; - - // aapt resource value: 0x7f010160 - public const int ahRimWidth = 2130772320; - - // aapt resource value: 0x7f010161 - public const int ahSpinSpeed = 2130772321; - - // aapt resource value: 0x7f01015b - public const int ahText = 2130772315; - - // aapt resource value: 0x7f01015c - public const int ahTextColor = 2130772316; - - // aapt resource value: 0x7f01015d - public const int ahTextSize = 2130772317; - // aapt resource value: 0x7f0100ad public const int alertDialogButtonGroupStyle = 2130772141; @@ -2549,26 +2475,26 @@ namespace Bit.Android // aapt resource value: 0x7f02005b public const int avd_hide_password = 2130837595; - // aapt resource value: 0x7f02015e - public const int avd_hide_password_1 = 2130837854; + // aapt resource value: 0x7f02015a + public const int avd_hide_password_1 = 2130837850; - // aapt resource value: 0x7f02015f - public const int avd_hide_password_2 = 2130837855; + // aapt resource value: 0x7f02015b + public const int avd_hide_password_2 = 2130837851; - // aapt resource value: 0x7f020160 - public const int avd_hide_password_3 = 2130837856; + // aapt resource value: 0x7f02015c + public const int avd_hide_password_3 = 2130837852; // aapt resource value: 0x7f02005c public const int avd_show_password = 2130837596; - // aapt resource value: 0x7f020161 - public const int avd_show_password_1 = 2130837857; + // aapt resource value: 0x7f02015d + public const int avd_show_password_1 = 2130837853; - // aapt resource value: 0x7f020162 - public const int avd_show_password_2 = 2130837858; + // aapt resource value: 0x7f02015e + public const int avd_show_password_2 = 2130837854; - // aapt resource value: 0x7f020163 - public const int avd_show_password_3 = 2130837859; + // aapt resource value: 0x7f02015f + public const int avd_show_password_3 = 2130837855; // aapt resource value: 0x7f02005d public const int camera = 2130837597; @@ -2724,622 +2650,610 @@ namespace Bit.Android public const int ic_dialog_close_light = 2130837647; // aapt resource value: 0x7f020090 - public const int ic_errorstatus = 2130837648; + public const int ic_group_collapse_00 = 2130837648; // aapt resource value: 0x7f020091 - public const int ic_group_collapse_00 = 2130837649; + public const int ic_group_collapse_01 = 2130837649; // aapt resource value: 0x7f020092 - public const int ic_group_collapse_01 = 2130837650; + public const int ic_group_collapse_02 = 2130837650; // aapt resource value: 0x7f020093 - public const int ic_group_collapse_02 = 2130837651; + public const int ic_group_collapse_03 = 2130837651; // aapt resource value: 0x7f020094 - public const int ic_group_collapse_03 = 2130837652; + public const int ic_group_collapse_04 = 2130837652; // aapt resource value: 0x7f020095 - public const int ic_group_collapse_04 = 2130837653; + public const int ic_group_collapse_05 = 2130837653; // aapt resource value: 0x7f020096 - public const int ic_group_collapse_05 = 2130837654; + public const int ic_group_collapse_06 = 2130837654; // aapt resource value: 0x7f020097 - public const int ic_group_collapse_06 = 2130837655; + public const int ic_group_collapse_07 = 2130837655; // aapt resource value: 0x7f020098 - public const int ic_group_collapse_07 = 2130837656; + public const int ic_group_collapse_08 = 2130837656; // aapt resource value: 0x7f020099 - public const int ic_group_collapse_08 = 2130837657; + public const int ic_group_collapse_09 = 2130837657; // aapt resource value: 0x7f02009a - public const int ic_group_collapse_09 = 2130837658; + public const int ic_group_collapse_10 = 2130837658; // aapt resource value: 0x7f02009b - public const int ic_group_collapse_10 = 2130837659; + public const int ic_group_collapse_11 = 2130837659; // aapt resource value: 0x7f02009c - public const int ic_group_collapse_11 = 2130837660; + public const int ic_group_collapse_12 = 2130837660; // aapt resource value: 0x7f02009d - public const int ic_group_collapse_12 = 2130837661; + public const int ic_group_collapse_13 = 2130837661; // aapt resource value: 0x7f02009e - public const int ic_group_collapse_13 = 2130837662; + public const int ic_group_collapse_14 = 2130837662; // aapt resource value: 0x7f02009f - public const int ic_group_collapse_14 = 2130837663; + public const int ic_group_collapse_15 = 2130837663; // aapt resource value: 0x7f0200a0 - public const int ic_group_collapse_15 = 2130837664; + public const int ic_group_expand_00 = 2130837664; // aapt resource value: 0x7f0200a1 - public const int ic_group_expand_00 = 2130837665; + public const int ic_group_expand_01 = 2130837665; // aapt resource value: 0x7f0200a2 - public const int ic_group_expand_01 = 2130837666; + public const int ic_group_expand_02 = 2130837666; // aapt resource value: 0x7f0200a3 - public const int ic_group_expand_02 = 2130837667; + public const int ic_group_expand_03 = 2130837667; // aapt resource value: 0x7f0200a4 - public const int ic_group_expand_03 = 2130837668; + public const int ic_group_expand_04 = 2130837668; // aapt resource value: 0x7f0200a5 - public const int ic_group_expand_04 = 2130837669; + public const int ic_group_expand_05 = 2130837669; // aapt resource value: 0x7f0200a6 - public const int ic_group_expand_05 = 2130837670; + public const int ic_group_expand_06 = 2130837670; // aapt resource value: 0x7f0200a7 - public const int ic_group_expand_06 = 2130837671; + public const int ic_group_expand_07 = 2130837671; // aapt resource value: 0x7f0200a8 - public const int ic_group_expand_07 = 2130837672; + public const int ic_group_expand_08 = 2130837672; // aapt resource value: 0x7f0200a9 - public const int ic_group_expand_08 = 2130837673; + public const int ic_group_expand_09 = 2130837673; // aapt resource value: 0x7f0200aa - public const int ic_group_expand_09 = 2130837674; + public const int ic_group_expand_10 = 2130837674; // aapt resource value: 0x7f0200ab - public const int ic_group_expand_10 = 2130837675; + public const int ic_group_expand_11 = 2130837675; // aapt resource value: 0x7f0200ac - public const int ic_group_expand_11 = 2130837676; + public const int ic_group_expand_12 = 2130837676; // aapt resource value: 0x7f0200ad - public const int ic_group_expand_12 = 2130837677; + public const int ic_group_expand_13 = 2130837677; // aapt resource value: 0x7f0200ae - public const int ic_group_expand_13 = 2130837678; + public const int ic_group_expand_14 = 2130837678; // aapt resource value: 0x7f0200af - public const int ic_group_expand_14 = 2130837679; + public const int ic_group_expand_15 = 2130837679; // aapt resource value: 0x7f0200b0 - public const int ic_group_expand_15 = 2130837680; + public const int ic_media_pause_dark = 2130837680; // aapt resource value: 0x7f0200b1 - public const int ic_media_pause_dark = 2130837681; + public const int ic_media_pause_light = 2130837681; // aapt resource value: 0x7f0200b2 - public const int ic_media_pause_light = 2130837682; + public const int ic_media_play_dark = 2130837682; // aapt resource value: 0x7f0200b3 - public const int ic_media_play_dark = 2130837683; + public const int ic_media_play_light = 2130837683; // aapt resource value: 0x7f0200b4 - public const int ic_media_play_light = 2130837684; + public const int ic_media_stop_dark = 2130837684; // aapt resource value: 0x7f0200b5 - public const int ic_media_stop_dark = 2130837685; + public const int ic_media_stop_light = 2130837685; // aapt resource value: 0x7f0200b6 - public const int ic_media_stop_light = 2130837686; + public const int ic_mr_button_connected_00_dark = 2130837686; // aapt resource value: 0x7f0200b7 - public const int ic_mr_button_connected_00_dark = 2130837687; + public const int ic_mr_button_connected_00_light = 2130837687; // aapt resource value: 0x7f0200b8 - public const int ic_mr_button_connected_00_light = 2130837688; + public const int ic_mr_button_connected_01_dark = 2130837688; // aapt resource value: 0x7f0200b9 - public const int ic_mr_button_connected_01_dark = 2130837689; + public const int ic_mr_button_connected_01_light = 2130837689; // aapt resource value: 0x7f0200ba - public const int ic_mr_button_connected_01_light = 2130837690; + public const int ic_mr_button_connected_02_dark = 2130837690; // aapt resource value: 0x7f0200bb - public const int ic_mr_button_connected_02_dark = 2130837691; + public const int ic_mr_button_connected_02_light = 2130837691; // aapt resource value: 0x7f0200bc - public const int ic_mr_button_connected_02_light = 2130837692; + public const int ic_mr_button_connected_03_dark = 2130837692; // aapt resource value: 0x7f0200bd - public const int ic_mr_button_connected_03_dark = 2130837693; + public const int ic_mr_button_connected_03_light = 2130837693; // aapt resource value: 0x7f0200be - public const int ic_mr_button_connected_03_light = 2130837694; + public const int ic_mr_button_connected_04_dark = 2130837694; // aapt resource value: 0x7f0200bf - public const int ic_mr_button_connected_04_dark = 2130837695; + public const int ic_mr_button_connected_04_light = 2130837695; // aapt resource value: 0x7f0200c0 - public const int ic_mr_button_connected_04_light = 2130837696; + public const int ic_mr_button_connected_05_dark = 2130837696; // aapt resource value: 0x7f0200c1 - public const int ic_mr_button_connected_05_dark = 2130837697; + public const int ic_mr_button_connected_05_light = 2130837697; // aapt resource value: 0x7f0200c2 - public const int ic_mr_button_connected_05_light = 2130837698; + public const int ic_mr_button_connected_06_dark = 2130837698; // aapt resource value: 0x7f0200c3 - public const int ic_mr_button_connected_06_dark = 2130837699; + public const int ic_mr_button_connected_06_light = 2130837699; // aapt resource value: 0x7f0200c4 - public const int ic_mr_button_connected_06_light = 2130837700; + public const int ic_mr_button_connected_07_dark = 2130837700; // aapt resource value: 0x7f0200c5 - public const int ic_mr_button_connected_07_dark = 2130837701; + public const int ic_mr_button_connected_07_light = 2130837701; // aapt resource value: 0x7f0200c6 - public const int ic_mr_button_connected_07_light = 2130837702; + public const int ic_mr_button_connected_08_dark = 2130837702; // aapt resource value: 0x7f0200c7 - public const int ic_mr_button_connected_08_dark = 2130837703; + public const int ic_mr_button_connected_08_light = 2130837703; // aapt resource value: 0x7f0200c8 - public const int ic_mr_button_connected_08_light = 2130837704; + public const int ic_mr_button_connected_09_dark = 2130837704; // aapt resource value: 0x7f0200c9 - public const int ic_mr_button_connected_09_dark = 2130837705; + public const int ic_mr_button_connected_09_light = 2130837705; // aapt resource value: 0x7f0200ca - public const int ic_mr_button_connected_09_light = 2130837706; + public const int ic_mr_button_connected_10_dark = 2130837706; // aapt resource value: 0x7f0200cb - public const int ic_mr_button_connected_10_dark = 2130837707; + public const int ic_mr_button_connected_10_light = 2130837707; // aapt resource value: 0x7f0200cc - public const int ic_mr_button_connected_10_light = 2130837708; + public const int ic_mr_button_connected_11_dark = 2130837708; // aapt resource value: 0x7f0200cd - public const int ic_mr_button_connected_11_dark = 2130837709; + public const int ic_mr_button_connected_11_light = 2130837709; // aapt resource value: 0x7f0200ce - public const int ic_mr_button_connected_11_light = 2130837710; + public const int ic_mr_button_connected_12_dark = 2130837710; // aapt resource value: 0x7f0200cf - public const int ic_mr_button_connected_12_dark = 2130837711; + public const int ic_mr_button_connected_12_light = 2130837711; // aapt resource value: 0x7f0200d0 - public const int ic_mr_button_connected_12_light = 2130837712; + public const int ic_mr_button_connected_13_dark = 2130837712; // aapt resource value: 0x7f0200d1 - public const int ic_mr_button_connected_13_dark = 2130837713; + public const int ic_mr_button_connected_13_light = 2130837713; // aapt resource value: 0x7f0200d2 - public const int ic_mr_button_connected_13_light = 2130837714; + public const int ic_mr_button_connected_14_dark = 2130837714; // aapt resource value: 0x7f0200d3 - public const int ic_mr_button_connected_14_dark = 2130837715; + public const int ic_mr_button_connected_14_light = 2130837715; // aapt resource value: 0x7f0200d4 - public const int ic_mr_button_connected_14_light = 2130837716; + public const int ic_mr_button_connected_15_dark = 2130837716; // aapt resource value: 0x7f0200d5 - public const int ic_mr_button_connected_15_dark = 2130837717; + public const int ic_mr_button_connected_15_light = 2130837717; // aapt resource value: 0x7f0200d6 - public const int ic_mr_button_connected_15_light = 2130837718; + public const int ic_mr_button_connected_16_dark = 2130837718; // aapt resource value: 0x7f0200d7 - public const int ic_mr_button_connected_16_dark = 2130837719; + public const int ic_mr_button_connected_16_light = 2130837719; // aapt resource value: 0x7f0200d8 - public const int ic_mr_button_connected_16_light = 2130837720; + public const int ic_mr_button_connected_17_dark = 2130837720; // aapt resource value: 0x7f0200d9 - public const int ic_mr_button_connected_17_dark = 2130837721; + public const int ic_mr_button_connected_17_light = 2130837721; // aapt resource value: 0x7f0200da - public const int ic_mr_button_connected_17_light = 2130837722; + public const int ic_mr_button_connected_18_dark = 2130837722; // aapt resource value: 0x7f0200db - public const int ic_mr_button_connected_18_dark = 2130837723; + public const int ic_mr_button_connected_18_light = 2130837723; // aapt resource value: 0x7f0200dc - public const int ic_mr_button_connected_18_light = 2130837724; + public const int ic_mr_button_connected_19_dark = 2130837724; // aapt resource value: 0x7f0200dd - public const int ic_mr_button_connected_19_dark = 2130837725; + public const int ic_mr_button_connected_19_light = 2130837725; // aapt resource value: 0x7f0200de - public const int ic_mr_button_connected_19_light = 2130837726; + public const int ic_mr_button_connected_20_dark = 2130837726; // aapt resource value: 0x7f0200df - public const int ic_mr_button_connected_20_dark = 2130837727; + public const int ic_mr_button_connected_20_light = 2130837727; // aapt resource value: 0x7f0200e0 - public const int ic_mr_button_connected_20_light = 2130837728; + public const int ic_mr_button_connected_21_dark = 2130837728; // aapt resource value: 0x7f0200e1 - public const int ic_mr_button_connected_21_dark = 2130837729; + public const int ic_mr_button_connected_21_light = 2130837729; // aapt resource value: 0x7f0200e2 - public const int ic_mr_button_connected_21_light = 2130837730; + public const int ic_mr_button_connected_22_dark = 2130837730; // aapt resource value: 0x7f0200e3 - public const int ic_mr_button_connected_22_dark = 2130837731; + public const int ic_mr_button_connected_22_light = 2130837731; // aapt resource value: 0x7f0200e4 - public const int ic_mr_button_connected_22_light = 2130837732; + public const int ic_mr_button_connecting_00_dark = 2130837732; // aapt resource value: 0x7f0200e5 - public const int ic_mr_button_connecting_00_dark = 2130837733; + public const int ic_mr_button_connecting_00_light = 2130837733; // aapt resource value: 0x7f0200e6 - public const int ic_mr_button_connecting_00_light = 2130837734; + public const int ic_mr_button_connecting_01_dark = 2130837734; // aapt resource value: 0x7f0200e7 - public const int ic_mr_button_connecting_01_dark = 2130837735; + public const int ic_mr_button_connecting_01_light = 2130837735; // aapt resource value: 0x7f0200e8 - public const int ic_mr_button_connecting_01_light = 2130837736; + public const int ic_mr_button_connecting_02_dark = 2130837736; // aapt resource value: 0x7f0200e9 - public const int ic_mr_button_connecting_02_dark = 2130837737; + public const int ic_mr_button_connecting_02_light = 2130837737; // aapt resource value: 0x7f0200ea - public const int ic_mr_button_connecting_02_light = 2130837738; + public const int ic_mr_button_connecting_03_dark = 2130837738; // aapt resource value: 0x7f0200eb - public const int ic_mr_button_connecting_03_dark = 2130837739; + public const int ic_mr_button_connecting_03_light = 2130837739; // aapt resource value: 0x7f0200ec - public const int ic_mr_button_connecting_03_light = 2130837740; + public const int ic_mr_button_connecting_04_dark = 2130837740; // aapt resource value: 0x7f0200ed - public const int ic_mr_button_connecting_04_dark = 2130837741; + public const int ic_mr_button_connecting_04_light = 2130837741; // aapt resource value: 0x7f0200ee - public const int ic_mr_button_connecting_04_light = 2130837742; + public const int ic_mr_button_connecting_05_dark = 2130837742; // aapt resource value: 0x7f0200ef - public const int ic_mr_button_connecting_05_dark = 2130837743; + public const int ic_mr_button_connecting_05_light = 2130837743; // aapt resource value: 0x7f0200f0 - public const int ic_mr_button_connecting_05_light = 2130837744; + public const int ic_mr_button_connecting_06_dark = 2130837744; // aapt resource value: 0x7f0200f1 - public const int ic_mr_button_connecting_06_dark = 2130837745; + public const int ic_mr_button_connecting_06_light = 2130837745; // aapt resource value: 0x7f0200f2 - public const int ic_mr_button_connecting_06_light = 2130837746; + public const int ic_mr_button_connecting_07_dark = 2130837746; // aapt resource value: 0x7f0200f3 - public const int ic_mr_button_connecting_07_dark = 2130837747; + public const int ic_mr_button_connecting_07_light = 2130837747; // aapt resource value: 0x7f0200f4 - public const int ic_mr_button_connecting_07_light = 2130837748; + public const int ic_mr_button_connecting_08_dark = 2130837748; // aapt resource value: 0x7f0200f5 - public const int ic_mr_button_connecting_08_dark = 2130837749; + public const int ic_mr_button_connecting_08_light = 2130837749; // aapt resource value: 0x7f0200f6 - public const int ic_mr_button_connecting_08_light = 2130837750; + public const int ic_mr_button_connecting_09_dark = 2130837750; // aapt resource value: 0x7f0200f7 - public const int ic_mr_button_connecting_09_dark = 2130837751; + public const int ic_mr_button_connecting_09_light = 2130837751; // aapt resource value: 0x7f0200f8 - public const int ic_mr_button_connecting_09_light = 2130837752; + public const int ic_mr_button_connecting_10_dark = 2130837752; // aapt resource value: 0x7f0200f9 - public const int ic_mr_button_connecting_10_dark = 2130837753; + public const int ic_mr_button_connecting_10_light = 2130837753; // aapt resource value: 0x7f0200fa - public const int ic_mr_button_connecting_10_light = 2130837754; + public const int ic_mr_button_connecting_11_dark = 2130837754; // aapt resource value: 0x7f0200fb - public const int ic_mr_button_connecting_11_dark = 2130837755; + public const int ic_mr_button_connecting_11_light = 2130837755; // aapt resource value: 0x7f0200fc - public const int ic_mr_button_connecting_11_light = 2130837756; + public const int ic_mr_button_connecting_12_dark = 2130837756; // aapt resource value: 0x7f0200fd - public const int ic_mr_button_connecting_12_dark = 2130837757; + public const int ic_mr_button_connecting_12_light = 2130837757; // aapt resource value: 0x7f0200fe - public const int ic_mr_button_connecting_12_light = 2130837758; + public const int ic_mr_button_connecting_13_dark = 2130837758; // aapt resource value: 0x7f0200ff - public const int ic_mr_button_connecting_13_dark = 2130837759; + public const int ic_mr_button_connecting_13_light = 2130837759; // aapt resource value: 0x7f020100 - public const int ic_mr_button_connecting_13_light = 2130837760; + public const int ic_mr_button_connecting_14_dark = 2130837760; // aapt resource value: 0x7f020101 - public const int ic_mr_button_connecting_14_dark = 2130837761; + public const int ic_mr_button_connecting_14_light = 2130837761; // aapt resource value: 0x7f020102 - public const int ic_mr_button_connecting_14_light = 2130837762; + public const int ic_mr_button_connecting_15_dark = 2130837762; // aapt resource value: 0x7f020103 - public const int ic_mr_button_connecting_15_dark = 2130837763; + public const int ic_mr_button_connecting_15_light = 2130837763; // aapt resource value: 0x7f020104 - public const int ic_mr_button_connecting_15_light = 2130837764; + public const int ic_mr_button_connecting_16_dark = 2130837764; // aapt resource value: 0x7f020105 - public const int ic_mr_button_connecting_16_dark = 2130837765; + public const int ic_mr_button_connecting_16_light = 2130837765; // aapt resource value: 0x7f020106 - public const int ic_mr_button_connecting_16_light = 2130837766; + public const int ic_mr_button_connecting_17_dark = 2130837766; // aapt resource value: 0x7f020107 - public const int ic_mr_button_connecting_17_dark = 2130837767; + public const int ic_mr_button_connecting_17_light = 2130837767; // aapt resource value: 0x7f020108 - public const int ic_mr_button_connecting_17_light = 2130837768; + public const int ic_mr_button_connecting_18_dark = 2130837768; // aapt resource value: 0x7f020109 - public const int ic_mr_button_connecting_18_dark = 2130837769; + public const int ic_mr_button_connecting_18_light = 2130837769; // aapt resource value: 0x7f02010a - public const int ic_mr_button_connecting_18_light = 2130837770; + public const int ic_mr_button_connecting_19_dark = 2130837770; // aapt resource value: 0x7f02010b - public const int ic_mr_button_connecting_19_dark = 2130837771; + public const int ic_mr_button_connecting_19_light = 2130837771; // aapt resource value: 0x7f02010c - public const int ic_mr_button_connecting_19_light = 2130837772; + public const int ic_mr_button_connecting_20_dark = 2130837772; // aapt resource value: 0x7f02010d - public const int ic_mr_button_connecting_20_dark = 2130837773; + public const int ic_mr_button_connecting_20_light = 2130837773; // aapt resource value: 0x7f02010e - public const int ic_mr_button_connecting_20_light = 2130837774; + public const int ic_mr_button_connecting_21_dark = 2130837774; // aapt resource value: 0x7f02010f - public const int ic_mr_button_connecting_21_dark = 2130837775; + public const int ic_mr_button_connecting_21_light = 2130837775; // aapt resource value: 0x7f020110 - public const int ic_mr_button_connecting_21_light = 2130837776; + public const int ic_mr_button_connecting_22_dark = 2130837776; // aapt resource value: 0x7f020111 - public const int ic_mr_button_connecting_22_dark = 2130837777; + public const int ic_mr_button_connecting_22_light = 2130837777; // aapt resource value: 0x7f020112 - public const int ic_mr_button_connecting_22_light = 2130837778; + public const int ic_mr_button_disabled_dark = 2130837778; // aapt resource value: 0x7f020113 - public const int ic_mr_button_disabled_dark = 2130837779; + public const int ic_mr_button_disabled_light = 2130837779; // aapt resource value: 0x7f020114 - public const int ic_mr_button_disabled_light = 2130837780; + public const int ic_mr_button_disconnected_dark = 2130837780; // aapt resource value: 0x7f020115 - public const int ic_mr_button_disconnected_dark = 2130837781; + public const int ic_mr_button_disconnected_light = 2130837781; // aapt resource value: 0x7f020116 - public const int ic_mr_button_disconnected_light = 2130837782; + public const int ic_mr_button_grey = 2130837782; // aapt resource value: 0x7f020117 - public const int ic_mr_button_grey = 2130837783; + public const int ic_vol_type_speaker_dark = 2130837783; // aapt resource value: 0x7f020118 - public const int ic_successstatus = 2130837784; + public const int ic_vol_type_speaker_group_dark = 2130837784; // aapt resource value: 0x7f020119 - public const int ic_vol_type_speaker_dark = 2130837785; + public const int ic_vol_type_speaker_group_light = 2130837785; // aapt resource value: 0x7f02011a - public const int ic_vol_type_speaker_group_dark = 2130837786; + public const int ic_vol_type_speaker_light = 2130837786; // aapt resource value: 0x7f02011b - public const int ic_vol_type_speaker_group_light = 2130837787; + public const int ic_vol_type_tv_dark = 2130837787; // aapt resource value: 0x7f02011c - public const int ic_vol_type_speaker_light = 2130837788; + public const int ic_vol_type_tv_light = 2130837788; // aapt resource value: 0x7f02011d - public const int ic_vol_type_tv_dark = 2130837789; + public const int icon = 2130837789; // aapt resource value: 0x7f02011e - public const int ic_vol_type_tv_light = 2130837790; + public const int id = 2130837790; // aapt resource value: 0x7f02011f - public const int icon = 2130837791; + public const int ion_chevron_right = 2130837791; // aapt resource value: 0x7f020120 - public const int id = 2130837792; + public const int launch = 2130837792; // aapt resource value: 0x7f020121 - public const int ion_chevron_right = 2130837793; + public const int lightbulb = 2130837793; // aapt resource value: 0x7f020122 - public const int launch = 2130837794; + public const int list_selector = 2130837794; // aapt resource value: 0x7f020123 - public const int lightbulb = 2130837795; + public const int @lock = 2130837795; // aapt resource value: 0x7f020124 - public const int list_selector = 2130837796; + public const int login = 2130837796; // aapt resource value: 0x7f020125 - public const int @lock = 2130837797; + public const int logo = 2130837797; // aapt resource value: 0x7f020126 - public const int login = 2130837798; + public const int more = 2130837798; // aapt resource value: 0x7f020127 - public const int logo = 2130837799; + public const int mr_button_connected_dark = 2130837799; // aapt resource value: 0x7f020128 - public const int more = 2130837800; + public const int mr_button_connected_light = 2130837800; // aapt resource value: 0x7f020129 - public const int mr_button_connected_dark = 2130837801; + public const int mr_button_connecting_dark = 2130837801; // aapt resource value: 0x7f02012a - public const int mr_button_connected_light = 2130837802; + public const int mr_button_connecting_light = 2130837802; // aapt resource value: 0x7f02012b - public const int mr_button_connecting_dark = 2130837803; + public const int mr_button_dark = 2130837803; // aapt resource value: 0x7f02012c - public const int mr_button_connecting_light = 2130837804; + public const int mr_button_light = 2130837804; // aapt resource value: 0x7f02012d - public const int mr_button_dark = 2130837805; + public const int mr_dialog_close_dark = 2130837805; // aapt resource value: 0x7f02012e - public const int mr_button_light = 2130837806; + public const int mr_dialog_close_light = 2130837806; // aapt resource value: 0x7f02012f - public const int mr_dialog_close_dark = 2130837807; + public const int mr_dialog_material_background_dark = 2130837807; // aapt resource value: 0x7f020130 - public const int mr_dialog_close_light = 2130837808; + public const int mr_dialog_material_background_light = 2130837808; // aapt resource value: 0x7f020131 - public const int mr_dialog_material_background_dark = 2130837809; + public const int mr_group_collapse = 2130837809; // aapt resource value: 0x7f020132 - public const int mr_dialog_material_background_light = 2130837810; + public const int mr_group_expand = 2130837810; // aapt resource value: 0x7f020133 - public const int mr_group_collapse = 2130837811; + public const int mr_media_pause_dark = 2130837811; // aapt resource value: 0x7f020134 - public const int mr_group_expand = 2130837812; + public const int mr_media_pause_light = 2130837812; // aapt resource value: 0x7f020135 - public const int mr_media_pause_dark = 2130837813; + public const int mr_media_play_dark = 2130837813; // aapt resource value: 0x7f020136 - public const int mr_media_pause_light = 2130837814; + public const int mr_media_play_light = 2130837814; // aapt resource value: 0x7f020137 - public const int mr_media_play_dark = 2130837815; + public const int mr_media_stop_dark = 2130837815; // aapt resource value: 0x7f020138 - public const int mr_media_play_light = 2130837816; + public const int mr_media_stop_light = 2130837816; // aapt resource value: 0x7f020139 - public const int mr_media_stop_dark = 2130837817; + public const int mr_vol_type_audiotrack_dark = 2130837817; // aapt resource value: 0x7f02013a - public const int mr_media_stop_light = 2130837818; + public const int mr_vol_type_audiotrack_light = 2130837818; // aapt resource value: 0x7f02013b - public const int mr_vol_type_audiotrack_dark = 2130837819; + public const int navigation_empty_icon = 2130837819; // aapt resource value: 0x7f02013c - public const int mr_vol_type_audiotrack_light = 2130837820; + public const int note = 2130837820; // aapt resource value: 0x7f02013d - public const int navigation_empty_icon = 2130837821; + public const int notification_action_background = 2130837821; // aapt resource value: 0x7f02013e - public const int note = 2130837822; + public const int notification_bg = 2130837822; // aapt resource value: 0x7f02013f - public const int notification_action_background = 2130837823; + public const int notification_bg_low = 2130837823; // aapt resource value: 0x7f020140 - public const int notification_bg = 2130837824; + public const int notification_bg_low_normal = 2130837824; // aapt resource value: 0x7f020141 - public const int notification_bg_low = 2130837825; + public const int notification_bg_low_pressed = 2130837825; // aapt resource value: 0x7f020142 - public const int notification_bg_low_normal = 2130837826; + public const int notification_bg_normal = 2130837826; // aapt resource value: 0x7f020143 - public const int notification_bg_low_pressed = 2130837827; + public const int notification_bg_normal_pressed = 2130837827; // aapt resource value: 0x7f020144 - public const int notification_bg_normal = 2130837828; + public const int notification_icon_background = 2130837828; // aapt resource value: 0x7f020145 - public const int notification_bg_normal_pressed = 2130837829; - - // aapt resource value: 0x7f020146 - public const int notification_icon_background = 2130837830; - - // aapt resource value: 0x7f020147 - public const int notification_sm = 2130837831; - - // aapt resource value: 0x7f02015c - public const int notification_template_icon_bg = 2130837852; - - // aapt resource value: 0x7f02015d - public const int notification_template_icon_low_bg = 2130837853; - - // aapt resource value: 0x7f020148 - public const int notification_tile_bg = 2130837832; - - // aapt resource value: 0x7f020149 - public const int notify_panel_notification_icon_bg = 2130837833; - - // aapt resource value: 0x7f02014a - public const int paperclip = 2130837834; - - // aapt resource value: 0x7f02014b - public const int plus = 2130837835; - - // aapt resource value: 0x7f02014c - public const int refresh = 2130837836; - - // aapt resource value: 0x7f02014d - public const int refresh_selected = 2130837837; - - // aapt resource value: 0x7f02014e - public const int roundedbg = 2130837838; - - // aapt resource value: 0x7f02014f - public const int roundedbgdark = 2130837839; - - // aapt resource value: 0x7f020150 - public const int search = 2130837840; - - // aapt resource value: 0x7f020151 - public const int share = 2130837841; - - // aapt resource value: 0x7f020152 - public const int share_tools = 2130837842; - - // aapt resource value: 0x7f020153 - public const int shield = 2130837843; - - // aapt resource value: 0x7f020154 - public const int slider_thumb = 2130837844; - - // aapt resource value: 0x7f020155 - public const int splash_screen = 2130837845; - - // aapt resource value: 0x7f020156 - public const int tools = 2130837846; - - // aapt resource value: 0x7f020157 - public const int tools_selected = 2130837847; + public const int notification_sm = 2130837829; // aapt resource value: 0x7f020158 - public const int trash = 2130837848; + public const int notification_template_icon_bg = 2130837848; // aapt resource value: 0x7f020159 - public const int upload = 2130837849; + public const int notification_template_icon_low_bg = 2130837849; - // aapt resource value: 0x7f02015a - public const int user = 2130837850; + // aapt resource value: 0x7f020146 + public const int notification_tile_bg = 2130837830; - // aapt resource value: 0x7f02015b - public const int yubikey = 2130837851; + // aapt resource value: 0x7f020147 + public const int notify_panel_notification_icon_bg = 2130837831; + + // aapt resource value: 0x7f020148 + public const int paperclip = 2130837832; + + // aapt resource value: 0x7f020149 + public const int plus = 2130837833; + + // aapt resource value: 0x7f02014a + public const int refresh = 2130837834; + + // aapt resource value: 0x7f02014b + public const int refresh_selected = 2130837835; + + // aapt resource value: 0x7f02014c + public const int search = 2130837836; + + // aapt resource value: 0x7f02014d + public const int share = 2130837837; + + // aapt resource value: 0x7f02014e + public const int share_tools = 2130837838; + + // aapt resource value: 0x7f02014f + public const int shield = 2130837839; + + // aapt resource value: 0x7f020150 + public const int slider_thumb = 2130837840; + + // aapt resource value: 0x7f020151 + public const int splash_screen = 2130837841; + + // aapt resource value: 0x7f020152 + public const int tools = 2130837842; + + // aapt resource value: 0x7f020153 + public const int tools_selected = 2130837843; + + // aapt resource value: 0x7f020154 + public const int trash = 2130837844; + + // aapt resource value: 0x7f020155 + public const int upload = 2130837845; + + // aapt resource value: 0x7f020156 + public const int user = 2130837846; + + // aapt resource value: 0x7f020157 + public const int yubikey = 2130837847; static Drawable() { @@ -3354,8 +3268,8 @@ namespace Bit.Android public partial class Id { - // aapt resource value: 0x7f0c00cc - public const int action0 = 2131493068; + // aapt resource value: 0x7f0c00c8 + public const int action0 = 2131493064; // aapt resource value: 0x7f0c006b public const int action_bar = 2131492971; @@ -3378,17 +3292,17 @@ namespace Bit.Android // aapt resource value: 0x7f0c0048 public const int action_bar_title = 2131492936; - // aapt resource value: 0x7f0c00c9 - public const int action_container = 2131493065; + // aapt resource value: 0x7f0c00c5 + public const int action_container = 2131493061; // aapt resource value: 0x7f0c006c public const int action_context_bar = 2131492972; - // aapt resource value: 0x7f0c00d0 - public const int action_divider = 2131493072; + // aapt resource value: 0x7f0c00cc + public const int action_divider = 2131493068; - // aapt resource value: 0x7f0c00ca - public const int action_image = 2131493066; + // aapt resource value: 0x7f0c00c6 + public const int action_image = 2131493062; // aapt resource value: 0x7f0c0003 public const int action_menu_divider = 2131492867; @@ -3405,11 +3319,11 @@ namespace Bit.Android // aapt resource value: 0x7f0c004a public const int action_mode_close_button = 2131492938; - // aapt resource value: 0x7f0c00cb - public const int action_text = 2131493067; + // aapt resource value: 0x7f0c00c7 + public const int action_text = 2131493063; - // aapt resource value: 0x7f0c00d9 - public const int actions = 2131493081; + // aapt resource value: 0x7f0c00d5 + public const int actions = 2131493077; // aapt resource value: 0x7f0c004b public const int activity_chooser_view_content = 2131492939; @@ -3462,8 +3376,8 @@ namespace Bit.Android // aapt resource value: 0x7f0c00a5 public const int button_update = 2131493029; - // aapt resource value: 0x7f0c00cd - public const int cancel_action = 2131493069; + // aapt resource value: 0x7f0c00c9 + public const int cancel_action = 2131493065; // aapt resource value: 0x7f0c0037 public const int center = 2131492919; @@ -3477,8 +3391,8 @@ namespace Bit.Android // aapt resource value: 0x7f0c0062 public const int checkbox = 2131492962; - // aapt resource value: 0x7f0c00d5 - public const int chronometer = 2131493077; + // aapt resource value: 0x7f0c00d1 + public const int chronometer = 2131493073; // aapt resource value: 0x7f0c0040 public const int clip_horizontal = 2131492928; @@ -3492,8 +3406,8 @@ namespace Bit.Android // aapt resource value: 0x7f0c007e public const int container = 2131492990; - // aapt resource value: 0x7f0c00e0 - public const int contentFrame = 2131493088; + // aapt resource value: 0x7f0c00dc + public const int contentFrame = 2131493084; // aapt resource value: 0x7f0c0055 public const int contentPanel = 2131492949; @@ -3540,8 +3454,8 @@ namespace Bit.Android // aapt resource value: 0x7f0c0029 public const int end = 2131492905; - // aapt resource value: 0x7f0c00dd - public const int end_padder = 2131493085; + // aapt resource value: 0x7f0c00d9 + public const int end_padder = 2131493081; // aapt resource value: 0x7f0c0032 public const int enterAlways = 2131492914; @@ -3594,8 +3508,8 @@ namespace Bit.Android // aapt resource value: 0x7f0c0050 public const int icon = 2131492944; - // aapt resource value: 0x7f0c00da - public const int icon_group = 2131493082; + // aapt resource value: 0x7f0c00d6 + public const int icon_group = 2131493078; // aapt resource value: 0x7f0c0012 public const int icon_only = 2131492882; @@ -3606,8 +3520,8 @@ namespace Bit.Android // aapt resource value: 0x7f0c004d public const int image = 2131492941; - // aapt resource value: 0x7f0c00d6 - public const int info = 2131493078; + // aapt resource value: 0x7f0c00d2 + public const int info = 2131493074; // aapt resource value: 0x7f0c0093 public const int input_email = 2131493011; @@ -3657,11 +3571,11 @@ namespace Bit.Android // aapt resource value: 0x7f0c0017 public const int light = 2131492887; - // aapt resource value: 0x7f0c00db - public const int line1 = 2131493083; + // aapt resource value: 0x7f0c00d7 + public const int line1 = 2131493079; - // aapt resource value: 0x7f0c00dc - public const int line3 = 2131493084; + // aapt resource value: 0x7f0c00d8 + public const int line3 = 2131493080; // aapt resource value: 0x7f0c0018 public const int listMode = 2131492888; @@ -3675,20 +3589,11 @@ namespace Bit.Android // aapt resource value: 0x7f0c004f public const int list_item = 2131492943; - // aapt resource value: 0x7f0c00ad - public const int loadingImage = 2131493037; + // aapt resource value: 0x7f0c00de + public const int masked = 2131493086; - // aapt resource value: 0x7f0c00ab - public const int loadingProgressBar = 2131493035; - - // aapt resource value: 0x7f0c00ae - public const int loadingProgressWheel = 2131493038; - - // aapt resource value: 0x7f0c00e2 - public const int masked = 2131493090; - - // aapt resource value: 0x7f0c00cf - public const int media_actions = 2131493071; + // aapt resource value: 0x7f0c00cb + public const int media_actions = 2131493067; // aapt resource value: 0x7f0c002a public const int middle = 2131492906; @@ -3696,80 +3601,80 @@ namespace Bit.Android // aapt resource value: 0x7f0c0045 public const int mini = 2131492933; - // aapt resource value: 0x7f0c00bb - public const int mr_art = 2131493051; + // aapt resource value: 0x7f0c00b7 + public const int mr_art = 2131493047; - // aapt resource value: 0x7f0c00b0 - public const int mr_chooser_list = 2131493040; - - // aapt resource value: 0x7f0c00b3 - public const int mr_chooser_route_desc = 2131493043; - - // aapt resource value: 0x7f0c00b1 - public const int mr_chooser_route_icon = 2131493041; - - // aapt resource value: 0x7f0c00b2 - public const int mr_chooser_route_name = 2131493042; + // aapt resource value: 0x7f0c00ac + public const int mr_chooser_list = 2131493036; // aapt resource value: 0x7f0c00af - public const int mr_chooser_title = 2131493039; + public const int mr_chooser_route_desc = 2131493039; - // aapt resource value: 0x7f0c00b8 - public const int mr_close = 2131493048; + // aapt resource value: 0x7f0c00ad + public const int mr_chooser_route_icon = 2131493037; - // aapt resource value: 0x7f0c00be - public const int mr_control_divider = 2131493054; + // aapt resource value: 0x7f0c00ae + public const int mr_chooser_route_name = 2131493038; - // aapt resource value: 0x7f0c00c4 - public const int mr_control_playback_ctrl = 2131493060; - - // aapt resource value: 0x7f0c00c7 - public const int mr_control_subtitle = 2131493063; - - // aapt resource value: 0x7f0c00c6 - public const int mr_control_title = 2131493062; - - // aapt resource value: 0x7f0c00c5 - public const int mr_control_title_container = 2131493061; - - // aapt resource value: 0x7f0c00b9 - public const int mr_custom_control = 2131493049; - - // aapt resource value: 0x7f0c00ba - public const int mr_default_control = 2131493050; - - // aapt resource value: 0x7f0c00b5 - public const int mr_dialog_area = 2131493045; + // aapt resource value: 0x7f0c00ab + public const int mr_chooser_title = 2131493035; // aapt resource value: 0x7f0c00b4 - public const int mr_expandable_area = 2131493044; + public const int mr_close = 2131493044; - // aapt resource value: 0x7f0c00c8 - public const int mr_group_expand_collapse = 2131493064; - - // aapt resource value: 0x7f0c00bc - public const int mr_media_main_control = 2131493052; - - // aapt resource value: 0x7f0c00b7 - public const int mr_name = 2131493047; - - // aapt resource value: 0x7f0c00bd - public const int mr_playback_control = 2131493053; - - // aapt resource value: 0x7f0c00b6 - public const int mr_title_bar = 2131493046; - - // aapt resource value: 0x7f0c00bf - public const int mr_volume_control = 2131493055; + // aapt resource value: 0x7f0c00ba + public const int mr_control_divider = 2131493050; // aapt resource value: 0x7f0c00c0 - public const int mr_volume_group_list = 2131493056; - - // aapt resource value: 0x7f0c00c2 - public const int mr_volume_item_icon = 2131493058; + public const int mr_control_playback_ctrl = 2131493056; // aapt resource value: 0x7f0c00c3 - public const int mr_volume_slider = 2131493059; + public const int mr_control_subtitle = 2131493059; + + // aapt resource value: 0x7f0c00c2 + public const int mr_control_title = 2131493058; + + // aapt resource value: 0x7f0c00c1 + public const int mr_control_title_container = 2131493057; + + // aapt resource value: 0x7f0c00b5 + public const int mr_custom_control = 2131493045; + + // aapt resource value: 0x7f0c00b6 + public const int mr_default_control = 2131493046; + + // aapt resource value: 0x7f0c00b1 + public const int mr_dialog_area = 2131493041; + + // aapt resource value: 0x7f0c00b0 + public const int mr_expandable_area = 2131493040; + + // aapt resource value: 0x7f0c00c4 + public const int mr_group_expand_collapse = 2131493060; + + // aapt resource value: 0x7f0c00b8 + public const int mr_media_main_control = 2131493048; + + // aapt resource value: 0x7f0c00b3 + public const int mr_name = 2131493043; + + // aapt resource value: 0x7f0c00b9 + public const int mr_playback_control = 2131493049; + + // aapt resource value: 0x7f0c00b2 + public const int mr_title_bar = 2131493042; + + // aapt resource value: 0x7f0c00bb + public const int mr_volume_control = 2131493051; + + // aapt resource value: 0x7f0c00bc + public const int mr_volume_group_list = 2131493052; + + // aapt resource value: 0x7f0c00be + public const int mr_volume_item_icon = 2131493054; + + // aapt resource value: 0x7f0c00bf + public const int mr_volume_slider = 2131493055; // aapt resource value: 0x7f0c0021 public const int multiply = 2131492897; @@ -3786,14 +3691,14 @@ namespace Bit.Android // aapt resource value: 0x7f0c0019 public const int normal = 2131492889; - // aapt resource value: 0x7f0c00d8 - public const int notification_background = 2131493080; + // aapt resource value: 0x7f0c00d4 + public const int notification_background = 2131493076; - // aapt resource value: 0x7f0c00d2 - public const int notification_main_column = 2131493074; + // aapt resource value: 0x7f0c00ce + public const int notification_main_column = 2131493070; - // aapt resource value: 0x7f0c00d1 - public const int notification_main_column_container = 2131493073; + // aapt resource value: 0x7f0c00cd + public const int notification_main_column_container = 2131493069; // aapt resource value: 0x7f0c003e public const int parallax = 2131492926; @@ -3816,11 +3721,11 @@ namespace Bit.Android // aapt resource value: 0x7f0c003c public const int right = 2131492924; - // aapt resource value: 0x7f0c00d7 - public const int right_icon = 2131493079; - // aapt resource value: 0x7f0c00d3 - public const int right_side = 2131493075; + public const int right_icon = 2131493075; + + // aapt resource value: 0x7f0c00cf + public const int right_side = 2131493071; // aapt resource value: 0x7f0c0022 public const int screen = 2131492898; @@ -3885,8 +3790,8 @@ namespace Bit.Android // aapt resource value: 0x7f0c001f public const int showTitle = 2131492895; - // aapt resource value: 0x7f0c00de - public const int sliding_tabs = 2131493086; + // aapt resource value: 0x7f0c00da + public const int sliding_tabs = 2131493082; // aapt resource value: 0x7f0c007c public const int smallLabel = 2131492988; @@ -3921,8 +3826,8 @@ namespace Bit.Android // aapt resource value: 0x7f0c003d public const int start = 2131492925; - // aapt resource value: 0x7f0c00ce - public const int status_bar_latest_event_content = 2131493070; + // aapt resource value: 0x7f0c00ca + public const int status_bar_latest_event_content = 2131493066; // aapt resource value: 0x7f0c0065 public const int submenuarrow = 2131492965; @@ -3945,9 +3850,6 @@ namespace Bit.Android // aapt resource value: 0x7f0c0058 public const int textSpacerNoTitle = 2131492952; - // aapt resource value: 0x7f0c00ac - public const int textViewStatus = 2131493036; - // aapt resource value: 0x7f0c009f public const int text_headline = 2131493023; @@ -3960,8 +3862,8 @@ namespace Bit.Android // aapt resource value: 0x7f0c000d public const int textinput_error = 2131492877; - // aapt resource value: 0x7f0c00d4 - public const int time = 2131493076; + // aapt resource value: 0x7f0c00d0 + public const int time = 2131493072; // aapt resource value: 0x7f0c0051 public const int title = 2131492945; @@ -3972,8 +3874,8 @@ namespace Bit.Android // aapt resource value: 0x7f0c005e public const int title_template = 2131492958; - // aapt resource value: 0x7f0c00df - public const int toolbar = 2131493087; + // aapt resource value: 0x7f0c00db + public const int toolbar = 2131493083; // aapt resource value: 0x7f0c0031 public const int top = 2131492913; @@ -4002,11 +3904,11 @@ namespace Bit.Android // aapt resource value: 0x7f0c000e public const int view_offset_helper = 2131492878; - // aapt resource value: 0x7f0c00e1 - public const int visible = 2131493089; + // aapt resource value: 0x7f0c00dd + public const int visible = 2131493085; - // aapt resource value: 0x7f0c00c1 - public const int volume_item_container = 2131493057; + // aapt resource value: 0x7f0c00bd + public const int volume_item_container = 2131493053; // aapt resource value: 0x7f0c00a6 public const int web_update_details = 2131493030; @@ -4264,100 +4166,91 @@ namespace Bit.Android public const int hockeyapp_view_feedback_message = 2130903087; // aapt resource value: 0x7f030030 - public const int loading = 2130903088; + public const int mr_chooser_dialog = 2130903088; // aapt resource value: 0x7f030031 - public const int loadingimage = 2130903089; + public const int mr_chooser_list_item = 2130903089; // aapt resource value: 0x7f030032 - public const int loadingprogress = 2130903090; + public const int mr_controller_material_dialog_b = 2130903090; // aapt resource value: 0x7f030033 - public const int mr_chooser_dialog = 2130903091; + public const int mr_controller_volume_item = 2130903091; // aapt resource value: 0x7f030034 - public const int mr_chooser_list_item = 2130903092; + public const int mr_playback_control = 2130903092; // aapt resource value: 0x7f030035 - public const int mr_controller_material_dialog_b = 2130903093; + public const int mr_volume_control = 2130903093; // aapt resource value: 0x7f030036 - public const int mr_controller_volume_item = 2130903094; + public const int notification_action = 2130903094; // aapt resource value: 0x7f030037 - public const int mr_playback_control = 2130903095; + public const int notification_action_tombstone = 2130903095; // aapt resource value: 0x7f030038 - public const int mr_volume_control = 2130903096; + public const int notification_media_action = 2130903096; // aapt resource value: 0x7f030039 - public const int notification_action = 2130903097; + public const int notification_media_cancel_action = 2130903097; // aapt resource value: 0x7f03003a - public const int notification_action_tombstone = 2130903098; + public const int notification_template_big_media = 2130903098; // aapt resource value: 0x7f03003b - public const int notification_media_action = 2130903099; + public const int notification_template_big_media_custom = 2130903099; // aapt resource value: 0x7f03003c - public const int notification_media_cancel_action = 2130903100; + public const int notification_template_big_media_narrow = 2130903100; // aapt resource value: 0x7f03003d - public const int notification_template_big_media = 2130903101; + public const int notification_template_big_media_narrow_custom = 2130903101; // aapt resource value: 0x7f03003e - public const int notification_template_big_media_custom = 2130903102; + public const int notification_template_custom_big = 2130903102; // aapt resource value: 0x7f03003f - public const int notification_template_big_media_narrow = 2130903103; + public const int notification_template_icon_group = 2130903103; // aapt resource value: 0x7f030040 - public const int notification_template_big_media_narrow_custom = 2130903104; + public const int notification_template_lines_media = 2130903104; // aapt resource value: 0x7f030041 - public const int notification_template_custom_big = 2130903105; + public const int notification_template_media = 2130903105; // aapt resource value: 0x7f030042 - public const int notification_template_icon_group = 2130903106; + public const int notification_template_media_custom = 2130903106; // aapt resource value: 0x7f030043 - public const int notification_template_lines_media = 2130903107; + public const int notification_template_part_chronometer = 2130903107; // aapt resource value: 0x7f030044 - public const int notification_template_media = 2130903108; + public const int notification_template_part_time = 2130903108; // aapt resource value: 0x7f030045 - public const int notification_template_media_custom = 2130903109; + public const int select_dialog_item_material = 2130903109; // aapt resource value: 0x7f030046 - public const int notification_template_part_chronometer = 2130903110; + public const int select_dialog_multichoice_material = 2130903110; // aapt resource value: 0x7f030047 - public const int notification_template_part_time = 2130903111; + public const int select_dialog_singlechoice_material = 2130903111; // aapt resource value: 0x7f030048 - public const int select_dialog_item_material = 2130903112; + public const int support_simple_spinner_dropdown_item = 2130903112; // aapt resource value: 0x7f030049 - public const int select_dialog_multichoice_material = 2130903113; + public const int tabs = 2130903113; // aapt resource value: 0x7f03004a - public const int select_dialog_singlechoice_material = 2130903114; + public const int toolbar = 2130903114; // aapt resource value: 0x7f03004b - public const int support_simple_spinner_dropdown_item = 2130903115; + public const int zxingscanneractivitylayout = 2130903115; // aapt resource value: 0x7f03004c - public const int tabs = 2130903116; - - // aapt resource value: 0x7f03004d - public const int toolbar = 2130903117; - - // aapt resource value: 0x7f03004e - public const int zxingscanneractivitylayout = 2130903118; - - // aapt resource value: 0x7f03004f - public const int zxingscannerfragmentlayout = 2130903119; + public const int zxingscannerfragmentlayout = 2130903116; static Layout() { @@ -4375,17 +4268,17 @@ namespace Bit.Android // aapt resource value: 0x7f090051 public const int ApplicationName = 2131296337; - // aapt resource value: 0x7f0900ab - public const int AutoFillServiceDescription = 2131296427; + // aapt resource value: 0x7f0900b2 + public const int AutoFillServiceDescription = 2131296434; - // aapt resource value: 0x7f0900aa - public const int AutoFillServiceSummary = 2131296426; + // aapt resource value: 0x7f0900b1 + public const int AutoFillServiceSummary = 2131296433; // aapt resource value: 0x7f090050 public const int Hello = 2131296336; - // aapt resource value: 0x7f0900ac - public const int MyVault = 2131296428; + // aapt resource value: 0x7f0900b3 + public const int MyVault = 2131296435; // aapt resource value: 0x7f090027 public const int abc_action_bar_home_description = 2131296295; @@ -4540,6 +4433,27 @@ namespace Bit.Android // aapt resource value: 0x7f09000f public const int common_signin_button_text_long = 2131296271; + // aapt resource value: 0x7f0900ac + public const int default_web_client_id = 2131296428; + + // aapt resource value: 0x7f0900ad + public const int firebase_database_url = 2131296429; + + // aapt resource value: 0x7f0900aa + public const int gcm_defaultSenderId = 2131296426; + + // aapt resource value: 0x7f0900ae + public const int google_api_key = 2131296430; + + // aapt resource value: 0x7f0900ab + public const int google_app_id = 2131296427; + + // aapt resource value: 0x7f0900af + public const int google_crash_reporting_api_key = 2131296431; + + // aapt resource value: 0x7f0900b0 + public const int google_storage_bucket = 2131296432; + // aapt resource value: 0x7f090052 public const int hockeyapp_crash_dialog_app_name_fallback = 2131296338; @@ -7546,56 +7460,6 @@ namespace Bit.Android // aapt resource value: 0 public const int PopupWindowBackgroundState_state_above_anchor = 0; - public static int[] ProgressWheel = new int[] { - 2130772315, - 2130772316, - 2130772317, - 2130772318, - 2130772319, - 2130772320, - 2130772321, - 2130772322, - 2130772323, - 2130772324, - 2130772325, - 2130772326}; - - // aapt resource value: 3 - public const int ProgressWheel_ahBarColor = 3; - - // aapt resource value: 11 - public const int ProgressWheel_ahBarLength = 11; - - // aapt resource value: 10 - public const int ProgressWheel_ahBarWidth = 10; - - // aapt resource value: 8 - public const int ProgressWheel_ahCircleColor = 8; - - // aapt resource value: 7 - public const int ProgressWheel_ahDelayMillis = 7; - - // aapt resource value: 9 - public const int ProgressWheel_ahRadius = 9; - - // aapt resource value: 4 - public const int ProgressWheel_ahRimColor = 4; - - // aapt resource value: 5 - public const int ProgressWheel_ahRimWidth = 5; - - // aapt resource value: 6 - public const int ProgressWheel_ahSpinSpeed = 6; - - // aapt resource value: 0 - public const int ProgressWheel_ahText = 0; - - // aapt resource value: 1 - public const int ProgressWheel_ahTextColor = 1; - - // aapt resource value: 2 - public const int ProgressWheel_ahTextSize = 2; - public static int[] RecycleListView = new int[] { 2130772185, 2130772186}; diff --git a/src/Android/Services/DeviceActionService.cs b/src/Android/Services/DeviceActionService.cs index d473bcfe3..fe329a116 100644 --- a/src/Android/Services/DeviceActionService.cs +++ b/src/Android/Services/DeviceActionService.cs @@ -32,6 +32,7 @@ namespace Bit.Android.Services private readonly IAppSettingsService _appSettingsService; private bool _cameraPermissionsDenied; private DateTime? _lastAction; + private ProgressDialog _progressDialog; public DeviceActionService( IAppSettingsService appSettingsService) @@ -419,5 +420,31 @@ namespace Bit.Android.Services intent.SetData(global::Android.Net.Uri.Parse("package:com.x8bit.bitwarden")); activity.StartActivity(intent); } + + public void ShowLoading(string text) + { + if(_progressDialog != null) + { + HideLoading(); + } + + var activity = (MainActivity)CurrentContext; + _progressDialog = new ProgressDialog(activity); + _progressDialog.SetMessage(text); + _progressDialog.SetCancelable(true); + _progressDialog.Show(); + } + + public void HideLoading() + { + if(_progressDialog == null) + { + return; + } + + _progressDialog.Dismiss(); + _progressDialog.Dispose(); + _progressDialog = null; + } } } diff --git a/src/App/Abstractions/Services/IDeviceActionService.cs b/src/App/Abstractions/Services/IDeviceActionService.cs index ea44b66f4..65c1f7786 100644 --- a/src/App/Abstractions/Services/IDeviceActionService.cs +++ b/src/App/Abstractions/Services/IDeviceActionService.cs @@ -6,6 +6,8 @@ namespace Bit.App.Abstractions { public interface IDeviceActionService { + void ShowLoading(string text); + void HideLoading(); void Toast(string text, bool longDuration = false); void CopyToClipboard(string text); bool OpenFile(byte[] fileData, string id, string fileName); diff --git a/src/App/App.csproj b/src/App/App.csproj index 55cabb9ac..5bd9bb935 100644 --- a/src/App/App.csproj +++ b/src/App/App.csproj @@ -16,7 +16,6 @@ - diff --git a/src/App/Pages/EnvironmentPage.cs b/src/App/Pages/EnvironmentPage.cs index 9a6bb0d44..1db08c0dc 100644 --- a/src/App/Pages/EnvironmentPage.cs +++ b/src/App/Pages/EnvironmentPage.cs @@ -5,7 +5,6 @@ using Bit.App.Resources; using Bit.App.Utilities; using Xamarin.Forms; using XLabs.Ioc; -using Acr.UserDialogs; using System.Threading.Tasks; namespace Bit.App.Pages diff --git a/src/App/Pages/HomePage.cs b/src/App/Pages/HomePage.cs index b16d788a7..d39f0925c 100644 --- a/src/App/Pages/HomePage.cs +++ b/src/App/Pages/HomePage.cs @@ -1,6 +1,5 @@ using System; using System.Threading.Tasks; -using Acr.UserDialogs; using Bit.App.Abstractions; using Bit.App.Resources; using Xamarin.Forms; diff --git a/src/App/Pages/Lock/BaseLockPage.cs b/src/App/Pages/Lock/BaseLockPage.cs index 137b4c826..0dcbbc35f 100644 --- a/src/App/Pages/Lock/BaseLockPage.cs +++ b/src/App/Pages/Lock/BaseLockPage.cs @@ -1,8 +1,6 @@ using System.Threading.Tasks; -using Acr.UserDialogs; using Bit.App.Controls; using Bit.App.Resources; -using Xamarin.Forms; using XLabs.Ioc; using Bit.App.Abstractions; diff --git a/src/App/Pages/LoginPage.cs b/src/App/Pages/LoginPage.cs index 89530833a..db9666a93 100644 --- a/src/App/Pages/LoginPage.cs +++ b/src/App/Pages/LoginPage.cs @@ -4,7 +4,6 @@ using Bit.App.Controls; using Bit.App.Resources; using Xamarin.Forms; using XLabs.Ioc; -using Acr.UserDialogs; using System.Threading.Tasks; using Plugin.Settings.Abstractions; using Bit.App.Utilities; @@ -14,8 +13,8 @@ namespace Bit.App.Pages public class LoginPage : ExtendedContentPage { private IAuthService _authService; - private IUserDialogs _userDialogs; private ISyncService _syncService; + private IDeviceActionService _deviceActionService; private ISettings _settings; private IGoogleAnalyticsService _googleAnalyticsService; private IPushNotificationService _pushNotification; @@ -26,8 +25,8 @@ namespace Bit.App.Pages { _email = email; _authService = Resolver.Resolve(); - _userDialogs = Resolver.Resolve(); _syncService = Resolver.Resolve(); + _deviceActionService = Resolver.Resolve(); _settings = Resolver.Resolve(); _googleAnalyticsService = Resolver.Resolve(); _pushNotification = Resolver.Resolve(); @@ -179,9 +178,10 @@ namespace Bit.App.Pages return; } - _userDialogs.ShowLoading(AppResources.LoggingIn, MaskType.Black); + _deviceActionService.ShowLoading(AppResources.LoggingIn); var result = await _authService.TokenPostAsync(EmailCell.Entry.Text, PasswordCell.Entry.Text); - _userDialogs.HideLoading(); + _deviceActionService.HideLoading(); + if(!result.Success) { await DisplayAlert(AppResources.AnErrorHasOccurred, result.ErrorMessage, AppResources.Ok); diff --git a/src/App/Pages/LoginTwoFactorPage.cs b/src/App/Pages/LoginTwoFactorPage.cs index 7a9ff24be..e8787e4f6 100644 --- a/src/App/Pages/LoginTwoFactorPage.cs +++ b/src/App/Pages/LoginTwoFactorPage.cs @@ -4,7 +4,6 @@ using Bit.App.Controls; using Bit.App.Resources; using Xamarin.Forms; using XLabs.Ioc; -using Acr.UserDialogs; using System.Threading.Tasks; using Bit.App.Models; using Bit.App.Utilities; @@ -19,7 +18,6 @@ namespace Bit.App.Pages { private DateTime? _lastAction; private IAuthService _authService; - private IUserDialogs _userDialogs; private ISyncService _syncService; private IDeviceInfoService _deviceInfoService; private IDeviceActionService _deviceActionService; @@ -48,7 +46,6 @@ namespace Bit.App.Pages _deviceActionService = Resolver.Resolve(); _authService = Resolver.Resolve(); - _userDialogs = Resolver.Resolve(); _syncService = Resolver.Resolve(); _appSettingsService = Resolver.Resolve(); _googleAnalyticsService = Resolver.Resolve(); @@ -402,10 +399,10 @@ namespace Bit.App.Pages return; } - _userDialogs.ShowLoading(string.Concat(AppResources.Validating, "..."), MaskType.Black); + _deviceActionService.ShowLoading(string.Concat(AppResources.Validating, "...")); var response = await _authService.TokenPostTwoFactorAsync(_providerType.Value, token, RememberCell.On, _email, _masterPasswordHash, _key); - _userDialogs.HideLoading(); + _deviceActionService.HideLoading(); if(!response.Success) { diff --git a/src/App/Pages/MainPage.cs b/src/App/Pages/MainPage.cs index 1d914f8e1..a1d74552d 100644 --- a/src/App/Pages/MainPage.cs +++ b/src/App/Pages/MainPage.cs @@ -1,8 +1,6 @@ using System; using Bit.App.Controls; using Xamarin.Forms; -using XLabs.Ioc; -using Bit.App.Abstractions; namespace Bit.App.Pages { diff --git a/src/App/Pages/PasswordHintPage.cs b/src/App/Pages/PasswordHintPage.cs index 6f2642dc5..9b7ee38dd 100644 --- a/src/App/Pages/PasswordHintPage.cs +++ b/src/App/Pages/PasswordHintPage.cs @@ -6,7 +6,6 @@ using Bit.App.Models.Api; using Bit.App.Resources; using Xamarin.Forms; using XLabs.Ioc; -using Acr.UserDialogs; using System.Threading.Tasks; using Bit.App.Utilities; @@ -14,15 +13,14 @@ namespace Bit.App.Pages { public class PasswordHintPage : ExtendedContentPage { - private IUserDialogs _userDialogs; private IAccountsApiRepository _accountApiRepository; + private IDeviceActionService _deviceActionService; public PasswordHintPage() : base(updateActivity: false) { - _userDialogs = Resolver.Resolve(); _accountApiRepository = Resolver.Resolve(); - + _deviceActionService = Resolver.Resolve(); Init(); } @@ -124,9 +122,9 @@ namespace Bit.App.Pages Email = EmailCell.Entry.Text }; - _userDialogs.ShowLoading(AppResources.Submitting, MaskType.Black); + _deviceActionService.ShowLoading(AppResources.Submitting); var response = await _accountApiRepository.PostPasswordHintAsync(request); - _userDialogs.HideLoading(); + _deviceActionService.HideLoading(); if(!response.Succeeded) { diff --git a/src/App/Pages/RegisterPage.cs b/src/App/Pages/RegisterPage.cs index b333763ac..a56df15c6 100644 --- a/src/App/Pages/RegisterPage.cs +++ b/src/App/Pages/RegisterPage.cs @@ -6,7 +6,6 @@ using Bit.App.Models.Api; using Bit.App.Resources; using Xamarin.Forms; using XLabs.Ioc; -using Acr.UserDialogs; using System.Threading.Tasks; using Bit.App.Utilities; @@ -15,7 +14,7 @@ namespace Bit.App.Pages public class RegisterPage : ExtendedContentPage { private ICryptoService _cryptoService; - private IUserDialogs _userDialogs; + private IDeviceActionService _deviceActionService; private IAccountsApiRepository _accountsApiRepository; private IGoogleAnalyticsService _googleAnalyticsService; private HomePage _homePage; @@ -25,7 +24,7 @@ namespace Bit.App.Pages { _homePage = homePage; _cryptoService = Resolver.Resolve(); - _userDialogs = Resolver.Resolve(); + _deviceActionService = Resolver.Resolve(); _accountsApiRepository = Resolver.Resolve(); _googleAnalyticsService = Resolver.Resolve(); @@ -213,9 +212,9 @@ namespace Bit.App.Pages Key = encKey.EncryptedString }; - _userDialogs.ShowLoading(AppResources.CreatingAccount, MaskType.Black); + _deviceActionService.ShowLoading(AppResources.CreatingAccount); var response = await _accountsApiRepository.PostRegisterAsync(request); - _userDialogs.HideLoading(); + _deviceActionService.HideLoading(); if(!response.Succeeded) { diff --git a/src/App/Pages/Settings/SettingsAddFolderPage.cs b/src/App/Pages/Settings/SettingsAddFolderPage.cs index b9fc700a0..567607856 100644 --- a/src/App/Pages/Settings/SettingsAddFolderPage.cs +++ b/src/App/Pages/Settings/SettingsAddFolderPage.cs @@ -1,5 +1,4 @@ using System; -using Acr.UserDialogs; using Bit.App.Abstractions; using Bit.App.Controls; using Bit.App.Models; @@ -15,7 +14,6 @@ namespace Bit.App.Pages public class SettingsAddFolderPage : ExtendedContentPage { private readonly IFolderService _folderService; - private readonly IUserDialogs _userDialogs; private readonly IDeviceActionService _deviceActionService; private readonly IConnectivity _connectivity; private readonly IGoogleAnalyticsService _googleAnalyticsService; @@ -24,7 +22,6 @@ namespace Bit.App.Pages public SettingsAddFolderPage() { _folderService = Resolver.Resolve(); - _userDialogs = Resolver.Resolve(); _deviceActionService = Resolver.Resolve(); _connectivity = Resolver.Resolve(); _googleAnalyticsService = Resolver.Resolve(); @@ -84,9 +81,9 @@ namespace Bit.App.Pages Name = NameCell.Entry.Text.Encrypt() }; - _userDialogs.ShowLoading(AppResources.Saving, MaskType.Black); + _deviceActionService.ShowLoading(AppResources.Saving); var saveResult = await _folderService.SaveAsync(folder); - _userDialogs.HideLoading(); + _deviceActionService.HideLoading(); if(saveResult.Succeeded) { diff --git a/src/App/Pages/Settings/SettingsEditFolderPage.cs b/src/App/Pages/Settings/SettingsEditFolderPage.cs index 35d411dee..01446e61d 100644 --- a/src/App/Pages/Settings/SettingsEditFolderPage.cs +++ b/src/App/Pages/Settings/SettingsEditFolderPage.cs @@ -1,5 +1,4 @@ using System; -using Acr.UserDialogs; using Bit.App.Abstractions; using Bit.App.Controls; using Bit.App.Resources; @@ -15,7 +14,6 @@ namespace Bit.App.Pages { private readonly string _folderId; private readonly IFolderService _folderService; - private readonly IUserDialogs _userDialogs; private readonly IDeviceActionService _deviceActionService; private readonly IConnectivity _connectivity; private readonly IGoogleAnalyticsService _googleAnalyticsService; @@ -25,7 +23,6 @@ namespace Bit.App.Pages { _folderId = folderId; _folderService = Resolver.Resolve(); - _userDialogs = Resolver.Resolve(); _deviceActionService = Resolver.Resolve(); _connectivity = Resolver.Resolve(); _googleAnalyticsService = Resolver.Resolve(); @@ -98,9 +95,9 @@ namespace Bit.App.Pages folder.Name = NameCell.Entry.Text.Encrypt(); - _userDialogs.ShowLoading(AppResources.Saving, MaskType.Black); + _deviceActionService.ShowLoading(AppResources.Saving); var saveResult = await _folderService.SaveAsync(folder); - _userDialogs.HideLoading(); + _deviceActionService.HideLoading(); if(saveResult.Succeeded) { @@ -162,9 +159,9 @@ namespace Bit.App.Pages return; } - _userDialogs.ShowLoading(AppResources.Deleting, MaskType.Black); + _deviceActionService.ShowLoading(AppResources.Deleting); var deleteTask = await _folderService.DeleteAsync(_folderId); - _userDialogs.HideLoading(); + _deviceActionService.HideLoading(); if(deleteTask.Succeeded) { diff --git a/src/App/Pages/Settings/SettingsPage.cs b/src/App/Pages/Settings/SettingsPage.cs index f41f2eb9d..85b2b8aba 100644 --- a/src/App/Pages/Settings/SettingsPage.cs +++ b/src/App/Pages/Settings/SettingsPage.cs @@ -4,7 +4,6 @@ using Bit.App.Resources; using Xamarin.Forms; using XLabs.Ioc; using Bit.App.Controls; -using Acr.UserDialogs; using Plugin.Settings.Abstractions; using Plugin.Fingerprint.Abstractions; using Bit.App.Utilities; diff --git a/src/App/Pages/Settings/SettingsSyncPage.cs b/src/App/Pages/Settings/SettingsSyncPage.cs index f8ffb71d5..392387111 100644 --- a/src/App/Pages/Settings/SettingsSyncPage.cs +++ b/src/App/Pages/Settings/SettingsSyncPage.cs @@ -1,6 +1,5 @@ using System; using System.Threading.Tasks; -using Acr.UserDialogs; using Bit.App.Abstractions; using Bit.App.Controls; using Bit.App.Resources; @@ -14,7 +13,6 @@ namespace Bit.App.Pages public class SettingsSyncPage : ExtendedContentPage { private readonly ISyncService _syncService; - private readonly IUserDialogs _userDialogs; private readonly IDeviceActionService _deviceActionService; private readonly IConnectivity _connectivity; private readonly ISettings _settings; @@ -23,7 +21,6 @@ namespace Bit.App.Pages public SettingsSyncPage() { _syncService = Resolver.Resolve(); - _userDialogs = Resolver.Resolve(); _deviceActionService = Resolver.Resolve(); _connectivity = Resolver.Resolve(); _settings = Resolver.Resolve(); @@ -104,9 +101,9 @@ namespace Bit.App.Pages return; } - _userDialogs.ShowLoading(AppResources.Syncing, MaskType.Black); + _deviceActionService.ShowLoading(AppResources.Syncing); var succeeded = await _syncService.FullSyncAsync(true); - _userDialogs.HideLoading(); + _deviceActionService.HideLoading(); if(succeeded) { _deviceActionService.Toast(AppResources.SyncingComplete); diff --git a/src/App/Pages/Tools/ToolsExtensionPage.cs b/src/App/Pages/Tools/ToolsExtensionPage.cs index a46a1f703..87cdbbff7 100644 --- a/src/App/Pages/Tools/ToolsExtensionPage.cs +++ b/src/App/Pages/Tools/ToolsExtensionPage.cs @@ -1,6 +1,4 @@ using System; -using System.Threading.Tasks; -using Acr.UserDialogs; using Bit.App.Controls; using Bit.App.Models.Page; using Plugin.Settings.Abstractions; diff --git a/src/App/Pages/Tools/ToolsPasswordGeneratorPage.cs b/src/App/Pages/Tools/ToolsPasswordGeneratorPage.cs index 12a76a8ed..a9d2add89 100644 --- a/src/App/Pages/Tools/ToolsPasswordGeneratorPage.cs +++ b/src/App/Pages/Tools/ToolsPasswordGeneratorPage.cs @@ -1,5 +1,4 @@ using System; -using Acr.UserDialogs; using Bit.App.Abstractions; using Bit.App.Controls; using Bit.App.Models.Page; diff --git a/src/App/Pages/Vault/VaultAddCipherPage.cs b/src/App/Pages/Vault/VaultAddCipherPage.cs index f021333c0..843055ae4 100644 --- a/src/App/Pages/Vault/VaultAddCipherPage.cs +++ b/src/App/Pages/Vault/VaultAddCipherPage.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using Acr.UserDialogs; using Bit.App.Abstractions; using Bit.App.Controls; using Bit.App.Models; @@ -12,7 +11,6 @@ using XLabs.Ioc; using Plugin.Settings.Abstractions; using Bit.App.Utilities; using Bit.App.Enums; -using Bit.App.Models.Page; namespace Bit.App.Pages { @@ -23,7 +21,6 @@ namespace Bit.App.Pages private readonly CipherType _type; private readonly ICipherService _cipherService; private readonly IFolderService _folderService; - private readonly IUserDialogs _userDialogs; private readonly IConnectivity _connectivity; private readonly IGoogleAnalyticsService _googleAnalyticsService; private readonly ISettings _settings; @@ -72,7 +69,6 @@ namespace Bit.App.Pages _cipherService = Resolver.Resolve(); _folderService = Resolver.Resolve(); - _userDialogs = Resolver.Resolve(); _connectivity = Resolver.Resolve(); _googleAnalyticsService = Resolver.Resolve(); _settings = Resolver.Resolve(); @@ -744,9 +740,9 @@ namespace Bit.App.Pages cipher.FolderId = Folders.ElementAt(FolderCell.Picker.SelectedIndex - 1).Id; } - _userDialogs.ShowLoading(AppResources.Saving, MaskType.Black); + _deviceActionService.ShowLoading(AppResources.Saving); var saveTask = await _cipherService.SaveAsync(cipher); - _userDialogs.HideLoading(); + _deviceActionService.HideLoading(); if(saveTask.Succeeded) { diff --git a/src/App/Pages/Vault/VaultAttachmentsPage.cs b/src/App/Pages/Vault/VaultAttachmentsPage.cs index 943e6c97d..f09c3b3e1 100644 --- a/src/App/Pages/Vault/VaultAttachmentsPage.cs +++ b/src/App/Pages/Vault/VaultAttachmentsPage.cs @@ -1,6 +1,5 @@ using System; using System.Linq; -using Acr.UserDialogs; using Bit.App.Abstractions; using Bit.App.Controls; using Bit.App.Models.Page; @@ -17,7 +16,6 @@ namespace Bit.App.Pages public class VaultAttachmentsPage : ExtendedContentPage { private readonly ICipherService _cipherService; - private readonly IUserDialogs _userDialogs; private readonly IConnectivity _connectivity; private readonly IDeviceActionService _deviceActionService; private readonly IGoogleAnalyticsService _googleAnalyticsService; @@ -35,7 +33,6 @@ namespace Bit.App.Pages _cipherId = cipherId; _cipherService = Resolver.Resolve(); _connectivity = Resolver.Resolve(); - _userDialogs = Resolver.Resolve(); _deviceActionService = Resolver.Resolve(); _googleAnalyticsService = Resolver.Resolve(); _tokenService = Resolver.Resolve(); @@ -160,9 +157,9 @@ namespace Bit.App.Pages return; } - _userDialogs.ShowLoading(AppResources.Saving, MaskType.Black); + _deviceActionService.ShowLoading(AppResources.Saving); var saveTask = await _cipherService.EncryptAndSaveAttachmentAsync(_cipher, _fileBytes, FileLabel.Text); - _userDialogs.HideLoading(); + _deviceActionService.HideLoading(); if(saveTask.Succeeded) { @@ -267,9 +264,9 @@ namespace Bit.App.Pages return; } - _userDialogs.ShowLoading(AppResources.Deleting, MaskType.Black); + _deviceActionService.ShowLoading(AppResources.Deleting); var saveTask = await _cipherService.DeleteAttachmentAsync(_cipher, attachment.Id); - _userDialogs.HideLoading(); + _deviceActionService.HideLoading(); if(saveTask.Succeeded) { diff --git a/src/App/Pages/Vault/VaultCustomFieldsPage.cs b/src/App/Pages/Vault/VaultCustomFieldsPage.cs index 505da90c0..abfc55f71 100644 --- a/src/App/Pages/Vault/VaultCustomFieldsPage.cs +++ b/src/App/Pages/Vault/VaultCustomFieldsPage.cs @@ -1,6 +1,5 @@ using System; using System.Linq; -using Acr.UserDialogs; using Bit.App.Abstractions; using Bit.App.Controls; using Bit.App.Resources; @@ -17,7 +16,6 @@ namespace Bit.App.Pages public class VaultCustomFieldsPage : ExtendedContentPage { private readonly ICipherService _cipherService; - private readonly IUserDialogs _userDialogs; private readonly IDeviceActionService _deviceActionService; private readonly IConnectivity _connectivity; private readonly IGoogleAnalyticsService _googleAnalyticsService; @@ -31,7 +29,6 @@ namespace Bit.App.Pages _cipherId = cipherId; _cipherService = Resolver.Resolve(); _connectivity = Resolver.Resolve(); - _userDialogs = Resolver.Resolve(); _deviceActionService = Resolver.Resolve(); _googleAnalyticsService = Resolver.Resolve(); @@ -115,9 +112,9 @@ namespace Bit.App.Pages _cipher.Fields = null; } - _userDialogs.ShowLoading(AppResources.Saving, MaskType.Black); + _deviceActionService.ShowLoading(AppResources.Saving); var saveTask = await _cipherService.SaveAsync(_cipher); - _userDialogs.HideLoading(); + _deviceActionService.HideLoading(); if(saveTask.Succeeded) { diff --git a/src/App/Pages/Vault/VaultEditCipherPage.cs b/src/App/Pages/Vault/VaultEditCipherPage.cs index 75c903776..0c3ab6384 100644 --- a/src/App/Pages/Vault/VaultEditCipherPage.cs +++ b/src/App/Pages/Vault/VaultEditCipherPage.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using Acr.UserDialogs; using Bit.App.Abstractions; using Bit.App.Controls; using Bit.App.Resources; @@ -19,7 +18,6 @@ namespace Bit.App.Pages private readonly string _cipherId; private readonly ICipherService _cipherService; private readonly IFolderService _folderService; - private readonly IUserDialogs _userDialogs; private readonly IDeviceActionService _deviceActionService; private readonly IConnectivity _connectivity; private readonly IDeviceInfoService _deviceInfo; @@ -31,7 +29,6 @@ namespace Bit.App.Pages _cipherId = cipherId; _cipherService = Resolver.Resolve(); _folderService = Resolver.Resolve(); - _userDialogs = Resolver.Resolve(); _deviceActionService = Resolver.Resolve(); _connectivity = Resolver.Resolve(); _deviceInfo = Resolver.Resolve(); @@ -613,9 +610,9 @@ namespace Bit.App.Pages Cipher.FolderId = null; } - _userDialogs.ShowLoading(AppResources.Saving, MaskType.Black); + _deviceActionService.ShowLoading(AppResources.Saving); var saveTask = await _cipherService.SaveAsync(Cipher); - _userDialogs.HideLoading(); + _deviceActionService.HideLoading(); if(saveTask.Succeeded) { @@ -860,9 +857,9 @@ namespace Bit.App.Pages return; } - _userDialogs.ShowLoading(AppResources.Deleting, MaskType.Black); + _deviceActionService.ShowLoading(AppResources.Deleting); var deleteTask = await _cipherService.DeleteAsync(_cipherId); - _userDialogs.HideLoading(); + _deviceActionService.HideLoading(); if(deleteTask.Succeeded) { diff --git a/src/App/Pages/Vault/VaultViewCipherPage.cs b/src/App/Pages/Vault/VaultViewCipherPage.cs index f1286269e..a8db99f39 100644 --- a/src/App/Pages/Vault/VaultViewCipherPage.cs +++ b/src/App/Pages/Vault/VaultViewCipherPage.cs @@ -1,5 +1,4 @@ using System; -using Acr.UserDialogs; using Bit.App.Abstractions; using Bit.App.Controls; using Bit.App.Models.Page; @@ -20,7 +19,6 @@ namespace Bit.App.Pages private readonly CipherType _type; private readonly string _cipherId; private readonly ICipherService _cipherService; - private readonly IUserDialogs _userDialogs; private readonly IDeviceActionService _deviceActionService; private readonly ITokenService _tokenService; private bool _pageDisappeared = true; @@ -30,7 +28,6 @@ namespace Bit.App.Pages _type = type; _cipherId = cipherId; _cipherService = Resolver.Resolve(); - _userDialogs = Resolver.Resolve(); _deviceActionService = Resolver.Resolve(); _tokenService = Resolver.Resolve(); @@ -438,8 +435,8 @@ namespace Bit.App.Pages } // 10 MB warning - if(attachment.Size >= 10485760 && !(await _userDialogs.ConfirmAsync( - string.Format(AppResources.AttachmentLargeWarning, attachment.SizeName), null, + if(attachment.Size >= 10485760 && !(await DisplayAlert( + null, string.Format(AppResources.AttachmentLargeWarning, attachment.SizeName), AppResources.Yes, AppResources.No))) { return; @@ -451,9 +448,9 @@ namespace Bit.App.Pages return; } - _userDialogs.ShowLoading(AppResources.Downloading, MaskType.Black); + _deviceActionService.ShowLoading(AppResources.Downloading); var data = await _cipherService.DownloadAndDecryptAttachmentAsync(attachment.Url, cipher.OrganizationId); - _userDialogs.HideLoading(); + _deviceActionService.HideLoading(); if(data == null) { diff --git a/src/App/Services/AuthService.cs b/src/App/Services/AuthService.cs index 272165889..f0f547783 100644 --- a/src/App/Services/AuthService.cs +++ b/src/App/Services/AuthService.cs @@ -10,7 +10,6 @@ using Bit.App.Enums; using Xamarin.Forms; using Bit.App.Pages; using Bit.App.Controls; -using Acr.UserDialogs; using XLabs.Ioc; namespace Bit.App.Services diff --git a/src/App/Utilities/Helpers.cs b/src/App/Utilities/Helpers.cs index 40e0b502e..3b545217a 100644 --- a/src/App/Utilities/Helpers.cs +++ b/src/App/Utilities/Helpers.cs @@ -1,5 +1,4 @@ -using Acr.UserDialogs; -using Bit.App.Abstractions; +using Bit.App.Abstractions; using Bit.App.Enums; using Bit.App.Models.Page; using Bit.App.Pages; diff --git a/src/iOS/Services/DeviceActionService.cs b/src/iOS/Services/DeviceActionService.cs index c34fb0076..5e49ea8ba 100644 --- a/src/iOS/Services/DeviceActionService.cs +++ b/src/iOS/Services/DeviceActionService.cs @@ -11,6 +11,7 @@ using System.Net; using System.Threading.Tasks; using Bit.App.Models.Page; using Bit.iOS.Core.Views; +using CoreGraphics; namespace Bit.iOS.Services { @@ -18,6 +19,7 @@ namespace Bit.iOS.Services { private readonly IAppSettingsService _appSettingsService; private readonly IDeviceInfoService _deviceInfoService; + private UIAlertController _progressAlert; public DeviceActionService( IAppSettingsService appSettingsService, @@ -264,5 +266,43 @@ namespace Bit.iOS.Services { throw new NotImplementedException(); } + + public void ShowLoading(string text) + { + var loadingIndicator = new UIActivityIndicatorView(new CGRect(10, 5, 50, 50)); + loadingIndicator.HidesWhenStopped = true; + loadingIndicator.ActivityIndicatorViewStyle = UIActivityIndicatorViewStyle.Gray; + loadingIndicator.StartAnimating(); + + _progressAlert = UIAlertController.Create(null, text, UIAlertControllerStyle.Alert); + _progressAlert.View.TintColor = UIColor.Black; + _progressAlert.View.Add(loadingIndicator); + + var window = UIApplication.SharedApplication.KeyWindow; + var vc = window.RootViewController; + while(vc.PresentedViewController != null) + { + vc = vc.PresentedViewController; + } + vc.PresentViewController(_progressAlert, true, null); + } + + public void HideLoading() + { + if(_progressAlert == null) + { + return; + } + + _progressAlert.DismissViewController(true, () => { }); + _progressAlert.Dispose(); + _progressAlert = null; + + } + + public Task LaunchAppAsync(string appName, Page page) + { + throw new NotImplementedException(); + } } }