diff --git a/src/ST.Client.Android/ST.Client.Android.csproj b/src/ST.Client.Android/ST.Client.Android.csproj index 036092b3b..3ef8f8676 100644 --- a/src/ST.Client.Android/ST.Client.Android.csproj +++ b/src/ST.Client.Android/ST.Client.Android.csproj @@ -320,6 +320,9 @@ Resources\drawable\icon_xbox_24.xml + + Resources\drawable\ic_baseline_double_arrow_24.xml + Resources\drawable\mdi_rocket_black_24.xml @@ -344,675 +347,60 @@ Resources\drawable-hdpi\avatar_default.png - - Resources\drawable-hdpi\baseline_account_box_black_24.png - - - Resources\drawable-hdpi\baseline_add_black_24.png - - - Resources\drawable-hdpi\baseline_cake_black_24.png - - - Resources\drawable-hdpi\baseline_checklist_black_24.png - - - Resources\drawable-hdpi\baseline_check_black_24.png - - - Resources\drawable-hdpi\baseline_close_black_24.png - - - Resources\drawable-hdpi\baseline_cloud_download_black_24.png - - - Resources\drawable-hdpi\baseline_content_copy_black_24.png - - - Resources\drawable-hdpi\baseline_dark_mode_black_24.png - - - Resources\drawable-hdpi\baseline_description_black_24.png - - - Resources\drawable-hdpi\baseline_edit_black_24.png - - - Resources\drawable-hdpi\baseline_enhanced_encryption_black_24.png - - - Resources\drawable-hdpi\baseline_female_black_24.png - - - Resources\drawable-hdpi\baseline_folder_black_24.png - - - Resources\drawable-hdpi\baseline_info_black_24.png - - - Resources\drawable-hdpi\baseline_language_black_24.png - - - Resources\drawable-hdpi\baseline_location_on_black_24.png - - - Resources\drawable-hdpi\baseline_lock_open_black_24.png - - - Resources\drawable-hdpi\baseline_logout_black_24.png - - - Resources\drawable-hdpi\baseline_male_black_24.png - - - Resources\drawable-hdpi\baseline_more_horiz_black_24.png - - - Resources\drawable-hdpi\baseline_notifications_black_24.png - - - Resources\drawable-hdpi\baseline_person_black_24.png - - - Resources\drawable-hdpi\baseline_phone_android_black_24.png - - - Resources\drawable-hdpi\baseline_phone_black_24.png - - - Resources\drawable-hdpi\baseline_photo_black_48.png - - - Resources\drawable-hdpi\baseline_qr_code_2_black_48.png - - - Resources\drawable-hdpi\baseline_refresh_black_24.png - - - Resources\drawable-hdpi\baseline_save_alt_black_24.png - - - Resources\drawable-hdpi\baseline_save_black_24.png - - - Resources\drawable-hdpi\baseline_screenshot_black_24.png - - - Resources\drawable-hdpi\baseline_settings_applications_black_24.png - - - Resources\drawable-hdpi\baseline_settings_black_24.png - - - Resources\drawable-hdpi\baseline_sports_esports_black_24.png - - - Resources\drawable-hdpi\baseline_update_black_24.png - - - Resources\drawable-hdpi\baseline_verified_user_black_24.png - - - Resources\drawable-hdpi\baseline_visibility_off_black_24.png - Resources\drawable-hdpi\ic_stat_notify_msg.png Resources\drawable-hdpi\logo.png - - Resources\drawable-hdpi\outline_chevron_right_black_24.png - - - Resources\drawable-hdpi\round_open_in_browser_black_24.png - - - Resources\drawable-hdpi\round_pause_circle_outline_black_24.png - - - Resources\drawable-hdpi\round_play_circle_outline_black_24.png - Resources\drawable-hdpi\splash_logo.png Resources\drawable-mdpi\avatar_default.png - - Resources\drawable-mdpi\baseline_account_box_black_24.png - - - Resources\drawable-mdpi\baseline_add_black_24.png - - - Resources\drawable-mdpi\baseline_cake_black_24.png - - - Resources\drawable-mdpi\baseline_checklist_black_24.png - - - Resources\drawable-mdpi\baseline_check_black_24.png - - - Resources\drawable-mdpi\baseline_close_black_24.png - - - Resources\drawable-mdpi\baseline_cloud_download_black_24.png - - - Resources\drawable-mdpi\baseline_content_copy_black_24.png - - - Resources\drawable-mdpi\baseline_dark_mode_black_24.png - - - Resources\drawable-mdpi\baseline_description_black_24.png - - - Resources\drawable-mdpi\baseline_edit_black_24.png - - - Resources\drawable-mdpi\baseline_enhanced_encryption_black_24.png - - - Resources\drawable-mdpi\baseline_female_black_24.png - - - Resources\drawable-mdpi\baseline_folder_black_24.png - - - Resources\drawable-mdpi\baseline_info_black_24.png - - - Resources\drawable-mdpi\baseline_language_black_24.png - - - Resources\drawable-mdpi\baseline_location_on_black_24.png - - - Resources\drawable-mdpi\baseline_lock_open_black_24.png - - - Resources\drawable-mdpi\baseline_logout_black_24.png - - - Resources\drawable-mdpi\baseline_male_black_24.png - - - Resources\drawable-mdpi\baseline_more_horiz_black_24.png - - - Resources\drawable-mdpi\baseline_notifications_black_24.png - - - Resources\drawable-mdpi\baseline_person_black_24.png - - - Resources\drawable-mdpi\baseline_phone_android_black_24.png - - - Resources\drawable-mdpi\baseline_phone_black_24.png - - - Resources\drawable-mdpi\baseline_photo_black_48.png - - - Resources\drawable-mdpi\baseline_qr_code_2_black_48.png - - - Resources\drawable-mdpi\baseline_refresh_black_24.png - - - Resources\drawable-mdpi\baseline_save_alt_black_24.png - - - Resources\drawable-mdpi\baseline_save_black_24.png - - - Resources\drawable-mdpi\baseline_screenshot_black_24.png - - - Resources\drawable-mdpi\baseline_settings_applications_black_24.png - - - Resources\drawable-mdpi\baseline_settings_black_24.png - - - Resources\drawable-mdpi\baseline_sports_esports_black_24.png - - - Resources\drawable-mdpi\baseline_update_black_24.png - - - Resources\drawable-mdpi\baseline_verified_user_black_24.png - - - Resources\drawable-mdpi\baseline_visibility_off_black_24.png - Resources\drawable-mdpi\ic_stat_notify_msg.png Resources\drawable-mdpi\logo.png - - Resources\drawable-mdpi\outline_chevron_right_black_24.png - - - Resources\drawable-mdpi\round_open_in_browser_black_24.png - - - Resources\drawable-mdpi\round_pause_circle_outline_black_24.png - - - Resources\drawable-mdpi\round_play_circle_outline_black_24.png - Resources\drawable-mdpi\splash_logo.png Resources\drawable-xhdpi\avatar_default.png - - Resources\drawable-xhdpi\baseline_account_box_black_24.png - - - Resources\drawable-xhdpi\baseline_add_black_24.png - - - Resources\drawable-xhdpi\baseline_cake_black_24.png - - - Resources\drawable-xhdpi\baseline_checklist_black_24.png - - - Resources\drawable-xhdpi\baseline_check_black_24.png - - - Resources\drawable-xhdpi\baseline_close_black_24.png - - - Resources\drawable-xhdpi\baseline_cloud_download_black_24.png - - - Resources\drawable-xhdpi\baseline_content_copy_black_24.png - - - Resources\drawable-xhdpi\baseline_dark_mode_black_24.png - - - Resources\drawable-xhdpi\baseline_description_black_24.png - - - Resources\drawable-xhdpi\baseline_edit_black_24.png - - - Resources\drawable-xhdpi\baseline_enhanced_encryption_black_24.png - - - Resources\drawable-xhdpi\baseline_female_black_24.png - - - Resources\drawable-xhdpi\baseline_folder_black_24.png - - - Resources\drawable-xhdpi\baseline_info_black_24.png - - - Resources\drawable-xhdpi\baseline_language_black_24.png - - - Resources\drawable-xhdpi\baseline_location_on_black_24.png - - - Resources\drawable-xhdpi\baseline_lock_open_black_24.png - - - Resources\drawable-xhdpi\baseline_logout_black_24.png - - - Resources\drawable-xhdpi\baseline_male_black_24.png - - - Resources\drawable-xhdpi\baseline_more_horiz_black_24.png - - - Resources\drawable-xhdpi\baseline_notifications_black_24.png - - - Resources\drawable-xhdpi\baseline_person_black_24.png - - - Resources\drawable-xhdpi\baseline_phone_android_black_24.png - - - Resources\drawable-xhdpi\baseline_phone_black_24.png - - - Resources\drawable-xhdpi\baseline_photo_black_48.png - - - Resources\drawable-xhdpi\baseline_qr_code_2_black_48.png - - - Resources\drawable-xhdpi\baseline_refresh_black_24.png - - - Resources\drawable-xhdpi\baseline_save_alt_black_24.png - - - Resources\drawable-xhdpi\baseline_save_black_24.png - - - Resources\drawable-xhdpi\baseline_screenshot_black_24.png - - - Resources\drawable-xhdpi\baseline_settings_applications_black_24.png - - - Resources\drawable-xhdpi\baseline_settings_black_24.png - - - Resources\drawable-xhdpi\baseline_sports_esports_black_24.png - - - Resources\drawable-xhdpi\baseline_update_black_24.png - - - Resources\drawable-xhdpi\baseline_verified_user_black_24.png - - - Resources\drawable-xhdpi\baseline_visibility_off_black_24.png - Resources\drawable-xhdpi\ic_stat_notify_msg.png Resources\drawable-xhdpi\logo.png - - Resources\drawable-xhdpi\outline_chevron_right_black_24.png - - - Resources\drawable-xhdpi\round_open_in_browser_black_24.png - - - Resources\drawable-xhdpi\round_pause_circle_outline_black_24.png - - - Resources\drawable-xhdpi\round_play_circle_outline_black_24.png - Resources\drawable-xhdpi\splash_logo.png Resources\drawable-xxhdpi\avatar_default.png - - Resources\drawable-xxhdpi\baseline_account_box_black_24.png - - - Resources\drawable-xxhdpi\baseline_add_black_24.png - - - Resources\drawable-xxhdpi\baseline_cake_black_24.png - - - Resources\drawable-xxhdpi\baseline_checklist_black_24.png - - - Resources\drawable-xxhdpi\baseline_check_black_24.png - - - Resources\drawable-xxhdpi\baseline_close_black_24.png - - - Resources\drawable-xxhdpi\baseline_cloud_download_black_24.png - - - Resources\drawable-xxhdpi\baseline_content_copy_black_24.png - - - Resources\drawable-xxhdpi\baseline_dark_mode_black_24.png - - - Resources\drawable-xxhdpi\baseline_description_black_24.png - - - Resources\drawable-xxhdpi\baseline_edit_black_24.png - - - Resources\drawable-xxhdpi\baseline_enhanced_encryption_black_24.png - - - Resources\drawable-xxhdpi\baseline_female_black_24.png - - - Resources\drawable-xxhdpi\baseline_folder_black_24.png - - - Resources\drawable-xxhdpi\baseline_info_black_24.png - - - Resources\drawable-xxhdpi\baseline_language_black_24.png - - - Resources\drawable-xxhdpi\baseline_location_on_black_24.png - - - Resources\drawable-xxhdpi\baseline_lock_open_black_24.png - - - Resources\drawable-xxhdpi\baseline_logout_black_24.png - - - Resources\drawable-xxhdpi\baseline_male_black_24.png - - - Resources\drawable-xxhdpi\baseline_more_horiz_black_24.png - - - Resources\drawable-xxhdpi\baseline_notifications_black_24.png - - - Resources\drawable-xxhdpi\baseline_person_black_24.png - - - Resources\drawable-xxhdpi\baseline_phone_android_black_24.png - - - Resources\drawable-xxhdpi\baseline_phone_black_24.png - - - Resources\drawable-xxhdpi\baseline_photo_black_48.png - - - Resources\drawable-xxhdpi\baseline_qr_code_2_black_48.png - - - Resources\drawable-xxhdpi\baseline_refresh_black_24.png - - - Resources\drawable-xxhdpi\baseline_save_alt_black_24.png - - - Resources\drawable-xxhdpi\baseline_save_black_24.png - - - Resources\drawable-xxhdpi\baseline_screenshot_black_24.png - - - Resources\drawable-xxhdpi\baseline_settings_applications_black_24.png - - - Resources\drawable-xxhdpi\baseline_settings_black_24.png - - - Resources\drawable-xxhdpi\baseline_sports_esports_black_24.png - - - Resources\drawable-xxhdpi\baseline_update_black_24.png - - - Resources\drawable-xxhdpi\baseline_verified_user_black_24.png - - - Resources\drawable-xxhdpi\baseline_visibility_off_black_24.png - Resources\drawable-xxhdpi\ic_stat_notify_msg.png Resources\drawable-xxhdpi\logo.png - - Resources\drawable-xxhdpi\outline_chevron_right_black_24.png - - - Resources\drawable-xxhdpi\round_open_in_browser_black_24.png - - - Resources\drawable-xxhdpi\round_pause_circle_outline_black_24.png - - - Resources\drawable-xxhdpi\round_play_circle_outline_black_24.png - Resources\drawable-xxhdpi\splash_logo.png Resources\drawable-xxxhdpi\avatar_default.png - - Resources\drawable-xxxhdpi\baseline_account_box_black_24.png - - - Resources\drawable-xxxhdpi\baseline_add_black_24.png - - - Resources\drawable-xxxhdpi\baseline_cake_black_24.png - - - Resources\drawable-xxxhdpi\baseline_checklist_black_24.png - - - Resources\drawable-xxxhdpi\baseline_check_black_24.png - - - Resources\drawable-xxxhdpi\baseline_close_black_24.png - - - Resources\drawable-xxxhdpi\baseline_cloud_download_black_24.png - - - Resources\drawable-xxxhdpi\baseline_content_copy_black_24.png - - - Resources\drawable-xxxhdpi\baseline_dark_mode_black_24.png - - - Resources\drawable-xxxhdpi\baseline_description_black_24.png - - - Resources\drawable-xxxhdpi\baseline_edit_black_24.png - - - Resources\drawable-xxxhdpi\baseline_enhanced_encryption_black_24.png - - - Resources\drawable-xxxhdpi\baseline_female_black_24.png - - - Resources\drawable-xxxhdpi\baseline_folder_black_24.png - - - Resources\drawable-xxxhdpi\baseline_info_black_24.png - - - Resources\drawable-xxxhdpi\baseline_language_black_24.png - - - Resources\drawable-xxxhdpi\baseline_location_on_black_24.png - - - Resources\drawable-xxxhdpi\baseline_lock_open_black_24.png - - - Resources\drawable-xxxhdpi\baseline_logout_black_24.png - - - Resources\drawable-xxxhdpi\baseline_male_black_24.png - - - Resources\drawable-xxxhdpi\baseline_more_horiz_black_24.png - - - Resources\drawable-xxxhdpi\baseline_notifications_black_24.png - - - Resources\drawable-xxxhdpi\baseline_person_black_24.png - - - Resources\drawable-xxxhdpi\baseline_phone_android_black_24.png - - - Resources\drawable-xxxhdpi\baseline_phone_black_24.png - - - Resources\drawable-xxxhdpi\baseline_photo_black_48.png - - - Resources\drawable-xxxhdpi\baseline_qr_code_2_black_48.png - - - Resources\drawable-xxxhdpi\baseline_refresh_black_24.png - - - Resources\drawable-xxxhdpi\baseline_save_alt_black_24.png - - - Resources\drawable-xxxhdpi\baseline_save_black_24.png - - - Resources\drawable-xxxhdpi\baseline_screenshot_black_24.png - - - Resources\drawable-xxxhdpi\baseline_settings_applications_black_24.png - - - Resources\drawable-xxxhdpi\baseline_settings_black_24.png - - - Resources\drawable-xxxhdpi\baseline_sports_esports_black_24.png - - - Resources\drawable-xxxhdpi\baseline_update_black_24.png - - - Resources\drawable-xxxhdpi\baseline_verified_user_black_24.png - - - Resources\drawable-xxxhdpi\baseline_visibility_off_black_24.png - Resources\drawable-xxxhdpi\ic_stat_notify_msg.png Resources\drawable-xxxhdpi\logo.png - - Resources\drawable-xxxhdpi\outline_chevron_right_black_24.png - - - Resources\drawable-xxxhdpi\round_open_in_browser_black_24.png - - - Resources\drawable-xxxhdpi\round_pause_circle_outline_black_24.png - - - Resources\drawable-xxxhdpi\round_play_circle_outline_black_24.png - Resources\drawable-xxxhdpi\splash_logo.png @@ -1121,6 +509,12 @@ Resources\layout\fragment_settings.xml + + Resources\layout\layout_card_accelerate_project_group.xml + + + Resources\layout\layout_card_accelerate_project_group_content.xml + Resources\layout\layout_card_gap_authenticator.xml @@ -1280,3 +674,5 @@ + + diff --git a/src/ST.Client.Android/UI/Activities/LocalAuthPage/SteamAuthTradeActivity.cs b/src/ST.Client.Android/UI/Activities/LocalAuthPage/SteamAuthTradeActivity.cs index 56f65b587..91146705f 100644 --- a/src/ST.Client.Android/UI/Activities/LocalAuthPage/SteamAuthTradeActivity.cs +++ b/src/ST.Client.Android/UI/Activities/LocalAuthPage/SteamAuthTradeActivity.cs @@ -35,7 +35,7 @@ namespace System.Application.UI.Activities [Register(JavaPackageConstants.Activities + nameof(MockSteamAuthTradeActivity))] [Activity(Theme = ManifestConstants.MainTheme2_NoActionBar, LaunchMode = LaunchMode.SingleTask, - MainLauncher = true, + //MainLauncher = true, Label = "AuthTrade(Mock)", ConfigurationChanges = ManifestConstants.ConfigurationChanges)] internal sealed class MockSteamAuthTradeActivity : BaseSteamAuthTradeActivity diff --git a/src/ST.Client.Android/UI/Adapters/AccelerateProjectGroupAdapter.cs b/src/ST.Client.Android/UI/Adapters/AccelerateProjectGroupAdapter.cs new file mode 100644 index 000000000..ca905bbda --- /dev/null +++ b/src/ST.Client.Android/UI/Adapters/AccelerateProjectGroupAdapter.cs @@ -0,0 +1,58 @@ +using Android.Views; +using Binding; +using ReactiveUI; +using System.Application.UI.Resx; +using System.Application.UI.ViewModels; +using TViewHolder = System.Application.UI.Adapters.AccelerateProjectGroupViewHolder; +using TViewModel = System.Application.Models.AccelerateProjectGroupDTO; +using static System.Application.UI.Resx.AppResources; +using System.Application.Services; +using System.Collections.Generic; +using DynamicData; + +namespace System.Application.UI.Adapters +{ + internal sealed class AccelerateProjectGroupAdapter : BaseReactiveRecycleViewAdapter + { + public AccelerateProjectGroupAdapter() : this(ProxyService.Current) + { + + } + + public AccelerateProjectGroupAdapter(ProxyService proxyService) : base(proxyService.ProxyDomainsList, proxyService.ProxyDomains) + { + + } + + public AccelerateProjectGroupAdapter(IList viewModels, ISourceList sourceList) : base(viewModels, sourceList) + { + + } + + public override int? GetLayoutResource(int viewType) + { + return Resource.Layout.layout_card_accelerate_project_group; + } + } + + internal sealed class AccelerateProjectGroupViewHolder : BaseReactiveViewHolder + { + readonly layout_card_accelerate_project_group binding; + + public AccelerateProjectGroupViewHolder(View itemView) : base(itemView) + { + binding = new(itemView); + } + + public override void OnBind() + { + base.OnBind(); + + var imageUrl = ImageUrlHelper.GetImageApiUrlById(ViewModel!.ImageId); + binding.ivImage.SetImageSource(imageUrl); + binding.tvName.Text = ViewModel.Name; + ViewModel.WhenAnyValue(x => x.Enable) + .Subscribe(value => binding.checkbox.Checked = value).AddTo(this); + } + } +} diff --git a/src/ST.Client.Android/UI/Fragments/CommunityFixFragment.cs b/src/ST.Client.Android/UI/Fragments/CommunityFixFragment.cs index 70ee2b95d..55598e9ec 100644 --- a/src/ST.Client.Android/UI/Fragments/CommunityFixFragment.cs +++ b/src/ST.Client.Android/UI/Fragments/CommunityFixFragment.cs @@ -1,22 +1,46 @@ using Android.Runtime; using Android.Views; +using AndroidX.RecyclerView.Widget; using Binding; +using System.Application.Services; +using System.Application.UI.Adapters; using System.Application.UI.Resx; -using System.Properties; -using System.Windows; +using System.Application.UI.ViewModels; namespace System.Application.UI.Fragments { [Register(JavaPackageConstants.Fragments + nameof(CommunityFixFragment))] - internal sealed class CommunityFixFragment : BaseFragment + internal sealed class CommunityFixFragment : BaseFragment { protected override int? LayoutResource => Resource.Layout.fragment_community_fix; + protected sealed override CommunityProxyPageViewModel? OnCreateViewModel() + { + return IViewModelManager.Instance.GetMainPageViewModel(); + } + public override void OnCreateView(View view) { base.OnCreateView(view); - binding!.textView.Text = GetType().Name.TrimEnd("Fragment") + Environment.NewLine + AppResources.UnderConstruction; - binding!.textView.Gravity = GravityFlags.Center; + + R.Subscribe(() => + { + if (binding == null) return; + binding.btnStart.Text = AppResources.CommunityFix_Acceleration; + }).AddTo(this); + + var ctx = RequireContext(); + var adapter = new AccelerateProjectGroupAdapter(); + adapter.ItemClick += (_, e) => + { + e.Current.Enable = !e.Current.Enable; + }; + var layout = new LinearLayoutManager2(ctx, LinearLayoutManager.Vertical, false); + binding!.rvAccelerateProjectGroup.SetLayoutManager(layout); + binding.rvAccelerateProjectGroup.AddItemDecoration(VerticalItemDecoration2.Get(ctx, Resource.Dimension.activity_vertical_margin, Resource.Dimension.fab_height_with_margin_top_bottom)); + binding.rvAccelerateProjectGroup.SetAdapter(adapter); + + SetOnClickListener(binding.btnStart); } } } \ No newline at end of file diff --git a/src/ST.Client.Android/UI/ImageLoader.cs b/src/ST.Client.Android/UI/ImageLoader.cs index 9679b1bb4..3680a726e 100644 --- a/src/ST.Client.Android/UI/ImageLoader.cs +++ b/src/ST.Client.Android/UI/ImageLoader.cs @@ -8,6 +8,8 @@ using System.IO; using JFile = Java.IO.File; using AndroidApplication = Android.App.Application; using _ThisAssembly = System.Properties.ThisAssembly; +using Android.OS; +using Square.OkHttp3; namespace System.Application.UI { @@ -20,18 +22,10 @@ namespace System.Application.UI { Picasso.Builder picassoBuilder = new(AndroidApplication.Context); picassoBuilder.IndicatorsEnabled(_ThisAssembly.Debuggable); - static JFile CreateDefaultCacheDir() - { - var cachePath = IHttpService.GetImagesCacheDirectory(null); - JFile cache = new(cachePath); - if (!cache.Exists()) - { - //noinspection ResultOfMethodCallIgnored - cache.Mkdirs(); - } - return cache; - } - OkHttp3Downloader downloader = new(CreateDefaultCacheDir()); + var cacheDir = CreateDefaultCacheDir(); + var maxSize = CalculateDiskCacheSize(cacheDir); + var client = CreateOkHttpClient(cacheDir, maxSize); + OkHttp3Downloader downloader = new(client); picassoBuilder.Downloader(downloader); return picassoBuilder.Build(); } @@ -70,7 +64,7 @@ namespace System.Application.UI } try { - var ctx = imageView.Context ?? Android.App.Application.Context; + var ctx = imageView.Context ?? AndroidApplication.Context; var placeholder = new ColorDrawable(new(ctx.GetColorCompat(Resource.Color.grey_background))); var errorDrawable = new ColorDrawable(Color.DarkRed); var requestCreator = Picasso.Load(requestUri) @@ -109,5 +103,51 @@ namespace System.Application.UI CenterCrop, CenterInside, } + + // https://github.com/JakeWharton/picasso2-okhttp3-downloader/blob/master/src/main/java/com/jakewharton/picasso/OkHttp3Downloader.java + + static JFile CreateDefaultCacheDir() + { + var cachePath = IHttpService.GetImagesCacheDirectory(null); + JFile cache = new(cachePath); + if (!cache.Exists()) + { + //noinspection ResultOfMethodCallIgnored + cache.Mkdirs(); + } + return cache; + } + + const int MIN_DISK_CACHE_SIZE = 5 * 1024 * 1024; // 5MB + const int MAX_DISK_CACHE_SIZE = 50 * 1024 * 1024; // 50MB + + static long CalculateDiskCacheSize(JFile dir) + { + long size = MIN_DISK_CACHE_SIZE; + + try + { + var statFs = new StatFs(dir.AbsolutePath); + long available = statFs.BlockCountLong * statFs.BlockSizeLong; + // Target 2% of the total space. + size = available / 50; + } + catch (Java.Lang.IllegalArgumentException) + { + } + + // Bound inside min/max size for disk cache. + return Math.Max(Math.Min(size, MAX_DISK_CACHE_SIZE), MIN_DISK_CACHE_SIZE); + } + + static OkHttpClient CreateOkHttpClient(JFile cacheDir, long maxSize) + { + var client = new OkHttpClient.Builder() + .Cache(new(cacheDir, maxSize)) + .FollowRedirects(true) + .FollowSslRedirects(true) + .Build(); + return client; + } } } \ No newline at end of file diff --git a/src/ST.Client.Android/UI/MainApplication.cs b/src/ST.Client.Android/UI/MainApplication.cs index 6be5f0021..be3e88165 100644 --- a/src/ST.Client.Android/UI/MainApplication.cs +++ b/src/ST.Client.Android/UI/MainApplication.cs @@ -43,9 +43,6 @@ namespace System.Application.UI public MainApplication(IntPtr javaReference, JniHandleOwnership transfer) : base(javaReference, transfer) { - // 此页面当前使用 Square.Picasso 库加载图片 - AuthTradeWindowViewModel.IsLoadImage = false; - #if __XAMARIN_FORMS__ // https://github.com/xamarin/Xamarin.Forms/blob/release-5.0.0-sr7/Xamarin.Forms.Platform.Android/Resources/Layout/RootLayout.axml // https://github.com/xamarin/Xamarin.Forms/blob/release-5.0.0-sr7/Xamarin.Forms.Platform.Android/Renderers/ShellSectionRenderer.cs @@ -196,6 +193,7 @@ namespace System.Application.UI startTrace.AppendFormatLine("init XFApp {0}ms", stopwatch.ElapsedMilliseconds); stopwatch.Restart(); #endif + vmService.MainWindow.Initialize(); } stopwatch.Stop(); diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_account_box_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_account_box_black_24.png deleted file mode 100644 index 7562b672d..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_account_box_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_add_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_add_black_24.png deleted file mode 100644 index 5f5d36cb9..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_add_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_cake_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_cake_black_24.png deleted file mode 100644 index 3256cbbbb..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_cake_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_check_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_check_black_24.png deleted file mode 100644 index 5c038ee03..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_check_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_checklist_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_checklist_black_24.png deleted file mode 100644 index 07e6337be..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_checklist_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_close_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_close_black_24.png deleted file mode 100644 index 864273ce1..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_close_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_cloud_download_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_cloud_download_black_24.png deleted file mode 100644 index e3c35faa1..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_cloud_download_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_content_copy_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_content_copy_black_24.png deleted file mode 100644 index 2be7b269d..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_content_copy_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_dark_mode_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_dark_mode_black_24.png deleted file mode 100644 index 2ed1e48fe..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_dark_mode_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_description_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_description_black_24.png deleted file mode 100644 index 903436f49..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_description_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_edit_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_edit_black_24.png deleted file mode 100644 index 56a28afc3..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_edit_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_enhanced_encryption_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_enhanced_encryption_black_24.png deleted file mode 100644 index 08c9192f4..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_enhanced_encryption_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_female_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_female_black_24.png deleted file mode 100644 index 4b3887028..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_female_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_folder_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_folder_black_24.png deleted file mode 100644 index c86c7dbe2..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_folder_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_info_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_info_black_24.png deleted file mode 100644 index 34b660ab7..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_info_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_language_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_language_black_24.png deleted file mode 100644 index 0b016febb..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_language_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_location_on_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_location_on_black_24.png deleted file mode 100644 index 0cf07dd0f..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_location_on_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_lock_open_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_lock_open_black_24.png deleted file mode 100644 index b31c84709..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_lock_open_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_logout_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_logout_black_24.png deleted file mode 100644 index 58e97fddb..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_logout_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_male_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_male_black_24.png deleted file mode 100644 index c0263bf03..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_male_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_more_horiz_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_more_horiz_black_24.png deleted file mode 100644 index 83cc3b9fb..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_more_horiz_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_notifications_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_notifications_black_24.png deleted file mode 100644 index 84e82b20b..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_notifications_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_person_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_person_black_24.png deleted file mode 100644 index 8d6332446..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_person_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_phone_android_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_phone_android_black_24.png deleted file mode 100644 index 61b92a029..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_phone_android_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_phone_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_phone_black_24.png deleted file mode 100644 index 657978d8f..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_phone_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_photo_black_48.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_photo_black_48.png deleted file mode 100644 index b18e14d85..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_photo_black_48.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_qr_code_2_black_48.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_qr_code_2_black_48.png deleted file mode 100644 index 9537fcf44..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_qr_code_2_black_48.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_refresh_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_refresh_black_24.png deleted file mode 100644 index c05f3e983..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_refresh_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_save_alt_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_save_alt_black_24.png deleted file mode 100644 index faf59b0a6..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_save_alt_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_save_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_save_black_24.png deleted file mode 100644 index fd26e5e40..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_save_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_screenshot_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_screenshot_black_24.png deleted file mode 100644 index 62be0dc5b..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_screenshot_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_settings_applications_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_settings_applications_black_24.png deleted file mode 100644 index 143c21fe7..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_settings_applications_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_settings_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_settings_black_24.png deleted file mode 100644 index 0b5801029..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_settings_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_sports_esports_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_sports_esports_black_24.png deleted file mode 100644 index 25547fd6b..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_sports_esports_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_update_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_update_black_24.png deleted file mode 100644 index e4957f12b..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_update_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_verified_user_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_verified_user_black_24.png deleted file mode 100644 index 480885ed5..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_verified_user_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_visibility_off_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_visibility_off_black_24.png deleted file mode 100644 index 2d1b00347..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_visibility_off_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/outline_chevron_right_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/outline_chevron_right_black_24.png deleted file mode 100644 index 9eb0836c5..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/outline_chevron_right_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/round_open_in_browser_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/round_open_in_browser_black_24.png deleted file mode 100644 index 433dfa23d..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/round_open_in_browser_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/round_pause_circle_outline_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/round_pause_circle_outline_black_24.png deleted file mode 100644 index 5ba06d33d..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/round_pause_circle_outline_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/round_play_circle_outline_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/round_play_circle_outline_black_24.png deleted file mode 100644 index 04ea3a3fe..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/round_play_circle_outline_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_account_box_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_account_box_black_24.png deleted file mode 100644 index b3c9c2bd7..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_account_box_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_add_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_add_black_24.png deleted file mode 100644 index 46ef969d5..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_add_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_cake_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_cake_black_24.png deleted file mode 100644 index 5e2bb2357..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_cake_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_check_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_check_black_24.png deleted file mode 100644 index 87a735699..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_check_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_checklist_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_checklist_black_24.png deleted file mode 100644 index b5c3060d6..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_checklist_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_close_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_close_black_24.png deleted file mode 100644 index c7e27e458..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_close_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_cloud_download_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_cloud_download_black_24.png deleted file mode 100644 index 54a1a1413..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_cloud_download_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_content_copy_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_content_copy_black_24.png deleted file mode 100644 index 4c2ec56a2..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_content_copy_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_dark_mode_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_dark_mode_black_24.png deleted file mode 100644 index 1d9a28e6d..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_dark_mode_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_description_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_description_black_24.png deleted file mode 100644 index 0cb2d69a3..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_description_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_edit_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_edit_black_24.png deleted file mode 100644 index 7fcd709c5..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_edit_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_enhanced_encryption_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_enhanced_encryption_black_24.png deleted file mode 100644 index d780794b4..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_enhanced_encryption_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_female_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_female_black_24.png deleted file mode 100644 index a0ab02fcb..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_female_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_folder_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_folder_black_24.png deleted file mode 100644 index 067f0ea22..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_folder_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_info_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_info_black_24.png deleted file mode 100644 index b9cca56d2..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_info_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_language_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_language_black_24.png deleted file mode 100644 index e3a8567d5..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_language_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_location_on_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_location_on_black_24.png deleted file mode 100644 index 9d1d49a48..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_location_on_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_lock_open_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_lock_open_black_24.png deleted file mode 100644 index 290e47105..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_lock_open_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_logout_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_logout_black_24.png deleted file mode 100644 index 0ec5ed9d0..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_logout_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_male_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_male_black_24.png deleted file mode 100644 index e0ba45b4a..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_male_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_more_horiz_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_more_horiz_black_24.png deleted file mode 100644 index 43dcb7a11..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_more_horiz_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_notifications_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_notifications_black_24.png deleted file mode 100644 index 61ec0c8aa..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_notifications_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_person_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_person_black_24.png deleted file mode 100644 index ed9992535..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_person_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_phone_android_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_phone_android_black_24.png deleted file mode 100644 index 6f5bfa712..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_phone_android_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_phone_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_phone_black_24.png deleted file mode 100644 index 919c21f53..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_phone_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_photo_black_48.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_photo_black_48.png deleted file mode 100644 index 33f8b0a70..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_photo_black_48.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_qr_code_2_black_48.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_qr_code_2_black_48.png deleted file mode 100644 index 3f24ff383..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_qr_code_2_black_48.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_refresh_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_refresh_black_24.png deleted file mode 100644 index 0efb334f2..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_refresh_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_save_alt_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_save_alt_black_24.png deleted file mode 100644 index 29f74d564..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_save_alt_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_save_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_save_black_24.png deleted file mode 100644 index 65ac2c29a..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_save_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_screenshot_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_screenshot_black_24.png deleted file mode 100644 index 798e7bc2f..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_screenshot_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_settings_applications_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_settings_applications_black_24.png deleted file mode 100644 index 4671220bb..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_settings_applications_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_settings_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_settings_black_24.png deleted file mode 100644 index abcab02d6..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_settings_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_sports_esports_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_sports_esports_black_24.png deleted file mode 100644 index 71d72fdd6..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_sports_esports_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_update_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_update_black_24.png deleted file mode 100644 index 9ec3629fa..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_update_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_verified_user_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_verified_user_black_24.png deleted file mode 100644 index d9d911821..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_verified_user_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_visibility_off_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_visibility_off_black_24.png deleted file mode 100644 index 4c52c4834..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_visibility_off_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/outline_chevron_right_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/outline_chevron_right_black_24.png deleted file mode 100644 index 31ef86ee4..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/outline_chevron_right_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/round_open_in_browser_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/round_open_in_browser_black_24.png deleted file mode 100644 index 42d515edd..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/round_open_in_browser_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/round_pause_circle_outline_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/round_pause_circle_outline_black_24.png deleted file mode 100644 index 3ae9e36ac..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/round_pause_circle_outline_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/round_play_circle_outline_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/round_play_circle_outline_black_24.png deleted file mode 100644 index e56e68085..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/round_play_circle_outline_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_account_box_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_account_box_black_24.png deleted file mode 100644 index b1bd64436..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_account_box_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_add_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_add_black_24.png deleted file mode 100644 index e00d6d14b..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_add_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_cake_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_cake_black_24.png deleted file mode 100644 index 9feb40fe7..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_cake_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_check_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_check_black_24.png deleted file mode 100644 index 479d5f5af..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_check_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_checklist_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_checklist_black_24.png deleted file mode 100644 index 12882d646..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_checklist_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_close_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_close_black_24.png deleted file mode 100644 index 8320babae..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_close_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_cloud_download_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_cloud_download_black_24.png deleted file mode 100644 index 02dfdd683..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_cloud_download_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_content_copy_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_content_copy_black_24.png deleted file mode 100644 index 916fe78e8..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_content_copy_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_dark_mode_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_dark_mode_black_24.png deleted file mode 100644 index 73e41c92f..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_dark_mode_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_description_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_description_black_24.png deleted file mode 100644 index fcc918760..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_description_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_edit_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_edit_black_24.png deleted file mode 100644 index 38cb2e06a..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_edit_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_enhanced_encryption_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_enhanced_encryption_black_24.png deleted file mode 100644 index 98a93bd77..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_enhanced_encryption_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_female_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_female_black_24.png deleted file mode 100644 index 97f087d10..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_female_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_folder_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_folder_black_24.png deleted file mode 100644 index 863560d3d..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_folder_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_info_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_info_black_24.png deleted file mode 100644 index 04ff957b0..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_info_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_language_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_language_black_24.png deleted file mode 100644 index 3abb339e5..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_language_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_location_on_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_location_on_black_24.png deleted file mode 100644 index 7210617bb..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_location_on_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_lock_open_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_lock_open_black_24.png deleted file mode 100644 index 3f10787fb..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_lock_open_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_logout_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_logout_black_24.png deleted file mode 100644 index 964c08d43..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_logout_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_male_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_male_black_24.png deleted file mode 100644 index 1db0e307e..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_male_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_more_horiz_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_more_horiz_black_24.png deleted file mode 100644 index c228eb99a..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_more_horiz_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_notifications_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_notifications_black_24.png deleted file mode 100644 index 46087ad85..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_notifications_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_person_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_person_black_24.png deleted file mode 100644 index df9885127..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_person_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_phone_android_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_phone_android_black_24.png deleted file mode 100644 index df25ffb9d..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_phone_android_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_phone_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_phone_black_24.png deleted file mode 100644 index 9512e959b..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_phone_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_photo_black_48.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_photo_black_48.png deleted file mode 100644 index 03f7a9153..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_photo_black_48.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_qr_code_2_black_48.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_qr_code_2_black_48.png deleted file mode 100644 index 4309221cf..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_qr_code_2_black_48.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_refresh_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_refresh_black_24.png deleted file mode 100644 index 1826a9224..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_refresh_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_save_alt_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_save_alt_black_24.png deleted file mode 100644 index 12721884c..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_save_alt_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_save_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_save_black_24.png deleted file mode 100644 index f8f6e6d70..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_save_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_screenshot_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_screenshot_black_24.png deleted file mode 100644 index 94dd4453e..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_screenshot_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_settings_applications_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_settings_applications_black_24.png deleted file mode 100644 index e44d6276f..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_settings_applications_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_settings_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_settings_black_24.png deleted file mode 100644 index e860fbe55..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_settings_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_sports_esports_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_sports_esports_black_24.png deleted file mode 100644 index f03a936c9..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_sports_esports_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_update_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_update_black_24.png deleted file mode 100644 index b323cc642..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_update_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_verified_user_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_verified_user_black_24.png deleted file mode 100644 index d17725a0d..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_verified_user_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_visibility_off_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_visibility_off_black_24.png deleted file mode 100644 index 60818ade8..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_visibility_off_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/outline_chevron_right_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/outline_chevron_right_black_24.png deleted file mode 100644 index 09ede1dc9..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/outline_chevron_right_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/round_open_in_browser_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/round_open_in_browser_black_24.png deleted file mode 100644 index c53c14c92..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/round_open_in_browser_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/round_pause_circle_outline_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/round_pause_circle_outline_black_24.png deleted file mode 100644 index a73766117..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/round_pause_circle_outline_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/round_play_circle_outline_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/round_play_circle_outline_black_24.png deleted file mode 100644 index 56136d588..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/round_play_circle_outline_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_account_box_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_account_box_black_24.png deleted file mode 100644 index 695a89073..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_account_box_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_add_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_add_black_24.png deleted file mode 100644 index a84106b01..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_add_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_cake_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_cake_black_24.png deleted file mode 100644 index 1bb9a213a..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_cake_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_check_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_check_black_24.png deleted file mode 100644 index 2b9692ef0..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_check_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_checklist_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_checklist_black_24.png deleted file mode 100644 index c65a72236..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_checklist_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_close_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_close_black_24.png deleted file mode 100644 index a7a98e9d0..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_close_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_cloud_download_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_cloud_download_black_24.png deleted file mode 100644 index c4da265ee..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_cloud_download_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_content_copy_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_content_copy_black_24.png deleted file mode 100644 index 952510c01..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_content_copy_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_dark_mode_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_dark_mode_black_24.png deleted file mode 100644 index 20d29233a..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_dark_mode_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_description_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_description_black_24.png deleted file mode 100644 index 8c39efc3a..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_description_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_edit_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_edit_black_24.png deleted file mode 100644 index c6a1f0d73..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_edit_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_enhanced_encryption_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_enhanced_encryption_black_24.png deleted file mode 100644 index 799ccc760..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_enhanced_encryption_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_female_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_female_black_24.png deleted file mode 100644 index a49cc873a..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_female_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_folder_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_folder_black_24.png deleted file mode 100644 index 9c3ad1eb9..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_folder_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_info_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_info_black_24.png deleted file mode 100644 index cbdcf4883..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_info_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_language_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_language_black_24.png deleted file mode 100644 index ba77b02c2..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_language_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_location_on_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_location_on_black_24.png deleted file mode 100644 index 53673e73b..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_location_on_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_lock_open_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_lock_open_black_24.png deleted file mode 100644 index 310a110a6..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_lock_open_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_logout_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_logout_black_24.png deleted file mode 100644 index 1ce9bfb45..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_logout_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_male_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_male_black_24.png deleted file mode 100644 index 8c118fb5d..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_male_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_more_horiz_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_more_horiz_black_24.png deleted file mode 100644 index 554d97707..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_more_horiz_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_notifications_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_notifications_black_24.png deleted file mode 100644 index f7b92be6b..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_notifications_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_person_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_person_black_24.png deleted file mode 100644 index 33a170e88..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_person_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_phone_android_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_phone_android_black_24.png deleted file mode 100644 index 02d22ae6c..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_phone_android_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_phone_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_phone_black_24.png deleted file mode 100644 index 2cc72d1b7..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_phone_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_photo_black_48.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_photo_black_48.png deleted file mode 100644 index 1e93297de..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_photo_black_48.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_qr_code_2_black_48.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_qr_code_2_black_48.png deleted file mode 100644 index 4971b82f7..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_qr_code_2_black_48.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_refresh_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_refresh_black_24.png deleted file mode 100644 index 0cbe18201..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_refresh_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_save_alt_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_save_alt_black_24.png deleted file mode 100644 index 688ac517f..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_save_alt_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_save_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_save_black_24.png deleted file mode 100644 index 60e0c03df..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_save_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_screenshot_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_screenshot_black_24.png deleted file mode 100644 index 908fc0f4f..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_screenshot_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_settings_applications_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_settings_applications_black_24.png deleted file mode 100644 index bfb38a7f1..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_settings_applications_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_settings_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_settings_black_24.png deleted file mode 100644 index bfb26bade..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_settings_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_sports_esports_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_sports_esports_black_24.png deleted file mode 100644 index d2bebee6f..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_sports_esports_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_update_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_update_black_24.png deleted file mode 100644 index d14d87166..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_update_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_verified_user_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_verified_user_black_24.png deleted file mode 100644 index d2d48a9a1..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_verified_user_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_visibility_off_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_visibility_off_black_24.png deleted file mode 100644 index 9e07b7061..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_visibility_off_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/outline_chevron_right_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/outline_chevron_right_black_24.png deleted file mode 100644 index 1bc908a26..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/outline_chevron_right_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/round_open_in_browser_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/round_open_in_browser_black_24.png deleted file mode 100644 index 52515f5bd..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/round_open_in_browser_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/round_pause_circle_outline_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/round_pause_circle_outline_black_24.png deleted file mode 100644 index 09313a882..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/round_pause_circle_outline_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/round_play_circle_outline_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/round_play_circle_outline_black_24.png deleted file mode 100644 index 65b82c1c0..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/round_play_circle_outline_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_account_box_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_account_box_black_24.png deleted file mode 100644 index dc9aa59e1..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_account_box_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_add_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_add_black_24.png deleted file mode 100644 index 3cb10924a..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_add_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_cake_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_cake_black_24.png deleted file mode 100644 index ec227e187..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_cake_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_check_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_check_black_24.png deleted file mode 100644 index 87e16c589..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_check_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_checklist_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_checklist_black_24.png deleted file mode 100644 index 280117d73..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_checklist_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_close_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_close_black_24.png deleted file mode 100644 index 51e1362a9..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_close_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_cloud_download_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_cloud_download_black_24.png deleted file mode 100644 index ec2242140..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_cloud_download_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_content_copy_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_content_copy_black_24.png deleted file mode 100644 index 14270f307..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_content_copy_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_dark_mode_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_dark_mode_black_24.png deleted file mode 100644 index f2bd07766..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_dark_mode_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_description_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_description_black_24.png deleted file mode 100644 index c75d5c3b0..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_description_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_edit_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_edit_black_24.png deleted file mode 100644 index b087bb7e8..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_edit_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_enhanced_encryption_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_enhanced_encryption_black_24.png deleted file mode 100644 index 0d5b4398d..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_enhanced_encryption_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_female_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_female_black_24.png deleted file mode 100644 index cda700487..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_female_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_folder_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_folder_black_24.png deleted file mode 100644 index 2a7c64f56..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_folder_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_info_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_info_black_24.png deleted file mode 100644 index 38413e8a3..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_info_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_language_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_language_black_24.png deleted file mode 100644 index 07c5774df..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_language_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_location_on_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_location_on_black_24.png deleted file mode 100644 index cad9c23de..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_location_on_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_lock_open_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_lock_open_black_24.png deleted file mode 100644 index b1e30a03f..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_lock_open_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_logout_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_logout_black_24.png deleted file mode 100644 index c511e78ed..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_logout_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_male_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_male_black_24.png deleted file mode 100644 index 6ec24f061..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_male_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_more_horiz_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_more_horiz_black_24.png deleted file mode 100644 index 4fa280b12..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_more_horiz_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_notifications_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_notifications_black_24.png deleted file mode 100644 index fc983c616..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_notifications_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_person_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_person_black_24.png deleted file mode 100644 index cad155deb..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_person_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_phone_android_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_phone_android_black_24.png deleted file mode 100644 index 5226540d1..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_phone_android_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_phone_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_phone_black_24.png deleted file mode 100644 index 95f866662..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_phone_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_photo_black_48.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_photo_black_48.png deleted file mode 100644 index fcbf26324..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_photo_black_48.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_qr_code_2_black_48.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_qr_code_2_black_48.png deleted file mode 100644 index 6c6ab88e9..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_qr_code_2_black_48.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_refresh_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_refresh_black_24.png deleted file mode 100644 index 91836ca91..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_refresh_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_save_alt_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_save_alt_black_24.png deleted file mode 100644 index 1e887ed4a..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_save_alt_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_save_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_save_black_24.png deleted file mode 100644 index 7c36b23b4..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_save_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_screenshot_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_screenshot_black_24.png deleted file mode 100644 index dbc4bf0ee..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_screenshot_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_settings_applications_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_settings_applications_black_24.png deleted file mode 100644 index b6d3cfc6d..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_settings_applications_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_settings_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_settings_black_24.png deleted file mode 100644 index 3ebbf52de..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_settings_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_sports_esports_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_sports_esports_black_24.png deleted file mode 100644 index 09442cda7..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_sports_esports_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_update_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_update_black_24.png deleted file mode 100644 index ae0a71638..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_update_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_verified_user_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_verified_user_black_24.png deleted file mode 100644 index 171a4c5db..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_verified_user_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_visibility_off_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_visibility_off_black_24.png deleted file mode 100644 index 9d6c7fb22..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_visibility_off_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/outline_chevron_right_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/outline_chevron_right_black_24.png deleted file mode 100644 index 3078694b0..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/outline_chevron_right_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/round_open_in_browser_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/round_open_in_browser_black_24.png deleted file mode 100644 index 102ff7ad5..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/round_open_in_browser_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/round_pause_circle_outline_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/round_pause_circle_outline_black_24.png deleted file mode 100644 index 291174fcd..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/round_pause_circle_outline_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/round_play_circle_outline_black_24.png b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/round_play_circle_outline_black_24.png deleted file mode 100644 index ea85ac7d8..000000000 Binary files a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/round_play_circle_outline_black_24.png and /dev/null differ diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable/ic_baseline_double_arrow_24.xml b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable/ic_baseline_double_arrow_24.xml new file mode 100644 index 000000000..f38e6bb99 --- /dev/null +++ b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable/ic_baseline_double_arrow_24.xml @@ -0,0 +1,13 @@ + + + + diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/layout/activity_steam_auth_trade.xml b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/layout/activity_steam_auth_trade.xml index 005dbde86..7944ec165 100644 --- a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/layout/activity_steam_auth_trade.xml +++ b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/layout/activity_steam_auth_trade.xml @@ -40,7 +40,9 @@ android:paddingStart="@dimen/activity_horizontal_margin" android:paddingTop="@dimen/activity_vertical_margin" android:paddingEnd="@dimen/activity_horizontal_margin" - android:paddingBottom="@dimen/activity_vertical_margin"> + android:paddingBottom="@dimen/activity_vertical_margin" + tools:paddingEnd="0dp" + tools:paddingStart="0dp"> - + + + android:fillViewport="true"> - + + - + android:overScrollMode="never" + tools:itemCount="6" + tools:listitem="@layout/layout_card_accelerate_project_group" + xamarin:managedType="AndroidX.RecyclerView.Widget.RecyclerView" /> + + + + + + + diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/layout/layout_card_accelerate_project_group.xml b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/layout/layout_card_accelerate_project_group.xml new file mode 100644 index 000000000..0cca8854c --- /dev/null +++ b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/layout/layout_card_accelerate_project_group.xml @@ -0,0 +1,16 @@ + + + + + + diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/layout/layout_card_accelerate_project_group_content.xml b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/layout/layout_card_accelerate_project_group_content.xml new file mode 100644 index 000000000..c4247bee6 --- /dev/null +++ b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/layout/layout_card_accelerate_project_group_content.xml @@ -0,0 +1,48 @@ + + + + + + + + + + diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/layout/layout_card_steam_auth_trade_confirmation.xml b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/layout/layout_card_steam_auth_trade_confirmation.xml index 2575a01e0..af32f7a0a 100644 --- a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/layout/layout_card_steam_auth_trade_confirmation.xml +++ b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/layout/layout_card_steam_auth_trade_confirmation.xml @@ -1,14 +1,16 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + xmlns:xamarin="http://schemas.xamarin.com/android/xamarin/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:clickable="true" + android:focusable="true" + tools:layout_marginBottom="@dimen/activity_vertical_margin" + tools:layout_marginEnd="@dimen/activity_horizontal_margin" + tools:layout_marginStart="@dimen/activity_horizontal_margin"> - + diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/values/dimens.xml b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/values/dimens.xml index 25e5b76e8..7133e443e 100644 --- a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/values/dimens.xml +++ b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/values/dimens.xml @@ -1,38 +1,44 @@ - - 16dp - 16dp - 22dp - 17dp - 24dp - 16dp - 1px - 12dp - 56dp - 10dp - 18sp - 16sp - 140dp - 8dp - 16dp - 8dp - 5dp - 18sp - 16sp - 125dp - 80dp - 88dp - 1px - 28dp - 2dp - 3dp - 33sp - 56dp - 18sp - 52dp - 48dp - -7dp - 25dp - 18dp - 18sp + + 16dp + 16dp + 22dp + 17dp + 24dp + 16dp + 1px + 12dp + 56dp + 10dp + 18sp + 16sp + 140dp + 8dp + 16dp + 8dp + 5dp + 18sp + 16sp + 125dp + 80dp + 88dp + 1px + 28dp + 2dp + 3dp + 33sp + 56dp + 18sp + 52dp + 48dp + -7dp + 25dp + 18dp + 18sp + 48dp + 48dp + + 64dp + + 80dp diff --git a/src/ST.Client/Services/Implementation/HttpServiceImpl.cs b/src/ST.Client/Services/Implementation/HttpServiceImpl.cs index b812fb27f..203e47cfe 100644 --- a/src/ST.Client/Services/Implementation/HttpServiceImpl.cs +++ b/src/ST.Client/Services/Implementation/HttpServiceImpl.cs @@ -49,6 +49,7 @@ namespace System.Application.Services.Implementation string? clientName = null) where T : notnull { HttpRequestMessage? request = null; + bool requestIsSend = false; HttpResponseMessage? response = null; bool notDisposeResponse = false; try @@ -62,6 +63,7 @@ namespace System.Application.Services.Implementation { try { + requestIsSend = true; response = await Csc.Forward(request, HttpCompletionOption.ResponseHeadersRead, cancellationToken); @@ -76,8 +78,11 @@ namespace System.Application.Services.Implementation if (response == null) { var client = CreateClient(clientName); - request.Dispose(); - request = requestFactory(); + if (requestIsSend) + { + request.Dispose(); + request = requestFactory(); + } response = await client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); diff --git a/src/ST.Client/Services/Mvvm/ASFService.cs b/src/ST.Client/Services/Mvvm/ASFService.cs index a4d4f2c8f..d13b033e4 100644 --- a/src/ST.Client/Services/Mvvm/ASFService.cs +++ b/src/ST.Client/Services/Mvvm/ASFService.cs @@ -50,7 +50,7 @@ namespace System.Application.Services set => this.RaiseAndSetIfChanged(ref _GlobalConfig, value); } - public ASFService() + private ASFService() { mCurrent = this; diff --git a/src/ST.Client/Services/Mvvm/AuthService.cs b/src/ST.Client/Services/Mvvm/AuthService.cs index 5d1a2eae4..29cc2d4e9 100644 --- a/src/ST.Client/Services/Mvvm/AuthService.cs +++ b/src/ST.Client/Services/Mvvm/AuthService.cs @@ -67,7 +67,7 @@ namespace System.Application.Services public GAPRepository Repository => repository; - public AuthService() + private AuthService() { mCurrent = this; diff --git a/src/ST.Client/Services/Mvvm/ProxyService.cs b/src/ST.Client/Services/Mvvm/ProxyService.cs index 70e1ea647..80afd4db3 100644 --- a/src/ST.Client/Services/Mvvm/ProxyService.cs +++ b/src/ST.Client/Services/Mvvm/ProxyService.cs @@ -5,6 +5,7 @@ using ReactiveUI; using System.Application.Models; using System.Application.Properties; using System.Application.Settings; +using System.Application.UI; using System.Application.UI.Resx; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -33,7 +34,7 @@ namespace System.Application.Services readonly IHostsFileService hostsFileService = IHostsFileService.Instance; readonly IPlatformService platformService = IPlatformService.Instance; - public ProxyService() + private ProxyService() { mCurrent = this; @@ -56,9 +57,16 @@ namespace System.Application.Services httpProxyService.ProxyDomains = EnableProxyDomains; httpProxyService.IsEnableScript = ProxySettings.IsEnableScript.Value; httpProxyService.Scripts = EnableProxyScripts; - httpProxyService.IsOnlyWorkSteamBrowser = ProxySettings.IsOnlyWorkSteamBrowser.Value; - httpProxyService.IsSystemProxy = ProxySettings.EnableWindowsProxy.Value; - httpProxyService.IsProxyGOG = ProxySettings.IsProxyGOG.Value; + if (IApplication.IsDesktopPlatform) + { + httpProxyService.IsOnlyWorkSteamBrowser = ProxySettings.IsOnlyWorkSteamBrowser.Value; + httpProxyService.IsSystemProxy = ProxySettings.EnableWindowsProxy.Value; + httpProxyService.IsProxyGOG = ProxySettings.IsProxyGOG.Value; + } + else + { + httpProxyService.IsSystemProxy = true; + } // macOS 上目前因权限问题仅支持 0.0.0.0(IPAddress.Any) httpProxyService.ProxyIp = (!OperatingSystem2.IsMacOS && IPAddress2.TryParse(ProxySettings.SystemProxyIp.Value, out var ip)) ? ip : IPAddress.Any; @@ -194,7 +202,7 @@ namespace System.Application.Services public SourceList ProxyDomains { get; } private readonly ReadOnlyObservableCollection? _ProxyDomainsList; - public ReadOnlyObservableCollection? ProxyDomainsList => _ProxyDomainsList; + public ReadOnlyObservableCollection ProxyDomainsList => _ProxyDomainsList ?? throw new ArgumentNullException(nameof(_ProxyDomainsList)); bool _IsLoading; public bool IsLoading @@ -260,9 +268,14 @@ namespace System.Application.Services public bool IsOnlyWorkSteamBrowser { - get => ProxySettings.IsOnlyWorkSteamBrowser.Value; + get + { + if (OperatingSystem2.IsAndroid || OperatingSystem2.IsIOS) return false; + return ProxySettings.IsOnlyWorkSteamBrowser.Value; + } set { + if (OperatingSystem2.IsAndroid || OperatingSystem2.IsIOS) return; if (ProxySettings.IsOnlyWorkSteamBrowser.Value != value) { ProxySettings.IsOnlyWorkSteamBrowser.Value = value; @@ -309,6 +322,19 @@ namespace System.Application.Services } } + /// + /// 是否使用 加载确认物品图片 + /// + static bool IsLoadImage + { + get + { + // 此页面当前使用 Square.Picasso 库加载图片 + if (OperatingSystem2.IsAndroid) return false; + return true; + } + } + public async Task InitializeAccelerate() { #region 加载代理服务数据 @@ -341,7 +367,7 @@ namespace System.Application.Services LoadOrSaveLocalAccelerate(); - if (ProxyDomains.Items.Any_Nullable()) + if (IsLoadImage && ProxyDomains.Items.Any_Nullable()) { foreach (var item in ProxyDomains.Items) { diff --git a/src/ST.Client/Services/Mvvm/SteamConnectService.cs b/src/ST.Client/Services/Mvvm/SteamConnectService.cs index 4cb03e24b..ac98b0304 100644 --- a/src/ST.Client/Services/Mvvm/SteamConnectService.cs +++ b/src/ST.Client/Services/Mvvm/SteamConnectService.cs @@ -29,7 +29,7 @@ namespace System.Application.Services readonly ISteamService SteamTool = ISteamService.Instance; public const int SteamAFKMaxCount = 32; - public SteamConnectService() + private SteamConnectService() { mCurrent = this; diff --git a/src/ST.Client/Services/Mvvm/ToastService.cs b/src/ST.Client/Services/Mvvm/ToastService.cs index 98e01ae61..eadd4c439 100644 --- a/src/ST.Client/Services/Mvvm/ToastService.cs +++ b/src/ST.Client/Services/Mvvm/ToastService.cs @@ -53,7 +53,7 @@ namespace System.Application.Services set => this.RaiseAndSetIfChanged(ref _IsVisible, value); } - public ToastService() + private ToastService() { mCurrent = this; diff --git a/src/ST.Client/Services/Mvvm/UserService.cs b/src/ST.Client/Services/Mvvm/UserService.cs index 8ade91aa4..54d21d633 100644 --- a/src/ST.Client/Services/Mvvm/UserService.cs +++ b/src/ST.Client/Services/Mvvm/UserService.cs @@ -110,7 +110,7 @@ namespace System.Application.Services set => this.RaiseAndSetIfChanged(ref _AvatarPath, value); } - public UserService() + private UserService() { mCurrent = this; diff --git a/src/ST.Client/UI/IApplication.cs b/src/ST.Client/UI/IApplication.cs index 54b8608ed..b870317f8 100644 --- a/src/ST.Client/UI/IApplication.cs +++ b/src/ST.Client/UI/IApplication.cs @@ -1,4 +1,3 @@ -using System; using System.Application.Models; using System.Application.Services; using System.Application.Settings; diff --git a/src/ST.Client/UI/ViewModels/Base/IViewModelBase.cs b/src/ST.Client/UI/ViewModels/Base/IViewModelBase.cs index 192d1d976..b41881313 100644 --- a/src/ST.Client/UI/ViewModels/Base/IViewModelBase.cs +++ b/src/ST.Client/UI/ViewModels/Base/IViewModelBase.cs @@ -19,13 +19,6 @@ namespace System.Application.UI.ViewModels /// /// 是否在设计器的上下文中运行 /// - public static bool IsInDesignMode { protected get; set; } - = IApplication.IsDesktopPlatform; - - /// - /// 是否使用移动端布局 - /// - public static bool IsMobileLayout { protected get; set; } - = !IApplication.IsDesktopPlatform; + public static bool IsInDesignMode { protected get; set; } = IApplication.IsDesktopPlatform; } } diff --git a/src/ST.Client/UI/ViewModels/Base/ViewModelBase.cs b/src/ST.Client/UI/ViewModels/Base/ViewModelBase.cs index e861dc83d..f0f45ed07 100644 --- a/src/ST.Client/UI/ViewModels/Base/ViewModelBase.cs +++ b/src/ST.Client/UI/ViewModels/Base/ViewModelBase.cs @@ -16,9 +16,6 @@ namespace System.Application.UI.ViewModels /// public static bool IsInDesignMode => IViewModelBase.IsInDesignMode; - /// - public static bool IsMobileLayout => IViewModelBase.IsMobileLayout; - public ViewModelActivator Activator { get; } public ViewModelBase() diff --git a/src/ST.Client/UI/ViewModels/CustomTabItemViewModel.cs b/src/ST.Client/UI/ViewModels/CustomTabItemViewModel.cs index 38ba92a79..9889cd747 100644 --- a/src/ST.Client/UI/ViewModels/CustomTabItemViewModel.cs +++ b/src/ST.Client/UI/ViewModels/CustomTabItemViewModel.cs @@ -1,4 +1,3 @@ -using System; using System.Application.UI.Resx; using System.Collections.Generic; using System.Text; diff --git a/src/ST.Client/UI/ViewModels/MainWindowViewModel.cs b/src/ST.Client/UI/ViewModels/MainWindowViewModel.cs index 1de5d87e2..12e0f8da6 100644 --- a/src/ST.Client/UI/ViewModels/MainWindowViewModel.cs +++ b/src/ST.Client/UI/ViewModels/MainWindowViewModel.cs @@ -64,8 +64,7 @@ namespace System.Application.UI.ViewModels protected static readonly IPlatformService platformService = IPlatformService.Instance; public MainWindowViewModel() { - var useAvalonia = OperatingSystem2.Application.UseAvalonia; - if (useAvalonia) + if (IApplication.IsDesktopPlatform) { var adminTag = platformService.IsAdministrator ? (OperatingSystem2.IsWindows ? " (Administrator)" : " (Root)") : string.Empty; Title = $"{ThisAssembly.AssemblyTrademark} {RuntimeInformation.ProcessArchitecture.ToString().ToLower()} v{ThisAssembly.VersionDisplay} for {DeviceInfo2.OSName}{adminTag}"; @@ -97,38 +96,26 @@ namespace System.Application.UI.ViewModels //AddTabItem(); AddTabItem(); AddTabItem(); - if (useAvalonia) + if (IApplication.IsDesktopPlatform) { AddTabItem(); + AddTabItem(); } - AddTabItem(); AddTabItem(); - var isVersion_2_5_OR_GREATER = -#if DEBUG - true; -#else - new Version(global::System.Properties.ThisAssembly.Version) >= new Version(2, 5); -#endif - - if (isVersion_2_5_OR_GREATER) - { - AddTabItem(); - } + AddTabItem(); //AddTabItem(); #if !TRAY_INDEPENDENT_PROGRAM - if (OperatingSystem2.IsWindows && useAvalonia) + if (OperatingSystem2.IsWindows) AddTabItem(); #endif //AddTabItem(); -#if !TRAY_INDEPENDENT_PROGRAM - if (IApplication.EnableDevtools && useAvalonia) +#if !TRAY_INDEPENDENT_PROGRAM && DEBUG + if (IApplication.EnableDevtools && IApplication.IsDesktopPlatform) { -#if DEBUG AddTabItem(); //FooterTabItems.Add(new DebugPageViewModel().AddTo(this)); -#endif //if (AppHelper.IsSystemWebViewAvailable) //{ @@ -165,7 +152,11 @@ namespace System.Application.UI.ViewModels await ASFService.Current.InitASF(); } }); - SteamConnectService.Current.Initialize(); + + if (IApplication.IsDesktopPlatform) + { + SteamConnectService.Current.Initialize(); + } Parallel.ForEach(TabItems, item => { diff --git a/src/ST.Client/UI/ViewModels/Pages/About/AboutPageViewModel.cs b/src/ST.Client/UI/ViewModels/Pages/About/AboutPageViewModel.cs index 20bf14283..9e0fb8fa2 100644 --- a/src/ST.Client/UI/ViewModels/Pages/About/AboutPageViewModel.cs +++ b/src/ST.Client/UI/ViewModels/Pages/About/AboutPageViewModel.cs @@ -110,7 +110,7 @@ namespace System.Application.UI.ViewModels } }); - if (IsMobileLayout) + if (!IApplication.IsDesktopPlatform) { preferenceButtons = new(Enum2.GetAll().Select(x => PreferenceButtonViewModel.Create(x, this))); diff --git a/src/ST.Client/UI/ViewModels/Pages/CommunityProxyPageViewModel.cs b/src/ST.Client/UI/ViewModels/Pages/CommunityProxyPageViewModel.cs index c3a8fca19..9e5a95cb7 100644 --- a/src/ST.Client/UI/ViewModels/Pages/CommunityProxyPageViewModel.cs +++ b/src/ST.Client/UI/ViewModels/Pages/CommunityProxyPageViewModel.cs @@ -52,24 +52,23 @@ namespace System.Application.UI.ViewModels { IconKey = nameof(CommunityProxyPageViewModel); - if (IsMobileLayout) + if (IApplication.IsDesktopPlatform) { - return; + SetupCertificateCommand = ReactiveCommand.Create(SetupCertificate_OnClick); + DeleteCertificateCommand = ReactiveCommand.Create(DeleteCertificate_OnClick); + EditHostsFileCommand = ReactiveCommand.Create(hostsFileService.OpenFile); + NetworkFixCommand = ReactiveCommand.Create(ProxyService.Current.FixNetwork); + TrustCerCommand = ReactiveCommand.Create(TrustCer_OnClick); + OpenCertificateDirCommand = ReactiveCommand.Create(() => + { + platformService.OpenFolder(Path.Combine(IOPath.AppDataDirectory, $@"{httpProxyService.CertificateName}.Certificate.pfx")); + }); } - SetupCertificateCommand = ReactiveCommand.Create(SetupCertificate_OnClick); - DeleteCertificateCommand = ReactiveCommand.Create(DeleteCertificate_OnClick); - EditHostsFileCommand = ReactiveCommand.Create(hostsFileService.OpenFile); - NetworkFixCommand = ReactiveCommand.Create(ProxyService.Current.FixNetwork); - TrustCerCommand = ReactiveCommand.Create(TrustCer_OnClick); //AutoRunProxyCommand = ReactiveCommand.Create(() => //{ // AutoRunProxy?.CheckmarkChange(ProxySettings.ProgramStartupRunProxy.Value = !ProxySettings.ProgramStartupRunProxy.Value); //}); - OpenCertificateDirCommand = ReactiveCommand.Create(() => - { - platformService.OpenFolder(Path.Combine(IOPath.AppDataDirectory, $@"{httpProxyService.CertificateName}.Certificate.pfx")); - }); ProxySettingsCommand = ReactiveCommand.Create(() => { IWindowManager.Instance.Show(CustomWindow.ProxySettings, resizeMode: ResizeMode.CanResize); diff --git a/src/ST.Client/UI/ViewModels/Pages/GameListPageViewModel.cs b/src/ST.Client/UI/ViewModels/Pages/GameListPageViewModel.cs index c70921537..472b21d67 100644 --- a/src/ST.Client/UI/ViewModels/Pages/GameListPageViewModel.cs +++ b/src/ST.Client/UI/ViewModels/Pages/GameListPageViewModel.cs @@ -71,7 +71,7 @@ namespace System.Application.UI.ViewModels { _IconKey = nameof(GameListPageViewModel); - if (IsMobileLayout) + if (!IApplication.IsDesktopPlatform) { return; } diff --git a/src/ST.Client/UI/ViewModels/Pages/ProxyScriptManagePageViewModel.cs b/src/ST.Client/UI/ViewModels/Pages/ProxyScriptManagePageViewModel.cs index b3124cde5..cd7b9e22d 100644 --- a/src/ST.Client/UI/ViewModels/Pages/ProxyScriptManagePageViewModel.cs +++ b/src/ST.Client/UI/ViewModels/Pages/ProxyScriptManagePageViewModel.cs @@ -41,7 +41,7 @@ namespace System.Application.UI.ViewModels { IconKey = nameof(ProxyScriptManagePageViewModel); - if (IsMobileLayout) + if (!IApplication.IsDesktopPlatform) { return; } diff --git a/src/ST.Client/UI/ViewModels/Windows/LocalAuthPage/AuthTradeWindowViewModel.cs b/src/ST.Client/UI/ViewModels/Windows/LocalAuthPage/AuthTradeWindowViewModel.cs index 4d84defa0..4df127497 100644 --- a/src/ST.Client/UI/ViewModels/Windows/LocalAuthPage/AuthTradeWindowViewModel.cs +++ b/src/ST.Client/UI/ViewModels/Windows/LocalAuthPage/AuthTradeWindowViewModel.cs @@ -67,7 +67,15 @@ namespace System.Application.UI.ViewModels /// /// 是否使用 加载确认物品图片 /// - public static bool IsLoadImage { protected get; set; } = true; + static bool IsLoadImage + { + get + { + // 此页面当前使用 Square.Picasso 库加载图片 + if (OperatingSystem2.IsAndroid) return false; + return true; + } + } private string? AuthPassword; private bool AuthIsLocal; diff --git a/src/ST.Client/UI/ViewModels/Windows/LoginOrRegisterWindowViewModel.cs b/src/ST.Client/UI/ViewModels/Windows/LoginOrRegisterWindowViewModel.cs index e8e663e2d..e44ab1138 100644 --- a/src/ST.Client/UI/ViewModels/Windows/LoginOrRegisterWindowViewModel.cs +++ b/src/ST.Client/UI/ViewModels/Windows/LoginOrRegisterWindowViewModel.cs @@ -67,7 +67,7 @@ namespace System.Application.UI.ViewModels } } - if (IsMobileLayout) + if (!IApplication.IsDesktopPlatform) { yield return FastLoginChannelViewModel.Create(FastLoginChannelViewModel.PhoneNumber, this); } @@ -143,7 +143,7 @@ namespace System.Application.UI.ViewModels if (_LoginState == value) return; _LoginState = value; this.RaisePropertyChanged(); - if (IsMobileLayout) + if (!IApplication.IsDesktopPlatform) { Title = _LoginState == 1 ? AppResources.User_PhoneLogin : AppResources.LoginAndRegister; }