From 39a34bd8c48ae9d55d7400a867c89a4350b4c607 Mon Sep 17 00:00:00 2001 From: Federico Maccaroni Date: Thu, 8 Feb 2024 16:05:26 -0300 Subject: [PATCH] [PM-3349] [PM-3350] MAUI Migration Initial (#2806) * PM-3349 PM-3350 MAUI Migration Initial * PM-3349 PM-3350 MAUI Migration fix nullable exception bindings and AsyncCommand canExecute null exception * PM-3349 PM-3350 MAUI Migration fix nullable bindings and fallbacks * PM-3349: Android Added CustomTabbedPageHandler for Android to handle the tab "reselection" for PopToRoot. Commented support for Windows in App.csproj Disabled Interpreter on Android to avoid very slow app in Debug (during Login for example) Added some null checks that were causing crashes (on GeneratorPageVM and PickerVM) Minor TabsPage cleanup * TabBarEffect removed and it's behavior is now taken care of by CustomTabbedPageHandler * PM-3349 PM-3350 Add null checks on CipherDetailsPageVM to avoid crash opening Secure Notes. * PM-3349 PM-3350 MAUI Migration Start iOS extensions * Changes to solution to hopefully fix Config Mappings * PM-3349 Removed Deploy from iOS.Autofill to allow running Android Changed MainApplication SpecialFolder.Personal to SpecialFolder.LocalApplicationData * PM-3350 MAUI Migration Fix iOS Autofill extension * PM-3349 Changed UseMauiApp init so that Android Handlers still get added * PM-3349 Implemented HybridWebViewHandler for Android which enables 2nd factor auth flows Ensured CustomTabbedPageHandler had it's DisconnectHandler called Some minor code upgrades of older obsolete Xamarin Forms code. * PM-3349 Implemented HybridWebViewHandler for iOS * hardcoded AccountViewCell Avatar image to 40x40 to avoid current iOS/Android bugs where they fill much larger space. * PM-3349 PM-3350 Added (migrated) CustomNavigationHandler (which should partially fix the AvatarIcon in the NavBar in iOS) Added (migrated) CustomContentPageHandler (which should mostly place the AvatarIcon in the navBar in the correct place for iOS) Added Task.Delay (workaround) to allow the Avatar to load in iOS on the LoginPage Added workaround for iOS bug with the toolbar size (more info in comment in AvatarImageSource.cs) Went through the AccountViewCell MAUI-Migration comments. (and deleted/added more comments as needed) Migrated some Device calls to DeviceInfo and MainThread Added (migrated) CustomTabbedHandler (for managing the iOS TabBar) * PM-3349 Replaced the FabShadowEffect with the new MAUI Shadow to fix the buggy shadows on the Android Fab Button. * PM-3349 ToolbarHandler created for setting text on Android go back buttons. * PM-3350 Migrated the CustomViewCellRenderer for iOS * PM-3350 Removed ButtonHandlerMappings and some other code related with fonts as MAUI is taking care of Accessibility and no custom code should be needed Migrated SelectableLabelRenderer to Handler Cleaned LabelHandlerMappings and added logic to migrate the CustomLabelRenderer * Enabled argon2Id for iOS * PM-3349 Added Argon libraries for Android minor change to gitignore so that the Argon x86 lib is not ignored on the Android platform * PM-3350 Migrated some Device to DeviceInfo and added temporary workaround with some comments to be able to see the Generated Password on iOS * PM-3350 Added some missing images in iOS * PM-3349 PRM-3350 Replaced XZing with Camera.MAUI for QRCodes * Checked some [MAUI-Migration] and deleted when it's working as intended. SearchBarHandlerMapping: IME options working as intended SliderHandlerMappings: The MAUI "replacement" for Color.Default seems to be White so the old use case doesn't seem to be needed anymore. * PM-3350 Checked some [MAUI-Migration] and changed as needed. TimePickerHandlerMappings: Remove old code for forcing the Wheel. After testing without it wheel picker is still used so this code shouldn't be needed anymore. AppDelegate.ContinueUserActivity: Uncommented and changed the iOS ContinueUserActivity. It needs to call Platform.ContinueUserActivity according with Xamarin Essentials migration docs. * PM-3349 Fixed white tint color not appearing on images added as MAU IImage SVG PM-3349 PM-3350 Fix for Avatar text not adjusting to white/black color correctly * PM-3350 Removed MAUI Splash Screen. Fixed iOS Privacy Screen logo (hardcoded image to avoid it getting cropped) * PM-3350 Quick workaround to allow 2nd factor auth to not get stuck in iOS in modals. Updated some older "Device" code to the newer MAUI code. * PM-3350 Removed duplicate reference to LaunchScreen.storyboard * PM-3349 PM-3350 Minor change to HomePage to set fixed Image height otherwise it takes more space than it did in the old Xamarin Forms app. Added HIdeSoftInputOnTapped on several pages (the ones with Entry controls) to allow hiding the keyboard when tapping "outside" of it. (just like we did in Xamarin Forms app) * PM-3350 Added Scrollview on HomePage so that the "Create account" button can be accessed in smaller devices like iPhone SE. * PM-3349 Added Handler that enables the ExtendedDatePicker to get IsFocused events in Android. This is a workaround for fixing the current bug where it's not possible to select the "current day" in the expiration date of a Send. Fix for TimePicker not displaying default Time Value Updated some "Device" code to the new MAUI "DeviceInfo" * PM-3349 PM-3350 Migrated IconLabelButton Frames to Borders to fix issue with TapGestureRecognizer in Android Also fixed some minor "styles" for normal Button and IconLabelButton (both Android and iOS) * PM-3349 Fix for TabGestureRecognizer not working inside the StackLayout area of IconLabelButton * PM-3349 Fix for Android buttons having all letters in Caps * PM-3349 PM-3350 Started using OnNavigatedTo/From instead of On(Dis)Appearing for LoginPage and LoginSSOPage to avoid the "Modal loading" issues in iOS Also had to add IsInitialized logic to these pages because OnNavigatedTo can be called twice in some scenario. Some minor migrations of Device to DeviceInfo was also done * PM-3350 Fixed iOS extensions (iOS.Extension and iOS.ShareExtension) to load and commented argon2id from debug configuration until we have the .a compiled again with the new platform/arch * PM-3350 Added configurations for Release mode (no FDroid yet) * PM-3349 PM-3350 Migrated remaining AutomationProperties to SemanticProperties. All 'IsInAccessibleTree="True"' were deleted. 'IsInAccessibleTree="False"' were kept and stayed in code. * PM-3349 PM-3350 Changed binding set for CipherViewCell so it updates accordingly * PM-3349 PM-3350 Changed AccountViewCell and its binding to be directly against the ViewModel * PM-3349 Fix for HTML Label on Android. Color hex doesn't need to be cropped anymore. * PM-3350 Fix for colored html text on iOS * PM-3349 PM-3350 Added the partial MAUI Community Toolkit implementation for TouchEffect. This is a temporary solution until they finalize this and add it to their nuget package. This allows implementing the LongPressCommand in AccountSwitchingOverlay and also have the "Ripple effect" animation when touching an item in Android * PM-3349 PM-3350 Changed SendViewCell and its binding to be directly against the ViewModel * PM-3350 Fixed iOS Share extension lazy views loading and an issue with the avatar loading. Also discovered issue with TapGestureRecognizer not working on MAUI Embedding * PM-3350 Fixed iOS Extensions navigation to several pages and improved avoiding duplicate calls to OnNavigatedTo * PM-3350 Updated PCL Crypto to latest alpha version to fix "Dll not found NCrypt" issue * PM-3350 Removed workaround for iOS issue with Avatar icon as it's now fixed in latest .Net8 release. * PM-3349 PM-3350 Removed AsyncCommand "wrapper" and added AsyncRelayCommand directly in all ViewModels that were using the other one. * PM-3350 Added watchOS app to main project and fixed some csproj conditions for runtime identifiers on iOS. * PM-3350 Fixed/Updated all MAUI-Migration TODOs * PM-3350 Fixed account toolbar item and TitleView on SendAddOnlyPage, also removed comments on AvatarImageSource given the workaround is not needed anymore to draw the image successfully. * PM-3350 Updated AppCenter package to latest version 5.0.3 and updated some things into MAUI style * PM-3350 Added workaround for iOS Avatar icon again. * PM-3349 Added workaround for Android to avoid issues with setting MainPage when app is in background. They are now kept on a Queue to be executed after the app has resumed. Updated some things on App.xaml.cs to the new MAUI style * PM-3349 PM-3350 Fixed issue where creating an account with weak/exposed password would get stuck after the Captcha (if a captcha is shown) Changed App.xaml.cs NavigateImpl to be private * PM-3349 Started to configure build.yml for MAUI Android * PM-3349 build.yml update paths for MAUI Android * PM-3349 build.yml commented verify format and just set qa as variant on MAUI Android for faster checks on CI * PM-3349 PM-3350 build.cake updated paths * PM-3349 build.yml updated env helpers variables and set specific csproj to build on Android so not to build iOS extensions * PM-3349 build.yml add Android "prod" variant * PM-3350 build.yml updated iOS build and ignore Android build to try the CI faster * PM-3350 build.yml changed nuget restore for dotnet restore on iOS build to fix issue on restoring due to msbuild * PM-3350 build.yml Upgraded iOS build to run on macos-13 image which has XCode 15, and set the XCode 15 version as currently the default one is 14.x * PM-3350 build.yml try to fix ILLINK warnings and changed image to be macos-13-arm64 to see if the build is faster * PM-3350 build.yml changed image back to be macos-13 to see if the build is faster * PM-3350 Added Document.Build.props to disable trimming on publish * PM-3350 build.yml disable trimming on publish so it's faster * PM-3350 added linkskip for iOS csprojs * PM-3350 iOS projs disable linking and set Newstandkit as weak framework * Update build.yml disabling iOS job to avoid long running process of publish until we can fix that * PM-3349 PM-3350 Workaround to fix issues with text getting cropped/truncated when a Label has both Multiline and LinebreakMode set * PM-3349 build.yml enabled android build workflow * PM-3349 build.yml configured FDROID job for MAUI * PM-3350 iOS extensions TapGestureRecognizer try Window workaround * PM-3350 iOS applied workaround on the iOS Autofill and Share extension to maui embed the navigation page with its content page in the Window * PM-3349 PM-3350 Added workaround for More Options to work on Search and Groupings Page Updated some code to MAUI Style also * PM-3349 PM-3350 Added the ability for users to press "Continue" button as a fallback when using the Yubikey if the "SubmitCommand" doesn't trigger automatically. * PM-3349 PM-3350 Fix for text getting cut/truncated in both account switcher and ciphers/search lists Issue is due to MAUI but can be avoided by using slightly different layout * PM-3350 iOS updated CFBundlerShortVersionString to latest one 2023.10.1 * PM-3350 fix build.yml Bitwarden.ipa AppStore exported file * PM-3350 build.yml added step to validate app for submitting into App Store and have better logs of it * PM-3350 build.yml Added several fixes like not using MtouchUseLLVM on the iOS builds to fix they taking forever to build and some changes on the automation CI to do a debug build for the moment * PM-3350 Improved MTouch linking and extra args on iOS related csprojs * PM-3349 PM-3350 Added MAUI label on self-host settings and on about settings to differentiate from XF app * PM-3349 PM-3350 build.yml uncommented jobs so we have a more complete workflow * PM-3349 PM-3350 Minor change: removed unneeded HorizontalTextAlignment from Label. * PM-3349 Replaced CrossCurrentActivity plugin with MAUI internal CurrentActivity * PM-3350 Fix iOS extensions navigation and Window/RootViewController handling for TapGestureRecognizer to work * PM-3350 Cleared left ClipLogger from the iOS extensions debug logging. * PM-3349 PM-3350 Refactored cipher bindings to have a simpler approach reusing a new CipherItemViewModel to avoid unwanted issues in the app * PM-3349 Added base structure for avoiding Android Autofill crash. This workaround works but it's not complete as it can't handle the entire workflow when showing CipherSelectionPAge (like checking if it should show LockPage) * PM-3350 Bumped iOS version * PM-3350 Changed linker to use default mode given that "Full" is presenting some problems as the linker is stripping things it shouldn't and we're trying to solve it. So for now we will use the mode "Link SDK assemblies only" so QA can test. * PM-3349 Fix for app crashing on Android when Dark mode is enabled Removed unused button style for android * Proof of concept for having multiple window in Android for autofill support and navigating with the help of an Extended splash page. * PM-3350 Fix crash on Release by adding Interpreter on iOS and also adding System.Security.Cryptography to be ignored by the linker * PM-3350 Apply Cryptography TrimmerRootAssembly only to iOS * PM-3350 Updated Plugin.Fingerprint so biometrics work * Update .github/workflows/build.yml setup-xcode commit hash Co-authored-by: Vince Grassia <593223+vgrassia@users.noreply.github.com> * PM-3349 PM-3350 Enabled argon2id and fixed one issue with the Uris when getting the icon image * PM-3349 Upgraded Android targetSdkVersion to 34 * minor change (public to private fields) * minor improvemments on autofill-redirect * PM-3349 Commented the Deploy step for Android job given that we're using the hotfix-rc branch for testing iOS on TestFlight * PM-3349 Uncommented the Deploy step for Android job * PM-3349 Ensure "_isResumed=true" is set on App.xaml.cs:Bootstrap * Reusing App.xaml.cs Navigation for the Android RedirectPage Some other cleanup and changes * Improved autofill workaround to better handle switching between windows. * PM-3349 minor fix to add space in HomePage between the region picker labels. * Added some comments and improvemments. * PM-3349 Added Window events unsubscription of events. Also changed code to avoid potentially having multiple autofillwindow * PM-3349 Minor ui fix (space between buttons in delete account page) * initial commit of android credential provider service (wip) * Revert "initial commit of android credential provider service (wip)" This reverts commit 6011b639586d081687d22d77352a024272ca6841. * PM-3350 Fix for Delete Account buttons on iOS * PM-3349 PM-3350 Changed search icon used in app to avoid issue with icon size on iOS * PM-3349 Added custom window so that we can always get the current Active Window. This is used to support the Android Autofil and multi-window scenarios. * PM-3349 Fix for icon and text spacing in some list items * PM-3349 Minor aligment improvemment for region selection in HomePage * PM-3349 Changed the "track color" for the Android switch so that the color is different from the "thumb" * PM-3350 Updated version to 2024.1.0 on iOS * PM-3349 Fix Picker selection style by doing a custom PickerHandler for Android which uses SetSingleChoiceItems(...) to provide with the appropriate UI * PM-3350 Updated MauiVersion to 8.0.4-nightly.* to have the TapGestureRecognizer fix applied. This is done on the Directory.Build.props so we don't have to change it on every csproj. Also removed the workaround of TapGestureHack and fix the Show environment picker to work on the extensions as well. * PM-3350 Added nuget.config so we add the nuget package source for MAUI Nightly builds * Bump main iOS version * PM-3350 Removed "iOS" old folder project that has been moved into the MAUI Single app project. * PM-3350 Improved code safety adding a lot of try...catch and logging throughout the app. Also made the invoking on main thread safer on several places of the app. Additionally, on the GroupingsPageViewModel changed the code removing the old Xamarin hack and just using Replace directly instead of Clearing first to see if that fixes the crash we're having sometimes on the app. * PM-3350 PM-3349 Updated Unit Test projects to NET 8.0 and fixed it to work with Core project reference. Also fixed a test that was breaking due to CIpherKey creation being wrong. Added "UT" as a constant to add when building/running Core.Test project so we have something on the context that tells us that is for a UT. With this I had to remove FFImageLoading on UT context because it doesn't support NET 8.0 * PM-3350 PM-3349 Updated Readme with MAUI and main branch * PM-3350 PM-3349 Enable running Core tests * PM-3350 Fix build.yml format * PM-3349 Fix navigation when coming from autofill with Accessibility Services enabled. The user was getting into Home page instead of where they were, with this workaround the app navigates as if the account has been switched, leaving the user as closely as possible to where they were, basically on the first screen for the current state of the user. * PM-3350 PM-3349 Added property to Directory.Build.props to enable Unit Testing globally so Test runners work * Improve TOTP scan performance on Android * Move Android camera/scan changes to xaml * PM-3350 Testing UseInterpreter false on CI build * PM-3350 Enabled back UseInterpreter on iOS Release given that it crashes on startup without it. * PM-3349 PM-3350 Improved code safety with try...catch, better invoke on main thread and better null handling. * PM-3349 PM-3350 Updated XCode version on build.yml to 15.1 * PM-3350 Removed TapGesture Window MAUI hack from iOS.Extension and iOS.ShareExtension * PM-3350 Fixed CancellationTokenSource proper disposal * PM-3350 Fix Avatar toolbar icon on extensions to load properly and to take advantage of using directly SkiaSharp to do the native conversion to UIImage. Also improved the toolbar item so that size is set appropriately. * PM-3349 PM-3350 Fix external link icon * PM-3350 Added new style to prevent spell check and text prediction * Fix merge from main * PM-3350 Commented event collection upload on the timer and when sending the app to background to see if that prevents the app from crashing on release mode. * PM-3350 Added check for state migration version before trying to migrate LiteDB values into Prefs when there's no need to and that may be inducing crashes on backgrounded iOS apps. * PM-3350 Try to disable Interpreter to have better crash knowledge. This time testing if avoiding loading the argon2id lib we're able to not use the interpreter. * PM-5928 Fix circle animation to be shown on verification codes list on each item * PM-3350 Go back to use Interpreter and added some Directory.Build.props to easily change Codesign properties and also include/exclude iOS extensions / WatchOS from the build. * PM-3350 Enabled iOS extensions and WatchOS app to be included based on the Directory.Build.props * PM-3350 Go back to include argon2id and interpreter * Removing error/loading placeholders of icons on the cells to see if that is causing the background crash on iOS; so we can test this in TestFlight * [PM-5910] Workaround for for sliding elements in Duo 2FA flow (#2967) * workaround for sliding elements in duo 2fa flow * restrict workaround to Android * restrict workaround to Android * Revert "restrict workaround to Android" This reverts commit c2753d5dc4960aeacdb4c798e7273ca86c08881d. * Revert "restrict workaround to Android" This reverts commit 69688cfb98e8e3e17812f126b4fd90ffd2ac3cf8. * PM-5902 fix for account switcher not dismissing when tapping outside (#2974) * PM-3350 Fix iossimulator-x64 argon2id load so we can test on simulators and also made easier to maintain loading the argon2id library on the iOS projects by setting a general Directory.Build.props that is shared. * PM-5903 Changed App.xaml.cs SetOption to only update the needed properties instead of replacing the existing Options object which would cause the AccountSwitcher button bug (#2973) * [PM-5896] Fix MAUI iOS Background crash due to lock files on suspension (#2969) * PM-5896 Fix background crash on iOS due to lock files when app gets suspended. Changed loading and error placeholders of the CachedImage to not be used and use default icon of IconLabel instead changing visibility. * PM-5896 Changed methods to be protected so that they don't get removed by the linker. * PM-5896 Added stub class and references to it so to have stronger references to Icon_Success and Icon_Error so the linker doesn't remove them. * PM-3349 Removed commented code from build.yml regarding FDroid that is not needed anymore. * PM-6077 Separated Android and iOS HybridWebViewHandler so that it can be used on iOS.Core (#2983) * [PM-5907] Fix for incorrect TOTP white text color on label when using light theme on iOS (#2982) * PM-5907 workaround for incorrect textcolor when programmatically changing text on Entry * Update src/Core/Pages/Vault/CipherAddEditPage.xaml.cs Co-authored-by: Federico Maccaroni --------- Co-authored-by: Federico Maccaroni * [PM-5906] Fix for incorrect Send MaxAccess white text color on label when using light theme on iOS (#2981) * PM-5906 workaround for incorrect textcolor when programmatically changing text on Entry * Update src/Core/Pages/Send/SendAddEditPage.xaml.cs Co-authored-by: Federico Maccaroni --------- Co-authored-by: Federico Maccaroni * PM-3349 PM-3350 Fixed Unit tests because of referencing FFImageLoading when it's not possible --------- Co-authored-by: Dinis Vieira Co-authored-by: Vince Grassia <593223+vgrassia@users.noreply.github.com> Co-authored-by: mpbw2 <59324545+mpbw2@users.noreply.github.com> --- .github/workflows/build.yml | 232 +- .gitignore | 1 + Directory.Build.props | 13 + README.md | 6 +- bitwarden-mobile.sln | 642 +- build.cake | 44 +- global.json | 7 - .../android/argon2}/arm64-v8a/libargon2.so | Bin .../android/argon2}/armeabi-v7a/libargon2.so | Bin .../android/argon2}/x86_64/libargon2.so | Bin nuget.config | 6 + src/Android/Android.csproj | 327 - src/Android/Effects/FabShadowEffect.cs | 30 - src/Android/Effects/FixedSizeEffect.cs | 23 - .../Effects/RemoveFontPaddingEffect.cs | 23 - src/Android/Effects/TabBarEffect.cs | 30 - src/Android/Properties/AssemblyInfo.cs | 28 - src/Android/Renderers/CustomEditorRenderer.cs | 69 - src/Android/Renderers/CustomEntryRenderer.cs | 107 - src/Android/Renderers/CustomLabelRenderer.cs | 43 - src/Android/Renderers/CustomPageRenderer.cs | 31 - src/Android/Renderers/CustomPickerRenderer.cs | 57 - .../Renderers/CustomSearchBarRenderer.cs | 33 - src/Android/Renderers/CustomSwitchRenderer.cs | 67 - src/Android/Renderers/CustomTabbedRenderer.cs | 66 - .../Renderers/ExtendedDatePickerRenderer.cs | 50 - src/Android/Renderers/ExtendedGridRenderer.cs | 23 - .../Renderers/ExtendedSliderRenderer.cs | 56 - .../Renderers/ExtendedStackLayoutRenderer.cs | 23 - .../Renderers/ExtendedStepperRenderer.cs | 72 - .../Renderers/ExtendedTimePickerRenderer.cs | 50 - .../Renderers/HybridWebViewRenderer.cs | 98 - .../Renderers/SelectableLabelRenderer.cs | 25 - src/App/App.csproj | 691 +- .../AuthenticatorViewCell.xaml.cs | 67 - src/App/Controls/AvatarImageSource.cs | 180 - .../CipherViewCell/CipherViewCell.xaml.cs | 82 - .../CipherViewCell/CipherViewCellViewModel.cs | 51 - src/App/Controls/ExtendedCollectionView.cs | 20 - src/App/Controls/ExtendedGrid.cs | 8 - src/App/Controls/ExtendedSearchBar.cs | 19 - src/App/Controls/ExtendedStackLayout.cs | 8 - .../IconLabelButton/IconLabelButton.xaml | 42 - src/App/Controls/MonoEntry.cs | 20 - src/App/Controls/MonoLabel.cs | 20 - .../SendViewCell/SendViewCell.xaml.cs | 68 - src/App/Effects/FabShadowEffect.cs | 11 - src/App/Effects/FixedSizeEffect.cs | 11 - src/App/Effects/NoEmojiKeyboardEffect.cs | 12 - src/App/Effects/RemoveFontPaddingEffect.cs | 13 - ...iewContentInsetAdjustmentBehaviorEffect.cs | 33 - src/App/Effects/TabBarEffect.cs | 11 - src/App/MauiProgram.cs | 41 + src/App/Pages/Accounts/HomePage.xaml | 145 - src/App/Pages/BaseContentPage.cs | 162 - src/App/Pages/BaseViewModel.cs | 73 - .../AutofillSettingsPageViewModel.ios.cs | 19 - .../GroupingsPageTOTPListItem.cs | 121 - .../Platforms}/Android/8bit.keystore.enc | Bin .../Accessibility/AccessibilityActivity.cs | 2 +- .../Accessibility/AccessibilityHelpers.cs | 9 +- .../Accessibility/AccessibilityService.cs | 3 +- .../Android/Accessibility/Browser.cs | 0 .../Android/Accessibility/Credentials.cs | 0 .../Accessibility/KnownUsernameField.cs | 0 .../Android/Accessibility/NodeList.cs | 0 .../Platforms/Android}/AndroidManifest.xml | 2 +- .../Android/Autofill/AutofillConstants.cs | 0 .../AutofillExternalSelectionActivity.cs | 4 +- .../Android/Autofill/AutofillHelpers.cs | 6 +- .../Android/Autofill/AutofillService.cs | 0 .../Platforms}/Android/Autofill/Field.cs | 1 + .../Android/Autofill/FieldCollection.cs | 1 + .../Platforms}/Android/Autofill/FilledItem.cs | 1 + .../Platforms}/Android/Autofill/Parser.cs | 0 .../Platforms}/Android/Autofill/SavedItem.cs | 0 src/{ => App/Platforms}/Android/Constants.cs | 0 .../Android/Handlers/ButtonHandlerMappings.cs | 14 + .../Handlers/CustomTabbedPageHandler.cs | 134 + .../Handlers/DatePickerHandlerMappings.cs | 39 + .../Android/Handlers/EditorHandlerMappings.cs | 24 + .../Android/Handlers/EntryHandlerMappings.cs | 63 + .../Handlers/ExtendedDatePickerHandler.cs | 76 + .../Android/Handlers/HybridWebViewHandler.cs | 105 + .../Android/Handlers/LabelHandlerMappings.cs | 49 + .../Android/Handlers/PickerHandlerMappings.cs | 21 + .../Handlers/SearchBarHandlerMappings.cs | 23 + .../Android/Handlers/SliderHandlerMappings.cs | 24 + .../Handlers/StepperHandlerMappings.cs | 45 + .../Android/Handlers/SwitchHandlerMappings.cs | 70 + .../Handlers/TimePickerHandlerMappings.cs | 39 + .../Handlers/ToolbarHandlerMappings.cs | 21 + .../Platforms}/Android/MainActivity.cs | 32 +- .../Platforms}/Android/MainApplication.cs | 39 +- .../Android/Push/FirebaseMessagingService.cs | 1 - .../Receivers/ClearClipboardAlarmReceiver.cs | 0 .../Android/Receivers/EventUploadReceiver.cs | 0 .../Receivers/NotificationDismissReceiver.cs | 0 .../Receivers/PackageReplacedReceiver.cs | 0 .../Receivers/RestrictionsChangedReceiver.cs | 2 +- .../Resources/drawable-hdpi/logo_legacy.png | Bin .../drawable-hdpi/logo_white_legacy.png | Bin .../Resources/drawable-hdpi/yubikey.png | Bin .../splash_screen_round.xml | 0 .../Resources/drawable-v23/splash_screen.xml | 0 .../drawable-v23/splash_screen_dark.xml | 0 .../drawable-v26/splash_screen_round.xml | 0 .../Resources/drawable-xhdpi/logo_legacy.png | Bin .../drawable-xhdpi/logo_white_legacy.png | Bin .../Resources/drawable-xhdpi/yubikey.png | Bin .../Resources/drawable-xxhdpi/logo_legacy.png | Bin .../drawable-xxhdpi/logo_white_legacy.png | Bin .../Resources/drawable-xxhdpi/yubikey.png | Bin .../Android/Resources/drawable/card.xml | 0 .../Resources/drawable/cog_environment.xml | 0 .../Resources/drawable/cog_settings.xml | 0 .../drawable/empty_login_requests.xml | 0 .../drawable/empty_login_requests_dark.xml | 0 .../drawable/empty_uris_placeholder.xml | 0 .../drawable/empty_uris_placeholder_dark.xml | 0 .../Android/Resources/drawable/generate.xml | 0 .../drawable/ic_launcher_foreground.xml | 0 .../drawable/ic_launcher_monochrome.xml | 0 .../Resources/drawable/ic_notification.xml | 0 .../Android/Resources/drawable/ic_warning.xml | 0 .../Android/Resources/drawable/icon.xml | 0 .../Android/Resources/drawable/id.xml | 0 .../Android/Resources/drawable/info.xml | 0 .../Resources/drawable/list_item_bg.xml | 0 .../Android/Resources/drawable/lock.xml | 0 .../Android/Resources/drawable/login.xml | 0 .../Android/Resources/drawable/logo.xml | 0 .../Resources/drawable/logo_rounded.xml | 0 .../Android/Resources/drawable/logo_white.xml | 0 .../Android/Resources/drawable/pencil.xml | 0 .../Android/Resources/drawable/plus.xml | 0 .../Android/Resources/drawable/search.xml | 0 .../Android/Resources/drawable/send.xml | 0 .../Android/Resources/drawable/shield.xml | 0 .../Resources/drawable/slider_thumb.xml | 0 .../Resources/drawable/splash_screen.xml | 0 .../Resources/drawable/splash_screen_dark.xml | 0 .../Resources/drawable/switch_thumb.xml | 0 .../Android/Resources/layout/Tabbar.axml | 0 .../Android/Resources/layout/Toolbar.axml | 0 .../Resources/layout/autofill_listitem.xml | 0 .../layout/progress_dialog_layout.xml | 0 .../validatable_input_dialog_layout.xml | 0 .../mipmap-anydpi-v26/ic_launcher.xml | 0 .../mipmap-anydpi-v26/ic_launcher_round.xml | 0 .../Resources/mipmap-hdpi/ic_launcher.png | Bin .../mipmap-hdpi/ic_launcher_round.png | Bin .../Resources/mipmap-mdpi/ic_launcher.png | Bin .../mipmap-mdpi/ic_launcher_round.png | Bin .../Resources/mipmap-xhdpi/ic_launcher.png | Bin .../mipmap-xhdpi/ic_launcher_round.png | Bin .../Resources/mipmap-xxhdpi/ic_launcher.png | Bin .../mipmap-xxhdpi/ic_launcher_round.png | Bin .../Resources/mipmap-xxxhdpi/ic_launcher.png | Bin .../mipmap-xxxhdpi/ic_launcher_round.png | Bin .../Android/Resources/values-night/styles.xml | 6 +- .../Android/Resources/values-v30/manifest.xml | 0 .../Android/Resources/values/attrs.xml | 6 + .../Android/Resources/values/colors.xml | 0 .../Android/Resources/values/dimens.xml | 0 .../values/ic_launcher_background.xml | 0 .../Android/Resources/values/manifest.xml | 0 .../Android/Resources/values/strings.xml | 0 .../Android/Resources/values/styles.xml | 12 +- .../Resources/xml/accessibilityservice.xml | 0 .../Resources/xml/app_restrictions.xml | 0 .../Android/Resources/xml/autofillservice.xml | 0 .../Android/Resources/xml/filepaths.xml | 0 .../Resources/xml/network_security_config.xml | 0 .../Android/Services/AndroidLogService.cs | 0 .../AndroidPushNotificationService.cs | 6 +- .../Android/Services/AutofillHandler.cs | 12 +- .../Android/Services/BiometricService.cs | 0 .../Android/Services/ClipboardService.cs | 4 +- .../Services/CryptoPrimitiveService.cs | 0 .../Android/Services/DeviceActionService.cs | 47 +- .../Android/Services/FileService.cs | 36 +- .../Android/Services/LocalizeService.cs | 0 .../Android/Services/WatchDeviceService.cs | 0 .../Android/Tiles/AutofillTileService.cs | 2 +- .../Android/Tiles/GeneratorTileService.cs | 0 .../Android/Tiles/MyVaultTileService.cs | 0 .../Android/Utilities/AndroidHelpers.cs | 6 +- .../Android/Utilities/IntentExtensions.cs | 3 +- .../Android/Utilities/ThemeHelpers.cs | 22 +- .../Android/WebAuthCallbackActivity.cs | 4 +- .../Android/fdroid-keystore.jks.enc | Bin .../Platforms}/Android/google-services.json | 0 .../Android/google-services.json.enc | Bin .../Android/lib/arm64-v8a/libargon2.so | Bin 0 -> 38760 bytes .../Android/lib/armeabi-v7a/libargon2.so | Bin 0 -> 38568 bytes .../Platforms}/Android/lib/x86/libargon2.so | Bin .../Platforms/Android/lib/x86_64/libargon2.so | Bin 0 -> 47224 bytes .../Android/upload-keystore.jks.enc | Bin src/App/Platforms/iOS/AppDelegate.cs | 531 ++ .../Platforms}/iOS/Entitlements.plist | 0 src/{ => App/Platforms}/iOS/Info.plist | 0 .../Platforms}/iOS/LaunchScreen.storyboard | 0 src/App/Platforms/iOS/Program.cs | 12 + .../AppIcons.appiconset/Contents.json | 0 .../AppIcons.appiconset/Icon-1024.png | Bin .../AppIcons.appiconset/Icon-120.png | Bin .../AppIcons.appiconset/Icon-152.png | Bin .../AppIcons.appiconset/Icon-167.png | Bin .../AppIcons.appiconset/Icon-180.png | Bin .../AppIcons.appiconset/Icon-20.png | Bin .../AppIcons.appiconset/Icon-29.png | Bin .../AppIcons.appiconset/Icon-40.png | Bin .../AppIcons.appiconset/Icon-58.png | Bin .../AppIcons.appiconset/Icon-60.png | Bin .../AppIcons.appiconset/Icon-76.png | Bin .../AppIcons.appiconset/Icon-80.png | Bin .../AppIcons.appiconset/Icon-87.png | Bin .../Resources/Assets.xcassets/Contents.json | 0 .../LaunchScreen.imageset/Contents.json | 0 .../LaunchScreen.imageset/logo.png | Bin .../LaunchScreen.imageset/logo@2x.png | Bin .../LaunchScreen.imageset/logo@3x.png | Bin .../LaunchScreen.imageset/logo_white.png | Bin .../LaunchScreen.imageset/logo_white@2x.png | Bin .../LaunchScreen.imageset/logo_white@3x.png | Bin .../autofill-kb.imageset/Contents.json | 27 + .../autofill-kb.imageset}/autofill-kb.png | Bin .../autofill-kb.imageset}/autofill-kb@2x.png | Bin .../autofill-kb.imageset}/autofill-kb@3x.png | Bin .../empty_items_state.imageset/Contents.json | 0 .../Empty-items-state-dark.pdf | Bin .../Empty-items-state.pdf | Bin .../Contents.json | 0 .../empty_login_requests.pdf | Bin .../empty_login_requests_dark.pdf | Bin .../ext-act.imageset/Contents.json | 27 + .../ext-act.imageset}/ext-act.png | Bin .../ext-act.imageset}/ext-act@2x.png | Bin .../ext-act.imageset}/ext-act@3x.png | Bin .../ext-more.imageset/Contents.json | 27 + .../ext-more.imageset}/ext-more.png | Bin .../ext-more.imageset}/ext-more@2x.png | Bin .../ext-more.imageset}/ext-more@3x.png | Bin .../ext-use.imageset/Contents.json | 27 + .../ext-use.imageset}/ext-use.png | Bin .../ext-use.imageset}/ext-use@2x.png | Bin .../ext-use.imageset}/ext-use@3x.png | Bin .../ic_warning.imageset/Contents.json | 0 .../ic_warning.imageset/ic_warning-1.pdf | 0 .../search.imageset/Contents.json | 27 + .../search.imageset}/search.png | Bin .../search.imageset}/search@2x.png | Bin .../search.imageset}/search@3x.png | Bin .../Platforms}/iOS/Resources/logo.png | Bin .../Platforms}/iOS/Resources/logo@2x.png | Bin .../Platforms}/iOS/Resources/logo@3x.png | Bin .../Platforms}/iOS/Resources/logo_white.png | Bin .../iOS/Resources/logo_white@2x.png | Bin .../iOS/Resources/logo_white@3x.png | Bin .../Platforms}/iOS/Resources/more_vert.png | Bin .../Platforms}/iOS/Resources/more_vert@2x.png | Bin .../Platforms}/iOS/Resources/more_vert@3x.png | Bin .../Services/iOSPushNotificationHandler.cs | 7 +- .../Services/iOSPushNotificationService.cs | 10 +- src/App/Resources/AppIcon/appicon.svg | 5 + src/App/Resources/AppIcon/appiconfg.svg | 8 + src/App/Resources/AppResources.cs.Designer.cs | 7821 ---------------- src/App/Resources/AppResources.da.Designer.cs | 7822 ---------------- src/App/Resources/AppResources.de.Designer.cs | 7821 ---------------- src/App/Resources/AppResources.es.Designer.cs | 7823 ---------------- src/App/Resources/AppResources.fi.Designer.cs | 7823 ---------------- src/App/Resources/AppResources.fr.Designer.cs | 7823 ---------------- src/App/Resources/AppResources.hi.Designer.cs | 7823 ---------------- src/App/Resources/AppResources.hr.Designer.cs | 7820 ---------------- src/App/Resources/AppResources.hu.Designer.cs | 7821 ---------------- src/App/Resources/AppResources.id.Designer.cs | 7822 ---------------- src/App/Resources/AppResources.it.Designer.cs | 7822 ---------------- src/App/Resources/AppResources.ja.Designer.cs | 7822 ---------------- src/App/Resources/AppResources.nl.Designer.cs | 7822 ---------------- src/App/Resources/AppResources.pl.Designer.cs | 7822 ---------------- .../Resources/AppResources.pt-BR.Designer.cs | 7823 ---------------- .../Resources/AppResources.pt-PT.Designer.cs | 7821 ---------------- src/App/Resources/AppResources.ro.Designer.cs | 7822 ---------------- src/App/Resources/AppResources.ru.Designer.cs | 7824 ---------------- src/App/Resources/AppResources.sk.Designer.cs | 7822 ---------------- src/App/Resources/AppResources.sv.Designer.cs | 7824 ---------------- src/App/Resources/AppResources.th.Designer.cs | 7830 ----------------- src/App/Resources/AppResources.tr.Designer.cs | 7821 ---------------- src/App/Resources/AppResources.uk.Designer.cs | 7822 ---------------- src/App/Resources/AppResources.vi.Designer.cs | 7823 ---------------- .../AppResources.zh-Hans.Designer.cs | 7822 ---------------- .../AppResources.zh-Hant.Designer.cs | 7822 ---------------- src/App/Resources/Splash/splash.svg | 9 + src/App/Resources/cog_settings.svg | 3 + src/App/Resources/ext_act.png | Bin 0 -> 72971 bytes src/App/Resources/ext_more.png | Bin 0 -> 71822 bytes src/App/Resources/ext_use.png | Bin 0 -> 74989 bytes src/App/Resources/generate.svg | 3 + src/App/Resources/info.svg | 10 + src/App/Resources/lock.svg | 10 + src/App/Resources/login.svg | 10 + src/App/Resources/logo.png | Bin 0 -> 8426 bytes src/App/Resources/logo_white.png | Bin 0 -> 8402 bytes src/App/Resources/more.svg | 3 + src/App/Resources/more_vert.svg | 3 + src/App/Resources/plus.svg | 10 + src/App/Resources/search.svg | 3 + src/App/Resources/send.svg | 10 + .../Resources/yubikey.png} | Bin .../Abstractions/IAccountsManager.cs | 0 .../Abstractions/IAccountsManagerHost.cs | 0 src/Core/Abstractions/IApiService.cs | 1 + src/Core/Abstractions/ICollectionService.cs | 1 + .../Abstractions/IDeepLinkContext.cs | 0 .../Abstractions/IDeviceActionService.cs | 2 +- src/Core/Abstractions/IEnvironmentService.cs | 9 +- .../Abstractions/ILocalizeService.cs | 0 .../Abstractions/IPasswordRepromptService.cs | 0 .../Abstractions/IPlatformUtilsService.cs | 2 +- .../IPushNotificationListenerService.cs | 0 .../Abstractions/IPushNotificationService.cs | 0 src/Core/Abstractions/IStateService.cs | 13 +- src/{App => Core}/App.xaml | 4 +- src/{App => Core}/App.xaml.cs | 381 +- ...entAutoBottomScrollingOnFocusedBehavior.cs | 5 +- .../Extensions/VisualElementExtensions.cs | 72 + .../MCTTouch/GestureManager.cs | 789 ++ .../MCTTouch/Primitives/HoverState.shared.cs | 18 + .../HoverStateChangedEventArgs.shared.cs | 15 + .../MCTTouch/Primitives/HoverStatus.shared.cs | 16 + .../HoverStatusChangedEventArgs.shared.cs | 15 + .../LongPressCompletedEventArgs.shared.cs | 15 + .../TouchCompletedEventArgs.shared.cs | 19 + .../TouchInteractionStatus.shared.cs | 17 + ...nteractionStatusChangedEventArgs.shared.cs | 15 + .../MCTTouch/Primitives/TouchState.shared.cs | 17 + .../TouchStateChangedEventArgs.shared.cs | 15 + .../MCTTouch/Primitives/TouchStatus.shared.cs | 22 + .../TouchStatusChangedEventArgs.shared.cs | 15 + .../MCTTouch/TouchBehavior.Methods.shared.cs | 162 + .../MCTTouch/TouchBehavior.android.cs | 555 ++ .../MCTTouch/TouchBehavior.macios.cs | 308 + .../MCTTouch/TouchBehavior.shared.cs | 1208 +++ src/Core/Constants.cs | 1 + .../AccountSwitchingOverlayView.xaml | 36 +- .../AccountSwitchingOverlayView.xaml.cs | 74 +- .../AccountSwitchingOverlayViewModel.cs | 18 +- .../AccountViewCell/AccountViewCell.xaml | 35 +- .../AccountViewCell/AccountViewCell.xaml.cs | 24 - .../AccountViewCellViewModel.cs | 3 +- .../AuthenticatorViewCell.xaml | 51 +- .../AuthenticatorViewCell.xaml.cs | 14 + src/Core/Controls/Avatar/AvatarImageSource.cs | 62 + .../Controls/Avatar}/AvatarImageSourcePool.cs | 0 src/Core/Controls/Avatar/AvatarInfo.cs | 63 + .../Controls/Avatar/SKAvatarImageHelper.cs | 63 + src/Core/Controls/CachedImage.cs | 42 + .../CipherViewCell/BaseCipherViewCell.cs | 110 + .../CipherViewCell/CipherViewCell.xaml | 57 +- .../CipherViewCell/CipherViewCell.xaml.cs | 44 + .../Controls/CircularProgressbarView.cs | 15 +- src/{App => Core}/Controls/CustomLabel.cs | 3 +- .../Controls/DateTime/DateTimePicker.xaml | 11 +- .../Controls/DateTime/DateTimePicker.xaml.cs | 12 +- .../Controls/DateTime/DateTimeViewModel.cs | 3 +- src/Core/Controls/ExtendedCollectionView.cs | 20 + .../Controls/ExtendedDatePicker.cs | 11 +- src/Core/Controls/ExtendedGrid.cs | 21 + src/Core/Controls/ExtendedSearchBar.cs | 22 + src/{App => Core}/Controls/ExtendedSlider.cs | 5 +- src/Core/Controls/ExtendedStackLayout.cs | 21 + src/{App => Core}/Controls/ExtendedStepper.cs | 8 +- .../Controls/ExtendedTimePicker.cs | 5 +- .../Controls/ExtendedToolbarItem.cs | 3 +- .../Controls/ExternalLinkItemView.xaml | 9 +- .../Controls/ExternalLinkItemView.xaml.cs | 3 +- src/{App => Core}/Controls/HybridWebView.cs | 5 +- src/{App => Core}/Controls/IconButton.cs | 6 +- src/{App => Core}/Controls/IconLabel.cs | 6 +- .../IconLabelButton/IconLabelButton.xaml | 37 + .../IconLabelButton/IconLabelButton.xaml.cs | 34 +- src/{App => Core}/Controls/MiButton.cs | 6 +- src/{App => Core}/Controls/MiLabel.cs | 6 +- src/Core/Controls/MonoEntry.cs | 14 + src/Core/Controls/MonoLabel.cs | 17 + .../IPasswordStrengthable.cs | 0 .../PasswordStrengthCategory.cs | 0 .../PasswordStrengthProgressBar.xaml | 4 +- .../PasswordStrengthProgressBar.xaml.cs | 6 +- .../PasswordStrengthViewModel.cs | 3 +- .../Controls/Picker/PickerHandler.Android.cs | 299 + src/Core/Controls/Picker/PickerHandler.cs | 53 + src/{App => Core}/Controls/RepeaterView.cs | 3 +- src/{App => Core}/Controls/SelectableLabel.cs | 3 +- .../Controls/SendViewCell/SendViewCell.xaml | 24 +- .../SendViewCell/SendViewCell.xaml.cs | 35 + .../SendViewCell/SendViewCellViewModel.cs | 3 +- .../Settings/BaseSettingControlView.cs | 5 +- .../Settings/SettingChooserItemView.xaml | 4 +- .../Settings/SettingChooserItemView.xaml.cs | 3 +- .../Controls/Settings/SwitchItemView.xaml | 4 +- .../Controls/Settings/SwitchItemView.xaml.cs | 3 +- .../Controls/TruncatedMultilineCustomLabel.cs | 12 + src/Core/Core.csproj | 131 +- src/Core/Effects/FixedSizeEffect.cs | 31 + .../Effects/NoEmojiKeyboardEffect.cs | 24 +- src/Core/Effects/RemoveFontPaddingEffect.cs | 32 + .../Effects/ScrollEnabledEffect.cs | 26 +- ...iewContentInsetAdjustmentBehaviorEffect.cs | 70 + .../CustomFieldItemTemplateSelector.cs | 3 +- .../BooleanCustomFieldItemLayout.xaml | 9 +- .../BooleanCustomFieldItemLayout.xaml.cs | 3 +- .../HiddenCustomFieldItemLayout.xaml | 18 +- .../HiddenCustomFieldItemLayout.xaml.cs | 3 +- .../LinkedCustomFieldItemLayout.xaml | 9 +- .../LinkedCustomFieldItemLayout.xaml.cs | 3 +- .../TextCustomFieldItemLayout.xaml | 15 +- .../TextCustomFieldItemLayout.xaml.cs | 3 +- .../BaseCustomFieldItemViewModel.cs | 3 +- .../BooleanCustomFieldItemViewModel.cs | 0 .../CustomFields/CustomFieldItemFactory.cs | 0 .../HiddenCustomFieldItemViewModel.cs | 8 +- .../CustomFields/ICustomFieldItemViewModel.cs | 0 .../LinkedCustomFieldItemViewModel.cs | 0 .../TextCustomFieldItemViewModel.cs | 3 +- src/Core/MauiProgram.cs | 75 + src/{App => Core}/Models/AppOptions.cs | 0 src/Core/Models/Data/EnvironmentUrlData.cs | 16 +- src/{App => Core}/Models/DialogDetails.cs | 0 src/Core/Models/Domain/Account.cs | 6 +- src/Core/Models/Domain/Collection.cs | 1 + src/Core/Models/Domain/Organization.cs | 1 + src/Core/Models/Export/Collection.cs | 1 + src/Core/Models/Export/CollectionWithId.cs | 1 + src/{App => Core}/Models/NotificationData.cs | 0 src/{App => Core}/Models/PlatformCulture.cs | 0 src/Core/Models/Request/DeviceRequest.cs | 2 +- src/Core/Models/Response/DeviceResponse.cs | 2 +- .../Response/ProfileOrganizationResponse.cs | 1 + .../Accounts/BaseChangePasswordViewModel.cs | 4 +- .../Pages/Accounts/DeleteAccountPage.xaml | 8 +- .../Pages/Accounts/DeleteAccountPage.xaml.cs | 3 +- .../Pages/Accounts/DeleteAccountViewModel.cs | 4 +- .../Pages/Accounts/EnvironmentPage.xaml | 17 +- .../Pages/Accounts/EnvironmentPage.xaml.cs | 17 +- .../Accounts/EnvironmentPageViewModel.cs | 17 +- .../Pages/Accounts/HintPage.xaml | 5 +- .../Pages/Accounts/HintPage.xaml.cs | 4 +- .../Pages/Accounts/HintPageViewModel.cs | 10 +- src/Core/Pages/Accounts/HomePage.xaml | 148 + .../Pages/Accounts/HomePage.xaml.cs | 83 +- .../Pages/Accounts/HomePageViewModel.cs | 31 +- .../Pages/Accounts/LockPage.xaml | 22 +- .../Pages/Accounts/LockPage.xaml.cs | 170 +- .../Pages/Accounts/LockPageViewModel.cs | 16 +- .../Accounts/LoginApproveDevicePage.xaml | 4 +- .../Accounts/LoginApproveDevicePage.xaml.cs | 16 +- .../Accounts/LoginApproveDeviceViewModel.cs | 17 +- .../Pages/Accounts/LoginPage.xaml | 28 +- .../Pages/Accounts/LoginPage.xaml.cs | 57 +- .../Pages/Accounts/LoginPageViewModel.cs | 13 +- .../Pages/Accounts/LoginPasswordlessPage.xaml | 4 +- .../Accounts/LoginPasswordlessPage.xaml.cs | 3 +- .../LoginPasswordlessRequestPage.xaml | 4 +- .../LoginPasswordlessRequestPage.xaml.cs | 40 +- .../LoginPasswordlessRequestViewModel.cs | 20 +- .../Accounts/LoginPasswordlessViewModel.cs | 12 +- .../Pages/Accounts/LoginSsoPage.xaml | 5 +- .../Pages/Accounts/LoginSsoPage.xaml.cs | 71 +- .../Pages/Accounts/LoginSsoPageViewModel.cs | 12 +- .../Pages/Accounts/RegisterPage.xaml | 15 +- .../Pages/Accounts/RegisterPage.xaml.cs | 23 +- .../Pages/Accounts/RegisterPageViewModel.cs | 11 +- .../Accounts/RemoveMasterPasswordPage.xaml | 4 +- .../Accounts/RemoveMasterPasswordPage.xaml.cs | 5 +- .../RemoveMasterPasswordPageViewModel.cs | 2 +- .../Pages/Accounts/SetPasswordPage.xaml | 15 +- .../Pages/Accounts/SetPasswordPage.xaml.cs | 38 +- .../Accounts/SetPasswordPageViewModel.cs | 9 +- .../Pages/Accounts/TwoFactorPage.xaml | 16 +- .../Pages/Accounts/TwoFactorPage.xaml.cs | 91 +- .../Pages/Accounts/TwoFactorPageViewModel.cs | 165 +- .../Accounts/UpdateTempPasswordPage.xaml | 20 +- .../Accounts/UpdateTempPasswordPage.xaml.cs | 21 +- .../UpdateTempPasswordPageViewModel.cs | 13 +- .../Pages/Accounts/VerificationCodePage.xaml | 8 +- .../Accounts/VerificationCodePage.xaml.cs | 0 .../Accounts/VerificationCodeViewModel.cs | 15 +- .../Pages/AndroidNavigationRedirectPage.xaml | 9 + .../AndroidNavigationRedirectPage.xaml.cs | 20 + src/Core/Pages/BaseContentPage.cs | 211 + .../Pages/BaseModalContentPage.cs | 0 src/Core/Pages/BaseViewModel.cs | 38 + .../Pages/CaptchaProtectedViewModel.cs | 4 +- .../Pages/CollectionViewModel.cs | 0 .../Pages/Generator/GeneratorHistoryPage.xaml | 14 +- .../Generator/GeneratorHistoryPage.xaml.cs | 6 +- .../GeneratorHistoryPageViewModel.cs | 9 +- .../Pages/Generator/GeneratorPage.xaml | 55 +- .../Pages/Generator/GeneratorPage.xaml.cs | 105 +- .../Pages/Generator/GeneratorPageViewModel.cs | 74 +- src/{App => Core}/Pages/PickerViewModel.cs | 19 +- .../Pages/Send/SendAddEditPage.xaml | 63 +- .../Pages/Send/SendAddEditPage.xaml.cs | 43 +- .../Pages/Send/SendAddEditPageViewModel.cs | 21 +- .../Pages/Send/SendAddOnlyOptionsView.xaml | 17 +- .../Pages/Send/SendAddOnlyOptionsView.xaml.cs | 8 +- .../Pages/Send/SendAddOnlyPage.xaml | 67 +- .../Pages/Send/SendAddOnlyPage.xaml.cs | 40 +- .../ISendGroupingsPageListItem.cs | 0 .../SendGroupingsPage/SendGroupingsPage.xaml | 39 +- .../SendGroupingsPage.xaml.cs | 137 +- .../SendGroupingsPageHeaderListItem.cs | 0 .../SendGroupingsPageListGroup.cs | 0 .../SendGroupingsPageListItem.cs | 69 +- .../SendGroupingsPageListItemSelector.cs | 5 +- .../SendGroupingsPageViewModel.cs | 109 +- src/{App => Core}/Pages/Send/SendsPage.xaml | 10 +- .../Pages/Send/SendsPage.xaml.cs | 10 +- .../Pages/Send/SendsPageViewModel.cs | 16 +- .../Pages/Settings/AboutSettingsPage.xaml | 11 +- .../Pages/Settings/AboutSettingsPage.xaml.cs | 2 +- .../Settings/AboutSettingsPageViewModel.cs | 40 +- .../Settings/AppearanceSettingsPage.xaml | 4 +- .../Settings/AppearanceSettingsPage.xaml.cs | 2 +- .../AppearanceSettingsPageViewModel.cs | 30 +- .../Pages/Settings/AutofillPage.xaml | 4 +- .../Pages/Settings/AutofillPage.xaml.cs | 0 .../Pages/Settings/AutofillSettingsPage.xaml | 4 +- .../Settings/AutofillSettingsPage.xaml.cs | 2 +- .../AutofillSettingsPageViewModel.android.cs | 35 +- .../Settings/AutofillSettingsPageViewModel.cs | 25 +- .../AutofillSettingsPageViewModel.ios.cs | 18 + .../Pages/Settings/BlockAutofillUrisPage.xaml | 15 +- .../Settings/BlockAutofillUrisPage.xaml.cs | 5 +- .../BlockAutofillUrisPageViewModel.cs | 14 +- .../Pages/Settings/ExportVaultPage.xaml | 10 +- .../Pages/Settings/ExportVaultPage.xaml.cs | 5 +- .../Settings/ExportVaultPageViewModel.cs | 5 +- .../Pages/Settings/ExtensionPage.xaml | 4 +- .../Pages/Settings/ExtensionPage.xaml.cs | 0 .../Pages/Settings/ExtensionPageViewModel.cs | 2 +- .../Pages/Settings/FolderAddEditPage.xaml | 8 +- .../Pages/Settings/FolderAddEditPage.xaml.cs | 8 +- .../Settings/FolderAddEditPageViewModel.cs | 9 +- .../Pages/Settings/FoldersPage.xaml | 20 +- .../Pages/Settings/FoldersPage.xaml.cs | 4 +- .../Pages/Settings/FoldersPageViewModel.cs | 2 +- .../LoginPasswordlessRequestsListPage.xaml | 12 +- .../LoginPasswordlessRequestsListPage.xaml.cs | 14 +- .../LoginPasswordlessRequestsListViewModel.cs | 19 +- .../Pages/Settings/OtherSettingsPage.xaml | 4 +- .../Pages/Settings/OtherSettingsPage.xaml.cs | 2 +- .../Settings/OtherSettingsPageViewModel.cs | 37 +- .../Pages/Settings/SecuritySettingsPage.xaml | 9 +- .../Settings/SecuritySettingsPage.xaml.cs | 2 +- .../Settings/SecuritySettingsPageViewModel.cs | 62 +- .../Settings/SettingsPage/SettingsPage.xaml | 4 +- .../SettingsPage/SettingsPage.xaml.cs | 4 +- .../SettingsPage/SettingsPageListItem.cs | 2 +- .../SettingsPage/SettingsPageViewModel.cs | 12 +- .../Pages/Settings/VaultSettingsPage.xaml | 4 +- .../Pages/Settings/VaultSettingsPage.xaml.cs | 0 .../Settings/VaultSettingsPageViewModel.cs | 15 +- src/{App => Core}/Pages/TabsPage.cs | 97 +- .../Pages/Vault/AttachmentsPage.xaml | 9 +- .../Pages/Vault/AttachmentsPage.xaml.cs | 7 +- .../Pages/Vault/AttachmentsPageViewModel.cs | 16 +- .../Vault/AutofillCiphersPageViewModel.cs | 16 +- .../Pages/Vault/BaseCipherViewModel.cs | 11 +- .../Pages/Vault/CipherAddEditPage.xaml | 208 +- .../Pages/Vault/CipherAddEditPage.xaml.cs | 67 +- .../Pages/Vault/CipherAddEditPageViewModel.cs | 45 +- .../Pages/Vault/CipherDetailsPage.xaml | 66 +- .../Pages/Vault/CipherDetailsPage.xaml.cs | 13 +- .../Pages/Vault/CipherDetailsPageViewModel.cs | 44 +- src/Core/Pages/Vault/CipherItemViewModel.cs | 48 + .../Pages/Vault/CipherSelectionPage.xaml | 25 +- .../Pages/Vault/CipherSelectionPage.xaml.cs | 26 +- .../Vault/CipherSelectionPageViewModel.cs | 24 +- .../Pages/Vault/CiphersPage.xaml | 27 +- .../Pages/Vault/CiphersPage.xaml.cs | 15 +- .../Pages/Vault/CiphersPageViewModel.cs | 102 +- .../Pages/Vault/CollectionsPage.xaml | 4 +- .../Pages/Vault/CollectionsPage.xaml.cs | 4 +- .../Pages/Vault/CollectionsPageViewModel.cs | 4 +- .../Vault/GroupingsPage/GroupingsPage.xaml | 50 +- .../Vault/GroupingsPage/GroupingsPage.xaml.cs | 307 +- .../GroupingsPageHeaderListItem.cs | 0 .../GroupingsPage/GroupingsPageListGroup.cs | 0 .../GroupingsPage/GroupingsPageListItem.cs | 7 +- .../GroupingsPageListItemSelector.cs | 23 +- .../GroupingsPageTOTPListItem.cs | 75 + .../GroupingsPage/GroupingsPageViewModel.cs | 147 +- .../GroupingsPage/IGroupingsPageListItem.cs | 0 .../Vault/OTPCipherSelectionPageViewModel.cs | 13 +- .../Pages/Vault/PasswordHistoryPage.xaml | 11 +- .../Pages/Vault/PasswordHistoryPage.xaml.cs | 4 +- .../Vault/PasswordHistoryPageViewModel.cs | 7 +- src/{App => Core}/Pages/Vault/ScanPage.xaml | 36 +- .../Pages/Vault/ScanPage.xaml.cs | 125 +- .../Pages/Vault/ScanPageViewModel.cs | 103 +- src/{App => Core}/Pages/Vault/SharePage.xaml | 4 +- .../Pages/Vault/SharePage.xaml.cs | 8 +- .../Pages/Vault/SharePageViewModel.cs | 8 +- .../Pages/VaultFilterViewModel.cs | 6 +- .../Fonts}/MaterialIcons_Regular.ttf | Bin .../Resources/Fonts}/RobotoMono_Regular.ttf | Bin .../Resources/Fonts}/bwi-font.ttf | Bin src/Core/Resources/Images/dotnet_bot.svg | 95 + .../Localization}/AppResources.Designer.cs | 4 +- .../Localization}/AppResources.af.resx | 0 .../Localization}/AppResources.ar.resx | 0 .../Localization}/AppResources.az.resx | 0 .../Localization}/AppResources.be.resx | 0 .../Localization}/AppResources.bg.resx | 0 .../Localization}/AppResources.bn.resx | 0 .../Localization}/AppResources.bs.resx | 0 .../Localization}/AppResources.ca.resx | 0 .../Localization}/AppResources.cs.resx | 0 .../Localization}/AppResources.cy.resx | 0 .../Localization}/AppResources.da.resx | 0 .../Localization}/AppResources.de.resx | 0 .../Localization}/AppResources.el.resx | 0 .../Localization}/AppResources.en-GB.resx | 0 .../Localization}/AppResources.en-IN.resx | 0 .../Localization}/AppResources.es.resx | 0 .../Localization}/AppResources.et.resx | 0 .../Localization}/AppResources.eu.resx | 0 .../Localization}/AppResources.fa.resx | 0 .../Localization}/AppResources.fi.resx | 0 .../Localization}/AppResources.fil.resx | 0 .../Localization}/AppResources.fr.resx | 0 .../Localization}/AppResources.gl.resx | 0 .../Localization}/AppResources.he.resx | 0 .../Localization}/AppResources.hi.resx | 0 .../Localization}/AppResources.hr.resx | 0 .../Localization}/AppResources.hu.resx | 0 .../Localization}/AppResources.id.resx | 0 .../Localization}/AppResources.it.resx | 0 .../Localization}/AppResources.ja.resx | 0 .../Localization}/AppResources.ka.resx | 0 .../Localization}/AppResources.kn.resx | 0 .../Localization}/AppResources.ko.resx | 0 .../Localization}/AppResources.lt.resx | 0 .../Localization}/AppResources.lv.resx | 0 .../Localization}/AppResources.ml.resx | 0 .../Localization}/AppResources.mr.resx | 0 .../Localization}/AppResources.my.resx | 0 .../Localization}/AppResources.nb.resx | 0 .../Localization}/AppResources.ne.resx | 0 .../Localization}/AppResources.nl.resx | 0 .../Localization}/AppResources.nn.resx | 0 .../Localization}/AppResources.or.resx | 0 .../Localization}/AppResources.pl.resx | 0 .../Localization}/AppResources.pt-BR.resx | 0 .../Localization}/AppResources.pt-PT.resx | 0 .../Resources/Localization}/AppResources.resx | 0 .../Localization}/AppResources.ro.resx | 0 .../Localization}/AppResources.ru.resx | 0 .../Localization}/AppResources.si.resx | 0 .../Localization}/AppResources.sk.resx | 0 .../Localization}/AppResources.sl.resx | 0 .../Localization}/AppResources.sr.resx | 0 .../Localization}/AppResources.sv.resx | 0 .../Localization}/AppResources.ta.resx | 0 .../Localization}/AppResources.te.resx | 0 .../Localization}/AppResources.th.resx | 0 .../Localization}/AppResources.tr.resx | 0 .../Localization}/AppResources.uk.resx | 0 .../Localization}/AppResources.vi.resx | 0 .../Localization}/AppResources.zh-Hans.resx | 0 .../Localization}/AppResources.zh-Hant.resx | 0 .../Resources}/Styles/Android.xaml | 11 +- .../Resources}/Styles/Android.xaml.cs | 3 +- src/{App => Core/Resources}/Styles/Base.xaml | 52 +- .../Resources}/Styles/Base.xaml.cs | 3 +- src/{App => Core/Resources}/Styles/Black.xaml | 4 +- .../Resources}/Styles/Black.xaml.cs | 3 +- .../Resources}/Styles/ControlTemplates.xaml | 6 +- .../Styles/ControlTemplates.xaml.cs | 3 +- src/{App => Core/Resources}/Styles/Dark.xaml | 4 +- .../Resources}/Styles/Dark.xaml.cs | 3 +- .../Resources}/Styles/IThemeDirtablePage.cs | 0 .../Styles/IThemeResourceDictionary.cs | 0 src/{App => Core/Resources}/Styles/Light.xaml | 4 +- .../Resources}/Styles/Light.xaml.cs | 3 +- src/{App => Core/Resources}/Styles/Nord.xaml | 4 +- .../Resources}/Styles/Nord.xaml.cs | 3 +- .../Resources}/Styles/SolarizedDark.xaml | 4 +- .../Resources}/Styles/SolarizedDark.xaml.cs | 3 +- .../Resources}/Styles/Variables.xaml | 4 +- .../Resources}/Styles/Variables.xaml.cs | 3 +- src/{App => Core/Resources}/Styles/iOS.xaml | 8 +- .../Resources}/Styles/iOS.xaml.cs | 3 +- src/Core/ResumeWindow.cs | 45 + src/Core/Services/ApiService.cs | 1 + .../Services/BaseBiometricService.cs | 0 .../Services/BaseWatchDeviceService.cs | 0 src/Core/Services/CipherService.cs | 1 + src/Core/Services/CollectionService.cs | 1 + src/{App => Core}/Services/DeepLinkContext.cs | 0 src/Core/Services/EnvironmentService.cs | 17 +- src/Core/Services/Logging/Logger.cs | 31 +- src/Core/Services/Logging/StubLogger.cs | 5 +- .../MobileBroadcasterMessagingService.cs | 0 .../Services/MobileI18nService.cs | 4 +- .../Services/MobilePasswordRepromptService.cs | 2 +- .../Services/MobilePlatformUtilsService.cs | 10 +- .../Services/MobileStorageService.cs | 8 + .../NoopPushNotificationListenerService.cs | 0 .../Services/NoopPushNotificationService.cs | 0 .../Services/PreferencesStorageService.cs | 34 +- .../PushNotificationListenerService.cs | 5 +- .../Services/SecureStorageService.cs | 8 +- src/Core/Services/StateMigrationService.cs | 16 +- src/Core/Services/StateService.cs | 15 +- src/{App => Core}/Services/UserPinService.cs | 0 src/{App => Core}/Utilities/A11yExtensions.cs | 2 +- .../AccountManagement/AccountsManager.cs | 20 +- .../AccountManagement/LockNavigationParams.cs | 0 .../LoginNavigationParams.cs | 0 src/{App => Core}/Utilities/AppHelpers.cs | 15 +- src/{App => Core}/Utilities/AppSetup.cs | 0 .../Automation/AutomationIdsHelper.cs | 0 .../Utilities/Automation/SuffixType.cs | 0 .../Utilities/BoolToColorConverter.cs | 6 +- .../BoxRowVsBoxRowInputPaddingConverter.cs | 3 +- .../Utilities/ColoredPasswordConverter.cs | 3 +- src/Core/Utilities/CoreHelpers.cs | 12 +- .../Utilities/DateTimeConverter.cs | 3 +- src/{App => Core}/Utilities/EnumHelper.cs | 4 +- src/Core/Utilities/ExtendedViewModel.cs | 88 +- .../Utilities/GeneratedValueFormatter.cs | 16 +- src/{App => Core}/Utilities/I18nExtension.cs | 5 +- .../Utilities/IPasswordPromptable.cs | 0 .../Utilities/IconGlyphConverter.cs | 3 +- .../Utilities/IconGlyphExtensions.cs | 0 .../Utilities/IconImageConverter.cs | 5 +- .../Utilities/InverseBoolConverter.cs | 3 +- .../Utilities/IsNotNullConverter.cs | 3 +- .../Utilities/IsNullConverter.cs | 3 +- .../Utilities/LocalizableEnumConverter.cs | 5 +- .../Utilities/ObservableRangeCollection.cs | 169 + src/{App => Core}/Utilities/PageExtensions.cs | 3 +- .../Utilities/PermissionManager.cs | 4 +- .../Utilities/ProgressBarExtensions.cs | 6 +- .../Prompts/ValidatablePromptConfig.cs | 0 src/Core/Utilities/RegionExtensions.cs | 22 +- .../Utilities/SendIconGlyphConverter.cs | 3 +- .../Utilities/StringHasValueConverter.cs | 3 +- src/{App => Core}/Utilities/ThemeManager.cs | 11 +- src/{App => Core}/Utilities/TimerTask.cs | 8 +- src/{App => Core}/Utilities/TotpHelper.cs | 0 .../Utilities/UpperCaseConverter.cs | 3 +- .../VerificationActionsFlowHelper.cs | 3 +- .../CredentialProviderViewController.cs | 164 +- ...edentialProviderViewController.designer.cs | 40 +- .../LockPasswordViewController.cs | 38 +- .../LockPasswordViewController.designer.cs | 33 +- src/iOS.Autofill/LoginListViewController.cs | 46 +- .../LoginListViewController.designer.cs | 23 - src/iOS.Autofill/LoginSearchViewController.cs | 2 +- src/iOS.Autofill/MainInterface.storyboard | 74 +- src/iOS.Autofill/Properties/AssemblyInfo.cs | 36 - src/iOS.Autofill/SetupViewController.cs | 2 +- src/iOS.Autofill/Utilities/AutofillHelpers.cs | 2 +- src/iOS.Autofill/iOS.Autofill.csproj | 268 +- .../BaseLockPasswordViewController.cs | 18 +- .../Controllers/LoginAddViewController.cs | 4 +- .../PasswordGeneratorViewController.cs | 2 +- src/iOS.Core/Effects/NoEmojiKeyboardEffect.cs | 7 +- src/iOS.Core/Effects/ScrollEnabledEffect.cs | 25 - ...iewContentInsetAdjustmentBehaviorEffect.cs | 37 - .../CustomContentPageHandler.cs} | 57 +- .../CustomNavigationHandler.cs} | 19 +- .../CustomTabbedHandler.cs} | 35 +- .../CustomViewCellHandler.cs} | 13 +- .../Handlers/DatePickerHandlerMappings.cs | 39 + .../Handlers/EditorHandlerMappings.cs | 35 + src/iOS.Core/Handlers/EntryHandlerMappings.cs | 34 + src/iOS.Core/Handlers/HybridWebViewHandler.cs | 93 + src/iOS.Core/Handlers/LabelHandlerMappings.cs | 37 + .../Handlers/PickerHandlerMappings.cs | 24 + .../Handlers/SearchBarHandlerMappings.cs | 20 + .../Handlers/SelectableLabelHandler.cs | 62 + .../Handlers/StepperHandlerMappings.cs | 31 + .../Handlers/TimePickerHandlerMappings.cs | 40 + src/iOS.Core/Properties/AssemblyInfo.cs | 35 - .../CollectionView/CollectionException.cs | 16 - .../ExtendedCollectionViewRenderer.cs | 16 - .../ExtendedGroupableItemsViewController.cs | 50 - .../ExtendedGroupableItemsViewDelegator.cs | 43 - .../Renderers/CustomButtonRenderer.cs | 40 - .../Renderers/CustomEditorRenderer.cs | 49 - src/iOS.Core/Renderers/CustomEntryRenderer.cs | 70 - src/iOS.Core/Renderers/CustomLabelRenderer.cs | 65 - .../Renderers/CustomPickerRenderer.cs | 32 - .../Renderers/CustomSearchBarRenderer.cs | 28 - .../Renderers/ExtendedDatePickerRenderer.cs | 46 - .../Renderers/ExtendedStepperRenderer.cs | 45 - .../Renderers/ExtendedTimePickerRenderer.cs | 59 - .../Renderers/HybridWebViewRenderer.cs | 64 - .../Renderers/SelectableLabelRenderer.cs | 72 - src/iOS.Core/Services/ClipboardService.cs | 3 +- .../Services/CryptoPrimitiveService.cs | 13 +- src/iOS.Core/Services/DeviceActionService.cs | 12 +- src/iOS.Core/Services/FileService.cs | 2 +- src/iOS.Core/Services/LocalizeService.cs | 9 +- .../AccountSwitchingOverlayHelper.cs | 63 +- .../Utilities/DictionaryExtensions.cs | 16 +- .../Utilities/FontElementExtensions.cs | 16 +- .../Utilities/ImageSourceExtensions.cs | 48 - .../Utilities/MauiContextSingleton.cs | 15 + src/iOS.Core/Utilities/ThemeHelpers.cs | 33 +- src/iOS.Core/Utilities/WCSessionManager.cs | 44 +- src/iOS.Core/Utilities/iOSCoreHelpers.cs | 145 +- src/iOS.Core/Utilities/iOSHelpers.cs | 3 +- src/iOS.Core/Views/ExtensionSearchDelegate.cs | 47 +- src/iOS.Core/Views/ExtensionTableSource.cs | 2 +- src/iOS.Core/Views/FormEntryTableViewCell.cs | 2 +- src/iOS.Core/Views/Toast.cs | 3 +- src/iOS.Core/iOS.Core.csproj | 247 +- src/iOS.Extension/LoadingViewController.cs | 220 +- src/iOS.Extension/LoginListViewController.cs | 16 +- src/iOS.Extension/SetupViewController.cs | 6 +- src/iOS.Extension/iOS.Extension.csproj | 261 +- .../LoadingViewController.cs | 43 +- .../LockPasswordViewController.cs | 48 +- .../LockPasswordViewController.designer.cs | 32 +- .../MainInterface.storyboard | 32 +- .../iOS.ShareExtension.csproj | 256 +- src/iOS/AppDelegate.cs | 413 - src/iOS/Main.cs | 13 - src/iOS/Properties/AssemblyInfo.cs | 35 - src/iOS/Resources/MaterialIcons_Regular.ttf | Bin 128180 -> 0 bytes src/iOS/Resources/bwi-font.ttf | Bin 76108 -> 0 bytes src/iOS/Resources/cog_environment.png | Bin 486 -> 0 bytes src/iOS/Resources/cog_environment@2x.png | Bin 931 -> 0 bytes src/iOS/Resources/cog_environment@3x.png | Bin 1451 -> 0 bytes src/iOS/Resources/cog_settings.png | Bin 486 -> 0 bytes src/iOS/Resources/cog_settings@2x.png | Bin 931 -> 0 bytes src/iOS/Resources/cog_settings@3x.png | Bin 1451 -> 0 bytes src/iOS/Resources/generate.png | Bin 676 -> 0 bytes src/iOS/Resources/generate@2x.png | Bin 1399 -> 0 bytes src/iOS/Resources/generate@3x.png | Bin 2175 -> 0 bytes src/iOS/Resources/info.png | Bin 608 -> 0 bytes src/iOS/Resources/info@2x.png | Bin 1259 -> 0 bytes src/iOS/Resources/info@3x.png | Bin 1870 -> 0 bytes src/iOS/Resources/lock.png | Bin 360 -> 0 bytes src/iOS/Resources/lock@2x.png | Bin 744 -> 0 bytes src/iOS/Resources/lock@3x.png | Bin 1089 -> 0 bytes src/iOS/Resources/login.png | Bin 791 -> 0 bytes src/iOS/Resources/login@2x.png | Bin 1721 -> 0 bytes src/iOS/Resources/login@3x.png | Bin 2636 -> 0 bytes src/iOS/Resources/more.png | Bin 145 -> 0 bytes src/iOS/Resources/more@2x.png | Bin 348 -> 0 bytes src/iOS/Resources/more@3x.png | Bin 555 -> 0 bytes src/iOS/Resources/plus.png | Bin 223 -> 0 bytes src/iOS/Resources/plus@2x.png | Bin 343 -> 0 bytes src/iOS/Resources/plus@3x.png | Bin 526 -> 0 bytes src/iOS/Resources/send.png | Bin 486 -> 0 bytes src/iOS/Resources/send@2x.png | Bin 956 -> 0 bytes src/iOS/Resources/send@3x.png | Bin 1365 -> 0 bytes src/iOS/Resources/yubikey.png | Bin 54828 -> 0 bytes src/iOS/Resources/yubikey@2x.png | Bin 204568 -> 0 bytes src/iOS/iOS.csproj | 437 - store/google/Publisher/Publisher.csproj | 2 +- test/Common/Common.csproj | 2 +- .../Cipher/CipherCustomizations.cs | 2 +- test/Core.Test/Core.Test.csproj | 12 +- test/Playground/Playground.csproj | 2 +- 873 files changed, 12374 insertions(+), 213060 deletions(-) create mode 100644 Directory.Build.props delete mode 100644 global.json rename {src/Android/lib => lib/android/argon2}/arm64-v8a/libargon2.so (100%) rename {src/Android/lib => lib/android/argon2}/armeabi-v7a/libargon2.so (100%) rename {src/Android/lib => lib/android/argon2}/x86_64/libargon2.so (100%) create mode 100644 nuget.config delete mode 100644 src/Android/Android.csproj delete mode 100644 src/Android/Effects/FabShadowEffect.cs delete mode 100644 src/Android/Effects/FixedSizeEffect.cs delete mode 100644 src/Android/Effects/RemoveFontPaddingEffect.cs delete mode 100644 src/Android/Effects/TabBarEffect.cs delete mode 100644 src/Android/Properties/AssemblyInfo.cs delete mode 100644 src/Android/Renderers/CustomEditorRenderer.cs delete mode 100644 src/Android/Renderers/CustomEntryRenderer.cs delete mode 100644 src/Android/Renderers/CustomLabelRenderer.cs delete mode 100644 src/Android/Renderers/CustomPageRenderer.cs delete mode 100644 src/Android/Renderers/CustomPickerRenderer.cs delete mode 100644 src/Android/Renderers/CustomSearchBarRenderer.cs delete mode 100644 src/Android/Renderers/CustomSwitchRenderer.cs delete mode 100644 src/Android/Renderers/CustomTabbedRenderer.cs delete mode 100644 src/Android/Renderers/ExtendedDatePickerRenderer.cs delete mode 100644 src/Android/Renderers/ExtendedGridRenderer.cs delete mode 100644 src/Android/Renderers/ExtendedSliderRenderer.cs delete mode 100644 src/Android/Renderers/ExtendedStackLayoutRenderer.cs delete mode 100644 src/Android/Renderers/ExtendedStepperRenderer.cs delete mode 100644 src/Android/Renderers/ExtendedTimePickerRenderer.cs delete mode 100644 src/Android/Renderers/HybridWebViewRenderer.cs delete mode 100644 src/Android/Renderers/SelectableLabelRenderer.cs delete mode 100644 src/App/Controls/AuthenticatorViewCell/AuthenticatorViewCell.xaml.cs delete mode 100644 src/App/Controls/AvatarImageSource.cs delete mode 100644 src/App/Controls/CipherViewCell/CipherViewCell.xaml.cs delete mode 100644 src/App/Controls/CipherViewCell/CipherViewCellViewModel.cs delete mode 100644 src/App/Controls/ExtendedCollectionView.cs delete mode 100644 src/App/Controls/ExtendedGrid.cs delete mode 100644 src/App/Controls/ExtendedSearchBar.cs delete mode 100644 src/App/Controls/ExtendedStackLayout.cs delete mode 100644 src/App/Controls/IconLabelButton/IconLabelButton.xaml delete mode 100644 src/App/Controls/MonoEntry.cs delete mode 100644 src/App/Controls/MonoLabel.cs delete mode 100644 src/App/Controls/SendViewCell/SendViewCell.xaml.cs delete mode 100644 src/App/Effects/FabShadowEffect.cs delete mode 100644 src/App/Effects/FixedSizeEffect.cs delete mode 100644 src/App/Effects/NoEmojiKeyboardEffect.cs delete mode 100644 src/App/Effects/RemoveFontPaddingEffect.cs delete mode 100644 src/App/Effects/ScrollViewContentInsetAdjustmentBehaviorEffect.cs delete mode 100644 src/App/Effects/TabBarEffect.cs create mode 100644 src/App/MauiProgram.cs delete mode 100644 src/App/Pages/Accounts/HomePage.xaml delete mode 100644 src/App/Pages/BaseContentPage.cs delete mode 100644 src/App/Pages/BaseViewModel.cs delete mode 100644 src/App/Pages/Settings/AutofillSettingsPageViewModel.ios.cs delete mode 100644 src/App/Pages/Vault/GroupingsPage/GroupingsPageTOTPListItem.cs rename src/{ => App/Platforms}/Android/8bit.keystore.enc (100%) rename src/{ => App/Platforms}/Android/Accessibility/AccessibilityActivity.cs (99%) rename src/{ => App/Platforms}/Android/Accessibility/AccessibilityHelpers.cs (99%) rename src/{ => App/Platforms}/Android/Accessibility/AccessibilityService.cs (99%) rename src/{ => App/Platforms}/Android/Accessibility/Browser.cs (100%) rename src/{ => App/Platforms}/Android/Accessibility/Credentials.cs (100%) rename src/{ => App/Platforms}/Android/Accessibility/KnownUsernameField.cs (100%) rename src/{ => App/Platforms}/Android/Accessibility/NodeList.cs (100%) rename src/{Android/Properties => App/Platforms/Android}/AndroidManifest.xml (99%) rename src/{ => App/Platforms}/Android/Autofill/AutofillConstants.cs (100%) rename src/{ => App/Platforms}/Android/Autofill/AutofillExternalSelectionActivity.cs (89%) rename src/{ => App/Platforms}/Android/Autofill/AutofillHelpers.cs (99%) rename src/{ => App/Platforms}/Android/Autofill/AutofillService.cs (100%) rename src/{ => App/Platforms}/Android/Autofill/Field.cs (99%) rename src/{ => App/Platforms}/Android/Autofill/FieldCollection.cs (99%) rename src/{ => App/Platforms}/Android/Autofill/FilledItem.cs (99%) rename src/{ => App/Platforms}/Android/Autofill/Parser.cs (100%) rename src/{ => App/Platforms}/Android/Autofill/SavedItem.cs (100%) rename src/{ => App/Platforms}/Android/Constants.cs (100%) create mode 100644 src/App/Platforms/Android/Handlers/ButtonHandlerMappings.cs create mode 100644 src/App/Platforms/Android/Handlers/CustomTabbedPageHandler.cs create mode 100644 src/App/Platforms/Android/Handlers/DatePickerHandlerMappings.cs create mode 100644 src/App/Platforms/Android/Handlers/EditorHandlerMappings.cs create mode 100644 src/App/Platforms/Android/Handlers/EntryHandlerMappings.cs create mode 100644 src/App/Platforms/Android/Handlers/ExtendedDatePickerHandler.cs create mode 100644 src/App/Platforms/Android/Handlers/HybridWebViewHandler.cs create mode 100644 src/App/Platforms/Android/Handlers/LabelHandlerMappings.cs create mode 100644 src/App/Platforms/Android/Handlers/PickerHandlerMappings.cs create mode 100644 src/App/Platforms/Android/Handlers/SearchBarHandlerMappings.cs create mode 100644 src/App/Platforms/Android/Handlers/SliderHandlerMappings.cs create mode 100644 src/App/Platforms/Android/Handlers/StepperHandlerMappings.cs create mode 100644 src/App/Platforms/Android/Handlers/SwitchHandlerMappings.cs create mode 100644 src/App/Platforms/Android/Handlers/TimePickerHandlerMappings.cs create mode 100644 src/App/Platforms/Android/Handlers/ToolbarHandlerMappings.cs rename src/{ => App/Platforms}/Android/MainActivity.cs (93%) rename src/{ => App/Platforms}/Android/MainApplication.cs (88%) rename src/{ => App/Platforms}/Android/Push/FirebaseMessagingService.cs (98%) rename src/{ => App/Platforms}/Android/Receivers/ClearClipboardAlarmReceiver.cs (100%) rename src/{ => App/Platforms}/Android/Receivers/EventUploadReceiver.cs (100%) rename src/{ => App/Platforms}/Android/Receivers/NotificationDismissReceiver.cs (100%) rename src/{ => App/Platforms}/Android/Receivers/PackageReplacedReceiver.cs (100%) rename src/{ => App/Platforms}/Android/Receivers/RestrictionsChangedReceiver.cs (95%) rename src/{ => App/Platforms}/Android/Resources/drawable-hdpi/logo_legacy.png (100%) rename src/{ => App/Platforms}/Android/Resources/drawable-hdpi/logo_white_legacy.png (100%) rename src/{ => App/Platforms}/Android/Resources/drawable-hdpi/yubikey.png (100%) rename src/{ => App/Platforms}/Android/Resources/drawable-night-v26/splash_screen_round.xml (100%) rename src/{ => App/Platforms}/Android/Resources/drawable-v23/splash_screen.xml (100%) rename src/{ => App/Platforms}/Android/Resources/drawable-v23/splash_screen_dark.xml (100%) rename src/{ => App/Platforms}/Android/Resources/drawable-v26/splash_screen_round.xml (100%) rename src/{ => App/Platforms}/Android/Resources/drawable-xhdpi/logo_legacy.png (100%) rename src/{ => App/Platforms}/Android/Resources/drawable-xhdpi/logo_white_legacy.png (100%) rename src/{ => App/Platforms}/Android/Resources/drawable-xhdpi/yubikey.png (100%) rename src/{ => App/Platforms}/Android/Resources/drawable-xxhdpi/logo_legacy.png (100%) rename src/{ => App/Platforms}/Android/Resources/drawable-xxhdpi/logo_white_legacy.png (100%) rename src/{ => App/Platforms}/Android/Resources/drawable-xxhdpi/yubikey.png (100%) rename src/{ => App/Platforms}/Android/Resources/drawable/card.xml (100%) rename src/{ => App/Platforms}/Android/Resources/drawable/cog_environment.xml (100%) rename src/{ => App/Platforms}/Android/Resources/drawable/cog_settings.xml (100%) rename src/{ => App/Platforms}/Android/Resources/drawable/empty_login_requests.xml (100%) rename src/{ => App/Platforms}/Android/Resources/drawable/empty_login_requests_dark.xml (100%) rename src/{ => App/Platforms}/Android/Resources/drawable/empty_uris_placeholder.xml (100%) rename src/{ => App/Platforms}/Android/Resources/drawable/empty_uris_placeholder_dark.xml (100%) rename src/{ => App/Platforms}/Android/Resources/drawable/generate.xml (100%) rename src/{ => App/Platforms}/Android/Resources/drawable/ic_launcher_foreground.xml (100%) rename src/{ => App/Platforms}/Android/Resources/drawable/ic_launcher_monochrome.xml (100%) rename src/{ => App/Platforms}/Android/Resources/drawable/ic_notification.xml (100%) rename src/{ => App/Platforms}/Android/Resources/drawable/ic_warning.xml (100%) rename src/{ => App/Platforms}/Android/Resources/drawable/icon.xml (100%) rename src/{ => App/Platforms}/Android/Resources/drawable/id.xml (100%) rename src/{ => App/Platforms}/Android/Resources/drawable/info.xml (100%) rename src/{ => App/Platforms}/Android/Resources/drawable/list_item_bg.xml (100%) rename src/{ => App/Platforms}/Android/Resources/drawable/lock.xml (100%) rename src/{ => App/Platforms}/Android/Resources/drawable/login.xml (100%) rename src/{ => App/Platforms}/Android/Resources/drawable/logo.xml (100%) rename src/{ => App/Platforms}/Android/Resources/drawable/logo_rounded.xml (100%) rename src/{ => App/Platforms}/Android/Resources/drawable/logo_white.xml (100%) rename src/{ => App/Platforms}/Android/Resources/drawable/pencil.xml (100%) rename src/{ => App/Platforms}/Android/Resources/drawable/plus.xml (100%) rename src/{ => App/Platforms}/Android/Resources/drawable/search.xml (100%) rename src/{ => App/Platforms}/Android/Resources/drawable/send.xml (100%) rename src/{ => App/Platforms}/Android/Resources/drawable/shield.xml (100%) rename src/{ => App/Platforms}/Android/Resources/drawable/slider_thumb.xml (100%) rename src/{ => App/Platforms}/Android/Resources/drawable/splash_screen.xml (100%) rename src/{ => App/Platforms}/Android/Resources/drawable/splash_screen_dark.xml (100%) rename src/{ => App/Platforms}/Android/Resources/drawable/switch_thumb.xml (100%) rename src/{ => App/Platforms}/Android/Resources/layout/Tabbar.axml (100%) rename src/{ => App/Platforms}/Android/Resources/layout/Toolbar.axml (100%) rename src/{ => App/Platforms}/Android/Resources/layout/autofill_listitem.xml (100%) rename src/{ => App/Platforms}/Android/Resources/layout/progress_dialog_layout.xml (100%) rename src/{ => App/Platforms}/Android/Resources/layout/validatable_input_dialog_layout.xml (100%) rename src/{ => App/Platforms}/Android/Resources/mipmap-anydpi-v26/ic_launcher.xml (100%) rename src/{ => App/Platforms}/Android/Resources/mipmap-anydpi-v26/ic_launcher_round.xml (100%) rename src/{ => App/Platforms}/Android/Resources/mipmap-hdpi/ic_launcher.png (100%) rename src/{ => App/Platforms}/Android/Resources/mipmap-hdpi/ic_launcher_round.png (100%) rename src/{ => App/Platforms}/Android/Resources/mipmap-mdpi/ic_launcher.png (100%) rename src/{ => App/Platforms}/Android/Resources/mipmap-mdpi/ic_launcher_round.png (100%) rename src/{ => App/Platforms}/Android/Resources/mipmap-xhdpi/ic_launcher.png (100%) rename src/{ => App/Platforms}/Android/Resources/mipmap-xhdpi/ic_launcher_round.png (100%) rename src/{ => App/Platforms}/Android/Resources/mipmap-xxhdpi/ic_launcher.png (100%) rename src/{ => App/Platforms}/Android/Resources/mipmap-xxhdpi/ic_launcher_round.png (100%) rename src/{ => App/Platforms}/Android/Resources/mipmap-xxxhdpi/ic_launcher.png (100%) rename src/{ => App/Platforms}/Android/Resources/mipmap-xxxhdpi/ic_launcher_round.png (100%) rename src/{ => App/Platforms}/Android/Resources/values-night/styles.xml (85%) rename src/{ => App/Platforms}/Android/Resources/values-v30/manifest.xml (100%) create mode 100644 src/App/Platforms/Android/Resources/values/attrs.xml rename src/{ => App/Platforms}/Android/Resources/values/colors.xml (100%) rename src/{ => App/Platforms}/Android/Resources/values/dimens.xml (100%) rename src/{ => App/Platforms}/Android/Resources/values/ic_launcher_background.xml (100%) rename src/{ => App/Platforms}/Android/Resources/values/manifest.xml (100%) rename src/{ => App/Platforms}/Android/Resources/values/strings.xml (100%) rename src/{ => App/Platforms}/Android/Resources/values/styles.xml (71%) rename src/{ => App/Platforms}/Android/Resources/xml/accessibilityservice.xml (100%) rename src/{ => App/Platforms}/Android/Resources/xml/app_restrictions.xml (100%) rename src/{ => App/Platforms}/Android/Resources/xml/autofillservice.xml (100%) rename src/{ => App/Platforms}/Android/Resources/xml/filepaths.xml (100%) rename src/{ => App/Platforms}/Android/Resources/xml/network_security_config.xml (100%) rename src/{ => App/Platforms}/Android/Services/AndroidLogService.cs (100%) rename src/{ => App/Platforms}/Android/Services/AndroidPushNotificationService.cs (96%) rename src/{ => App/Platforms}/Android/Services/AutofillHandler.cs (93%) rename src/{ => App/Platforms}/Android/Services/BiometricService.cs (100%) rename src/{ => App/Platforms}/Android/Services/ClipboardService.cs (97%) rename src/{ => App/Platforms}/Android/Services/CryptoPrimitiveService.cs (100%) rename src/{ => App/Platforms}/Android/Services/DeviceActionService.cs (91%) rename src/{ => App/Platforms}/Android/Services/FileService.cs (87%) rename src/{ => App/Platforms}/Android/Services/LocalizeService.cs (100%) rename src/{ => App/Platforms}/Android/Services/WatchDeviceService.cs (100%) rename src/{ => App/Platforms}/Android/Tiles/AutofillTileService.cs (98%) rename src/{ => App/Platforms}/Android/Tiles/GeneratorTileService.cs (100%) rename src/{ => App/Platforms}/Android/Tiles/MyVaultTileService.cs (100%) rename src/{ => App/Platforms}/Android/Utilities/AndroidHelpers.cs (95%) rename src/{ => App/Platforms}/Android/Utilities/IntentExtensions.cs (92%) rename src/{ => App/Platforms}/Android/Utilities/ThemeHelpers.cs (77%) rename src/{ => App/Platforms}/Android/WebAuthCallbackActivity.cs (82%) rename src/{ => App/Platforms}/Android/fdroid-keystore.jks.enc (100%) rename src/{ => App/Platforms}/Android/google-services.json (100%) rename src/{ => App/Platforms}/Android/google-services.json.enc (100%) create mode 100644 src/App/Platforms/Android/lib/arm64-v8a/libargon2.so create mode 100644 src/App/Platforms/Android/lib/armeabi-v7a/libargon2.so rename src/{ => App/Platforms}/Android/lib/x86/libargon2.so (100%) mode change 100755 => 100644 create mode 100644 src/App/Platforms/Android/lib/x86_64/libargon2.so rename src/{ => App/Platforms}/Android/upload-keystore.jks.enc (100%) create mode 100644 src/App/Platforms/iOS/AppDelegate.cs rename src/{ => App/Platforms}/iOS/Entitlements.plist (100%) rename src/{ => App/Platforms}/iOS/Info.plist (100%) rename src/{ => App/Platforms}/iOS/LaunchScreen.storyboard (100%) create mode 100644 src/App/Platforms/iOS/Program.cs rename src/{ => App/Platforms}/iOS/Resources/Assets.xcassets/AppIcons.appiconset/Contents.json (100%) mode change 100644 => 100755 rename src/{ => App/Platforms}/iOS/Resources/Assets.xcassets/AppIcons.appiconset/Icon-1024.png (100%) mode change 100644 => 100755 rename src/{ => App/Platforms}/iOS/Resources/Assets.xcassets/AppIcons.appiconset/Icon-120.png (100%) mode change 100644 => 100755 rename src/{ => App/Platforms}/iOS/Resources/Assets.xcassets/AppIcons.appiconset/Icon-152.png (100%) mode change 100644 => 100755 rename src/{ => App/Platforms}/iOS/Resources/Assets.xcassets/AppIcons.appiconset/Icon-167.png (100%) mode change 100644 => 100755 rename src/{ => App/Platforms}/iOS/Resources/Assets.xcassets/AppIcons.appiconset/Icon-180.png (100%) mode change 100644 => 100755 rename src/{ => App/Platforms}/iOS/Resources/Assets.xcassets/AppIcons.appiconset/Icon-20.png (100%) mode change 100644 => 100755 rename src/{ => App/Platforms}/iOS/Resources/Assets.xcassets/AppIcons.appiconset/Icon-29.png (100%) mode change 100644 => 100755 rename src/{ => App/Platforms}/iOS/Resources/Assets.xcassets/AppIcons.appiconset/Icon-40.png (100%) mode change 100644 => 100755 rename src/{ => App/Platforms}/iOS/Resources/Assets.xcassets/AppIcons.appiconset/Icon-58.png (100%) mode change 100644 => 100755 rename src/{ => App/Platforms}/iOS/Resources/Assets.xcassets/AppIcons.appiconset/Icon-60.png (100%) mode change 100644 => 100755 rename src/{ => App/Platforms}/iOS/Resources/Assets.xcassets/AppIcons.appiconset/Icon-76.png (100%) mode change 100644 => 100755 rename src/{ => App/Platforms}/iOS/Resources/Assets.xcassets/AppIcons.appiconset/Icon-80.png (100%) mode change 100644 => 100755 rename src/{ => App/Platforms}/iOS/Resources/Assets.xcassets/AppIcons.appiconset/Icon-87.png (100%) mode change 100644 => 100755 rename src/{ => App/Platforms}/iOS/Resources/Assets.xcassets/Contents.json (100%) mode change 100644 => 100755 rename src/{ => App/Platforms}/iOS/Resources/Assets.xcassets/LaunchScreen.imageset/Contents.json (100%) mode change 100644 => 100755 rename src/{ => App/Platforms}/iOS/Resources/Assets.xcassets/LaunchScreen.imageset/logo.png (100%) mode change 100644 => 100755 rename src/{ => App/Platforms}/iOS/Resources/Assets.xcassets/LaunchScreen.imageset/logo@2x.png (100%) mode change 100644 => 100755 rename src/{ => App/Platforms}/iOS/Resources/Assets.xcassets/LaunchScreen.imageset/logo@3x.png (100%) mode change 100644 => 100755 rename src/{ => App/Platforms}/iOS/Resources/Assets.xcassets/LaunchScreen.imageset/logo_white.png (100%) mode change 100644 => 100755 rename src/{ => App/Platforms}/iOS/Resources/Assets.xcassets/LaunchScreen.imageset/logo_white@2x.png (100%) mode change 100644 => 100755 rename src/{ => App/Platforms}/iOS/Resources/Assets.xcassets/LaunchScreen.imageset/logo_white@3x.png (100%) mode change 100644 => 100755 create mode 100644 src/App/Platforms/iOS/Resources/Assets.xcassets/autofill-kb.imageset/Contents.json rename src/{iOS/Resources => App/Platforms/iOS/Resources/Assets.xcassets/autofill-kb.imageset}/autofill-kb.png (100%) rename src/{iOS/Resources => App/Platforms/iOS/Resources/Assets.xcassets/autofill-kb.imageset}/autofill-kb@2x.png (100%) rename src/{iOS/Resources => App/Platforms/iOS/Resources/Assets.xcassets/autofill-kb.imageset}/autofill-kb@3x.png (100%) rename src/{ => App/Platforms}/iOS/Resources/Assets.xcassets/empty_items_state.imageset/Contents.json (100%) mode change 100644 => 100755 rename src/{ => App/Platforms}/iOS/Resources/Assets.xcassets/empty_items_state.imageset/Empty-items-state-dark.pdf (100%) mode change 100644 => 100755 rename src/{ => App/Platforms}/iOS/Resources/Assets.xcassets/empty_items_state.imageset/Empty-items-state.pdf (100%) mode change 100644 => 100755 rename src/{ => App/Platforms}/iOS/Resources/Assets.xcassets/empty_login_requests.imageset/Contents.json (100%) rename src/{ => App/Platforms}/iOS/Resources/Assets.xcassets/empty_login_requests.imageset/empty_login_requests.pdf (100%) rename src/{ => App/Platforms}/iOS/Resources/Assets.xcassets/empty_login_requests.imageset/empty_login_requests_dark.pdf (100%) create mode 100644 src/App/Platforms/iOS/Resources/Assets.xcassets/ext-act.imageset/Contents.json rename src/{iOS/Resources => App/Platforms/iOS/Resources/Assets.xcassets/ext-act.imageset}/ext-act.png (100%) rename src/{iOS/Resources => App/Platforms/iOS/Resources/Assets.xcassets/ext-act.imageset}/ext-act@2x.png (100%) rename src/{iOS/Resources => App/Platforms/iOS/Resources/Assets.xcassets/ext-act.imageset}/ext-act@3x.png (100%) create mode 100644 src/App/Platforms/iOS/Resources/Assets.xcassets/ext-more.imageset/Contents.json rename src/{iOS/Resources => App/Platforms/iOS/Resources/Assets.xcassets/ext-more.imageset}/ext-more.png (100%) rename src/{iOS/Resources => App/Platforms/iOS/Resources/Assets.xcassets/ext-more.imageset}/ext-more@2x.png (100%) rename src/{iOS/Resources => App/Platforms/iOS/Resources/Assets.xcassets/ext-more.imageset}/ext-more@3x.png (100%) create mode 100644 src/App/Platforms/iOS/Resources/Assets.xcassets/ext-use.imageset/Contents.json rename src/{iOS/Resources => App/Platforms/iOS/Resources/Assets.xcassets/ext-use.imageset}/ext-use.png (100%) rename src/{iOS/Resources => App/Platforms/iOS/Resources/Assets.xcassets/ext-use.imageset}/ext-use@2x.png (100%) rename src/{iOS/Resources => App/Platforms/iOS/Resources/Assets.xcassets/ext-use.imageset}/ext-use@3x.png (100%) rename src/{ => App/Platforms}/iOS/Resources/Assets.xcassets/ic_warning.imageset/Contents.json (100%) mode change 100644 => 100755 rename src/{ => App/Platforms}/iOS/Resources/Assets.xcassets/ic_warning.imageset/ic_warning-1.pdf (100%) mode change 100644 => 100755 create mode 100644 src/App/Platforms/iOS/Resources/Assets.xcassets/search.imageset/Contents.json rename src/{iOS/Resources => App/Platforms/iOS/Resources/Assets.xcassets/search.imageset}/search.png (100%) rename src/{iOS/Resources => App/Platforms/iOS/Resources/Assets.xcassets/search.imageset}/search@2x.png (100%) rename src/{iOS/Resources => App/Platforms/iOS/Resources/Assets.xcassets/search.imageset}/search@3x.png (100%) rename src/{ => App/Platforms}/iOS/Resources/logo.png (100%) rename src/{ => App/Platforms}/iOS/Resources/logo@2x.png (100%) rename src/{ => App/Platforms}/iOS/Resources/logo@3x.png (100%) rename src/{ => App/Platforms}/iOS/Resources/logo_white.png (100%) rename src/{ => App/Platforms}/iOS/Resources/logo_white@2x.png (100%) rename src/{ => App/Platforms}/iOS/Resources/logo_white@3x.png (100%) rename src/{ => App/Platforms}/iOS/Resources/more_vert.png (100%) rename src/{ => App/Platforms}/iOS/Resources/more_vert@2x.png (100%) rename src/{ => App/Platforms}/iOS/Resources/more_vert@3x.png (100%) rename src/{ => App/Platforms}/iOS/Services/iOSPushNotificationHandler.cs (97%) rename src/{ => App/Platforms}/iOS/Services/iOSPushNotificationService.cs (95%) create mode 100644 src/App/Resources/AppIcon/appicon.svg create mode 100755 src/App/Resources/AppIcon/appiconfg.svg delete mode 100644 src/App/Resources/AppResources.cs.Designer.cs delete mode 100644 src/App/Resources/AppResources.da.Designer.cs delete mode 100644 src/App/Resources/AppResources.de.Designer.cs delete mode 100644 src/App/Resources/AppResources.es.Designer.cs delete mode 100644 src/App/Resources/AppResources.fi.Designer.cs delete mode 100644 src/App/Resources/AppResources.fr.Designer.cs delete mode 100644 src/App/Resources/AppResources.hi.Designer.cs delete mode 100644 src/App/Resources/AppResources.hr.Designer.cs delete mode 100644 src/App/Resources/AppResources.hu.Designer.cs delete mode 100644 src/App/Resources/AppResources.id.Designer.cs delete mode 100644 src/App/Resources/AppResources.it.Designer.cs delete mode 100644 src/App/Resources/AppResources.ja.Designer.cs delete mode 100644 src/App/Resources/AppResources.nl.Designer.cs delete mode 100644 src/App/Resources/AppResources.pl.Designer.cs delete mode 100644 src/App/Resources/AppResources.pt-BR.Designer.cs delete mode 100644 src/App/Resources/AppResources.pt-PT.Designer.cs delete mode 100644 src/App/Resources/AppResources.ro.Designer.cs delete mode 100644 src/App/Resources/AppResources.ru.Designer.cs delete mode 100644 src/App/Resources/AppResources.sk.Designer.cs delete mode 100644 src/App/Resources/AppResources.sv.Designer.cs delete mode 100644 src/App/Resources/AppResources.th.Designer.cs delete mode 100644 src/App/Resources/AppResources.tr.Designer.cs delete mode 100644 src/App/Resources/AppResources.uk.Designer.cs delete mode 100644 src/App/Resources/AppResources.vi.Designer.cs delete mode 100644 src/App/Resources/AppResources.zh-Hans.Designer.cs delete mode 100644 src/App/Resources/AppResources.zh-Hant.Designer.cs create mode 100755 src/App/Resources/Splash/splash.svg create mode 100644 src/App/Resources/cog_settings.svg create mode 100755 src/App/Resources/ext_act.png create mode 100755 src/App/Resources/ext_more.png create mode 100755 src/App/Resources/ext_use.png create mode 100644 src/App/Resources/generate.svg create mode 100644 src/App/Resources/info.svg create mode 100644 src/App/Resources/lock.svg create mode 100644 src/App/Resources/login.svg create mode 100755 src/App/Resources/logo.png create mode 100755 src/App/Resources/logo_white.png create mode 100644 src/App/Resources/more.svg create mode 100644 src/App/Resources/more_vert.svg create mode 100644 src/App/Resources/plus.svg create mode 100644 src/App/Resources/search.svg create mode 100644 src/App/Resources/send.svg rename src/{iOS/Resources/yubikey@3x.png => App/Resources/yubikey.png} (100%) mode change 100644 => 100755 rename src/{App => Core}/Abstractions/IAccountsManager.cs (100%) rename src/{App => Core}/Abstractions/IAccountsManagerHost.cs (100%) rename src/{App => Core}/Abstractions/IDeepLinkContext.cs (100%) rename src/{App => Core}/Abstractions/IDeviceActionService.cs (97%) rename src/{App => Core}/Abstractions/ILocalizeService.cs (100%) rename src/{App => Core}/Abstractions/IPasswordRepromptService.cs (100%) rename src/{App => Core}/Abstractions/IPushNotificationListenerService.cs (100%) rename src/{App => Core}/Abstractions/IPushNotificationService.cs (100%) rename src/{App => Core}/App.xaml (61%) rename src/{App => Core}/App.xaml.cs (55%) rename src/{App => Core}/Behaviors/EditorPreventAutoBottomScrollingOnFocusedBehavior.cs (94%) create mode 100644 src/Core/Behaviors/PlatformBehaviors/MCTTouch/Extensions/VisualElementExtensions.cs create mode 100644 src/Core/Behaviors/PlatformBehaviors/MCTTouch/GestureManager.cs create mode 100644 src/Core/Behaviors/PlatformBehaviors/MCTTouch/Primitives/HoverState.shared.cs create mode 100644 src/Core/Behaviors/PlatformBehaviors/MCTTouch/Primitives/HoverStateChangedEventArgs.shared.cs create mode 100644 src/Core/Behaviors/PlatformBehaviors/MCTTouch/Primitives/HoverStatus.shared.cs create mode 100644 src/Core/Behaviors/PlatformBehaviors/MCTTouch/Primitives/HoverStatusChangedEventArgs.shared.cs create mode 100644 src/Core/Behaviors/PlatformBehaviors/MCTTouch/Primitives/LongPressCompletedEventArgs.shared.cs create mode 100644 src/Core/Behaviors/PlatformBehaviors/MCTTouch/Primitives/TouchCompletedEventArgs.shared.cs create mode 100644 src/Core/Behaviors/PlatformBehaviors/MCTTouch/Primitives/TouchInteractionStatus.shared.cs create mode 100644 src/Core/Behaviors/PlatformBehaviors/MCTTouch/Primitives/TouchInteractionStatusChangedEventArgs.shared.cs create mode 100644 src/Core/Behaviors/PlatformBehaviors/MCTTouch/Primitives/TouchState.shared.cs create mode 100644 src/Core/Behaviors/PlatformBehaviors/MCTTouch/Primitives/TouchStateChangedEventArgs.shared.cs create mode 100644 src/Core/Behaviors/PlatformBehaviors/MCTTouch/Primitives/TouchStatus.shared.cs create mode 100644 src/Core/Behaviors/PlatformBehaviors/MCTTouch/Primitives/TouchStatusChangedEventArgs.shared.cs create mode 100644 src/Core/Behaviors/PlatformBehaviors/MCTTouch/TouchBehavior.Methods.shared.cs create mode 100644 src/Core/Behaviors/PlatformBehaviors/MCTTouch/TouchBehavior.android.cs create mode 100644 src/Core/Behaviors/PlatformBehaviors/MCTTouch/TouchBehavior.macios.cs create mode 100644 src/Core/Behaviors/PlatformBehaviors/MCTTouch/TouchBehavior.shared.cs rename src/{App => Core}/Controls/AccountSwitchingOverlay/AccountSwitchingOverlayView.xaml (72%) rename src/{App => Core}/Controls/AccountSwitchingOverlay/AccountSwitchingOverlayView.xaml.cs (75%) rename src/{App => Core}/Controls/AccountSwitchingOverlay/AccountSwitchingOverlayViewModel.cs (79%) rename src/{App => Core}/Controls/AccountViewCell/AccountViewCell.xaml (82%) rename src/{App => Core}/Controls/AccountViewCell/AccountViewCell.xaml.cs (56%) rename src/{App => Core}/Controls/AccountViewCell/AccountViewCellViewModel.cs (98%) rename src/{App => Core}/Controls/AuthenticatorViewCell/AuthenticatorViewCell.xaml (82%) create mode 100644 src/Core/Controls/AuthenticatorViewCell/AuthenticatorViewCell.xaml.cs create mode 100644 src/Core/Controls/Avatar/AvatarImageSource.cs rename src/{App/Controls => Core/Controls/Avatar}/AvatarImageSourcePool.cs (100%) create mode 100644 src/Core/Controls/Avatar/AvatarInfo.cs create mode 100644 src/Core/Controls/Avatar/SKAvatarImageHelper.cs create mode 100644 src/Core/Controls/CachedImage.cs create mode 100644 src/Core/Controls/CipherViewCell/BaseCipherViewCell.cs rename src/{App => Core}/Controls/CipherViewCell/CipherViewCell.xaml (82%) create mode 100644 src/Core/Controls/CipherViewCell/CipherViewCell.xaml.cs rename src/{App => Core}/Controls/CircularProgressbarView.cs (94%) rename src/{App => Core}/Controls/CustomLabel.cs (75%) rename src/{App => Core}/Controls/DateTime/DateTimePicker.xaml (65%) rename src/{App => Core}/Controls/DateTime/DateTimePicker.xaml.cs (68%) rename src/{App => Core}/Controls/DateTime/DateTimeViewModel.cs (97%) create mode 100644 src/Core/Controls/ExtendedCollectionView.cs rename src/{App => Core}/Controls/ExtendedDatePicker.cs (90%) create mode 100644 src/Core/Controls/ExtendedGrid.cs create mode 100644 src/Core/Controls/ExtendedSearchBar.cs rename src/{App => Core}/Controls/ExtendedSlider.cs (81%) create mode 100644 src/Core/Controls/ExtendedStackLayout.cs rename src/{App => Core}/Controls/ExtendedStepper.cs (84%) rename src/{App => Core}/Controls/ExtendedTimePicker.cs (97%) rename src/{App => Core}/Controls/ExtendedToolbarItem.cs (95%) rename src/{App => Core}/Controls/ExternalLinkItemView.xaml (76%) rename src/{App => Core}/Controls/ExternalLinkItemView.xaml.cs (94%) rename src/{App => Core}/Controls/HybridWebView.cs (92%) rename src/{App => Core}/Controls/IconButton.cs (58%) rename src/{App => Core}/Controls/IconLabel.cs (60%) create mode 100644 src/Core/Controls/IconLabelButton/IconLabelButton.xaml rename src/{App => Core}/Controls/IconLabelButton/IconLabelButton.xaml.cs (74%) rename src/{App => Core}/Controls/MiButton.cs (52%) rename src/{App => Core}/Controls/MiLabel.cs (50%) create mode 100644 src/Core/Controls/MonoEntry.cs create mode 100644 src/Core/Controls/MonoLabel.cs rename src/{App => Core}/Controls/PasswordStrengthProgressBar/IPasswordStrengthable.cs (100%) rename src/{App => Core}/Controls/PasswordStrengthProgressBar/PasswordStrengthCategory.cs (100%) rename src/{App => Core}/Controls/PasswordStrengthProgressBar/PasswordStrengthProgressBar.xaml (89%) rename src/{App => Core}/Controls/PasswordStrengthProgressBar/PasswordStrengthProgressBar.xaml.cs (96%) rename src/{App => Core}/Controls/PasswordStrengthProgressBar/PasswordStrengthViewModel.cs (97%) create mode 100644 src/Core/Controls/Picker/PickerHandler.Android.cs create mode 100644 src/Core/Controls/Picker/PickerHandler.cs rename src/{App => Core}/Controls/RepeaterView.cs (98%) rename src/{App => Core}/Controls/SelectableLabel.cs (66%) rename src/{App => Core}/Controls/SendViewCell/SendViewCell.xaml (84%) create mode 100644 src/Core/Controls/SendViewCell/SendViewCell.xaml.cs rename src/{App => Core}/Controls/SendViewCell/SendViewCellViewModel.cs (91%) rename src/{App => Core}/Controls/Settings/BaseSettingControlView.cs (89%) rename src/{App => Core}/Controls/Settings/SettingChooserItemView.xaml (88%) rename src/{App => Core}/Controls/Settings/SettingChooserItemView.xaml.cs (94%) rename src/{App => Core}/Controls/Settings/SwitchItemView.xaml (88%) rename src/{App => Core}/Controls/Settings/SwitchItemView.xaml.cs (96%) create mode 100644 src/Core/Controls/TruncatedMultilineCustomLabel.cs create mode 100755 src/Core/Effects/FixedSizeEffect.cs rename src/{Android => Core}/Effects/NoEmojiKeyboardEffect.cs (54%) mode change 100644 => 100755 create mode 100755 src/Core/Effects/RemoveFontPaddingEffect.cs rename src/{App => Core}/Effects/ScrollEnabledEffect.cs (52%) mode change 100644 => 100755 create mode 100755 src/Core/Effects/ScrollViewContentInsetAdjustmentBehaviorEffect.cs rename src/{App => Core}/Lists/DataTemplateSelectors/CustomFieldItemTemplateSelector.cs (94%) rename src/{App => Core}/Lists/ItemLayouts/CustomFields/BooleanCustomFieldItemLayout.xaml (91%) rename src/{App => Core}/Lists/ItemLayouts/CustomFields/BooleanCustomFieldItemLayout.xaml.cs (80%) rename src/{App => Core}/Lists/ItemLayouts/CustomFields/HiddenCustomFieldItemLayout.xaml (86%) rename src/{App => Core}/Lists/ItemLayouts/CustomFields/HiddenCustomFieldItemLayout.xaml.cs (80%) rename src/{App => Core}/Lists/ItemLayouts/CustomFields/LinkedCustomFieldItemLayout.xaml (90%) rename src/{App => Core}/Lists/ItemLayouts/CustomFields/LinkedCustomFieldItemLayout.xaml.cs (80%) rename src/{App => Core}/Lists/ItemLayouts/CustomFields/TextCustomFieldItemLayout.xaml (84%) rename src/{App => Core}/Lists/ItemLayouts/CustomFields/TextCustomFieldItemLayout.xaml.cs (80%) rename src/{App => Core}/Lists/ItemViewModels/CustomFields/BaseCustomFieldItemViewModel.cs (96%) rename src/{App => Core}/Lists/ItemViewModels/CustomFields/BooleanCustomFieldItemViewModel.cs (100%) rename src/{App => Core}/Lists/ItemViewModels/CustomFields/CustomFieldItemFactory.cs (100%) rename src/{App => Core}/Lists/ItemViewModels/CustomFields/HiddenCustomFieldItemViewModel.cs (90%) rename src/{App => Core}/Lists/ItemViewModels/CustomFields/ICustomFieldItemViewModel.cs (100%) rename src/{App => Core}/Lists/ItemViewModels/CustomFields/LinkedCustomFieldItemViewModel.cs (100%) rename src/{App => Core}/Lists/ItemViewModels/CustomFields/TextCustomFieldItemViewModel.cs (92%) create mode 100644 src/Core/MauiProgram.cs rename src/{App => Core}/Models/AppOptions.cs (100%) rename src/{App => Core}/Models/DialogDetails.cs (100%) rename src/{App => Core}/Models/NotificationData.cs (100%) rename src/{App => Core}/Models/PlatformCulture.cs (100%) rename src/{App => Core}/Pages/Accounts/BaseChangePasswordViewModel.cs (99%) rename src/{App => Core}/Pages/Accounts/DeleteAccountPage.xaml (93%) rename src/{App => Core}/Pages/Accounts/DeleteAccountPage.xaml.cs (93%) rename src/{App => Core}/Pages/Accounts/DeleteAccountViewModel.cs (96%) rename src/{App => Core}/Pages/Accounts/EnvironmentPage.xaml (86%) rename src/{App => Core}/Pages/Accounts/EnvironmentPage.xaml.cs (79%) rename src/{App => Core}/Pages/Accounts/EnvironmentPageViewModel.cs (85%) rename src/{App => Core}/Pages/Accounts/HintPage.xaml (91%) rename src/{App => Core}/Pages/Accounts/HintPage.xaml.cs (72%) rename src/{App => Core}/Pages/Accounts/HintPageViewModel.cs (91%) create mode 100644 src/Core/Pages/Accounts/HomePage.xaml rename src/{App => Core}/Pages/Accounts/HomePage.xaml.cs (60%) rename src/{App => Core}/Pages/Accounts/HomePageViewModel.cs (87%) rename src/{App => Core}/Pages/Accounts/LockPage.xaml (89%) rename src/{App => Core}/Pages/Accounts/LockPage.xaml.cs (52%) rename src/{App => Core}/Pages/Accounts/LockPageViewModel.cs (97%) rename src/{App => Core}/Pages/Accounts/LoginApproveDevicePage.xaml (97%) rename src/{App => Core}/Pages/Accounts/LoginApproveDevicePage.xaml.cs (87%) rename src/{App => Core}/Pages/Accounts/LoginApproveDeviceViewModel.cs (89%) rename src/{App => Core}/Pages/Accounts/LoginPage.xaml (87%) rename src/{App => Core}/Pages/Accounts/LoginPage.xaml.cs (78%) rename src/{App => Core}/Pages/Accounts/LoginPageViewModel.cs (96%) rename src/{App => Core}/Pages/Accounts/LoginPasswordlessPage.xaml (97%) rename src/{App => Core}/Pages/Accounts/LoginPasswordlessPage.xaml.cs (94%) rename src/{App => Core}/Pages/Accounts/LoginPasswordlessRequestPage.xaml (96%) rename src/{App => Core}/Pages/Accounts/LoginPasswordlessRequestPage.xaml.cs (56%) rename src/{App => Core}/Pages/Accounts/LoginPasswordlessRequestViewModel.cs (95%) rename src/{App => Core}/Pages/Accounts/LoginPasswordlessViewModel.cs (94%) rename src/{App => Core}/Pages/Accounts/LoginSsoPage.xaml (93%) rename src/{App => Core}/Pages/Accounts/LoginSsoPage.xaml.cs (59%) rename src/{App => Core}/Pages/Accounts/LoginSsoPageViewModel.cs (97%) rename src/{App => Core}/Pages/Accounts/RegisterPage.xaml (93%) rename src/{App => Core}/Pages/Accounts/RegisterPage.xaml.cs (81%) rename src/{App => Core}/Pages/Accounts/RegisterPageViewModel.cs (96%) rename src/{App => Core}/Pages/Accounts/RemoveMasterPasswordPage.xaml (92%) rename src/{App => Core}/Pages/Accounts/RemoveMasterPasswordPage.xaml.cs (94%) rename src/{App => Core}/Pages/Accounts/RemoveMasterPasswordPageViewModel.cs (97%) rename src/{App => Core}/Pages/Accounts/SetPasswordPage.xaml (92%) rename src/{App => Core}/Pages/Accounts/SetPasswordPage.xaml.cs (68%) rename src/{App => Core}/Pages/Accounts/SetPasswordPageViewModel.cs (98%) rename src/{App => Core}/Pages/Accounts/TwoFactorPage.xaml (94%) rename src/{App => Core}/Pages/Accounts/TwoFactorPage.xaml.cs (72%) rename src/{App => Core}/Pages/Accounts/TwoFactorPageViewModel.cs (81%) rename src/{App => Core}/Pages/Accounts/UpdateTempPasswordPage.xaml (91%) rename src/{App => Core}/Pages/Accounts/UpdateTempPasswordPage.xaml.cs (82%) rename src/{App => Core}/Pages/Accounts/UpdateTempPasswordPageViewModel.cs (95%) rename src/{App => Core}/Pages/Accounts/VerificationCodePage.xaml (94%) rename src/{App => Core}/Pages/Accounts/VerificationCodePage.xaml.cs (100%) rename src/{App => Core}/Pages/Accounts/VerificationCodeViewModel.cs (91%) create mode 100644 src/Core/Pages/AndroidNavigationRedirectPage.xaml create mode 100644 src/Core/Pages/AndroidNavigationRedirectPage.xaml.cs create mode 100644 src/Core/Pages/BaseContentPage.cs rename src/{App => Core}/Pages/BaseModalContentPage.cs (100%) create mode 100644 src/Core/Pages/BaseViewModel.cs rename src/{App => Core}/Pages/CaptchaProtectedViewModel.cs (97%) rename src/{App => Core}/Pages/CollectionViewModel.cs (100%) rename src/{App => Core}/Pages/Generator/GeneratorHistoryPage.xaml (89%) rename src/{App => Core}/Pages/Generator/GeneratorHistoryPage.xaml.cs (85%) rename src/{App => Core}/Pages/Generator/GeneratorHistoryPageViewModel.cs (90%) rename src/{App => Core}/Pages/Generator/GeneratorPage.xaml (92%) rename src/{App => Core}/Pages/Generator/GeneratorPage.xaml.cs (58%) rename src/{App => Core}/Pages/Generator/GeneratorPageViewModel.cs (91%) rename src/{App => Core}/Pages/PickerViewModel.cs (88%) rename src/{App => Core}/Pages/Send/SendAddEditPage.xaml (91%) rename src/{App => Core}/Pages/Send/SendAddEditPage.xaml.cs (88%) rename src/{App => Core}/Pages/Send/SendAddEditPageViewModel.cs (97%) rename src/{App => Core}/Pages/Send/SendAddOnlyOptionsView.xaml (91%) rename src/{App => Core}/Pages/Send/SendAddOnlyOptionsView.xaml.cs (92%) rename src/{App => Core}/Pages/Send/SendAddOnlyPage.xaml (77%) rename src/{App => Core}/Pages/Send/SendAddOnlyPage.xaml.cs (84%) rename src/{App => Core}/Pages/Send/SendGroupingsPage/ISendGroupingsPageListItem.cs (100%) rename src/{App => Core}/Pages/Send/SendGroupingsPage/SendGroupingsPage.xaml (85%) rename src/{App => Core}/Pages/Send/SendGroupingsPage/SendGroupingsPage.xaml.cs (62%) rename src/{App => Core}/Pages/Send/SendGroupingsPage/SendGroupingsPageHeaderListItem.cs (100%) rename src/{App => Core}/Pages/Send/SendGroupingsPage/SendGroupingsPageListGroup.cs (100%) rename src/{App => Core}/Pages/Send/SendGroupingsPage/SendGroupingsPageListItem.cs (51%) rename src/{App => Core}/Pages/Send/SendGroupingsPage/SendGroupingsPageListItemSelector.cs (81%) rename src/{App => Core}/Pages/Send/SendGroupingsPage/SendGroupingsPageViewModel.cs (81%) rename src/{App => Core}/Pages/Send/SendsPage.xaml (89%) rename src/{App => Core}/Pages/Send/SendsPage.xaml.cs (88%) rename src/{App => Core}/Pages/Send/SendsPageViewModel.cs (90%) rename src/{App => Core}/Pages/Settings/AboutSettingsPage.xaml (90%) rename src/{App => Core}/Pages/Settings/AboutSettingsPage.xaml.cs (95%) rename src/{App => Core}/Pages/Settings/AboutSettingsPageViewModel.cs (83%) rename src/{App => Core}/Pages/Settings/AppearanceSettingsPage.xaml (96%) rename src/{App => Core}/Pages/Settings/AppearanceSettingsPage.xaml.cs (96%) rename src/{App => Core}/Pages/Settings/AppearanceSettingsPageViewModel.cs (90%) rename src/{App => Core}/Pages/Settings/AutofillPage.xaml (95%) rename src/{App => Core}/Pages/Settings/AutofillPage.xaml.cs (100%) rename src/{App => Core}/Pages/Settings/AutofillSettingsPage.xaml (98%) rename src/{App => Core}/Pages/Settings/AutofillSettingsPage.xaml.cs (95%) rename src/{App => Core}/Pages/Settings/AutofillSettingsPageViewModel.android.cs (74%) rename src/{App => Core}/Pages/Settings/AutofillSettingsPageViewModel.cs (83%) create mode 100644 src/Core/Pages/Settings/AutofillSettingsPageViewModel.ios.cs rename src/{App => Core}/Pages/Settings/BlockAutofillUrisPage.xaml (85%) rename src/{App => Core}/Pages/Settings/BlockAutofillUrisPage.xaml.cs (92%) rename src/{App => Core}/Pages/Settings/BlockAutofillUrisPageViewModel.cs (95%) rename src/{App => Core}/Pages/Settings/ExportVaultPage.xaml (94%) rename src/{App => Core}/Pages/Settings/ExportVaultPage.xaml.cs (95%) rename src/{App => Core}/Pages/Settings/ExportVaultPageViewModel.cs (99%) rename src/{App => Core}/Pages/Settings/ExtensionPage.xaml (97%) rename src/{App => Core}/Pages/Settings/ExtensionPage.xaml.cs (100%) rename src/{App => Core}/Pages/Settings/ExtensionPageViewModel.cs (97%) rename src/{App => Core}/Pages/Settings/FolderAddEditPage.xaml (86%) rename src/{App => Core}/Pages/Settings/FolderAddEditPage.xaml.cs (74%) rename src/{App => Core}/Pages/Settings/FolderAddEditPageViewModel.cs (93%) rename src/{App => Core}/Pages/Settings/FoldersPage.xaml (83%) rename src/{App => Core}/Pages/Settings/FoldersPage.xaml.cs (86%) rename src/{App => Core}/Pages/Settings/FoldersPageViewModel.cs (96%) rename src/{App => Core}/Pages/Settings/LoginPasswordlessRequestsListPage.xaml (92%) rename src/{App => Core}/Pages/Settings/LoginPasswordlessRequestsListPage.xaml.cs (79%) rename src/{App => Core}/Pages/Settings/LoginPasswordlessRequestsListViewModel.cs (89%) rename src/{App => Core}/Pages/Settings/OtherSettingsPage.xaml (96%) rename src/{App => Core}/Pages/Settings/OtherSettingsPage.xaml.cs (96%) rename src/{App => Core}/Pages/Settings/OtherSettingsPageViewModel.cs (89%) rename src/{App => Core}/Pages/Settings/SecuritySettingsPage.xaml (95%) rename src/{App => Core}/Pages/Settings/SecuritySettingsPage.xaml.cs (95%) rename src/{App => Core}/Pages/Settings/SecuritySettingsPageViewModel.cs (90%) rename src/{App => Core}/Pages/Settings/SettingsPage/SettingsPage.xaml (92%) rename src/{App => Core}/Pages/Settings/SettingsPage/SettingsPage.xaml.cs (69%) rename src/{App => Core}/Pages/Settings/SettingsPage/SettingsPageListItem.cs (95%) rename src/{App => Core}/Pages/Settings/SettingsPage/SettingsPageViewModel.cs (78%) rename src/{App => Core}/Pages/Settings/VaultSettingsPage.xaml (94%) rename src/{App => Core}/Pages/Settings/VaultSettingsPage.xaml.cs (100%) rename src/{App => Core}/Pages/Settings/VaultSettingsPageViewModel.cs (76%) rename src/{App => Core}/Pages/TabsPage.cs (66%) rename src/{App => Core}/Pages/Vault/AttachmentsPage.xaml (93%) rename src/{App => Core}/Pages/Vault/AttachmentsPage.xaml.cs (77%) rename src/{App => Core}/Pages/Vault/AttachmentsPageViewModel.cs (91%) rename src/{App => Core}/Pages/Vault/AutofillCiphersPageViewModel.cs (90%) rename src/{App => Core}/Pages/Vault/BaseCipherViewModel.cs (88%) rename src/{App => Core}/Pages/Vault/CipherAddEditPage.xaml (84%) rename src/{App => Core}/Pages/Vault/CipherAddEditPage.xaml.cs (85%) rename src/{App => Core}/Pages/Vault/CipherAddEditPageViewModel.cs (95%) rename src/{App => Core}/Pages/Vault/CipherDetailsPage.xaml (93%) rename src/{App => Core}/Pages/Vault/CipherDetailsPage.xaml.cs (92%) rename src/{App => Core}/Pages/Vault/CipherDetailsPageViewModel.cs (91%) create mode 100644 src/Core/Pages/Vault/CipherItemViewModel.cs rename src/{App => Core}/Pages/Vault/CipherSelectionPage.xaml (87%) rename src/{App => Core}/Pages/Vault/CipherSelectionPage.xaml.cs (91%) rename src/{App => Core}/Pages/Vault/CipherSelectionPageViewModel.cs (87%) rename src/{App => Core}/Pages/Vault/CiphersPage.xaml (82%) rename src/{App => Core}/Pages/Vault/CiphersPage.xaml.cs (91%) rename src/{App => Core}/Pages/Vault/CiphersPageViewModel.cs (75%) rename src/{App => Core}/Pages/Vault/CollectionsPage.xaml (96%) rename src/{App => Core}/Pages/Vault/CollectionsPage.xaml.cs (80%) rename src/{App => Core}/Pages/Vault/CollectionsPageViewModel.cs (96%) rename src/{App => Core}/Pages/Vault/GroupingsPage/GroupingsPage.xaml (82%) rename src/{App => Core}/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs (52%) rename src/{App => Core}/Pages/Vault/GroupingsPage/GroupingsPageHeaderListItem.cs (100%) rename src/{App => Core}/Pages/Vault/GroupingsPage/GroupingsPageListGroup.cs (100%) rename src/{App => Core}/Pages/Vault/GroupingsPage/GroupingsPageListItem.cs (96%) rename src/{App => Core}/Pages/Vault/GroupingsPage/GroupingsPageListItemSelector.cs (76%) create mode 100644 src/Core/Pages/Vault/GroupingsPage/GroupingsPageTOTPListItem.cs rename src/{App => Core}/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs (87%) rename src/{App => Core}/Pages/Vault/GroupingsPage/IGroupingsPageListItem.cs (100%) rename src/{App => Core}/Pages/Vault/OTPCipherSelectionPageViewModel.cs (88%) rename src/{App => Core}/Pages/Vault/PasswordHistoryPage.xaml (90%) rename src/{App => Core}/Pages/Vault/PasswordHistoryPage.xaml.cs (77%) rename src/{App => Core}/Pages/Vault/PasswordHistoryPageViewModel.cs (93%) rename src/{App => Core}/Pages/Vault/ScanPage.xaml (77%) rename src/{App => Core}/Pages/Vault/ScanPage.xaml.cs (65%) rename src/{App => Core}/Pages/Vault/ScanPageViewModel.cs (57%) rename src/{App => Core}/Pages/Vault/SharePage.xaml (97%) rename src/{App => Core}/Pages/Vault/SharePage.xaml.cs (72%) rename src/{App => Core}/Pages/Vault/SharePageViewModel.cs (95%) rename src/{App => Core}/Pages/VaultFilterViewModel.cs (96%) rename src/{Android/Assets => Core/Resources/Fonts}/MaterialIcons_Regular.ttf (100%) rename src/{Android/Assets => Core/Resources/Fonts}/RobotoMono_Regular.ttf (100%) rename src/{Android/Assets => Core/Resources/Fonts}/bwi-font.ttf (100%) create mode 100755 src/Core/Resources/Images/dotnet_bot.svg rename src/{App/Resources => Core/Resources/Localization}/AppResources.Designer.cs (99%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.af.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.ar.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.az.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.be.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.bg.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.bn.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.bs.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.ca.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.cs.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.cy.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.da.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.de.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.el.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.en-GB.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.en-IN.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.es.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.et.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.eu.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.fa.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.fi.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.fil.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.fr.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.gl.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.he.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.hi.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.hr.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.hu.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.id.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.it.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.ja.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.ka.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.kn.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.ko.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.lt.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.lv.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.ml.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.mr.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.my.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.nb.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.ne.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.nl.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.nn.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.or.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.pl.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.pt-BR.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.pt-PT.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.ro.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.ru.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.si.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.sk.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.sl.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.sr.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.sv.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.ta.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.te.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.th.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.tr.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.uk.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.vi.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.zh-Hans.resx (100%) rename src/{App/Resources => Core/Resources/Localization}/AppResources.zh-Hant.resx (100%) rename src/{App => Core/Resources}/Styles/Android.xaml (97%) rename src/{App => Core/Resources}/Styles/Android.xaml.cs (75%) rename src/{App => Core/Resources}/Styles/Base.xaml (93%) rename src/{App => Core/Resources}/Styles/Base.xaml.cs (75%) rename src/{App => Core/Resources}/Styles/Black.xaml (96%) rename src/{App => Core/Resources}/Styles/Black.xaml.cs (77%) rename src/{App => Core/Resources}/Styles/ControlTemplates.xaml (92%) rename src/{App => Core/Resources}/Styles/ControlTemplates.xaml.cs (77%) rename src/{App => Core/Resources}/Styles/Dark.xaml (96%) rename src/{App => Core/Resources}/Styles/Dark.xaml.cs (77%) rename src/{App => Core/Resources}/Styles/IThemeDirtablePage.cs (100%) rename src/{App => Core/Resources}/Styles/IThemeResourceDictionary.cs (100%) rename src/{App => Core/Resources}/Styles/Light.xaml (96%) rename src/{App => Core/Resources}/Styles/Light.xaml.cs (77%) rename src/{App => Core/Resources}/Styles/Nord.xaml (96%) rename src/{App => Core/Resources}/Styles/Nord.xaml.cs (77%) rename src/{App => Core/Resources}/Styles/SolarizedDark.xaml (96%) rename src/{App => Core/Resources}/Styles/SolarizedDark.xaml.cs (79%) rename src/{App => Core/Resources}/Styles/Variables.xaml (57%) rename src/{App => Core/Resources}/Styles/Variables.xaml.cs (76%) rename src/{App => Core/Resources}/Styles/iOS.xaml (98%) rename src/{App => Core/Resources}/Styles/iOS.xaml.cs (75%) create mode 100644 src/Core/ResumeWindow.cs rename src/{App => Core}/Services/BaseBiometricService.cs (100%) rename src/{App => Core}/Services/BaseWatchDeviceService.cs (100%) rename src/{App => Core}/Services/DeepLinkContext.cs (100%) rename src/{App => Core}/Services/MobileBroadcasterMessagingService.cs (100%) rename src/{App => Core}/Services/MobileI18nService.cs (97%) rename src/{App => Core}/Services/MobilePasswordRepromptService.cs (98%) rename src/{App => Core}/Services/MobilePlatformUtilsService.cs (95%) rename src/{App => Core}/Services/MobileStorageService.cs (85%) rename src/{App => Core}/Services/NoopPushNotificationListenerService.cs (100%) rename src/{App => Core}/Services/NoopPushNotificationService.cs (100%) rename src/{App => Core}/Services/PreferencesStorageService.cs (68%) rename src/{App => Core}/Services/PushNotificationListenerService.cs (99%) rename src/{App => Core}/Services/SecureStorageService.cs (81%) rename src/{App => Core}/Services/UserPinService.cs (100%) rename src/{App => Core}/Utilities/A11yExtensions.cs (96%) rename src/{App => Core}/Utilities/AccountManagement/AccountsManager.cs (92%) rename src/{App => Core}/Utilities/AccountManagement/LockNavigationParams.cs (100%) rename src/{App => Core}/Utilities/AccountManagement/LoginNavigationParams.cs (100%) rename src/{App => Core}/Utilities/AppHelpers.cs (98%) rename src/{App => Core}/Utilities/AppSetup.cs (100%) rename src/{App => Core}/Utilities/Automation/AutomationIdsHelper.cs (100%) rename src/{App => Core}/Utilities/Automation/SuffixType.cs (100%) rename src/{App => Core}/Utilities/BoolToColorConverter.cs (92%) rename src/{App => Core}/Utilities/BoxRowVsBoxRowInputPaddingConverter.cs (93%) rename src/{App => Core}/Utilities/ColoredPasswordConverter.cs (93%) rename src/{App => Core}/Utilities/DateTimeConverter.cs (95%) rename src/{App => Core}/Utilities/EnumHelper.cs (91%) rename src/{App => Core}/Utilities/GeneratedValueFormatter.cs (83%) rename src/{App => Core}/Utilities/I18nExtension.cs (90%) rename src/{App => Core}/Utilities/IPasswordPromptable.cs (100%) rename src/{App => Core}/Utilities/IconGlyphConverter.cs (94%) rename src/{App => Core}/Utilities/IconGlyphExtensions.cs (100%) rename src/{App => Core}/Utilities/IconImageConverter.cs (95%) rename src/{App => Core}/Utilities/InverseBoolConverter.cs (92%) rename src/{App => Core}/Utilities/IsNotNullConverter.cs (92%) rename src/{App => Core}/Utilities/IsNullConverter.cs (92%) rename src/{App => Core}/Utilities/LocalizableEnumConverter.cs (79%) create mode 100644 src/Core/Utilities/ObservableRangeCollection.cs rename src/{App => Core}/Utilities/PageExtensions.cs (97%) rename src/{App => Core}/Utilities/PermissionManager.cs (83%) rename src/{App => Core}/Utilities/ProgressBarExtensions.cs (88%) rename src/{App => Core}/Utilities/Prompts/ValidatablePromptConfig.cs (100%) rename src/{App => Core}/Utilities/SendIconGlyphConverter.cs (94%) rename src/{App => Core}/Utilities/StringHasValueConverter.cs (94%) rename src/{App => Core}/Utilities/ThemeManager.cs (93%) rename src/{App => Core}/Utilities/TimerTask.cs (92%) rename src/{App => Core}/Utilities/TotpHelper.cs (100%) rename src/{App => Core}/Utilities/UpperCaseConverter.cs (93%) rename src/{App => Core}/Utilities/VerificationActionsFlowHelper.cs (99%) delete mode 100644 src/iOS.Autofill/Properties/AssemblyInfo.cs delete mode 100644 src/iOS.Core/Effects/ScrollEnabledEffect.cs delete mode 100644 src/iOS.Core/Effects/ScrollViewContentInsetAdjustmentBehaviorEffect.cs rename src/iOS.Core/{Renderers/CustomContentPageRenderer.cs => Handlers/CustomContentPageHandler.cs} (51%) rename src/iOS.Core/{Renderers/CustomNavigationRenderer.cs => Handlers/CustomNavigationHandler.cs} (91%) rename src/iOS.Core/{Renderers/CustomTabbedRenderer.cs => Handlers/CustomTabbedHandler.cs} (72%) rename src/iOS.Core/{Renderers/CustomViewCellRenderer.cs => Handlers/CustomViewCellHandler.cs} (53%) create mode 100644 src/iOS.Core/Handlers/DatePickerHandlerMappings.cs create mode 100644 src/iOS.Core/Handlers/EditorHandlerMappings.cs create mode 100644 src/iOS.Core/Handlers/EntryHandlerMappings.cs create mode 100644 src/iOS.Core/Handlers/HybridWebViewHandler.cs create mode 100644 src/iOS.Core/Handlers/LabelHandlerMappings.cs create mode 100644 src/iOS.Core/Handlers/PickerHandlerMappings.cs create mode 100644 src/iOS.Core/Handlers/SearchBarHandlerMappings.cs create mode 100644 src/iOS.Core/Handlers/SelectableLabelHandler.cs create mode 100644 src/iOS.Core/Handlers/StepperHandlerMappings.cs create mode 100644 src/iOS.Core/Handlers/TimePickerHandlerMappings.cs delete mode 100644 src/iOS.Core/Properties/AssemblyInfo.cs delete mode 100644 src/iOS.Core/Renderers/CollectionView/CollectionException.cs delete mode 100644 src/iOS.Core/Renderers/CollectionView/ExtendedCollectionViewRenderer.cs delete mode 100644 src/iOS.Core/Renderers/CollectionView/ExtendedGroupableItemsViewController.cs delete mode 100644 src/iOS.Core/Renderers/CollectionView/ExtendedGroupableItemsViewDelegator.cs delete mode 100644 src/iOS.Core/Renderers/CustomButtonRenderer.cs delete mode 100644 src/iOS.Core/Renderers/CustomEditorRenderer.cs delete mode 100644 src/iOS.Core/Renderers/CustomEntryRenderer.cs delete mode 100644 src/iOS.Core/Renderers/CustomLabelRenderer.cs delete mode 100644 src/iOS.Core/Renderers/CustomPickerRenderer.cs delete mode 100644 src/iOS.Core/Renderers/CustomSearchBarRenderer.cs delete mode 100644 src/iOS.Core/Renderers/ExtendedDatePickerRenderer.cs delete mode 100644 src/iOS.Core/Renderers/ExtendedStepperRenderer.cs delete mode 100644 src/iOS.Core/Renderers/ExtendedTimePickerRenderer.cs delete mode 100644 src/iOS.Core/Renderers/HybridWebViewRenderer.cs delete mode 100644 src/iOS.Core/Renderers/SelectableLabelRenderer.cs delete mode 100644 src/iOS.Core/Utilities/ImageSourceExtensions.cs create mode 100644 src/iOS.Core/Utilities/MauiContextSingleton.cs delete mode 100644 src/iOS/AppDelegate.cs delete mode 100644 src/iOS/Main.cs delete mode 100644 src/iOS/Properties/AssemblyInfo.cs delete mode 100644 src/iOS/Resources/MaterialIcons_Regular.ttf delete mode 100644 src/iOS/Resources/bwi-font.ttf delete mode 100644 src/iOS/Resources/cog_environment.png delete mode 100644 src/iOS/Resources/cog_environment@2x.png delete mode 100644 src/iOS/Resources/cog_environment@3x.png delete mode 100644 src/iOS/Resources/cog_settings.png delete mode 100644 src/iOS/Resources/cog_settings@2x.png delete mode 100644 src/iOS/Resources/cog_settings@3x.png delete mode 100644 src/iOS/Resources/generate.png delete mode 100644 src/iOS/Resources/generate@2x.png delete mode 100644 src/iOS/Resources/generate@3x.png delete mode 100644 src/iOS/Resources/info.png delete mode 100644 src/iOS/Resources/info@2x.png delete mode 100644 src/iOS/Resources/info@3x.png delete mode 100644 src/iOS/Resources/lock.png delete mode 100644 src/iOS/Resources/lock@2x.png delete mode 100644 src/iOS/Resources/lock@3x.png delete mode 100644 src/iOS/Resources/login.png delete mode 100644 src/iOS/Resources/login@2x.png delete mode 100644 src/iOS/Resources/login@3x.png delete mode 100644 src/iOS/Resources/more.png delete mode 100644 src/iOS/Resources/more@2x.png delete mode 100644 src/iOS/Resources/more@3x.png delete mode 100644 src/iOS/Resources/plus.png delete mode 100644 src/iOS/Resources/plus@2x.png delete mode 100644 src/iOS/Resources/plus@3x.png delete mode 100644 src/iOS/Resources/send.png delete mode 100644 src/iOS/Resources/send@2x.png delete mode 100644 src/iOS/Resources/send@3x.png delete mode 100644 src/iOS/Resources/yubikey.png delete mode 100644 src/iOS/Resources/yubikey@2x.png delete mode 100644 src/iOS/iOS.csproj diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 092b5e2f1..f40ce596c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,6 +10,11 @@ on: - ".github/workflows/**" workflow_dispatch: +env: + main_app_folder_path: src/App + main_app_project_path: src/App/App.csproj + target-net-version: net8.0 + jobs: cloc: name: CLOC @@ -26,7 +31,6 @@ jobs: - name: Print lines of code run: cloc --vcs git --exclude-dir Resources,store,test,Properties --include-lang C#,XAML - setup: name: Setup runs-on: ubuntu-22.04 @@ -54,7 +58,6 @@ jobs: echo "hotfix_branch_exists=0" >> $GITHUB_OUTPUT fi - android: name: Android runs-on: windows-2022 @@ -63,20 +66,27 @@ jobs: fail-fast: false matrix: variant: ["prod", "qa"] + env: + android_folder_path: src/App/Platforms/Android steps: - name: Setup NuGet uses: nuget/setup-nuget@296fd3ccf8528660c91106efefe2364482f86d6f # v1.2.0 with: - nuget-version: 5.9.0 + nuget-version: 6.4.0 - name: Set up .NET uses: actions/setup-dotnet@4d6c8fcf3c8f7a60068d26b594648e99df24cee3 # v4.0.0 with: - dotnet-version: '3.1.x' + dotnet-version: '8.0.x' - name: Set up MSBuild uses: microsoft/setup-msbuild@ede762b26a2de8d110bb5a3db4d7e0e080c0e917 # v1.3.3 + # This step might be obsolete at some point as .NET MAUI workloads + # are starting to come pre-installed on the GH Actions build agents. + - name: Install MAUI Workload + run: dotnet workload install maui --ignore-failed-sources + - name: Setup Windows builder run: choco install checksum --no-progress @@ -106,9 +116,9 @@ jobs: mkdir -p ~/secrets gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \ - --output ./src/Android/app_play-keystore.jks ./.github/secrets/app_play-keystore.jks.gpg + --output ./${{ env.main_app_folder_path }}/app_play-keystore.jks ./.github/secrets/app_play-keystore.jks.gpg gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \ - --output ./src/Android/app_upload-keystore.jks ./.github/secrets/app_upload-keystore.jks.gpg + --output ./${{ env.main_app_folder_path }}/app_upload-keystore.jks ./.github/secrets/app_upload-keystore.jks.gpg gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \ --output $HOME/secrets/play_creds.json ./.github/secrets/play_creds.json.gpg shell: bash @@ -119,7 +129,7 @@ jobs: DECRYPT_FILE_PASSWORD: ${{ secrets.DECRYPT_FILE_PASSWORD }} run: | gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \ - --output ./src/Android/google-services.json ./.github/secrets/google-services.json.gpg + --output ./${{ env.android_folder_path }}/google-services.json ./.github/secrets/google-services.json.gpg shell: bash - name: Increment version @@ -129,9 +139,9 @@ jobs: echo "########################################" echo "##### Setting Version Code $BUILD_NUMBER" echo "########################################" - + sed -i "s/android:versionCode=\"1\"/android:versionCode=\"$BUILD_NUMBER\"/" \ - ./src/Android/Properties/AndroidManifest.xml + ./${{ env.android_folder_path }}/AndroidManifest.xml shell: bash - name: Restore packages @@ -140,11 +150,11 @@ jobs: - name: Restore tools run: dotnet tool restore - - name: Verify Format - run: dotnet tool run dotnet-format --check + # - name: Verify Format + # run: dotnet tool run dotnet-format --check - name: Run Core tests - run: dotnet test test/Core.Test/Core.Test.csproj --logger "trx;LogFileName=test-results.trx" + run: dotnet test test/Core.Test/Core.Test.csproj --logger "trx;LogFileName=test-results.trx" /p:CustomConstants=UT - name: Report test results uses: dorny/test-reporter@eaa763f6ffc21c7a37837f56cd5f9737f27fc6c8 # v1.8.0 @@ -165,18 +175,20 @@ jobs: - name: Build Android run: | $configuration = "Release"; + $projToBuild = $($env:GITHUB_WORKSPACE + "/${{ env.main_app_project_path }}"); Write-Output "########################################" Write-Output "##### Build $configuration Configuration" Write-Output "########################################" - msbuild "$($env:GITHUB_WORKSPACE + "/src/Android/Android.csproj")" "/p:Configuration=$configuration" + + dotnet build $projToBuild -c $configuration -f ${{ env.target-net-version }}-android - name: Sign Android Build env: PLAY_KEYSTORE_PASSWORD: ${{ secrets.PLAY_KEYSTORE_PASSWORD }} UPLOAD_KEYSTORE_PASSWORD: ${{ secrets.UPLOAD_KEYSTORE_PASSWORD }} run: | - $androidPath = $($env:GITHUB_WORKSPACE + "/src/Android/Android.csproj"); + $projToBuild = $($env:GITHUB_WORKSPACE + "/${{ env.main_app_project_path }}"); $packageName = "com.x8bit.bitwarden"; if ("${{ matrix.variant }}" -ne "prod") @@ -187,16 +199,13 @@ jobs: Write-Output "##### Sign Google Play Bundle Release Configuration" Write-Output "########################################" - msbuild "$($androidPath)" "/t:SignAndroidPackage" "/p:Configuration=Release" "/p:AndroidKeyStore=true" ` - "/p:AndroidSigningKeyAlias=upload" "/p:AndroidSigningKeyPass=$($env:UPLOAD_KEYSTORE_PASSWORD)" ` - "/p:AndroidSigningKeyStore=$("app_upload-keystore.jks")" ` - "/p:AndroidSigningStorePass=$($env:UPLOAD_KEYSTORE_PASSWORD)" "/p:AndroidPackageFormat=aab" "/v:quiet" + dotnet publish $projToBuild -c Release -f ${{ env.target-net-version }}-android /p:AndroidPackageFormats=aab /p:AndroidKeyStore=true /p:AndroidSigningKeyStore=$("app_upload-keystore.jks") /p:AndroidSigningKeyAlias=upload /p:AndroidSigningKeyPass="$($env:UPLOAD_KEYSTORE_PASSWORD)" /p:AndroidSigningStorePass="$($env:UPLOAD_KEYSTORE_PASSWORD)" --no-restore Write-Output "########################################" Write-Output "##### Copy Google Play Bundle to project root" Write-Output "########################################" - $signedAabPath = $($env:GITHUB_WORKSPACE + "/src/Android/bin/Release/$($packageName)-Signed.aab"); + $signedAabPath = $($env:GITHUB_WORKSPACE + "/${{ env.main_app_folder_path }}/bin/Release/${{ env.target-net-version }}-android/publish/$($packageName)-Signed.aab"); $signedAabDestPath = $($env:GITHUB_WORKSPACE + "/$($packageName).aab"); Copy-Item $signedAabPath $signedAabDestPath @@ -204,16 +213,13 @@ jobs: Write-Output "##### Sign APK Release Configuration" Write-Output "########################################" - msbuild "$($androidPath)" "/t:SignAndroidPackage" "/p:Configuration=Release" "/p:AndroidKeyStore=true" ` - "/p:AndroidSigningKeyAlias=bitwarden" "/p:AndroidSigningKeyPass=$($env:PLAY_KEYSTORE_PASSWORD)" ` - "/p:AndroidSigningKeyStore=$("app_play-keystore.jks")" ` - "/p:AndroidSigningStorePass=$($env:PLAY_KEYSTORE_PASSWORD)" "/v:quiet" + dotnet publish $projToBuild -c Release -f ${{ env.target-net-version }}-android /p:AndroidKeyStore=true /p:AndroidSigningKeyStore=$("app_play-keystore.jks") /p:AndroidSigningKeyAlias=bitwarden /p:AndroidSigningKeyPass="$($env:PLAY_KEYSTORE_PASSWORD)" /p:AndroidSigningStorePass="$($env:PLAY_KEYSTORE_PASSWORD)" --no-restore Write-Output "########################################" Write-Output "##### Copy Release APK to project root" Write-Output "########################################" - $signedApkPath = $($env:GITHUB_WORKSPACE + "/src/Android/bin/Release/$($packageName)-Signed.apk"); + $signedApkPath = $($env:GITHUB_WORKSPACE + "/${{ env.main_app_folder_path }}/bin/Release/${{ env.target-net-version }}-android/publish/$($packageName)-Signed.apk"); $signedApkDestPath = $($env:GITHUB_WORKSPACE + "/$($packageName).apk"); Copy-Item $signedApkPath $signedApkDestPath @@ -277,7 +283,7 @@ jobs: || (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0) || github.ref == 'refs/heads/hotfix-rc' ) }} run: | - PUBLISHER_PATH="$GITHUB_WORKSPACE/store/google/Publisher/bin/Release/netcoreapp3.1/Publisher.dll" + PUBLISHER_PATH="$GITHUB_WORKSPACE/store/google/Publisher/bin/Release/net7.0/Publisher.dll" CREDS_PATH="$HOME/secrets/play_creds.json" AAB_PATH="$GITHUB_WORKSPACE/com.x8bit.bitwarden.aab" TRACK="internal" @@ -289,15 +295,28 @@ jobs: f-droid: name: F-Droid Build runs-on: windows-2022 + env: + android_folder_path: src/App/Platforms/Android + android_manifest_path: src/App/Platforms/Android/AndroidManifest.xml steps: - name: Setup NuGet uses: nuget/setup-nuget@296fd3ccf8528660c91106efefe2364482f86d6f # v1.2.0 with: - nuget-version: 5.9.0 + nuget-version: 6.4.0 + + - name: Set up .NET + uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0 + with: + dotnet-version: '8.0.x' - name: Set up MSBuild uses: microsoft/setup-msbuild@ede762b26a2de8d110bb5a3db4d7e0e080c0e917 # v1.3.3 + # This step might be obsolete at some point as .NET MAUI workloads + # are starting to come pre-installed on the GH Actions build agents. + - name: Install MAUI Workload + run: dotnet workload install maui --ignore-failed-sources + - name: Setup Windows builder run: choco install checksum --no-progress @@ -325,7 +344,7 @@ jobs: mkdir -p ~/secrets gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \ - --output ./src/Android/app_fdroid-keystore.jks ./.github/secrets/app_fdroid-keystore.jks.gpg + --output ./${{ env.main_app_folder_path }}/app_fdroid-keystore.jks ./.github/secrets/app_fdroid-keystore.jks.gpg shell: bash - name: Increment version @@ -337,30 +356,21 @@ jobs: echo "########################################" sed -i "s/android:versionCode=\"1\"/android:versionCode=\"$BUILD_NUMBER\"/" \ - ./src/Android/Properties/AndroidManifest.xml + ./${{ env.android_manifest_path }} shell: bash - name: Clean for F-Droid run: | - $androidPath = $($env:GITHUB_WORKSPACE + "/src/Android/Android.csproj"); - $appPath = $($env:GITHUB_WORKSPACE + "/src/App/App.csproj"); + $appPath = $($env:GITHUB_WORKSPACE + "/${{ env.main_app_project_path }}"); $corePath = $($env:GITHUB_WORKSPACE + "/src/Core/Core.csproj"); - $androidManifest = $($env:GITHUB_WORKSPACE + "/src/Android/Properties/AndroidManifest.xml"); - - Write-Output "########################################" - Write-Output "##### Clean Android and App" - Write-Output "########################################" - - msbuild "$($androidPath)" "/t:Clean" "/p:Configuration=FDroid" - msbuild "$($appPath)" "/t:Clean" "/p:Configuration=FDroid" + $androidManifest = $($env:GITHUB_WORKSPACE + "/${{ env.android_manifest_path }}"); Write-Output "########################################" Write-Output "##### Backup project files" Write-Output "########################################" Copy-Item $androidManifest $($androidManifest + ".original"); - Copy-Item $androidPath $($androidPath + ".original"); Copy-Item $appPath $($appPath + ".original"); Write-Output "########################################" @@ -375,74 +385,38 @@ jobs: $xml.Save($androidManifest); - Write-Output "########################################" - Write-Output "##### Uninstall from Android.csproj" - Write-Output "########################################" - - $xml=New-Object XML; - $xml.Load($androidPath); - - $ns=New-Object System.Xml.XmlNamespaceManager($xml.NameTable); - $ns.AddNamespace("ns", $xml.DocumentElement.NamespaceURI); - - $firebaseNode=$xml.SelectSingleNode(` - "/ns:Project/ns:ItemGroup/ns:PackageReference[@Include='Xamarin.Firebase.Messaging']", $ns); - $firebaseNode.ParentNode.RemoveChild($firebaseNode); - - $daggerNode=$xml.SelectSingleNode(` - "/ns:Project/ns:ItemGroup/ns:PackageReference[@Include='Xamarin.Google.Dagger']", $ns); - $daggerNode.ParentNode.RemoveChild($daggerNode); - - $safetyNetNode=$xml.SelectSingleNode(` - "/ns:Project/ns:ItemGroup/ns:PackageReference[@Include='Xamarin.GooglePlayServices.SafetyNet']", $ns); - $safetyNetNode.ParentNode.RemoveChild($safetyNetNode); - - $xml.Save($androidPath); - - Write-Output "########################################" - Write-Output "##### Uninstall from Core.csproj" - Write-Output "########################################" - - $xml=New-Object XML; - $xml.Load($corePath); - - $appCenterNode=$xml.SelectSingleNode("/Project/ItemGroup/PackageReference[@Include='Microsoft.AppCenter.Crashes']"); - $appCenterNode.ParentNode.RemoveChild($appCenterNode); - - $xml.Save($corePath); - - name: Restore packages - run: nuget restore + run: dotnet restore - name: Build for F-Droid run: | - $configuration = "FDroid"; + $configuration = "Release"; + $projToBuild = $($env:GITHUB_WORKSPACE + "/${{ env.main_app_project_path }}"); Write-Output "########################################" - Write-Output "##### Build $configuration Configuration" + Write-Output "##### Build $configuration FDROID Write-Output "########################################" - - msbuild "$($env:GITHUB_WORKSPACE + "/src/Android/Android.csproj")" "/p:Configuration=$configuration" + + dotnet build $projToBuild -c $configuration -f ${{ env.target-net-version }}-android /p:CustomConstants="FDROID" - name: Sign for F-Droid env: FDROID_KEYSTORE_PASSWORD: ${{ secrets.FDROID_KEYSTORE_PASSWORD }} run: | + $projToBuild = $($env:GITHUB_WORKSPACE + "/${{ env.main_app_project_path }}"); + $packageName = "com.x8bit.bitwarden"; + Write-Output "########################################" - Write-Output "##### Sign FDroid Configuration" + Write-Output "##### Sign FDroid" Write-Output "########################################" - msbuild "$($env:GITHUB_WORKSPACE + "/src/Android/Android.csproj")" ` - "/t:SignAndroidPackage" "/p:Configuration=FDroid" "/p:AndroidKeyStore=true" ` - "/p:AndroidSigningKeyAlias=bitwarden" "/p:AndroidSigningKeyPass=$($env:FDROID_KEYSTORE_PASSWORD)" ` - "/p:AndroidSigningKeyStore=$("app_fdroid-keystore.jks")" ` - "/p:AndroidSigningStorePass=$($env:FDROID_KEYSTORE_PASSWORD)" "/v:quiet" + dotnet publish $projToBuild -c Release -f ${{ env.target-net-version }}-android /p:AndroidKeyStore=true /p:AndroidSigningKeyStore=$("app_fdroid-keystore.jks") /p:AndroidSigningKeyAlias=bitwarden /p:AndroidSigningKeyPass="$($env:FDROID_KEYSTORE_PASSWORD)" /p:AndroidSigningStorePass="$($env:FDROID_KEYSTORE_PASSWORD)" /p:CustomConstants="FDROID" --no-restore Write-Output "########################################" Write-Output "##### Copy FDroid apk to project root" Write-Output "########################################" - $signedApkPath = $($env:GITHUB_WORKSPACE + "/src/Android/bin/FDroid/com.x8bit.bitwarden-Signed.apk"); + $signedApkPath = $($env:GITHUB_WORKSPACE + "/${{ env.main_app_folder_path }}/bin/Release/${{ env.target-net-version }}-android/publish/$($packageName)-Signed.apk"); $signedApkDestPath = $($env:GITHUB_WORKSPACE + "/com.x8bit.bitwarden-fdroid.apk"); Copy-Item $signedApkPath $signedApkDestPath @@ -466,21 +440,38 @@ jobs: path: ./bw-fdroid-apk-sha256.txt if-no-files-found: error - ios: name: Apple iOS - runs-on: macos-12 + runs-on: macos-13 needs: setup + env: + ios_folder_path: src/App/Platforms/iOS + app_output_name: App + app_ci_output_filename: App_x64_Debug steps: + - name: Set XCode version + uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0 + with: + xcode-version: 15.1 + - name: Setup NuGet uses: nuget/setup-nuget@296fd3ccf8528660c91106efefe2364482f86d6f # v1.2.0 with: - nuget-version: 5.9.0 + nuget-version: 6.4.0 + + - name: Set up .NET + uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0 + with: + dotnet-version: '8.0.x' + + # This step might be obsolete at some point as .NET MAUI workloads + # are starting to come pre-installed on the GH Actions build agents. + - name: Install MAUI Workload + run: dotnet workload install maui --ignore-failed-sources - name: Print environment run: | nuget help | grep Version - msbuild -version dotnet --info echo "GitHub ref: $GITHUB_REF" echo "GitHub event: $GITHUB_EVENT" @@ -538,7 +529,7 @@ jobs: echo "##### Setting CFBundleVersion $BUILD_NUMBER" echo "########################################" - perl -0777 -pi.bak -e 's/CFBundleVersion<\/key>\s*1<\/string>/CFBundleVersion<\/key>\n\t'"$BUILD_NUMBER"'<\/string>/' ./src/iOS/Info.plist + perl -0777 -pi.bak -e 's/CFBundleVersion<\/key>\s*1<\/string>/CFBundleVersion<\/key>\n\t'"$BUILD_NUMBER"'<\/string>/' ./${{ env.ios_folder_path }}/Info.plist perl -0777 -pi.bak -e 's/CFBundleVersion<\/key>\s*1<\/string>/CFBundleVersion<\/key>\n\t'"$BUILD_NUMBER"'<\/string>/' ./src/iOS.Extension/Info.plist perl -0777 -pi.bak -e 's/CFBundleVersion<\/key>\s*1<\/string>/CFBundleVersion<\/key>\n\t'"$BUILD_NUMBER"'<\/string>/' ./src/iOS.Autofill/Info.plist perl -0777 -pi.bak -e 's/CFBundleVersion<\/key>\s*1<\/string>/CFBundleVersion<\/key>\n\t'"$BUILD_NUMBER"'<\/string>/' ./src/iOS.ShareExtension/Info.plist @@ -551,8 +542,8 @@ jobs: echo "##### Updating Entitlements" echo "########################################" - perl -0777 -pi.bak -e 's/aps-environment<\/key>\s*development<\/string>/aps-environment<\/key>\n\tproduction<\/string>/' ./src/iOS/Entitlements.plist - + perl -0777 -pi.bak -e 's/aps-environment<\/key>\s*development<\/string>/aps-environment<\/key>\n\tproduction<\/string>/' ./${{ env.ios_folder_path }}/Entitlements.plist + - name: Set up Keychain env: KEYCHAIN_PASSWORD: ${{ secrets.IOS_KEYCHAIN_PASSWORD }} @@ -599,6 +590,9 @@ jobs: WATCH_APP_EXTENSION_UUID=$(grep UUID -A1 -a $WATCH_APP_EXTENSION_PROFILE_PATH | grep -io "[-A-F0-9]\{36\}") cp $WATCH_APP_EXTENSION_PROFILE_PATH "$PROFILES_DIR_PATH/$WATCH_APP_EXTENSION_UUID.mobileprovision" + - name: Restore packages + run: dotnet restore + - name: Bulid WatchApp run: | echo "########################################" @@ -611,19 +605,13 @@ jobs: echo "##### Done" echo "########################################" - - name: Restore packages - run: nuget restore - - name: Archive Build for App Store run: | - $configuration = "AppStore"; - $platform = "iPhone"; + Write-Output "########################################" + Write-Output "##### Archive for Release ios-arm64 + Write-Output "########################################" - Write-Output "########################################" - Write-Output "##### Archive $configuration Configuration for $platform Platform" - Write-Output "########################################" - msbuild "$($env:GITHUB_WORKSPACE + "/src/iOS/iOS.csproj")" "/p:Platform=$platform" ` - "/p:Configuration=$configuration" "/p:ArchiveOnBuild=true" "/t:`"Build`"" + dotnet publish ${{ env.main_app_project_path }} -c Release -f ${{ env.target-net-version }}-ios /p:RuntimeIdentifier=ios-arm64 /p:ArchiveOnBuild=true /p:MtouchUseLlvm=false Write-Output "########################################" Write-Output "##### Done" @@ -632,14 +620,11 @@ jobs: - name: Archive Build for Mobile Automation run: | - $configuration = "Release"; - $platform = "iPhoneSimulator"; + Write-Output "########################################" + Write-Output "##### Archive Debug for iossimulator-x64 + Write-Output "########################################" - Write-Output "########################################" - Write-Output "##### Archive $configuration Configuration for $platform Platform" - Write-Output "########################################" - msbuild "$($env:GITHUB_WORKSPACE + "/src/iOS/iOS.csproj")" "/p:Platform=$platform" ` - "/p:Configuration=$configuration" "/p:ArchiveOnBuild=true" "/t:`"Build`"" + dotnet build ${{ env.main_app_project_path }} -c Debug -f ${{ env.target-net-version }}-ios /p:RuntimeIdentifier=iossimulator-x64 /p:ArchiveOnBuild=true /p:MtouchUseLlvm=false Write-Output "########################################" Write-Output "##### Done" @@ -658,11 +643,11 @@ jobs: - name: Export .app for Automation CI run: | - ARCHIVE_PATH="./src/iOS/bin/iPhoneSimulator/Release/BitwardeniOS.app" + ARCHIVE_PATH="./${{ env.main_app_folder_path }}/bin/Debug/${{ env.target-net-version }}-ios/iossimulator-x64" EXPORT_PATH="./bitwarden-export" - zip -r -q BitwardeniOS.app.zip $ARCHIVE_PATH - mv BitwardeniOS.app.zip $EXPORT_PATH + zip -r -q ${{ env.app_ci_output_filename }}.app.zip $ARCHIVE_PATH + mv ${{ env.app_ci_output_filename }}.app.zip $EXPORT_PATH - name: Copy all dSYMs files to upload run: | @@ -688,8 +673,8 @@ jobs: - name: Upload .app file for Automation CI uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0 with: - name: BitwardeniOS.app.zip - path: ./bitwarden-export/BitwardeniOS.app.zip + name: ${{ env.app_ci_output_filename }}.app.zip + path: ./bitwarden-export/${{ env.app_ci_output_filename }}.app.zip if-no-files-found: error - name: Install AppCenter CLI @@ -726,6 +711,21 @@ jobs: find "$HOME/Library/Developer/XCode/DerivedData" -name "upload-symbols" -exec chmod +x {} \; -exec {} -gsp "./src/watchOS/bitwarden/GoogleService-Info.plist" -p ios "./bitwarden-export/Watch_dSYMs" \; + - name: Validate app in App Store + if: | + (github.ref == 'refs/heads/master' + && needs.setup.outputs.rc_branch_exists == 0 + && needs.setup.outputs.hotfix_branch_exists == 0) + || (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0) + || github.ref == 'refs/heads/hotfix-rc' + env: + APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }} + APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} + run: | + xcrun altool --validate-app --type ios --file "./bitwarden-export/Bitwarden.ipa" \ + --username "$APPLE_ID_USERNAME" --password "$APPLE_ID_PASSWORD" + shell: bash + - name: Deploy to App Store if: | (github.ref == 'refs/heads/main' diff --git a/.gitignore b/.gitignore index a006ce4bf..d5148da27 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,7 @@ Components/ x64/ x86/ !src/lib/x86/ +!src/App/Platforms/Android/lib/x86/ build/ bld/ [Bb]in/ diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 000000000..5a27c8b90 --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,13 @@ + + + 8.0.4-nightly.* + Automatic:AppStore + iPhone Distribution + True + True + -gcc_flags "-L$(ProjectDir)../../lib/ios -largon2 -force_load $(ProjectDir)../../lib/ios/libargon2.a" + + + + + \ No newline at end of file diff --git a/README.md b/README.md index d740a0266..a31013b39 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Github Workflow build on master](https://github.com/bitwarden/mobile/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/bitwarden/mobile/actions/workflows/build.yml?query=branch:master) +[![Github Workflow build on main](https://github.com/bitwarden/mobile/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/bitwarden/mobile/actions/workflows/build.yml?query=branch:main) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/bitwarden-mobile/localized.svg)](https://crowdin.com/project/bitwarden-mobile) [![Join the chat at https://gitter.im/bitwarden/Lobby](https://badges.gitter.im/bitwarden/Lobby.svg)](https://gitter.im/bitwarden/Lobby) @@ -6,7 +6,7 @@ Get it on Google Play Get it on F-Droid -The Bitwarden mobile application is written in C# with Xamarin Android, Xamarin iOS, and Xamarin Forms. +The Bitwarden mobile application is written in C# using .NET MAUI. @@ -20,6 +20,6 @@ Interested in contributing in a big way? Consider joining our team! We're hiring # Contribute -Code contributions are welcome! Please commit any pull requests against the `master` branch. Learn more about how to contribute by reading the [Contributing Guidelines](https://contributing.bitwarden.com/contributing/). Check out the [Contributing Documentation](https://contributing.bitwarden.com/) for how to get started with your first contribution. +Code contributions are welcome! Please commit any pull requests against the `main` branch. Learn more about how to contribute by reading the [Contributing Guidelines](https://contributing.bitwarden.com/contributing/). Check out the [Contributing Documentation](https://contributing.bitwarden.com/) for how to get started with your first contribution. Security audits and feedback are welcome. Please open an issue or email us privately if the report is sensitive in nature. You can read our security policy in the [`SECURITY.md`](SECURITY.md) file. diff --git a/bitwarden-mobile.sln b/bitwarden-mobile.sln index 07434b50a..a804eca0b 100644 --- a/bitwarden-mobile.sln +++ b/bitwarden-mobile.sln @@ -1,471 +1,233 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29009.5 +# Visual Studio Version 17 +VisualStudioVersion = 17.8.34112.27 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Android", "src\Android\Android.csproj", "{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "App", "src\App\App.csproj", "{971FDF07-E288-4239-B47A-E9E7E912193B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "App", "src\App\App.csproj", "{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "src\Core\Core.csproj", "{11DBC05E-F8B4-49ED-AAC9-96D92336D21C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "src\Core\Core.csproj", "{4B8A8C41-9820-4341-974C-41E65B7F4366}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Playground", "test\Playground\Playground.csproj", "{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D10CA4A9-F866-40E1-B658-F69051236C71}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{8904C536-C67D-420F-9971-51B26574C3AA}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "store", "store", "{92470CBD-9047-4C3C-8EA3-D972D6622D84}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "google", "google", "{2E399654-26A2-46F6-B9CA-1B496A3F370A}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{76690DFB-B7F4-4781-83E4-113FDC450AFE}" - ProjectSection(SolutionItems) = preProject - .editorconfig = .editorconfig - .gitignore = .gitignore - .github\workflows\build.yml = .github\workflows\build.yml - CONTRIBUTING.md = CONTRIBUTING.md - crowdin.yml = crowdin.yml - README.md = README.md - SECURITY.md = SECURITY.md - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Publisher", "store\google\Publisher\Publisher.csproj", "{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS.Core", "src\iOS.Core\iOS.Core.csproj", "{E71F3053-056C-4381-9638-048ED73BDFF6}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS", "src\iOS\iOS.csproj", "{599E0201-420A-4C3E-A7BA-5349F72E0B15}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "iOS.Core", "src\iOS.Core\iOS.Core.csproj", "{E71F3053-056C-4381-9638-048ED73BDFF6}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS.Extension", "src\iOS.Extension\iOS.Extension.csproj", "{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "test\Common\Common.csproj", "{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Test", "test\Core.Test\Core.Test.csproj", "{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS.ShareExtension", "src\iOS.ShareExtension\iOS.ShareExtension.csproj", "{F8C3F648-EA5A-4719-8005-85D1690B1655}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS.Autofill", "src\iOS.Autofill\iOS.Autofill.csproj", "{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS.Autofill", "src\iOS.Autofill\iOS.Autofill.csproj", "{83449CC4-1F76-4CFE-92B1-D2E13A62506F}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{BB702EBD-3B79-4ECA-A2A6-1237B07F0AF0}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B972BBFA-917F-4A10-B07E-B89CFEC6BBDC}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Test", "test\Core.Test\Core.Test.csproj", "{137959BD-073B-4EC7-8ED5-31D73FA7DBC6}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "test\Common\Common.csproj", "{1AC5ED7F-301E-4B3C-ACDE-C0EADFA5AE44}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Ad-Hoc|Any CPU = Ad-Hoc|Any CPU - Ad-Hoc|iPhone = Ad-Hoc|iPhone - Ad-Hoc|iPhoneSimulator = Ad-Hoc|iPhoneSimulator - AppStore|Any CPU = AppStore|Any CPU - AppStore|iPhone = AppStore|iPhone - AppStore|iPhoneSimulator = AppStore|iPhoneSimulator Debug|Any CPU = Debug|Any CPU - Debug|iPhone = Debug|iPhone - Debug|iPhoneSimulator = Debug|iPhoneSimulator - FDroid|Any CPU = FDroid|Any CPU - FDroid|iPhone = FDroid|iPhone - FDroid|iPhoneSimulator = FDroid|iPhoneSimulator Release|Any CPU = Release|Any CPU - Release|iPhone = Release|iPhone + Debug|iPhoneSimulator = Debug|iPhoneSimulator Release|iPhoneSimulator = Release|iPhoneSimulator + Debug|iPhone = Debug|iPhone + Release|iPhone = Release|iPhone + AppStore|iPhoneSimulator = AppStore|iPhoneSimulator + AppStore|iPhone = AppStore|iPhone + Ad-Hoc|iPhoneSimulator = Ad-Hoc|iPhoneSimulator + Ad-Hoc|iPhone = Ad-Hoc|iPhone + FDroid|Any CPU = FDroid|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|Any CPU.Deploy.0 = Release|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|iPhone.Deploy.0 = Release|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|Any CPU.ActiveCfg = Release|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|Any CPU.Build.0 = Release|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|Any CPU.Deploy.0 = Release|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|iPhone.ActiveCfg = Release|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|iPhone.Build.0 = Release|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|iPhone.Deploy.0 = Release|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|iPhoneSimulator.Deploy.0 = Release|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|iPhone.Build.0 = Debug|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|iPhone.Deploy.0 = Debug|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|Any CPU.ActiveCfg = FDroid|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|Any CPU.Build.0 = FDroid|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|Any CPU.Deploy.0 = FDroid|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|iPhone.ActiveCfg = FDroid|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|iPhone.Build.0 = FDroid|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|iPhone.Deploy.0 = FDroid|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|iPhoneSimulator.ActiveCfg = FDroid|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|iPhoneSimulator.Build.0 = FDroid|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|iPhoneSimulator.Deploy.0 = FDroid|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|Any CPU.Build.0 = Release|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|Any CPU.Deploy.0 = Release|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|iPhone.ActiveCfg = Release|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|iPhone.Build.0 = Release|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|iPhone.Deploy.0 = Release|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Ad-Hoc|Any CPU.Deploy.0 = Release|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Ad-Hoc|iPhone.Deploy.0 = Release|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.AppStore|Any CPU.ActiveCfg = Release|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.AppStore|Any CPU.Build.0 = Release|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.AppStore|Any CPU.Deploy.0 = Release|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.AppStore|iPhone.ActiveCfg = Release|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.AppStore|iPhone.Build.0 = Release|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.AppStore|iPhone.Deploy.0 = Release|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.AppStore|iPhoneSimulator.Deploy.0 = Release|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Debug|Any CPU.Deploy.0 = Debug|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Debug|iPhone.Build.0 = Debug|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Debug|iPhone.Deploy.0 = Debug|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.FDroid|Any CPU.ActiveCfg = FDroid|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.FDroid|Any CPU.Build.0 = FDroid|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.FDroid|iPhone.ActiveCfg = FDroid|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.FDroid|iPhone.Build.0 = FDroid|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.FDroid|iPhoneSimulator.ActiveCfg = FDroid|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.FDroid|iPhoneSimulator.Build.0 = FDroid|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Release|Any CPU.Build.0 = Release|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Release|Any CPU.Deploy.0 = Release|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Release|iPhone.ActiveCfg = Release|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Release|iPhone.Build.0 = Release|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Release|iPhone.Deploy.0 = Release|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU - {4B8A8C41-9820-4341-974C-41E65B7F4366}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU - {4B8A8C41-9820-4341-974C-41E65B7F4366}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU - {4B8A8C41-9820-4341-974C-41E65B7F4366}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU - {4B8A8C41-9820-4341-974C-41E65B7F4366}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU - {4B8A8C41-9820-4341-974C-41E65B7F4366}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU - {4B8A8C41-9820-4341-974C-41E65B7F4366}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU - {4B8A8C41-9820-4341-974C-41E65B7F4366}.AppStore|Any CPU.ActiveCfg = Release|Any CPU - {4B8A8C41-9820-4341-974C-41E65B7F4366}.AppStore|Any CPU.Build.0 = Release|Any CPU - {4B8A8C41-9820-4341-974C-41E65B7F4366}.AppStore|iPhone.ActiveCfg = Release|Any CPU - {4B8A8C41-9820-4341-974C-41E65B7F4366}.AppStore|iPhone.Build.0 = Release|Any CPU - {4B8A8C41-9820-4341-974C-41E65B7F4366}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU - {4B8A8C41-9820-4341-974C-41E65B7F4366}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU - {4B8A8C41-9820-4341-974C-41E65B7F4366}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4B8A8C41-9820-4341-974C-41E65B7F4366}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4B8A8C41-9820-4341-974C-41E65B7F4366}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {4B8A8C41-9820-4341-974C-41E65B7F4366}.Debug|iPhone.Build.0 = Debug|Any CPU - {4B8A8C41-9820-4341-974C-41E65B7F4366}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {4B8A8C41-9820-4341-974C-41E65B7F4366}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {4B8A8C41-9820-4341-974C-41E65B7F4366}.FDroid|Any CPU.ActiveCfg = FDroid|Any CPU - {4B8A8C41-9820-4341-974C-41E65B7F4366}.FDroid|Any CPU.Build.0 = FDroid|Any CPU - {4B8A8C41-9820-4341-974C-41E65B7F4366}.FDroid|iPhone.ActiveCfg = FDroid|Any CPU - {4B8A8C41-9820-4341-974C-41E65B7F4366}.FDroid|iPhone.Build.0 = FDroid|Any CPU - {4B8A8C41-9820-4341-974C-41E65B7F4366}.FDroid|iPhoneSimulator.ActiveCfg = FDroid|Any CPU - {4B8A8C41-9820-4341-974C-41E65B7F4366}.FDroid|iPhoneSimulator.Build.0 = FDroid|Any CPU - {4B8A8C41-9820-4341-974C-41E65B7F4366}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4B8A8C41-9820-4341-974C-41E65B7F4366}.Release|Any CPU.Build.0 = Release|Any CPU - {4B8A8C41-9820-4341-974C-41E65B7F4366}.Release|iPhone.ActiveCfg = Release|Any CPU - {4B8A8C41-9820-4341-974C-41E65B7F4366}.Release|iPhone.Build.0 = Release|Any CPU - {4B8A8C41-9820-4341-974C-41E65B7F4366}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {4B8A8C41-9820-4341-974C-41E65B7F4366}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU - {9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU - {9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU - {9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU - {9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU - {9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU - {9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.AppStore|Any CPU.Build.0 = Debug|Any CPU - {9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.AppStore|iPhone.ActiveCfg = Debug|Any CPU - {9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.AppStore|iPhone.Build.0 = Debug|Any CPU - {9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU - {9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Debug|iPhone.Build.0 = Debug|Any CPU - {9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.FDroid|Any CPU.ActiveCfg = FDroid|Any CPU - {9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.FDroid|Any CPU.Build.0 = FDroid|Any CPU - {9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.FDroid|iPhone.ActiveCfg = FDroid|Any CPU - {9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.FDroid|iPhone.Build.0 = FDroid|Any CPU - {9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.FDroid|iPhoneSimulator.ActiveCfg = FDroid|Any CPU - {9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.FDroid|iPhoneSimulator.Build.0 = FDroid|Any CPU - {9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Release|Any CPU.Build.0 = Release|Any CPU - {9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Release|iPhone.ActiveCfg = Release|Any CPU - {9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Release|iPhone.Build.0 = Release|Any CPU - {9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU - {256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU - {256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU - {256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU - {256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU - {256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU - {256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.AppStore|Any CPU.Build.0 = Debug|Any CPU - {256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.AppStore|iPhone.ActiveCfg = Debug|Any CPU - {256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.AppStore|iPhone.Build.0 = Debug|Any CPU - {256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU - {256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Debug|iPhone.Build.0 = Debug|Any CPU - {256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.FDroid|Any CPU.ActiveCfg = FDroid|Any CPU - {256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.FDroid|Any CPU.Build.0 = FDroid|Any CPU - {256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.FDroid|iPhone.ActiveCfg = FDroid|Any CPU - {256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.FDroid|iPhone.Build.0 = FDroid|Any CPU - {256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.FDroid|iPhoneSimulator.ActiveCfg = FDroid|Any CPU - {256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.FDroid|iPhoneSimulator.Build.0 = FDroid|Any CPU - {256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Release|Any CPU.Build.0 = Release|Any CPU - {256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Release|iPhone.ActiveCfg = Release|Any CPU - {256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Release|iPhone.Build.0 = Release|Any CPU - {256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|Any CPU - {E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|Any CPU.Build.0 = Ad-Hoc|Any CPU - {E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone - {E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone - {E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator - {E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator - {E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|Any CPU.ActiveCfg = AppStore|Any CPU - {E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|Any CPU.Build.0 = AppStore|Any CPU - {E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhone.ActiveCfg = AppStore|iPhone - {E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhone.Build.0 = AppStore|iPhone - {E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator - {E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator + {971FDF07-E288-4239-B47A-E9E7E912193B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {971FDF07-E288-4239-B47A-E9E7E912193B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {971FDF07-E288-4239-B47A-E9E7E912193B}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {971FDF07-E288-4239-B47A-E9E7E912193B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {971FDF07-E288-4239-B47A-E9E7E912193B}.Release|Any CPU.Build.0 = Release|Any CPU + {971FDF07-E288-4239-B47A-E9E7E912193B}.Release|Any CPU.Deploy.0 = Release|Any CPU + {971FDF07-E288-4239-B47A-E9E7E912193B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {971FDF07-E288-4239-B47A-E9E7E912193B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {971FDF07-E288-4239-B47A-E9E7E912193B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {971FDF07-E288-4239-B47A-E9E7E912193B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {971FDF07-E288-4239-B47A-E9E7E912193B}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {971FDF07-E288-4239-B47A-E9E7E912193B}.Debug|iPhone.Build.0 = Debug|Any CPU + {971FDF07-E288-4239-B47A-E9E7E912193B}.Release|iPhone.ActiveCfg = Release|Any CPU + {971FDF07-E288-4239-B47A-E9E7E912193B}.Release|iPhone.Build.0 = Release|Any CPU + {971FDF07-E288-4239-B47A-E9E7E912193B}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {971FDF07-E288-4239-B47A-E9E7E912193B}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU + {971FDF07-E288-4239-B47A-E9E7E912193B}.AppStore|iPhone.ActiveCfg = Release|Any CPU + {971FDF07-E288-4239-B47A-E9E7E912193B}.AppStore|iPhone.Build.0 = Release|Any CPU + {971FDF07-E288-4239-B47A-E9E7E912193B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {971FDF07-E288-4239-B47A-E9E7E912193B}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU + {971FDF07-E288-4239-B47A-E9E7E912193B}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU + {971FDF07-E288-4239-B47A-E9E7E912193B}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU + {971FDF07-E288-4239-B47A-E9E7E912193B}.FDroid|Any CPU.ActiveCfg = Debug|Any CPU + {971FDF07-E288-4239-B47A-E9E7E912193B}.FDroid|Any CPU.Build.0 = Debug|Any CPU + {11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.Release|Any CPU.Build.0 = Release|Any CPU + {11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.Debug|iPhone.Build.0 = Debug|Any CPU + {11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.Release|iPhone.ActiveCfg = Release|Any CPU + {11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.Release|iPhone.Build.0 = Release|Any CPU + {11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU + {11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.AppStore|iPhone.ActiveCfg = Release|Any CPU + {11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.AppStore|iPhone.Build.0 = Release|Any CPU + {11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU + {11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU + {11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU + {11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.FDroid|Any CPU.ActiveCfg = Debug|Any CPU + {11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.FDroid|Any CPU.Build.0 = Debug|Any CPU {E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhone.ActiveCfg = Debug|iPhone - {E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhone.Build.0 = Debug|iPhone - {E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|Any CPU.ActiveCfg = FDroid|Any CPU - {E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|Any CPU.Build.0 = FDroid|Any CPU - {E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|iPhone.ActiveCfg = FDroid|Any CPU - {E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|iPhone.Build.0 = FDroid|Any CPU - {E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|iPhoneSimulator.ActiveCfg = FDroid|Any CPU - {E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|iPhoneSimulator.Build.0 = FDroid|Any CPU {E71F3053-056C-4381-9638-048ED73BDFF6}.Release|Any CPU.ActiveCfg = Release|Any CPU {E71F3053-056C-4381-9638-048ED73BDFF6}.Release|Any CPU.Build.0 = Release|Any CPU - {E71F3053-056C-4381-9638-048ED73BDFF6}.Release|iPhone.ActiveCfg = Release|Any CPU - {E71F3053-056C-4381-9638-048ED73BDFF6}.Release|iPhone.Build.0 = Release|Any CPU + {E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {E71F3053-056C-4381-9638-048ED73BDFF6}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {E71F3053-056C-4381-9638-048ED73BDFF6}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {599E0201-420A-4C3E-A7BA-5349F72E0B15}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone - {599E0201-420A-4C3E-A7BA-5349F72E0B15}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone - {599E0201-420A-4C3E-A7BA-5349F72E0B15}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone - {599E0201-420A-4C3E-A7BA-5349F72E0B15}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator - {599E0201-420A-4C3E-A7BA-5349F72E0B15}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator - {599E0201-420A-4C3E-A7BA-5349F72E0B15}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone - {599E0201-420A-4C3E-A7BA-5349F72E0B15}.AppStore|iPhone.ActiveCfg = AppStore|iPhone - {599E0201-420A-4C3E-A7BA-5349F72E0B15}.AppStore|iPhone.Build.0 = AppStore|iPhone - {599E0201-420A-4C3E-A7BA-5349F72E0B15}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator - {599E0201-420A-4C3E-A7BA-5349F72E0B15}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator - {599E0201-420A-4C3E-A7BA-5349F72E0B15}.Debug|Any CPU.ActiveCfg = Debug|iPhone - {599E0201-420A-4C3E-A7BA-5349F72E0B15}.Debug|iPhone.ActiveCfg = Debug|iPhone - {599E0201-420A-4C3E-A7BA-5349F72E0B15}.Debug|iPhone.Build.0 = Debug|iPhone - {599E0201-420A-4C3E-A7BA-5349F72E0B15}.Debug|iPhone.Deploy.0 = Debug|iPhone - {599E0201-420A-4C3E-A7BA-5349F72E0B15}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {599E0201-420A-4C3E-A7BA-5349F72E0B15}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {599E0201-420A-4C3E-A7BA-5349F72E0B15}.FDroid|Any CPU.ActiveCfg = FDroid|iPhone - {599E0201-420A-4C3E-A7BA-5349F72E0B15}.FDroid|iPhone.ActiveCfg = FDroid|iPhone - {599E0201-420A-4C3E-A7BA-5349F72E0B15}.FDroid|iPhone.Build.0 = FDroid|iPhone - {599E0201-420A-4C3E-A7BA-5349F72E0B15}.FDroid|iPhoneSimulator.ActiveCfg = FDroid|iPhoneSimulator - {599E0201-420A-4C3E-A7BA-5349F72E0B15}.FDroid|iPhoneSimulator.Build.0 = FDroid|iPhoneSimulator - {599E0201-420A-4C3E-A7BA-5349F72E0B15}.Release|Any CPU.ActiveCfg = Release|iPhone - {599E0201-420A-4C3E-A7BA-5349F72E0B15}.Release|iPhone.ActiveCfg = Release|iPhone - {599E0201-420A-4C3E-A7BA-5349F72E0B15}.Release|iPhone.Build.0 = Release|iPhone - {599E0201-420A-4C3E-A7BA-5349F72E0B15}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {599E0201-420A-4C3E-A7BA-5349F72E0B15}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone - {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Ad-Hoc|Any CPU.Build.0 = Ad-Hoc|iPhone - {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone - {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone - {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator - {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator - {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone - {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.AppStore|Any CPU.Build.0 = AppStore|iPhone - {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.AppStore|iPhone.ActiveCfg = AppStore|iPhone - {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.AppStore|iPhone.Build.0 = AppStore|iPhone - {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator - {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator - {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Debug|Any CPU.ActiveCfg = Debug|iPhone - {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Debug|iPhone.ActiveCfg = Debug|iPhone - {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Debug|iPhone.Build.0 = Debug|iPhone - {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Debug|iPhone.Deploy.0 = Debug|iPhone - {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.FDroid|Any CPU.ActiveCfg = Release|iPhone - {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.FDroid|Any CPU.Build.0 = Release|iPhone - {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.FDroid|iPhone.ActiveCfg = Release|iPhone - {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.FDroid|iPhone.Build.0 = Release|iPhone - {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.FDroid|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.FDroid|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Release|Any CPU.ActiveCfg = Release|iPhone - {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Release|iPhone.ActiveCfg = Release|iPhone - {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Release|iPhone.Build.0 = Release|iPhone - {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU - {4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU - {4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU - {4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU - {4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU - {4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU - {4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.AppStore|Any CPU.ActiveCfg = Release|Any CPU - {4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.AppStore|Any CPU.Build.0 = Release|Any CPU - {4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.AppStore|iPhone.ActiveCfg = Release|Any CPU - {4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.AppStore|iPhone.Build.0 = Release|Any CPU - {4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU - {4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU - {4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Debug|iPhone.Build.0 = Debug|Any CPU - {4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.FDroid|Any CPU.ActiveCfg = Release|Any CPU - {4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.FDroid|Any CPU.Build.0 = Release|Any CPU - {4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.FDroid|iPhone.ActiveCfg = Release|Any CPU - {4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.FDroid|iPhone.Build.0 = Release|Any CPU - {4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.FDroid|iPhoneSimulator.ActiveCfg = Release|Any CPU - {4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.FDroid|iPhoneSimulator.Build.0 = Release|Any CPU - {4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Release|Any CPU.Build.0 = Release|Any CPU - {4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Release|iPhone.ActiveCfg = Release|Any CPU - {4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Release|iPhone.Build.0 = Release|Any CPU - {4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU - {8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU - {8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU - {8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU - {8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU - {8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU - {8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.AppStore|Any CPU.ActiveCfg = Release|Any CPU - {8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.AppStore|Any CPU.Build.0 = Release|Any CPU - {8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.AppStore|iPhone.ActiveCfg = Release|Any CPU - {8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.AppStore|iPhone.Build.0 = Release|Any CPU - {8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU - {8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU - {8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Debug|iPhone.Build.0 = Debug|Any CPU - {8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.FDroid|Any CPU.ActiveCfg = Release|Any CPU - {8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.FDroid|Any CPU.Build.0 = Release|Any CPU - {8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.FDroid|iPhone.ActiveCfg = Release|Any CPU - {8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.FDroid|iPhone.Build.0 = Release|Any CPU - {8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.FDroid|iPhoneSimulator.ActiveCfg = Release|Any CPU - {8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.FDroid|iPhoneSimulator.Build.0 = Release|Any CPU - {8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Release|Any CPU.Build.0 = Release|Any CPU - {8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Release|iPhone.ActiveCfg = Release|Any CPU - {8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Release|iPhone.Build.0 = Release|Any CPU - {8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {F8C3F648-EA5A-4719-8005-85D1690B1655}.Ad-Hoc|Any CPU.ActiveCfg = Debug|iPhoneSimulator - {F8C3F648-EA5A-4719-8005-85D1690B1655}.Ad-Hoc|Any CPU.Build.0 = Debug|iPhoneSimulator - {F8C3F648-EA5A-4719-8005-85D1690B1655}.Ad-Hoc|iPhone.ActiveCfg = Release|iPhone - {F8C3F648-EA5A-4719-8005-85D1690B1655}.Ad-Hoc|iPhone.Build.0 = Release|iPhone - {F8C3F648-EA5A-4719-8005-85D1690B1655}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {F8C3F648-EA5A-4719-8005-85D1690B1655}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {F8C3F648-EA5A-4719-8005-85D1690B1655}.AppStore|Any CPU.ActiveCfg = Debug|iPhoneSimulator - {F8C3F648-EA5A-4719-8005-85D1690B1655}.AppStore|Any CPU.Build.0 = Debug|iPhoneSimulator - {F8C3F648-EA5A-4719-8005-85D1690B1655}.AppStore|iPhone.ActiveCfg = Release|iPhone - {F8C3F648-EA5A-4719-8005-85D1690B1655}.AppStore|iPhone.Build.0 = Release|iPhone - {F8C3F648-EA5A-4719-8005-85D1690B1655}.AppStore|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {F8C3F648-EA5A-4719-8005-85D1690B1655}.AppStore|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {F8C3F648-EA5A-4719-8005-85D1690B1655}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator - {F8C3F648-EA5A-4719-8005-85D1690B1655}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator - {F8C3F648-EA5A-4719-8005-85D1690B1655}.Debug|iPhone.ActiveCfg = Debug|iPhone - {F8C3F648-EA5A-4719-8005-85D1690B1655}.Debug|iPhone.Build.0 = Debug|iPhone - {F8C3F648-EA5A-4719-8005-85D1690B1655}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {F8C3F648-EA5A-4719-8005-85D1690B1655}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {F8C3F648-EA5A-4719-8005-85D1690B1655}.FDroid|Any CPU.ActiveCfg = Debug|iPhoneSimulator - {F8C3F648-EA5A-4719-8005-85D1690B1655}.FDroid|Any CPU.Build.0 = Debug|iPhoneSimulator - {F8C3F648-EA5A-4719-8005-85D1690B1655}.FDroid|iPhone.ActiveCfg = Release|iPhone - {F8C3F648-EA5A-4719-8005-85D1690B1655}.FDroid|iPhone.Build.0 = Release|iPhone - {F8C3F648-EA5A-4719-8005-85D1690B1655}.FDroid|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {F8C3F648-EA5A-4719-8005-85D1690B1655}.FDroid|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {F8C3F648-EA5A-4719-8005-85D1690B1655}.Release|Any CPU.ActiveCfg = Release|iPhone - {F8C3F648-EA5A-4719-8005-85D1690B1655}.Release|Any CPU.Build.0 = Release|iPhone - {F8C3F648-EA5A-4719-8005-85D1690B1655}.Release|iPhone.ActiveCfg = Release|iPhone - {F8C3F648-EA5A-4719-8005-85D1690B1655}.Release|iPhone.Build.0 = Release|iPhone - {F8C3F648-EA5A-4719-8005-85D1690B1655}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {F8C3F648-EA5A-4719-8005-85D1690B1655}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone - {8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Ad-Hoc|Any CPU.Build.0 = Ad-Hoc|iPhone - {8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone - {8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone - {8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator - {8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator - {8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone - {8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.AppStore|Any CPU.Build.0 = AppStore|iPhone - {8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.AppStore|iPhone.ActiveCfg = AppStore|iPhone - {8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.AppStore|iPhone.Build.0 = AppStore|iPhone - {8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator - {8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator - {8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Debug|Any CPU.ActiveCfg = Debug|iPhone - {8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Debug|iPhone.ActiveCfg = Debug|iPhone - {8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Debug|iPhone.Build.0 = Debug|iPhone - {8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Debug|iPhone.Deploy.0 = Debug|iPhone - {8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.FDroid|Any CPU.ActiveCfg = Release|iPhone - {8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.FDroid|Any CPU.Build.0 = Release|iPhone - {8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.FDroid|iPhone.ActiveCfg = Release|iPhone - {8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.FDroid|iPhone.Build.0 = Release|iPhone - {8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.FDroid|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.FDroid|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Release|Any CPU.ActiveCfg = Release|iPhone - {8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Release|iPhone.ActiveCfg = Release|iPhone - {8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Release|iPhone.Build.0 = Release|iPhone - {8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator + {E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhone.Build.0 = Debug|Any CPU + {E71F3053-056C-4381-9638-048ED73BDFF6}.Release|iPhone.ActiveCfg = Release|Any CPU + {E71F3053-056C-4381-9638-048ED73BDFF6}.Release|iPhone.Build.0 = Release|Any CPU + {E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU + {E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhone.ActiveCfg = Release|Any CPU + {E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhone.Build.0 = Release|Any CPU + {E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU + {E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU + {E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU + {E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|Any CPU.ActiveCfg = Debug|Any CPU + {E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|Any CPU.Build.0 = Debug|Any CPU + {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Debug|Any CPU.Build.0 = Debug|Any CPU + {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Release|Any CPU.ActiveCfg = Release|Any CPU + {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Release|Any CPU.Build.0 = Release|Any CPU + {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Debug|iPhone.Build.0 = Debug|Any CPU + {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Release|iPhone.ActiveCfg = Release|Any CPU + {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Release|iPhone.Build.0 = Release|Any CPU + {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU + {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU + {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.AppStore|iPhone.ActiveCfg = Release|Any CPU + {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.AppStore|iPhone.Build.0 = Release|Any CPU + {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU + {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU + {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU + {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.FDroid|Any CPU.ActiveCfg = Debug|Any CPU + {324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.FDroid|Any CPU.Build.0 = Debug|Any CPU + {F8C3F648-EA5A-4719-8005-85D1690B1655}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F8C3F648-EA5A-4719-8005-85D1690B1655}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F8C3F648-EA5A-4719-8005-85D1690B1655}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F8C3F648-EA5A-4719-8005-85D1690B1655}.Release|Any CPU.Build.0 = Release|Any CPU + {F8C3F648-EA5A-4719-8005-85D1690B1655}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {F8C3F648-EA5A-4719-8005-85D1690B1655}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {F8C3F648-EA5A-4719-8005-85D1690B1655}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {F8C3F648-EA5A-4719-8005-85D1690B1655}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {F8C3F648-EA5A-4719-8005-85D1690B1655}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {F8C3F648-EA5A-4719-8005-85D1690B1655}.Debug|iPhone.Build.0 = Debug|Any CPU + {F8C3F648-EA5A-4719-8005-85D1690B1655}.Release|iPhone.ActiveCfg = Release|Any CPU + {F8C3F648-EA5A-4719-8005-85D1690B1655}.Release|iPhone.Build.0 = Release|Any CPU + {F8C3F648-EA5A-4719-8005-85D1690B1655}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU + {F8C3F648-EA5A-4719-8005-85D1690B1655}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU + {F8C3F648-EA5A-4719-8005-85D1690B1655}.AppStore|iPhone.ActiveCfg = Release|Any CPU + {F8C3F648-EA5A-4719-8005-85D1690B1655}.AppStore|iPhone.Build.0 = Release|Any CPU + {F8C3F648-EA5A-4719-8005-85D1690B1655}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {F8C3F648-EA5A-4719-8005-85D1690B1655}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU + {F8C3F648-EA5A-4719-8005-85D1690B1655}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU + {F8C3F648-EA5A-4719-8005-85D1690B1655}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU + {F8C3F648-EA5A-4719-8005-85D1690B1655}.FDroid|Any CPU.ActiveCfg = Debug|Any CPU + {F8C3F648-EA5A-4719-8005-85D1690B1655}.FDroid|Any CPU.Build.0 = Debug|Any CPU + {83449CC4-1F76-4CFE-92B1-D2E13A62506F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {83449CC4-1F76-4CFE-92B1-D2E13A62506F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {83449CC4-1F76-4CFE-92B1-D2E13A62506F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {83449CC4-1F76-4CFE-92B1-D2E13A62506F}.Release|Any CPU.Build.0 = Release|Any CPU + {83449CC4-1F76-4CFE-92B1-D2E13A62506F}.Release|iPhone.ActiveCfg = Release|Any CPU + {83449CC4-1F76-4CFE-92B1-D2E13A62506F}.Release|iPhone.Build.0 = Release|Any CPU + {83449CC4-1F76-4CFE-92B1-D2E13A62506F}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {83449CC4-1F76-4CFE-92B1-D2E13A62506F}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU + {83449CC4-1F76-4CFE-92B1-D2E13A62506F}.AppStore|iPhone.ActiveCfg = Release|Any CPU + {83449CC4-1F76-4CFE-92B1-D2E13A62506F}.AppStore|iPhone.Build.0 = Release|Any CPU + {83449CC4-1F76-4CFE-92B1-D2E13A62506F}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {83449CC4-1F76-4CFE-92B1-D2E13A62506F}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU + {83449CC4-1F76-4CFE-92B1-D2E13A62506F}.FDroid|Any CPU.ActiveCfg = Debug|Any CPU + {83449CC4-1F76-4CFE-92B1-D2E13A62506F}.FDroid|Any CPU.Build.0 = Debug|Any CPU + {137959BD-073B-4EC7-8ED5-31D73FA7DBC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {137959BD-073B-4EC7-8ED5-31D73FA7DBC6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {137959BD-073B-4EC7-8ED5-31D73FA7DBC6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {137959BD-073B-4EC7-8ED5-31D73FA7DBC6}.Release|Any CPU.Build.0 = Release|Any CPU + {137959BD-073B-4EC7-8ED5-31D73FA7DBC6}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {137959BD-073B-4EC7-8ED5-31D73FA7DBC6}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {137959BD-073B-4EC7-8ED5-31D73FA7DBC6}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {137959BD-073B-4EC7-8ED5-31D73FA7DBC6}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {137959BD-073B-4EC7-8ED5-31D73FA7DBC6}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {137959BD-073B-4EC7-8ED5-31D73FA7DBC6}.Debug|iPhone.Build.0 = Debug|Any CPU + {137959BD-073B-4EC7-8ED5-31D73FA7DBC6}.Release|iPhone.ActiveCfg = Release|Any CPU + {137959BD-073B-4EC7-8ED5-31D73FA7DBC6}.Release|iPhone.Build.0 = Release|Any CPU + {137959BD-073B-4EC7-8ED5-31D73FA7DBC6}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {137959BD-073B-4EC7-8ED5-31D73FA7DBC6}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU + {137959BD-073B-4EC7-8ED5-31D73FA7DBC6}.AppStore|iPhone.ActiveCfg = Release|Any CPU + {137959BD-073B-4EC7-8ED5-31D73FA7DBC6}.AppStore|iPhone.Build.0 = Release|Any CPU + {137959BD-073B-4EC7-8ED5-31D73FA7DBC6}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {137959BD-073B-4EC7-8ED5-31D73FA7DBC6}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU + {137959BD-073B-4EC7-8ED5-31D73FA7DBC6}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU + {137959BD-073B-4EC7-8ED5-31D73FA7DBC6}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU + {137959BD-073B-4EC7-8ED5-31D73FA7DBC6}.FDroid|Any CPU.ActiveCfg = Debug|Any CPU + {137959BD-073B-4EC7-8ED5-31D73FA7DBC6}.FDroid|Any CPU.Build.0 = Debug|Any CPU + {1AC5ED7F-301E-4B3C-ACDE-C0EADFA5AE44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1AC5ED7F-301E-4B3C-ACDE-C0EADFA5AE44}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1AC5ED7F-301E-4B3C-ACDE-C0EADFA5AE44}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1AC5ED7F-301E-4B3C-ACDE-C0EADFA5AE44}.Release|Any CPU.Build.0 = Release|Any CPU + {1AC5ED7F-301E-4B3C-ACDE-C0EADFA5AE44}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {1AC5ED7F-301E-4B3C-ACDE-C0EADFA5AE44}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {1AC5ED7F-301E-4B3C-ACDE-C0EADFA5AE44}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {1AC5ED7F-301E-4B3C-ACDE-C0EADFA5AE44}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {1AC5ED7F-301E-4B3C-ACDE-C0EADFA5AE44}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {1AC5ED7F-301E-4B3C-ACDE-C0EADFA5AE44}.Debug|iPhone.Build.0 = Debug|Any CPU + {1AC5ED7F-301E-4B3C-ACDE-C0EADFA5AE44}.Release|iPhone.ActiveCfg = Release|Any CPU + {1AC5ED7F-301E-4B3C-ACDE-C0EADFA5AE44}.Release|iPhone.Build.0 = Release|Any CPU + {1AC5ED7F-301E-4B3C-ACDE-C0EADFA5AE44}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {1AC5ED7F-301E-4B3C-ACDE-C0EADFA5AE44}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU + {1AC5ED7F-301E-4B3C-ACDE-C0EADFA5AE44}.AppStore|iPhone.ActiveCfg = Release|Any CPU + {1AC5ED7F-301E-4B3C-ACDE-C0EADFA5AE44}.AppStore|iPhone.Build.0 = Release|Any CPU + {1AC5ED7F-301E-4B3C-ACDE-C0EADFA5AE44}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {1AC5ED7F-301E-4B3C-ACDE-C0EADFA5AE44}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU + {1AC5ED7F-301E-4B3C-ACDE-C0EADFA5AE44}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU + {1AC5ED7F-301E-4B3C-ACDE-C0EADFA5AE44}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU + {1AC5ED7F-301E-4B3C-ACDE-C0EADFA5AE44}.FDroid|Any CPU.ActiveCfg = Debug|Any CPU + {1AC5ED7F-301E-4B3C-ACDE-C0EADFA5AE44}.FDroid|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F} = {D10CA4A9-F866-40E1-B658-F69051236C71} - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C} = {D10CA4A9-F866-40E1-B658-F69051236C71} - {4B8A8C41-9820-4341-974C-41E65B7F4366} = {D10CA4A9-F866-40E1-B658-F69051236C71} - {9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3} = {8904C536-C67D-420F-9971-51B26574C3AA} - {2E399654-26A2-46F6-B9CA-1B496A3F370A} = {92470CBD-9047-4C3C-8EA3-D972D6622D84} - {256F9E44-0AF5-4D97-A2F9-DA26080C0A5D} = {2E399654-26A2-46F6-B9CA-1B496A3F370A} - {E71F3053-056C-4381-9638-048ED73BDFF6} = {D10CA4A9-F866-40E1-B658-F69051236C71} - {599E0201-420A-4C3E-A7BA-5349F72E0B15} = {D10CA4A9-F866-40E1-B658-F69051236C71} - {324BE76C-38FA-4F11-8BB1-95C7B3B1B545} = {D10CA4A9-F866-40E1-B658-F69051236C71} - {4085B0A5-12A9-4993-B8B8-4ACE72E62E39} = {8904C536-C67D-420F-9971-51B26574C3AA} - {8AE548D9-A567-4E97-995E-93EC7DB0FDE0} = {8904C536-C67D-420F-9971-51B26574C3AA} - {F8C3F648-EA5A-4719-8005-85D1690B1655} = {D10CA4A9-F866-40E1-B658-F69051236C71} - {8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A} = {D10CA4A9-F866-40E1-B658-F69051236C71} - EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {7D436EA3-8B7E-45D2-8D14-0730BD2E0410} + SolutionGuid = {3B3A9B6C-D325-4BB3-97D3-8070630C5D3B} + EndGlobalSection + GlobalSection(MonoDevelopProperties) = preSolution + Policies = $0 + $0.DotNetNamingPolicy = $1 + $1.DirectoryNamespaceAssociation = PrefixedHierarchical + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {971FDF07-E288-4239-B47A-E9E7E912193B} = {B972BBFA-917F-4A10-B07E-B89CFEC6BBDC} + {11DBC05E-F8B4-49ED-AAC9-96D92336D21C} = {B972BBFA-917F-4A10-B07E-B89CFEC6BBDC} + {83449CC4-1F76-4CFE-92B1-D2E13A62506F} = {B972BBFA-917F-4A10-B07E-B89CFEC6BBDC} + {E71F3053-056C-4381-9638-048ED73BDFF6} = {B972BBFA-917F-4A10-B07E-B89CFEC6BBDC} + {324BE76C-38FA-4F11-8BB1-95C7B3B1B545} = {B972BBFA-917F-4A10-B07E-B89CFEC6BBDC} + {F8C3F648-EA5A-4719-8005-85D1690B1655} = {B972BBFA-917F-4A10-B07E-B89CFEC6BBDC} + {137959BD-073B-4EC7-8ED5-31D73FA7DBC6} = {BB702EBD-3B79-4ECA-A2A6-1237B07F0AF0} + {1AC5ED7F-301E-4B3C-ACDE-C0EADFA5AE44} = {BB702EBD-3B79-4ECA-A2A6-1237B07F0AF0} EndGlobalSection EndGlobal diff --git a/build.cake b/build.cake index 466a96cc8..166995bef 100644 --- a/build.cake +++ b/build.cake @@ -67,7 +67,7 @@ Task("UpdateAndroidManifest") .Does(()=> { var buildVariant = GetVariant(); - var manifestPath = Path.Combine(_slnPath, "src", "Android", "Properties", "AndroidManifest.xml"); + var manifestPath = Path.Combine(_slnPath, "src", "App", "Platforms", "Android", "AndroidManifest.xml"); // Cake.AndroidAppManifest doesn't currently enable us to access nested items so, quick (not ideal) fix: var manifestText = FileReadText(manifestPath); @@ -119,26 +119,26 @@ Task("UpdateAndroidCodeFiles") //We're not using _androidPackageName here because the codefile is currently slightly different string than the one in AndroidManifest.xml var keyName = "com.8bit.bitwarden"; var fixedPackageName = buildVariant.AndroidPackageName.Replace("x8bit", "8bit"); - var filePath = Path.Combine(_slnPath, "src", "Android", "Services", "BiometricService.cs"); + var filePath = Path.Combine(_slnPath, "src", "App", "Platforms", "Android", "Services", "BiometricService.cs"); ReplaceInFile(filePath, keyName, fixedPackageName); var packageFileList = new string[] { - Path.Combine(_slnPath, "src", "Android", "MainActivity.cs"), - Path.Combine(_slnPath, "src", "Android", "MainApplication.cs"), - Path.Combine(_slnPath, "src", "Android", "Constants.cs"), - Path.Combine(_slnPath, "src", "Android", "Accessibility", "AccessibilityService.cs"), - Path.Combine(_slnPath, "src", "Android", "Autofill", "AutofillHelpers.cs"), - Path.Combine(_slnPath, "src", "Android", "Autofill", "AutofillService.cs"), - Path.Combine(_slnPath, "src", "Android", "Receivers", "ClearClipboardAlarmReceiver.cs"), - Path.Combine(_slnPath, "src", "Android", "Receivers", "EventUploadReceiver.cs"), - Path.Combine(_slnPath, "src", "Android", "Receivers", "PackageReplacedReceiver.cs"), - Path.Combine(_slnPath, "src", "Android", "Receivers", "RestrictionsChangedReceiver.cs"), - Path.Combine(_slnPath, "src", "Android", "Services", "DeviceActionService.cs"), - Path.Combine(_slnPath, "src", "Android", "Services", "FileService.cs"), - Path.Combine(_slnPath, "src", "Android", "Tiles", "AutofillTileService.cs"), - Path.Combine(_slnPath, "src", "Android", "Tiles", "GeneratorTileService.cs"), - Path.Combine(_slnPath, "src", "Android", "Tiles", "MyVaultTileService.cs"), - Path.Combine(_slnPath, "src", "Android", "google-services.json"), + Path.Combine(_slnPath, "src", "App", "Platforms", "Android", "MainActivity.cs"), + Path.Combine(_slnPath, "src", "App", "Platforms", "Android", "MainApplication.cs"), + Path.Combine(_slnPath, "src", "App", "Platforms", "Android", "Constants.cs"), + Path.Combine(_slnPath, "src", "App", "Platforms", "Android", "Accessibility", "AccessibilityService.cs"), + Path.Combine(_slnPath, "src", "App", "Platforms", "Android", "Autofill", "AutofillHelpers.cs"), + Path.Combine(_slnPath, "src", "App", "Platforms", "Android", "Autofill", "AutofillService.cs"), + Path.Combine(_slnPath, "src", "App", "Platforms", "Android", "Receivers", "ClearClipboardAlarmReceiver.cs"), + Path.Combine(_slnPath, "src", "App", "Platforms", "Android", "Receivers", "EventUploadReceiver.cs"), + Path.Combine(_slnPath, "src", "App", "Platforms", "Android", "Receivers", "PackageReplacedReceiver.cs"), + Path.Combine(_slnPath, "src", "App", "Platforms", "Android", "Receivers", "RestrictionsChangedReceiver.cs"), + Path.Combine(_slnPath, "src", "App", "Platforms", "Android", "Services", "DeviceActionService.cs"), + Path.Combine(_slnPath, "src", "App", "Platforms", "Android", "Services", "FileService.cs"), + Path.Combine(_slnPath, "src", "App", "Platforms", "Android", "Tiles", "AutofillTileService.cs"), + Path.Combine(_slnPath, "src", "App", "Platforms", "Android", "Tiles", "GeneratorTileService.cs"), + Path.Combine(_slnPath, "src", "App", "Platforms", "Android", "Tiles", "MyVaultTileService.cs"), + Path.Combine(_slnPath, "src", "App", "Platforms", "Android", "google-services.json"), Path.Combine(_slnPath, "store", "google", "Publisher", "Program.cs"), }; @@ -148,7 +148,7 @@ Task("UpdateAndroidCodeFiles") } var labelFileList = new string[] { - Path.Combine(_slnPath, "src", "Android", "Autofill", "AutofillService.cs"), + Path.Combine(_slnPath, "src", "App", "Platforms", "Android", "Autofill", "AutofillService.cs"), }; foreach(string path in labelFileList) @@ -315,7 +315,7 @@ private void UpdateAppleIcons(string target, string appiconsetTarget) Task("UpdateiOSIcons") .Does(()=>{ - UpdateAppleIcons("ios", Path.Combine(_slnPath, "src", "iOS", "Resources", "Assets.xcassets", "AppIcons.appiconset")); + UpdateAppleIcons("ios", Path.Combine(_slnPath, "src", "App", "Platforms", "iOS", "Resources", "Assets.xcassets", "AppIcons.appiconset")); UpdateAppleIcons("watch", Path.Combine(_slnPath, "src", "watchOS", "bitwarden", "bitwarden WatchKit App", "Assets.xcassets", "AppIcon.appiconset")); // TODO: Update complication icons when they start working }); @@ -324,8 +324,8 @@ Task("UpdateiOSPlist") .IsDependentOn("GetGitInfo") .Does(()=> { var buildVariant = GetVariant(); - var infoPath = Path.Combine(_slnPath, "src", "iOS", "Info.plist"); - var entitlementsPath = Path.Combine(_slnPath, "src", "iOS", "Entitlements.plist"); + var infoPath = Path.Combine(_slnPath, "src", "App", "Platforms", "iOS", "Info.plist"); + var entitlementsPath = Path.Combine(_slnPath, "src", "App", "Platforms", "iOS", "Entitlements.plist"); UpdateiOSInfoPlist(infoPath, buildVariant, _gitVersion, iOSProjectType.MainApp); UpdateiOSEntitlementsPlist(entitlementsPath, buildVariant); }); diff --git a/global.json b/global.json deleted file mode 100644 index 68bdb4538..000000000 --- a/global.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "sdk": { - "version": "7.0.400", - "rollForward": "latestPatch", - "allowPrerelease": false - } -} \ No newline at end of file diff --git a/src/Android/lib/arm64-v8a/libargon2.so b/lib/android/argon2/arm64-v8a/libargon2.so similarity index 100% rename from src/Android/lib/arm64-v8a/libargon2.so rename to lib/android/argon2/arm64-v8a/libargon2.so diff --git a/src/Android/lib/armeabi-v7a/libargon2.so b/lib/android/argon2/armeabi-v7a/libargon2.so similarity index 100% rename from src/Android/lib/armeabi-v7a/libargon2.so rename to lib/android/argon2/armeabi-v7a/libargon2.so diff --git a/src/Android/lib/x86_64/libargon2.so b/lib/android/argon2/x86_64/libargon2.so similarity index 100% rename from src/Android/lib/x86_64/libargon2.so rename to lib/android/argon2/x86_64/libargon2.so diff --git a/nuget.config b/nuget.config new file mode 100644 index 000000000..16502a7fd --- /dev/null +++ b/nuget.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/Android/Android.csproj b/src/Android/Android.csproj deleted file mode 100644 index 3997e036b..000000000 --- a/src/Android/Android.csproj +++ /dev/null @@ -1,327 +0,0 @@ - - - - Debug - AnyCPU - {304400AF-F0ED-40FA-B102-EA3C3EC43E4F} - {EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - {c9e5eea5-ca05-42a1-839b-61506e0a37df} - Library - Bit.Droid - BitwardenAndroid - True - Resources\Resource.designer.cs - Resource - Properties\AndroidManifest.xml - Resources - Assets - v13.0 - Xamarin.Android.Net.AndroidClientHandler - - - - - true - portable - false - bin\Debug - DEBUG; - prompt - 3 - - 1G - - - false - pdbonly - true - bin\Release - prompt - 4 - true - false - armeabi-v7a;x86;x86_64;arm64-v8a - 1G - true - true - - - false - bin\FDroid\ - true - pdbonly - AnyCPU - Off - prompt - MinimumRecommendedRules.ruleset - FDROID - armeabi-v7a;x86;x86_64;arm64-v8a - 1G - false - true - true - - - - - - - - - - - - - 2.1.0.4 - - - 1.9.0 - - - - - - - - 1.8.0 - - - 123.1.2.2 - - - - - 118.0.1.5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C} - App - - - {4b8a8c41-9820-4341-974c-41e65b7f4366} - Core - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - MSBuild:UpdateGeneratedFiles - Designer - - - - - MSBuild:UpdateGeneratedFiles - Designer - - - - - MSBuild:UpdateGeneratedFiles - Designer - - - - - - - - - \ No newline at end of file diff --git a/src/Android/Effects/FabShadowEffect.cs b/src/Android/Effects/FabShadowEffect.cs deleted file mode 100644 index 9901a51ba..000000000 --- a/src/Android/Effects/FabShadowEffect.cs +++ /dev/null @@ -1,30 +0,0 @@ -using Android.Graphics.Drawables; -using Bit.Droid.Effects; -using Bit.Droid.Utilities; -using Xamarin.Forms; -using Xamarin.Forms.Platform.Android; - -[assembly: ExportEffect(typeof(FabShadowEffect), "FabShadowEffect")] -namespace Bit.Droid.Effects -{ - public class FabShadowEffect : PlatformEffect - { - protected override void OnAttached () - { - if (Control is Android.Widget.Button button) - { - var gd = new GradientDrawable(); - gd.SetColor(ThemeHelpers.FabColor); - gd.SetCornerRadius(100); - - button.SetBackground(gd); - button.Elevation = 6; - button.TranslationZ = 20; - } - } - - protected override void OnDetached () - { - } - } -} diff --git a/src/Android/Effects/FixedSizeEffect.cs b/src/Android/Effects/FixedSizeEffect.cs deleted file mode 100644 index 98c997e18..000000000 --- a/src/Android/Effects/FixedSizeEffect.cs +++ /dev/null @@ -1,23 +0,0 @@ -using Android.Widget; -using Bit.Droid.Effects; -using Xamarin.Forms; -using Xamarin.Forms.Platform.Android; - -[assembly: ExportEffect(typeof(FixedSizeEffect), "FixedSizeEffect")] -namespace Bit.Droid.Effects -{ - public class FixedSizeEffect : PlatformEffect - { - protected override void OnAttached() - { - if (Element is Label label && Control is TextView textView) - { - textView.SetTextSize(Android.Util.ComplexUnitType.Pt, (float)label.FontSize); - } - } - - protected override void OnDetached() - { - } - } -} diff --git a/src/Android/Effects/RemoveFontPaddingEffect.cs b/src/Android/Effects/RemoveFontPaddingEffect.cs deleted file mode 100644 index 1f7cf1297..000000000 --- a/src/Android/Effects/RemoveFontPaddingEffect.cs +++ /dev/null @@ -1,23 +0,0 @@ -using Android.Widget; -using Bit.Droid.Effects; -using Xamarin.Forms; -using Xamarin.Forms.Platform.Android; - -[assembly: ExportEffect(typeof(RemoveFontPaddingEffect), nameof(RemoveFontPaddingEffect))] -namespace Bit.Droid.Effects -{ - public class RemoveFontPaddingEffect : PlatformEffect - { - protected override void OnAttached() - { - if (Control is TextView textView) - { - textView.SetIncludeFontPadding(false); - } - } - - protected override void OnDetached() - { - } - } -} \ No newline at end of file diff --git a/src/Android/Effects/TabBarEffect.cs b/src/Android/Effects/TabBarEffect.cs deleted file mode 100644 index e684ef452..000000000 --- a/src/Android/Effects/TabBarEffect.cs +++ /dev/null @@ -1,30 +0,0 @@ -using Android.Views; -using Bit.Droid.Effects; -using Google.Android.Material.BottomNavigation; -using Xamarin.Forms; -using Xamarin.Forms.Platform.Android; - -[assembly: ResolutionGroupName("Bitwarden")] -[assembly: ExportEffect(typeof(TabBarEffect), "TabBarEffect")] -namespace Bit.Droid.Effects -{ - public class TabBarEffect : PlatformEffect - { - protected override void OnAttached() - { - if (!(Container.GetChildAt(0) is ViewGroup layout)) - { - return; - } - if (!(layout.GetChildAt(1) is BottomNavigationView bottomNavigationView)) - { - return; - } - bottomNavigationView.LabelVisibilityMode = LabelVisibilityMode.LabelVisibilityLabeled; - } - - protected override void OnDetached() - { - } - } -} diff --git a/src/Android/Properties/AssemblyInfo.cs b/src/Android/Properties/AssemblyInfo.cs deleted file mode 100644 index 7a135b7b7..000000000 --- a/src/Android/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("BitwardenAndroid")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Bitwarden Inc.")] -[assembly: AssemblyProduct("Bitwarden")] -[assembly: AssemblyCopyright("Copyright © 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: ComVisible(false)] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/Android/Renderers/CustomEditorRenderer.cs b/src/Android/Renderers/CustomEditorRenderer.cs deleted file mode 100644 index 035c2f3eb..000000000 --- a/src/Android/Renderers/CustomEditorRenderer.cs +++ /dev/null @@ -1,69 +0,0 @@ -using System.ComponentModel; -using Android.Content; -using Android.Content.Res; -using Android.Views.InputMethods; -using Bit.Droid.Renderers; -using Bit.Droid.Utilities; -using Xamarin.Forms; -using Xamarin.Forms.Platform.Android; - -[assembly: ExportRenderer(typeof(Editor), typeof(CustomEditorRenderer))] -namespace Bit.Droid.Renderers -{ - public class CustomEditorRenderer : EditorRenderer - { - public CustomEditorRenderer(Context context) - : base(context) - { } - - // Workaround for issue described here: - // https://github.com/xamarin/Xamarin.Forms/issues/8291#issuecomment-617456651 - protected override void OnAttachedToWindow() - { - base.OnAttachedToWindow(); - EditText.Enabled = false; - EditText.Enabled = true; - } - - protected override void OnElementChanged(ElementChangedEventArgs e) - { - base.OnElementChanged(e); - UpdateBorderColor(); - if (Control != null && e.NewElement != null) - { - Control.SetPadding(Control.PaddingLeft, Control.PaddingTop - 10, Control.PaddingRight, - Control.PaddingBottom + 20); - Control.ImeOptions = Control.ImeOptions | (ImeAction)ImeFlags.NoPersonalizedLearning | - (ImeAction)ImeFlags.NoExtractUi; - } - } - - protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e) - { - base.OnElementPropertyChanged(sender, e); - - if (e.PropertyName == Entry.TextColorProperty.PropertyName) - { - UpdateBorderColor(); - } - } - - private void UpdateBorderColor() - { - if (Control != null) - { - var states = new[] - { - new[] { Android.Resource.Attribute.StateFocused }, // focused - new[] { -Android.Resource.Attribute.StateFocused }, // unfocused - }; - var colors = new int[] - { - ThemeHelpers.PrimaryColor, - ThemeHelpers.MutedColor - }; - Control.BackgroundTintList = new ColorStateList(states, colors); - } - } - } -} diff --git a/src/Android/Renderers/CustomEntryRenderer.cs b/src/Android/Renderers/CustomEntryRenderer.cs deleted file mode 100644 index fd1eb03b3..000000000 --- a/src/Android/Renderers/CustomEntryRenderer.cs +++ /dev/null @@ -1,107 +0,0 @@ -using System.ComponentModel; -using Android.Content; -using Android.Content.Res; -using Android.Graphics; -using Android.Text; -using Android.Views.InputMethods; -using Android.Widget; -using Bit.Droid.Renderers; -using Bit.Droid.Utilities; -using Xamarin.Forms; -using Xamarin.Forms.Platform.Android; - -[assembly: ExportRenderer(typeof(Entry), typeof(CustomEntryRenderer))] -namespace Bit.Droid.Renderers -{ - public class CustomEntryRenderer : EntryRenderer - { - public CustomEntryRenderer(Context context) - : base(context) - { } - - protected override void OnElementChanged(ElementChangedEventArgs e) - { - base.OnElementChanged(e); - UpdateBorderColor(); - if (Control != null && e.NewElement != null) - { - Control.SetPadding(Control.PaddingLeft, Control.PaddingTop - 10, Control.PaddingRight, - Control.PaddingBottom + 20); - Control.ImeOptions = Control.ImeOptions | (ImeAction)ImeFlags.NoPersonalizedLearning | - (ImeAction)ImeFlags.NoExtractUi; - } - } - - // Workaround for bug preventing long-press -> copy/paste on Android 11 - // See https://issuetracker.google.com/issues/37095917 - protected override void OnAttachedToWindow() - { - base.OnAttachedToWindow(); - Control.Enabled = false; - Control.Enabled = true; - } - - // Workaround for failure to disable text prediction on non-password fields - // see https://github.com/xamarin/Xamarin.Forms/issues/10857 - protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e) - { - base.OnElementPropertyChanged(sender, e); - - // Check if changed property is "IsPassword", otherwise ignore - if (e.PropertyName == Entry.IsPasswordProperty.PropertyName) - { - // Check if field type is text, otherwise ignore (numeric passwords, etc.) - EditText.InputType = Element.Keyboard.ToInputType(); - bool isText = (EditText.InputType & InputTypes.ClassText) == InputTypes.ClassText, - isNumber = (EditText.InputType & InputTypes.ClassNumber) == InputTypes.ClassNumber; - if (isText || isNumber) - { - if (Element.IsPassword) - { - // Element is a password field, set inputType to TextVariationPassword which disables - // predictive text by default - EditText.InputType = EditText.InputType | - (isText ? InputTypes.TextVariationPassword : InputTypes.NumberVariationPassword); - } - else - { - // Element is not a password field, set inputType to TextVariationVisiblePassword to - // disable predictive text while still displaying the content. - EditText.InputType = EditText.InputType | - (isText ? InputTypes.TextVariationVisiblePassword : InputTypes.NumberVariationNormal); - } - - // The workaround above forces a reset of the style properties, so we need to re-apply the font. - // see https://xamarin.github.io/bugzilla-archives/33/33666/bug.html - var typeface = Typeface.CreateFromAsset(Context.Assets, "RobotoMono_Regular.ttf"); - if (Control is TextView label) - { - label.Typeface = typeface; - } - } - } - else if (e.PropertyName == Entry.TextColorProperty.PropertyName) - { - UpdateBorderColor(); - } - } - - private void UpdateBorderColor() - { - if (Control != null) - { - var states = new[] - { - new[] { Android.Resource.Attribute.StateFocused }, // focused - new[] { -Android.Resource.Attribute.StateFocused }, // unfocused - }; - var colors = new int[] - { - ThemeHelpers.PrimaryColor, - ThemeHelpers.MutedColor - }; - Control.BackgroundTintList = new ColorStateList(states, colors); - } - } - } -} diff --git a/src/Android/Renderers/CustomLabelRenderer.cs b/src/Android/Renderers/CustomLabelRenderer.cs deleted file mode 100644 index 838b9b967..000000000 --- a/src/Android/Renderers/CustomLabelRenderer.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System.ComponentModel; -using Android.Content; -using Android.OS; -using Bit.App.Controls; -using Bit.Droid.Renderers; -using Xamarin.Forms; -using Xamarin.Forms.Platform.Android; - -[assembly: ExportRenderer(typeof(CustomLabel), typeof(CustomLabelRenderer))] -namespace Bit.Droid.Renderers -{ - public class CustomLabelRenderer : LabelRenderer - { - public CustomLabelRenderer(Context context) - : base(context) - { } - - protected override void OnElementChanged(ElementChangedEventArgs