PM-3349 MAUI - Android - Fix crash on converter

PM-3349 MAUI - Android - Fix Add/Edit cipher page
PM-3349 MAUI - Android - Fix Options page
2025-12-05 23:53:33 +00:00 · 2023-09-05 17:40:12 -03:00 · 2023-09-04 20:37:30 -03:00 · 2023-09-01 19:44:20 -03:00 · 2023-09-01 18:48:25 -03:00 · 2023-09-01 18:46:07 -03:00
1321 changed files with 273440 additions and 2065 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -71,6 +71,11 @@ jobs:
        with:
          nuget-version: 5.9.0

+      - name: Set up .NET
+        uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0
+        with:
+          dotnet-version: '3.1.x'
+
      - name: Set up MSBuild
        uses: microsoft/setup-msbuild@1ff57057b5cfdc39105cd07a01d78e9b0ea0c14c # v1.3.1

--- a/.github/workflows/version-auto-bump.yml
+++ b/.github/workflows/version-auto-bump.yml
@@ -32,14 +32,10 @@ jobs:
          echo "new-version=$NEW_VER" >> $GITHUB_OUTPUT

  trigger_version_bump:
-    name: "Version bump"
-    runs-on: ubuntu-22.04
-    needs:
-      - setup
-    steps:
-      - name: Bump version to ${{ needs.setup.outputs.version_number }}
-        uses: ./.github/workflows/version-bump.yml
-        secrets:
-          AZURE_PROD_KV_CREDENTIALS: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
-        with:
-          version_number: ${{ needs.setup.outputs.version_number }}
+    name: Bump version to ${{ needs.setup.outputs.version_number }}
+    needs: setup
+    uses: ./.github/workflows/version-bump.yml
+    secrets:
+      AZURE_PROD_KV_CREDENTIALS: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
+    with:
+      version_number: ${{ needs.setup.outputs.version_number }}
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@

 # Bitwarden Mobile Application

-<a href="https://play.google.com/store/apps/details?id=com.x8bit.bitwarden" target="_blank"><img alt="Get it on Google Play" src="https://imgur.com/YQzmZi9.png" width="153" height="46"></a> <a href="https://mobileapp.bitwarden.com/fdroid/" target="_blank"><img alt="Get it on Google Play" src="https://i.imgur.com/HDicnzz.png" width="154" height="46"></a> <a href="https://itunes.apple.com/us/app/bitwarden-free-password-manager/id1137397744?mt=8" target="_blank"><img src="https://imgur.com/GdGqPMY.png" width="135" height="40"></a>
+<a href="https://play.google.com/store/apps/details?id=com.x8bit.bitwarden" target="_blank"><img alt="Get it on Google Play" src="https://imgur.com/YQzmZi9.png" width="153" height="46"></a> <a href="https://mobileapp.bitwarden.com/fdroid/" target="_blank"><img alt="Get it on F-Droid" src="https://i.imgur.com/HDicnzz.png" width="154" height="46"></a> <a href="https://itunes.apple.com/us/app/bitwarden-free-password-manager/id1137397744?mt=8" target="_blank"><img src="https://imgur.com/GdGqPMY.png" width="135" height="40"></a>

 The Bitwarden mobile application is written in C# with Xamarin Android, Xamarin iOS, and Xamarin Forms.

--- a/bitwarden-mobile.sln
+++ b/bitwarden-mobile.sln
@@ -46,8 +46,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS.ShareExtension", "src\i
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS.Autofill", "src\iOS.Autofill\iOS.Autofill.csproj", "{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamariniOS17CredentialProviderBinding", "lib\ios\iOS17CredentialProvider\XamariniOS17CredentialProvider\XamariniOS17CredentialProviderBinding\XamariniOS17CredentialProviderBinding.csproj", "{63938BA1-0F72-4BFD-B7A4-823C146E43B4}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
@@ -448,36 +446,6 @@ Global
 		{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
-		{63938BA1-0F72-4BFD-B7A4-823C146E43B4}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{63938BA1-0F72-4BFD-B7A4-823C146E43B4}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{63938BA1-0F72-4BFD-B7A4-823C146E43B4}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{63938BA1-0F72-4BFD-B7A4-823C146E43B4}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{63938BA1-0F72-4BFD-B7A4-823C146E43B4}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{63938BA1-0F72-4BFD-B7A4-823C146E43B4}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{63938BA1-0F72-4BFD-B7A4-823C146E43B4}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{63938BA1-0F72-4BFD-B7A4-823C146E43B4}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{63938BA1-0F72-4BFD-B7A4-823C146E43B4}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{63938BA1-0F72-4BFD-B7A4-823C146E43B4}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{63938BA1-0F72-4BFD-B7A4-823C146E43B4}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{63938BA1-0F72-4BFD-B7A4-823C146E43B4}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{63938BA1-0F72-4BFD-B7A4-823C146E43B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{63938BA1-0F72-4BFD-B7A4-823C146E43B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{63938BA1-0F72-4BFD-B7A4-823C146E43B4}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{63938BA1-0F72-4BFD-B7A4-823C146E43B4}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{63938BA1-0F72-4BFD-B7A4-823C146E43B4}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{63938BA1-0F72-4BFD-B7A4-823C146E43B4}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{63938BA1-0F72-4BFD-B7A4-823C146E43B4}.FDroid|Any CPU.ActiveCfg = Release|Any CPU
-		{63938BA1-0F72-4BFD-B7A4-823C146E43B4}.FDroid|Any CPU.Build.0 = Release|Any CPU
-		{63938BA1-0F72-4BFD-B7A4-823C146E43B4}.FDroid|iPhone.ActiveCfg = Release|Any CPU
-		{63938BA1-0F72-4BFD-B7A4-823C146E43B4}.FDroid|iPhone.Build.0 = Release|Any CPU
-		{63938BA1-0F72-4BFD-B7A4-823C146E43B4}.FDroid|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{63938BA1-0F72-4BFD-B7A4-823C146E43B4}.FDroid|iPhoneSimulator.Build.0 = Release|Any CPU
-		{63938BA1-0F72-4BFD-B7A4-823C146E43B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{63938BA1-0F72-4BFD-B7A4-823C146E43B4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{63938BA1-0F72-4BFD-B7A4-823C146E43B4}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{63938BA1-0F72-4BFD-B7A4-823C146E43B4}.Release|iPhone.Build.0 = Release|Any CPU
-		{63938BA1-0F72-4BFD-B7A4-823C146E43B4}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{63938BA1-0F72-4BFD-B7A4-823C146E43B4}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -496,7 +464,6 @@ Global
 		{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}
-		{63938BA1-0F72-4BFD-B7A4-823C146E43B4} = {D10CA4A9-F866-40E1-B658-F69051236C71}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {7D436EA3-8B7E-45D2-8D14-0730BD2E0410}
--- a/crowdin.yml
+++ b/crowdin.yml
@@ -38,3 +38,15 @@ files:
        pt-PT: pt-PT
        en-GB: en-GB
        en-IN: en-IN
+  - source: "/src/watchOS/bitwarden/bitwarden WatchKit Extension/Localization/en.lproj/Localizable.strings"
+    dest: "/src/watchOS/bitwarden/bitwarden WatchKit Extension/Localization/en.lproj/%original_file_name%"
+    translation: "/src/watchOS/bitwarden/bitwarden WatchKit Extension/Localization//%two_letters_code%.lproj/%original_file_name%"
+    update_option: update_as_unapproved
+    languages_mapping:
+      two_letters_code:
+        zh-CN: zh-Hans
+        zh-TW: zh-Hant
+        pt-BR: pt-BR
+        pt-PT: pt-PT
+        en-GB: en-GB
+        en-IN: en-IN
--- a/global.json
+++ b/global.json
@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "version": "7.0.306"
+  }
+}
--- a/lib/ios/iOS17CredentialProvider/XamariniOS17CredentialProvider/XamarinPasskeysManager.sln
+++ b/lib/ios/iOS17CredentialProvider/XamariniOS17CredentialProvider/XamarinPasskeysManager.sln
@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 25.0.1706.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamariniOS17CredentialProviderBinding", "XamariniOS17CredentialProviderBinding\XamariniOS17CredentialProviderBinding.csproj", "{63938BA1-0F72-4BFD-B7A4-823C146E43B4}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{63938BA1-0F72-4BFD-B7A4-823C146E43B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{63938BA1-0F72-4BFD-B7A4-823C146E43B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{63938BA1-0F72-4BFD-B7A4-823C146E43B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{63938BA1-0F72-4BFD-B7A4-823C146E43B4}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {5EE0FEF7-C01A-4CAF-BCF0-3A1B818D056A}
-	EndGlobalSection
-EndGlobal
--- a/lib/ios/iOS17CredentialProvider/XamariniOS17CredentialProvider/XamariniOS17CredentialProviderBinding/ApiDefinitions.cs
+++ b/lib/ios/iOS17CredentialProvider/XamariniOS17CredentialProvider/XamariniOS17CredentialProviderBinding/ApiDefinitions.cs
@@ -1,141 +0,0 @@
-using System;
-using AuthenticationServices;
-using Foundation;
-using ObjCRuntime;
-
-namespace XamariniOS17CredentialProviderBinding
-{
-    interface IASCredentialProviderCompatDelegate { }
-
-    // @protocol ASCredentialProviderCompatDelegate
-    [Protocol, Model(AutoGeneratedName = true)]
-    interface ASCredentialProviderCompatDelegate
-    {
-        // @required -(void)prepareInterfaceToProvideCredentialCompatFor:(ASCredentialRequestCompat * _Nonnull)credentialRequest;
-        [iOS(17, 0)]
-        [Abstract]
-        [Export("prepareInterfaceToProvideCredentialCompatFor:")]
-        void PrepareInterfaceToProvideCredentialCompatFor(ASCredentialRequestCompat credentialRequest);
-
-        // @required -(void)provideCredentialWithoutUserInteractionCompatFor:(ASCredentialRequestCompat * _Nonnull)credentialRequest;
-        [iOS(17, 0)]
-        [Abstract]
-        [Export("provideCredentialWithoutUserInteractionCompatFor:")]
-        void ProvideCredentialWithoutUserInteractionCompatFor(ASCredentialRequestCompat credentialRequest);
-
-        // @required -(void)prepareInterfaceCompatForPasskeyRegistration:(ASCredentialRequestCompat * _Nonnull)registrationRequest;
-        [iOS(17, 0)]
-        [Abstract]
-        [Export("prepareInterfaceCompatForPasskeyRegistration:")]
-        void PrepareInterfaceCompatForPasskeyRegistration(ASCredentialRequestCompat registrationRequest);
-    }
-
-    // @interface ASCredentialRequestCompat : NSObject
-    [iOS(17, 0)]
-    [BaseType (typeof(NSObject))]
-	[DisableDefaultCtor]
-	interface ASCredentialRequestCompat
-    {
-		// @property (nonatomic) enum ASCredentialRequestCompatType type;
-        [Export("type", ArgumentSemantic.Assign)]
-        ASCredentialRequestCompatType Type { get; set; }
-
-        // @property (nonatomic, strong) id<ASCredentialIdentity> _Nonnull credentialIdentity;
-        //[Export("credentialIdentity", ArgumentSemantic.Strong)]
-        //ASCredentialIdentity CredentialIdentity { get; set; }
-
-
-        // @property (readonly, nonatomic, strong) ASPasswordCredentialIdentity * _Nullable passwordCredentialIdentity;
-        [iOS(17, 0)]
-        [NullAllowed, Export("passwordCredentialIdentity", ArgumentSemantic.Strong)]
-        ASPasswordCredentialIdentity PasswordCredentialIdentity { get; }
-
-        // @property (readonly, nonatomic, strong) ASPasskeyCredentialIdentityCompat * _Nullable passkeyCredentialIdentity;
-        [iOS(17, 0)]
-        [NullAllowed, Export("passkeyCredentialIdentity", ArgumentSemantic.Strong)]
-        ASPasskeyCredentialIdentityCompat PasskeyCredentialIdentity { get; }
-    }
-
-    // @interface ASPasskeyCredentialIdentityCompat : NSObject
-    [BaseType(typeof(NSObject))]
-    [DisableDefaultCtor]
-    interface ASPasskeyCredentialIdentityCompat
-    {
-        // @property (copy, nonatomic) NSString * _Nonnull relyingPartyIdentifier;
-        [Export("relyingPartyIdentifier")]
-        string RelyingPartyIdentifier { get; set; }
-
-        // @property (copy, nonatomic) NSString * _Nonnull userName;
-        [Export("userName")]
-        string UserName { get; set; }
-
-        // @property (copy, nonatomic) NSData * _Nonnull credentialID;
-        [Export("credentialID", ArgumentSemantic.Copy)]
-        NSData CredentialID { get; set; }
-
-        // @property (copy, nonatomic) NSData * _Nonnull userHandle;
-        [Export("userHandle", ArgumentSemantic.Copy)]
-        NSData UserHandle { get; set; }
-
-        // @property (copy, nonatomic) NSString * _Nullable recordIdentifier;
-        [NullAllowed, Export("recordIdentifier")]
-        string RecordIdentifier { get; set; }
-
-        // @property (nonatomic) NSInteger rank;
-        [Export("rank")]
-        nint Rank { get; set; }
-    }
-
-    // @interface BaseASCredentialProviderViewController : ASCredentialProviderViewController
-    [BaseType (typeof(ASCredentialProviderViewController))]
-	interface BaseASCredentialProviderViewController
-	{
-        // -(void)prepareInterfaceToProvideCredentialForRequest:(id<ASCredentialRequest> _Nonnull)credentialRequest;
-        //[Export ("prepareInterfaceToProvideCredentialForRequest:")]
-        //void PrepareInterfaceToProvideCredentialForRequest (ASCredentialRequest credentialRequest);
-
-        //// -(void)provideCredentialWithoutUserInteractionForRequest:(id<ASCredentialRequest> _Nonnull)credentialRequest;
-        //[Export ("provideCredentialWithoutUserInteractionForRequest:")]
-        //void ProvideCredentialWithoutUserInteractionForRequest (ASCredentialRequest credentialRequest);
-
-        //// -(void)prepareInterfaceForPasskeyRegistration:(id<ASCredentialRequest> _Nonnull)registrationRequest;
-        //[Export ("prepareInterfaceForPasskeyRegistration:")]
-        //void PrepareInterfaceForPasskeyRegistration (ASCredentialRequest registrationRequest);
-
-        // -(void)prepareInterfaceToProvideCredentialCompatFor:(ASCredentialRequestCompat * _Nonnull)credentialRequest;
-        //[Export ("prepareInterfaceToProvideCredentialCompatFor:")]
-        //      [Abstract]
-        //      void PrepareInterfaceToProvideCredentialCompatFor (ASCredentialRequestCompat credentialRequest);
-
-        //// -(void)provideCredentialWithoutUserInteractionCompatFor:(ASCredentialRequestCompat * _Nonnull)credentialRequest;
-        //[Export ("provideCredentialWithoutUserInteractionCompatFor:")]
-        //      [Abstract]
-        //      void ProvideCredentialWithoutUserInteractionCompatFor (ASCredentialRequestCompat credentialRequest);
-
-        //// -(void)prepareInterfaceCompatForPasskeyRegistration:(ASCredentialRequestCompat * _Nonnull)registrationRequest;
-        //[Export ("prepareInterfaceCompatForPasskeyRegistration:")]
-        //      [Abstract]
-        //      void PrepareInterfaceCompatForPasskeyRegistration (ASCredentialRequestCompat registrationRequest);
-
-        [iOS(17, 0)]
-        [Export("SetCompatDelegate:")]
-        void SetCompatDelegate(IASCredentialProviderCompatDelegate @delegate);
-
-        // -(instancetype _Nonnull)initWithNibName:(NSString * _Nullable)nibNameOrNil bundle:(NSBundle * _Nullable)nibBundleOrNil __attribute__((objc_designated_initializer));
-        [Export ("initWithNibName:bundle:")]
-		[DesignatedInitializer]
-        IntPtr Constructor ([NullAllowed] string nibNameOrNil, [NullAllowed] NSBundle nibBundleOrNil);
-
-		//// -(instancetype _Nullable)initWithCoder:(NSCoder * _Nonnull)coder __attribute__((objc_designated_initializer));
-		//[Export ("initWithCoder:")]
-		//[DesignatedInitializer]
-  //      IntPtr Constructor (NSCoder coder);
-	}
-
-    // @interface MyTest : NSObject
-    [BaseType(typeof(NSObject))]
-    //[DisableDefaultCtor]
-    interface MyTest
-    {
-    }
-}
--- a/lib/ios/iOS17CredentialProvider/XamariniOS17CredentialProvider/XamariniOS17CredentialProviderBinding/Properties/AssemblyInfo.cs
+++ b/lib/ios/iOS17CredentialProvider/XamariniOS17CredentialProvider/XamariniOS17CredentialProviderBinding/Properties/AssemblyInfo.cs
@@ -1,35 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-using Foundation;
-
-// This attribute allows you to mark your assemblies as “safe to link”.
-// When the attribute is present, the linker—if enabled—will process the assembly
-// even if you’re using the “Link SDK assemblies only” option, which is the default for device builds.
-
-[assembly: LinkerSafe]
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle("NativeLibrary")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("NativeLibrary")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion("1.0.*")]
-
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
-
--- a/lib/ios/iOS17CredentialProvider/XamariniOS17CredentialProvider/XamariniOS17CredentialProviderBinding/StructsAndEnums.cs
+++ b/lib/ios/iOS17CredentialProvider/XamariniOS17CredentialProvider/XamariniOS17CredentialProviderBinding/StructsAndEnums.cs
@@ -1,11 +0,0 @@
-using ObjCRuntime;
-
-namespace XamariniOS17CredentialProviderBinding
-{
-	[Native]
-	public enum ASCredentialRequestCompatType : long
-	{
-		word = 0,
-		keyAssertion = 1
-	}
-}
--- a/lib/ios/iOS17CredentialProvider/XamariniOS17CredentialProvider/XamariniOS17CredentialProviderBinding/XamariniOS17CredentialProviderBinding.csproj
+++ b/lib/ios/iOS17CredentialProvider/XamariniOS17CredentialProvider/XamariniOS17CredentialProviderBinding/XamariniOS17CredentialProviderBinding.csproj
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{8FFB629D-F513-41CE-95D2-7ECE97B6EEEC};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>{63938BA1-0F72-4BFD-B7A4-823C146E43B4}</ProjectGuid>
-    <TemplateGuid>{b6f3ff35-79b2-4f25-a2fc-60a7cf61013b}</TemplateGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>NativeLibrary</RootNamespace>
-    <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
-    <AssemblyName>NativeLibrary</AssemblyName>
-    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>portable</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>portable</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="Xamarin.iOS" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Resources\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ObjcBindingApiDefinition Include="ApiDefinitions.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ObjcBindingCoreSource Include="StructsAndEnums.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <NativeReference Include="..\..\iOS17CredentialProvider\build\Release-fat\iOS17CredentialProvider.framework">
-      <Kind>Framework</Kind>
-      <SmartLink>True</SmartLink>
-      <ForceLoad>False</ForceLoad>
-      <WeakFrameworks>Foundation AuthenticationServices</WeakFrameworks>
-    </NativeReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.ObjCBinding.CSharp.targets" />
-</Project>
--- a/lib/ios/iOS17CredentialProvider/iOS17CredentialProvider/buildfat.sh
+++ b/lib/ios/iOS17CredentialProvider/iOS17CredentialProvider/buildfat.sh
@@ -1,14 +0,0 @@
-echo "Building framework"
-
-xcodebuild -sdk iphonesimulator17.0 -project "iOS17CredentialProvider.xcodeproj" -configuration Release -arch x86_64
-xcodebuild -sdk iphoneos17.0 -project "iOS17CredentialProvider.xcodeproj" -configuration Release
-cd build
-cp -R "Release-iphoneos" "Release-fat"
-cp -R "Release-iphonesimulator/iOS17CredentialProvider.framework/Modules/iOS17CredentialProvider.swiftmodule/" "Release-fat/iOS17CredentialProvider.framework/Modules/iOS17CredentialProvider.swiftmodule/"
-lipo -create -output "Release-fat/iOS17CredentialProvider.framework/iOS17CredentialProvider" "Release-iphoneos/iOS17CredentialProvider.framework/iOS17CredentialProvider" "Release-iphonesimulator/iOS17CredentialProvider.framework/iOS17CredentialProvider"
-
-echo "Sharpie creating binding definitions"
-
-sharpie bind --sdk=iphoneos17.0 --output="XamarinApiDef" --namespace="Binding" --scope="Release-iphoneos/iOS17CredentialProvider.framework/Headers/" "Release-iphoneos/iOS17CredentialProvider.framework/Headers/iOS17CredentialProvider-Swift.h"
-
-echo "Done!"
--- a/lib/ios/iOS17CredentialProvider/iOS17CredentialProvider/iOS17CredentialProvider.xcodeproj/project.pbxproj
+++ b/lib/ios/iOS17CredentialProvider/iOS17CredentialProvider/iOS17CredentialProvider.xcodeproj/project.pbxproj
@@ -1,357 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 56;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		B72040A62A4E421C00E62648 /* iOS17CredentialProvider.docc in Sources */ = {isa = PBXBuildFile; fileRef = B72040A52A4E421C00E62648 /* iOS17CredentialProvider.docc */; };
-		B72040A72A4E421C00E62648 /* iOS17CredentialProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = B72040A42A4E421C00E62648 /* iOS17CredentialProvider.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		B72040AE2A535D6500E62648 /* BaseASCredentialProviderViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B72040AD2A535D6500E62648 /* BaseASCredentialProviderViewController.swift */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXFileReference section */
-		B72040A12A4E421C00E62648 /* iOS17CredentialProvider.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = iOS17CredentialProvider.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		B72040A42A4E421C00E62648 /* iOS17CredentialProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = iOS17CredentialProvider.h; sourceTree = "<group>"; };
-		B72040A52A4E421C00E62648 /* iOS17CredentialProvider.docc */ = {isa = PBXFileReference; lastKnownFileType = folder.documentationcatalog; path = iOS17CredentialProvider.docc; sourceTree = "<group>"; };
-		B72040AD2A535D6500E62648 /* BaseASCredentialProviderViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseASCredentialProviderViewController.swift; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		B720409E2A4E421C00E62648 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		B72040972A4E421C00E62648 = {
-			isa = PBXGroup;
-			children = (
-				B72040A32A4E421C00E62648 /* iOS17CredentialProvider */,
-				B72040A22A4E421C00E62648 /* Products */,
-			);
-			sourceTree = "<group>";
-		};
-		B72040A22A4E421C00E62648 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				B72040A12A4E421C00E62648 /* iOS17CredentialProvider.framework */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		B72040A32A4E421C00E62648 /* iOS17CredentialProvider */ = {
-			isa = PBXGroup;
-			children = (
-				B72040A42A4E421C00E62648 /* iOS17CredentialProvider.h */,
-				B72040A52A4E421C00E62648 /* iOS17CredentialProvider.docc */,
-				B72040AD2A535D6500E62648 /* BaseASCredentialProviderViewController.swift */,
-			);
-			path = "iOS17CredentialProvider";
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXHeadersBuildPhase section */
-		B720409C2A4E421C00E62648 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				B72040A72A4E421C00E62648 /* iOS17CredentialProvider.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXHeadersBuildPhase section */
-
-/* Begin PBXNativeTarget section */
-		B72040A02A4E421C00E62648 /* iOS17CredentialProvider */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = B72040AA2A4E421C00E62648 /* Build configuration list for PBXNativeTarget "iOS17CredentialProvider" */;
-			buildPhases = (
-				B720409C2A4E421C00E62648 /* Headers */,
-				B720409D2A4E421C00E62648 /* Sources */,
-				B720409E2A4E421C00E62648 /* Frameworks */,
-				B720409F2A4E421C00E62648 /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = "iOS17CredentialProvider";
-			productName = "iOS17CredentialProvider";
-			productReference = B72040A12A4E421C00E62648 /* iOS17CredentialProvider.framework */;
-			productType = "com.apple.product-type.framework";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		B72040982A4E421C00E62648 /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				BuildIndependentTargetsInParallel = 1;
-				LastUpgradeCheck = 1500;
-				TargetAttributes = {
-					B72040A02A4E421C00E62648 = {
-						CreatedOnToolsVersion = 15.0;
-					};
-				};
-			};
-			buildConfigurationList = B720409B2A4E421C00E62648 /* Build configuration list for PBXProject "iOS17CredentialProvider" */;
-			compatibilityVersion = "Xcode 14.0";
-			developmentRegion = en;
-			hasScannedForEncodings = 0;
-			knownRegions = (
-				en,
-				Base,
-			);
-			mainGroup = B72040972A4E421C00E62648;
-			productRefGroup = B72040A22A4E421C00E62648 /* Products */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				B72040A02A4E421C00E62648 /* iOS17CredentialProvider */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-		B720409F2A4E421C00E62648 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		B720409D2A4E421C00E62648 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				B72040A62A4E421C00E62648 /* iOS17CredentialProvider.docc in Sources */,
-				B72040AE2A535D6500E62648 /* BaseASCredentialProviderViewController.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin XCBuildConfiguration section */
-		B72040A82A4E421C00E62648 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = dwarf;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_TESTABILITY = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu17;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 17.0;
-				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
-				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
-				MTL_FAST_MATH = YES;
-				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = iphoneos;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Debug;
-		};
-		B72040A92A4E421C00E62648 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu17;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 17.0;
-				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				MTL_FAST_MATH = YES;
-				SDKROOT = iphoneos;
-				SWIFT_COMPILATION_MODE = wholemodule;
-				VALIDATE_PRODUCT = YES;
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Release;
-		};
-		B72040AB2A4E421C00E62648 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
-				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = LTZ2PFU5D6;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_MODULE_VERIFIER = YES;
-				GENERATE_INFOPLIST_FILE = YES;
-				INFOPLIST_KEY_NSHumanReadableCopyright = "";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-				);
-				MARKETING_VERSION = 1.0;
-				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
-				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20";
-				PRODUCT_BUNDLE_IDENTIFIER = "com.8bit.bitwarden.iOS17CredentialProvider";
-				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
-				SKIP_INSTALL = YES;
-				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = Debug;
-		};
-		B72040AC2A4E421C00E62648 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
-				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = LTZ2PFU5D6;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_MODULE_VERIFIER = YES;
-				GENERATE_INFOPLIST_FILE = YES;
-				INFOPLIST_KEY_NSHumanReadableCopyright = "";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-				);
-				MARKETING_VERSION = 1.0;
-				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
-				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20";
-				PRODUCT_BUNDLE_IDENTIFIER = "com.8bit.bitwarden.iOS17CredentialProvider";
-				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
-				SKIP_INSTALL = YES;
-				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		B720409B2A4E421C00E62648 /* Build configuration list for PBXProject "iOS17CredentialProvider" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				B72040A82A4E421C00E62648 /* Debug */,
-				B72040A92A4E421C00E62648 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		B72040AA2A4E421C00E62648 /* Build configuration list for PBXNativeTarget "iOS17CredentialProvider" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				B72040AB2A4E421C00E62648 /* Debug */,
-				B72040AC2A4E421C00E62648 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = B72040982A4E421C00E62648 /* Project object */;
-}
--- a/lib/ios/iOS17CredentialProvider/iOS17CredentialProvider/iOS17CredentialProvider.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ b/lib/ios/iOS17CredentialProvider/iOS17CredentialProvider/iOS17CredentialProvider.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:">
-   </FileRef>
-</Workspace>
--- a/lib/ios/iOS17CredentialProvider/iOS17CredentialProvider/iOS17CredentialProvider.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+++ b/lib/ios/iOS17CredentialProvider/iOS17CredentialProvider/iOS17CredentialProvider.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>
--- a/lib/ios/iOS17CredentialProvider/iOS17CredentialProvider/iOS17CredentialProvider.xcodeproj/xcshareddata/xcschemes/iOS17CredentialProvider.xcscheme
+++ b/lib/ios/iOS17CredentialProvider/iOS17CredentialProvider/iOS17CredentialProvider.xcodeproj/xcshareddata/xcschemes/iOS17CredentialProvider.xcscheme
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1500"
-   version = "1.7">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "B72040A02A4E421C00E62648"
-               BuildableName = "iOS17CredentialProvider.framework"
-               BlueprintName = "iOS17CredentialProvider"
-               ReferencedContainer = "container:iOS17CredentialProvider.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      shouldAutocreateTestPlan = "YES">
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Release"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "B72040A02A4E421C00E62648"
-            BuildableName = "iOS17CredentialProvider.framework"
-            BlueprintName = "iOS17CredentialProvider"
-            ReferencedContainer = "container:iOS17CredentialProvider.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
--- a/lib/ios/iOS17CredentialProvider/iOS17CredentialProvider/iOS17CredentialProvider/BaseASCredentialProviderViewController.swift
+++ b/lib/ios/iOS17CredentialProvider/iOS17CredentialProvider/iOS17CredentialProvider/BaseASCredentialProviderViewController.swift
@@ -1,188 +0,0 @@
-//
-//  BaseASCredentialProviderViewController.swift
-//  iOS17CredentialProvider
-//
-//  Created by Federico Maccaroni on 03/07/2023.
-//
-
-import Foundation
-import AuthenticationServices
-
-@objc(ASCredentialRequestCompatType)
-public enum ASCredentialRequestCompatType : Int, @unchecked Sendable {
-    case password = 0
-
-    case passkeyAssertion = 1
-}
-
-@objc(ASPasskeyCredentialIdentityCompat)
-public class ASPasskeyCredentialIdentityCompat : NSObject {
-    
-    init(relyingPartyIdentifier: String, userName: String, credentialID: Data, userHandle: Data, recordIdentifier: String? = nil, rank: Int) {
-        self.relyingPartyIdentifier = relyingPartyIdentifier
-        self.userName = userName
-        self.credentialID = credentialID
-        self.userHandle = userHandle
-        self.recordIdentifier = recordIdentifier
-        self.rank = rank
-    }
-    
-    /** The relying party identifier of this passkey credential.
-     @discussion This field is reported as the serviceIdentifier property of ASCredentialIdentity.
-     */
-    @objc
-    public var relyingPartyIdentifier: String
-
-    
-    /** The user name of this passkey credential.
-     @discussion This field is reported as the user property of ASCredentialIdentity.
-     */
-    @objc
-    public var userName: String
-
-    
-    /** The credential ID of this passkey credential.
-     @discussion This field is used to identify the correct credential to use based on relying party request parameters.
-     */
-    @objc
-    public var credentialID: Data
-
-    
-    /** The user handle of this passkey credential.
-     @discussion This field is used to identify the correct credential to use based on relying party request parameters.
-     */
-    @objc
-    public var userHandle: Data
-
-    
-    /** Get the record identifier.
-     @result The record identifier.
-     @discussion You can utilize the record identifier to uniquely identify the credential identity in your local database.
-     */
-    @objc
-    public var recordIdentifier: String?
-
-    
-    /** Get or set the rank of the credential identity object.
-     @discussion The system may utilize the rank to decide which credential identity precedes the other
-     if two identities have the same service identifier. A credential identity with a larger rank value
-     precedes one with a smaller value if both credential identities have the same service identifier.
-     The default value of this property is 0.
-     */
-    @objc
-    public var rank: Int
-}
-
-@available(iOS 17.0, *)
-@objc(ASCredentialRequestCompat)
-public class ASCredentialRequestCompat : NSObject {
-
-    /** The type of credential used for this request.
-     */
-    @objc
-    public var type: ASCredentialRequestCompatType
-
-    
-    /** The credential identity selected by the user to authenticate.
-     */
-    @available(iOS 17.0, *)
-    var credentialIdentity: ASCredentialIdentity
-    
-    @available(iOS 17.0, *)
-    @objc
-    public var passwordCredentialIdentity: ASPasswordCredentialIdentity? {
-        guard type == .password, let password = credentialIdentity as? ASPasswordCredentialIdentity else {
-            return nil
-        }
-        return password
-    }
-    
-    @available(iOS 17.0, *)
-    @objc
-    public var passkeyCredentialIdentity: ASPasskeyCredentialIdentityCompat? {
-        guard type == .passkeyAssertion, let passkey = credentialIdentity as? ASPasskeyCredentialIdentity else {
-            return nil
-        }
-        return ASPasskeyCredentialIdentityCompat(relyingPartyIdentifier: passkey.relyingPartyIdentifier, userName: passkey.userName, credentialID: passkey.credentialID, userHandle: passkey.userHandle, recordIdentifier: passkey.recordIdentifier, rank: passkey.rank)
-    }
-    
-    @available(iOS 17.0, *)
-    init(type: ASCredentialRequestCompatType, credentialIdentity: ASCredentialIdentity) {
-        self.type = type
-        self.credentialIdentity = credentialIdentity
-    }
-}
-
-@objc(BaseASCredentialProviderViewController)
-open class BaseASCredentialProviderViewController : ASCredentialProviderViewController
-{
-    // MARK: iOS 17 new methods
-    
-    @available(iOS 17.0, *)
-    override final public func prepareInterfaceToProvideCredential(for credentialRequest: ASCredentialRequest) {
-        guard let compatDelegate = compatDelegate else {
-            return
-        }
-        compatDelegate.prepareInterfaceToProvideCredentialCompat(for: convertRequestToCompat(from: credentialRequest))
-    }
-    
-    @available(iOS 17.0, *)
-    override final public func provideCredentialWithoutUserInteraction(for credentialRequest: ASCredentialRequest) {
-        guard let compatDelegate = compatDelegate else {
-            return
-        }
-        compatDelegate.provideCredentialWithoutUserInteractionCompat(for: convertRequestToCompat(from: credentialRequest))
-    }
-    
-    @available(iOS 17.0, *)
-    override final public func prepareInterface(forPasskeyRegistration registrationRequest: ASCredentialRequest) {
-        guard let compatDelegate = compatDelegate else {
-            return
-        }
-        compatDelegate.prepareInterfaceCompat(forPasskeyRegistration: convertRequestToCompat(from: registrationRequest))
-    }
-    
-    // MARK: Compat
-    
-    var compatDelegate: ASCredentialProviderCompatDelegate? = nil;
-    
-    @objc
-    @available(iOS 17.0, *)
-    public func SetCompatDelegate(_ delegate: ASCredentialProviderCompatDelegate)
-    {
-        compatDelegate = delegate
-    }
-    
-    @available(iOS 17.0, *)
-    func convertRequestToCompat(from credentialRequest: ASCredentialRequest) -> ASCredentialRequestCompat {
-        return ASCredentialRequestCompat(
-            type: credentialRequest.type == .password ? .password : .passkeyAssertion,
-            credentialIdentity: credentialRequest.credentialIdentity)
-    }
-}
-
-@objc(ASCredentialProviderCompatDelegate)
-public protocol ASCredentialProviderCompatDelegate
-{
-    @available(iOS 17.0, *)
-    @objc
-    func prepareInterfaceToProvideCredentialCompat(for credentialRequest: ASCredentialRequestCompat)
-    
-    @available(iOS 17.0, *)
-    @objc
-    func provideCredentialWithoutUserInteractionCompat(for credentialRequest: ASCredentialRequestCompat)
-    
-    @available(iOS 17.0, *)
-    @objc
-    func prepareInterfaceCompat(forPasskeyRegistration registrationRequest: ASCredentialRequestCompat)
-}
-
-@objc(MyTest)
-public class MyTest : NSObject
-{
-    var a: String
-    
-    init(a: String) {
-        self.a = a
-    }
-}
--- a/lib/ios/iOS17CredentialProvider/iOS17CredentialProvider/iOS17CredentialProvider/iOS17CredentialProvider.docc/iOS17CredentialProvider.md
+++ b/lib/ios/iOS17CredentialProvider/iOS17CredentialProvider/iOS17CredentialProvider/iOS17CredentialProvider.docc/iOS17CredentialProvider.md
@@ -1,13 +0,0 @@
-# ``iOS17CredentialProvider``
-
-<!--@START_MENU_TOKEN@-->Summary<!--@END_MENU_TOKEN@-->
-
-## Overview
-
-<!--@START_MENU_TOKEN@-->Text<!--@END_MENU_TOKEN@-->
-
-## Topics
-
-### <!--@START_MENU_TOKEN@-->Group<!--@END_MENU_TOKEN@-->
-
- <!--@START_MENU_TOKEN@-->``Symbol``<!--@END_MENU_TOKEN@-->
--- a/lib/ios/iOS17CredentialProvider/iOS17CredentialProvider/iOS17CredentialProvider/iOS17CredentialProvider.h
+++ b/lib/ios/iOS17CredentialProvider/iOS17CredentialProvider/iOS17CredentialProvider/iOS17CredentialProvider.h
@@ -1,18 +0,0 @@
-//
-//  iOS17CredentialProvider.h
-//  iOS17CredentialProvider
-//
-//  Created by Federico Maccaroni on 29/06/2023.
-//
-
-#import <Foundation/Foundation.h>
-
-//! Project version number for iOS17CredentialProvider.
-FOUNDATION_EXPORT double iOS17CredentialProviderVersionNumber;
-
-//! Project version string for iOS17CredentialProvider.
-FOUNDATION_EXPORT const unsigned char iOS17CredentialProviderVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <iOS17CredentialProvider/PublicHeader.h>
-
-
--- a/src/Android/Android.csproj
+++ b/src/Android/Android.csproj
@@ -233,6 +233,18 @@
      <SubType></SubType>
      <Generator></Generator>
    </AndroidResource>
+    <AndroidResource Include="Resources\layout\validatable_input_dialog_layout.xml">
+      <SubType></SubType>
+      <Generator></Generator>
+    </AndroidResource>
+    <AndroidResource Include="Resources\drawable\empty_uris_placeholder.xml">
+      <SubType></SubType>
+      <Generator></Generator>
+    </AndroidResource>
+    <AndroidResource Include="Resources\drawable\empty_uris_placeholder_dark.xml">
+      <SubType></SubType>
+      <Generator></Generator>
+    </AndroidResource>
  </ItemGroup>
  <ItemGroup>
    <AndroidResource Include="Resources\drawable\splash_screen.xml" />
--- a/src/Android/Assets/bwi-font.ttf
+++ b/src/Android/Assets/bwi-font.ttf
--- a/src/Android/Properties/AndroidManifest.xml
+++ b/src/Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2023.5.1" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2023.7.1" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
 	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.NFC" />
--- a/src/Android/Renderers/CustomLabelRenderer.cs
+++ b/src/Android/Renderers/CustomLabelRenderer.cs
@@ -1,10 +1,10 @@
-using System;
-using Bit.App.Controls;
-using System.ComponentModel;
-using Xamarin.Forms.Platform.Android;
+using System.ComponentModel;
 using Android.Content;
-using Xamarin.Forms;
+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
@@ -15,6 +15,19 @@ namespace Bit.Droid.Renderers
            : base(context)
        { }

+        protected override void OnElementChanged(ElementChangedEventArgs<Label> e)
+        {
+            base.OnElementChanged(e);
+
+            if (Control != null && e.NewElement is CustomLabel label)
+            {
+                if (label.FontWeight.HasValue && Build.VERSION.SdkInt >= BuildVersionCodes.P)
+                {
+                    Control.Typeface = Android.Graphics.Typeface.Create(null, label.FontWeight.Value, false);
+                }
+            }
+        }
+
        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
        {
            var label = sender as CustomLabel;
@@ -28,4 +41,3 @@ namespace Bit.Droid.Renderers
        }
    }
 }
-
--- a/src/Android/Resources/drawable/empty_uris_placeholder.xml
+++ b/src/Android/Resources/drawable/empty_uris_placeholder.xml
@@ -0,0 +1,35 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="129"
+    android:viewportHeight="124"
+    android:width="129dp"
+    android:height="124dp">
+    <path
+        android:pathData="M126.8227 61.9441A59.6843 59.6843 0 0 1 7.4541 61.9441A59.6843 59.6843 0 0 1 126.8227 61.9441Z"
+        android:fillColor="#F0F0F0"
+        android:strokeColor="#89929F"
+        android:strokeWidth="3" />
+    <path
+        android:pathData="M21.6167 100.851C52.597 103.31 79.6937 80.3264 82.1391 49.5156C83.6205 30.8497 76.0789 14.8844 62.7275 3.63385"
+        android:strokeColor="#89929F"
+        android:strokeWidth="1.5"
+        android:strokeLineCap="round" />
+    <path
+        android:pathData="M14.5633 34.2845C12.2035 66.7711 38.5225 96.3429 72.6666 98.8232C74.2596 98.9389 78.629 98.9975 80.1951 99C84.6245 98.8232 97.8063 96.593 106.813 91.8485C113.439 88.3581 119.745 84.6984 124.644 79.1121"
+        android:strokeColor="#89929F"
+        android:strokeWidth="1.5"
+        android:strokeLineCap="round" />
+    <path
+        android:pathData="M124.502 48.5051C106.554 24.3817 68.8237 21.6709 41.4178 42.0617C24.8146 54.4149 14.7327 72.4183 13.9255 90.1427"
+        android:strokeColor="#89929F"
+        android:strokeWidth="1.5"
+        android:strokeLineCap="round" />
+    <path
+        android:pathData="M83.4034 28.3934A5 5 0 0 1 73.4034 28.3934A5 5 0 0 1 83.4034 28.3934Z"
+        android:fillColor="#89929F" />
+    <path
+        android:pathData="M24.7698 66.5518A5 5 0 0 1 14.7698 66.5518A5 5 0 0 1 24.7698 66.5518Z"
+        android:fillColor="#89929F" />
+    <path
+        android:pathData="M57.344 94.4726A5 5 0 0 1 47.344 94.4726A5 5 0 0 1 57.344 94.4726Z"
+        android:fillColor="#89929F" />
+</vector>
--- a/src/Android/Resources/drawable/empty_uris_placeholder_dark.xml
+++ b/src/Android/Resources/drawable/empty_uris_placeholder_dark.xml
@@ -0,0 +1,35 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="129"
+    android:viewportHeight="124"
+    android:width="129dp"
+    android:height="124dp">
+    <path
+        android:pathData="M126.8227 61.9441A59.6843 59.6843 0 0 1 7.4541 61.9441A59.6843 59.6843 0 0 1 126.8227 61.9441Z"
+        android:fillColor="@android:color/transparent"
+        android:strokeColor="#A3A3A3"
+        android:strokeWidth="3" />
+    <path
+        android:pathData="M21.6167 100.851C52.597 103.31 79.6937 80.3264 82.1391 49.5156C83.6205 30.8497 76.0789 14.8844 62.7275 3.63385"
+        android:strokeColor="#A3A3A3"
+        android:strokeWidth="1.5"
+        android:strokeLineCap="round" />
+    <path
+        android:pathData="M14.5633 34.2845C12.2035 66.7711 38.5225 96.3429 72.6666 98.8232C74.2596 98.9389 78.629 98.9975 80.1951 99C84.6245 98.8232 97.8063 96.593 106.813 91.8485C113.439 88.3581 119.745 84.6984 124.644 79.1121"
+        android:strokeColor="#A3A3A3"
+        android:strokeWidth="1.5"
+        android:strokeLineCap="round" />
+    <path
+        android:pathData="M124.502 48.5051C106.554 24.3817 68.8237 21.6709 41.4178 42.0617C24.8146 54.4149 14.7327 72.4183 13.9255 90.1427"
+        android:strokeColor="#A3A3A3"
+        android:strokeWidth="1.5"
+        android:strokeLineCap="round" />
+    <path
+        android:pathData="M83.4034 28.3934A5 5 0 0 1 73.4034 28.3934A5 5 0 0 1 83.4034 28.3934Z"
+        android:fillColor="#A3A3A3" />
+    <path
+        android:pathData="M24.7698 66.5518A5 5 0 0 1 14.7698 66.5518A5 5 0 0 1 24.7698 66.5518Z"
+        android:fillColor="#A3A3A3" />
+    <path
+        android:pathData="M57.344 94.4726A5 5 0 0 1 47.344 94.4726A5 5 0 0 1 57.344 94.4726Z"
+        android:fillColor="#A3A3A3" />
+</vector>
--- a/src/Android/Resources/layout/validatable_input_dialog_layout.xml
+++ b/src/Android/Resources/layout/validatable_input_dialog_layout.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingLeft="30dp"
+    android:paddingRight="30dp">
+    <TextView
+        android:id="@+id/lblHeader"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="@dimen/dialog_header_text_size"
+        android:layout_marginTop="5dp"
+        android:layout_marginBottom="-3dp"
+        android:labelFor="@+id/txtValue"/>
+    <EditText
+        android:id="@id/txtValue"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="@dimen/dialog_input_text_size"/>
+    <TextView
+        android:id="@+id/lblValueSubinfo"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="@dimen/dialog_sub_value_info_text_size"/>
+</LinearLayout>
+
--- a/src/Android/Resources/values/dimens.xml
+++ b/src/Android/Resources/values/dimens.xml
@@ -2,4 +2,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
  <dimen name="design_bottom_navigation_text_size" tools:override="true">15sp</dimen>
  <dimen name="design_bottom_navigation_active_text_size" tools:override="true">15sp</dimen>
+  <dimen name="dialog_input_text_size">16sp</dimen>
+  <dimen name="dialog_header_text_size">12sp</dimen>
+  <dimen name="dialog_sub_value_info_text_size">12sp</dimen>
 </resources>
--- a/src/Android/Services/DeviceActionService.cs
+++ b/src/Android/Services/DeviceActionService.cs
@@ -13,12 +13,13 @@ using Android.Views.InputMethods;
 using Android.Widget;
 using Bit.App.Abstractions;
 using Bit.App.Resources;
+using Bit.App.Utilities;
+using Bit.App.Utilities.Prompts;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
-using Bit.Core.Utilities;
 using Bit.Droid.Utilities;
 using Plugin.CurrentActivity;
-using static Bit.App.Pages.SettingsPageViewModel;
+using Xamarin.Forms.Platform.Android;

 namespace Bit.Droid.Services
 {
@@ -209,10 +210,7 @@ namespace Bit.Droid.Services
            }
            if (numericKeyboard)
            {
-                input.InputType = InputTypes.ClassNumber | InputTypes.NumberFlagDecimal | InputTypes.NumberFlagSigned;
-#pragma warning disable CS0618 // Type or member is obsolete
-                input.KeyListener = DigitsKeyListener.GetInstance(false, false);
-#pragma warning restore CS0618 // Type or member is obsolete
+                SetNumericKeyboardTo(input);
            }
            if (password)
            {
@@ -248,6 +246,83 @@ namespace Bit.Droid.Services
            return result.Task;
        }

+        public Task<ValidatablePromptResponse?> DisplayValidatablePromptAsync(ValidatablePromptConfig config)
+        {
+            var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
+            if (activity == null)
+            {
+                return Task.FromResult<ValidatablePromptResponse?>(null);
+            }
+
+            var alertBuilder = new AlertDialog.Builder(activity);
+            alertBuilder.SetTitle(config.Title);
+            var view = activity.LayoutInflater.Inflate(Resource.Layout.validatable_input_dialog_layout, null);
+            alertBuilder.SetView(view);
+            
+            var result = new TaskCompletionSource<ValidatablePromptResponse?>();
+
+            alertBuilder.SetOnCancelListener(new BasicDialogWithResultCancelListener(result));
+            alertBuilder.SetPositiveButton(config.OkButtonText ?? AppResources.Ok, listener: null);
+            alertBuilder.SetNegativeButton(config.CancelButtonText ?? AppResources.Cancel, (sender, args) => result.TrySetResult(null));
+            if (!string.IsNullOrEmpty(config.ThirdButtonText))
+            {
+                alertBuilder.SetNeutralButton(config.ThirdButtonText, (sender, args) => result.TrySetResult(new ValidatablePromptResponse(null, true)));
+            }
+
+            var alert = alertBuilder.Create();
+
+            var input = view.FindViewById<EditText>(Resource.Id.txtValue);
+            var lblHeader = view.FindViewById<TextView>(Resource.Id.lblHeader);
+            var lblValueSubinfo = view.FindViewById<TextView>(Resource.Id.lblValueSubinfo);
+
+            lblHeader.Text = config.Subtitle;
+            lblValueSubinfo.Text = config.ValueSubInfo;
+
+            var defaultSubInfoColor = lblValueSubinfo.TextColors;
+
+            input.InputType = InputTypes.ClassText;
+
+            if (config.NumericKeyboard)
+            {
+                SetNumericKeyboardTo(input);
+            }
+
+            input.ImeOptions = input.ImeOptions | (ImeAction)ImeFlags.NoPersonalizedLearning | (ImeAction)ImeFlags.NoExtractUi;
+            input.Text = config.Text ?? string.Empty;
+            input.SetSelection(config.Text?.Length ?? 0);
+            input.AfterTextChanged += (sender, args) =>
+            {
+                if (lblValueSubinfo.Text != config.ValueSubInfo)
+                {
+                    lblValueSubinfo.Text = config.ValueSubInfo;
+                    lblHeader.SetTextColor(defaultSubInfoColor);
+                    lblValueSubinfo.SetTextColor(defaultSubInfoColor);
+                }
+            };
+
+            alert.Window.SetSoftInputMode(SoftInput.StateVisible);
+            alert.Show();
+
+            var positiveButton = alert.GetButton((int)DialogButtonType.Positive);
+            positiveButton.Click += (sender, args) =>
+            {
+                var error = config.ValidateText(input.Text);
+                if (error != null)
+                {
+                    lblHeader.SetTextColor(ThemeManager.GetResourceColor("DangerColor").ToAndroid());
+                    lblValueSubinfo.SetTextColor(ThemeManager.GetResourceColor("DangerColor").ToAndroid());
+                    lblValueSubinfo.Text = error;
+                    lblValueSubinfo.SendAccessibilityEvent(Android.Views.Accessibility.EventTypes.ViewFocused);
+                    return;
+                }
+
+                result.TrySetResult(new ValidatablePromptResponse(input.Text, false));
+                alert.Dismiss();
+            };
+
+            return result.Task;
+        }
+
        public void RateApp()
        {
            var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
@@ -525,5 +600,29 @@ namespace Bit.Droid.Services
            // only used by iOS
            throw new NotImplementedException();
        }
+
+        private void SetNumericKeyboardTo(EditText editText)
+        {
+            editText.InputType = InputTypes.ClassNumber | InputTypes.NumberFlagDecimal | InputTypes.NumberFlagSigned;
+#pragma warning disable CS0618 // Type or member is obsolete
+            editText.KeyListener = DigitsKeyListener.GetInstance(false, false);
+#pragma warning restore CS0618 // Type or member is obsolete
+        }
+    }
+
+    class BasicDialogWithResultCancelListener : Java.Lang.Object, IDialogInterfaceOnCancelListener
+    {
+        private readonly TaskCompletionSource<ValidatablePromptResponse?> _taskCompletionSource;
+
+        public BasicDialogWithResultCancelListener(TaskCompletionSource<ValidatablePromptResponse?> taskCompletionSource)
+        {
+            _taskCompletionSource = taskCompletionSource;
+        }
+
+        public void OnCancel(IDialogInterface dialog)
+        {
+            _taskCompletionSource?.TrySetResult(null);
+            dialog?.Dismiss();
+        }
    }
 }
--- a/src/Android/Utilities/IntentExtensions.cs
+++ b/src/Android/Utilities/IntentExtensions.cs
@@ -1,5 +1,6 @@
 using Android.Content;
 using Android.OS;
+using Java.Lang;

 namespace Bit.Droid.Utilities
 {
@@ -13,7 +14,12 @@ namespace Bit.Droid.Utilities
                // Note: getting the bundle like this will cause to call unparcel() internally
                var b = intent?.Extras?.GetBundle("trashstringwhichhasnousebuttocheckunparcel");
            }
-            catch (BadParcelableException)
+            catch (Exception ex) when
+            (
+                ex is BadParcelableException ||
+                ex is ClassNotFoundException ||
+                ex is RuntimeException
+            )
            {
                intent.ReplaceExtras((Bundle)null);
            }
--- a/src/App/Abstractions/IDeviceActionService.cs
+++ b/src/App/Abstractions/IDeviceActionService.cs
@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using Bit.App.Utilities.Prompts;
 using Bit.Core.Enums;
 using Bit.Core.Models;

@@ -18,6 +19,7 @@ namespace Bit.App.Abstractions
        Task<string> DisplayPromptAync(string title = null, string description = null, string text = null,
            string okButtonText = null, string cancelButtonText = null, bool numericKeyboard = false,
            bool autofocus = true, bool password = false);
+        Task<ValidatablePromptResponse?> DisplayValidatablePromptAsync(ValidatablePromptConfig config);
        Task<string> DisplayAlertAsync(string title, string message, string cancel, params string[] buttons);
        Task<string> DisplayActionSheetAsync(string title, string cancel, string destruction, params string[] buttons);

--- a/src/App/App.csproj
+++ b/src/App/App.csproj
@@ -1,33 +1,28 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
  <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
    <RootNamespace>Bit.App</RootNamespace>
    <AssemblyName>BitwardenApp</AssemblyName>
    <Configurations>Debug;Release;FDroid</Configurations>
+    <TargetFrameworks>net7.0-android;net7.0-ios</TargetFrameworks>
+    <UseMaui>True</UseMaui>
+    <OutputType>Library</OutputType>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <SingleProject>true</SingleProject>
  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DebugType>pdbonly</DebugType>
-    <DebugSymbols>true</DebugSymbols>
-  </PropertyGroup>
-
  <ItemGroup>
    <PackageReference Include="Plugin.Fingerprint" Version="2.1.5" />
-    <PackageReference Include="SkiaSharp.Views.Forms" Version="2.88.3" />
-    <PackageReference Include="Xamarin.CommunityToolkit" Version="2.0.6" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.7.5" />
    <PackageReference Include="Xamarin.FFImageLoading.Forms" Version="2.4.11.982" />
-    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2578" />
    <PackageReference Include="ZXing.Net.Mobile" Version="2.4.1" />
    <PackageReference Include="ZXing.Net.Mobile.Forms" Version="2.4.1" />
    <PackageReference Include="MessagePack" Version="2.4.59" />
+    <PackageReference Include="SkiaSharp.Views.Maui.Core" Version="2.88.3" />
+    <PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="2.88.3" />
+    <PackageReference Include="SkiaSharp.Views.Maui.Controls.Compatibility" Version="2.88.3" />
+    <PackageReference Include="CommunityToolkit.Maui" Version="5.2.0" />
  </ItemGroup>
-
  <ItemGroup>
    <ProjectReference Include="..\Core\Core.csproj" />
  </ItemGroup>
-
  <ItemGroup>
    <Compile Update="Pages\Accounts\EnvironmentPage.xaml.cs">
      <DependentUpon>EnvironmentPage.xaml</DependentUpon>
@@ -130,7 +125,6 @@
      <DependentUpon>LoginPasswordlessRequestPage.xaml</DependentUpon>
    </Compile>
  </ItemGroup>
-
  <ItemGroup>
    <Folder Include="Resources\" />
    <Folder Include="Behaviors\" />
@@ -146,12 +140,11 @@
    <Folder Include="Controls\IconLabelButton\" />
    <Folder Include="Controls\PasswordStrengthProgressBar\" />
    <Folder Include="Utilities\Automation\" />
+    <Folder Include="Utilities\Prompts\" />
  </ItemGroup>
-
  <ItemGroup>
    <EmbeddedResource Remove="Pages\Accounts\AccountsPopupPage.xaml" />
  </ItemGroup>
-
  <ItemGroup>
    <Compile Update="Styles\Black.xaml.cs">
      <DependentUpon>Black.xaml</DependentUpon>
@@ -175,7 +168,6 @@
      <DependentUpon>Android.xaml</DependentUpon>
    </Compile>
  </ItemGroup>
-
  <ItemGroup>
    <Compile Update="Resources\AppResources.cs.Designer.cs">
      <DependentUpon>AppResources.cs.resx</DependentUpon>
@@ -313,7 +305,6 @@
      <AutoGen>True</AutoGen>
    </Compile>
  </ItemGroup>
-
  <ItemGroup>
    <EmbeddedResource Update="Resources\AppResources.cs.resx">
      <LastGenOutput>AppResources.cs.Designer.cs</LastGenOutput>
@@ -424,7 +415,6 @@
      <Generator>ResXFileCodeGenerator</Generator>
    </EmbeddedResource>
  </ItemGroup>
-
  <ItemGroup>
    <None Remove="Behaviors\" />
    <None Remove="Xamarin.CommunityToolkit" />
@@ -442,5 +432,6 @@
    <None Remove="MessagePack.MSBuild.Tasks" />
    <None Remove="Controls\PasswordStrengthProgressBar\" />
    <None Remove="Utilities\Automation\" />
+    <None Remove="Utilities\Prompts\" />
  </ItemGroup>
-</Project>
+</Project>
--- a/src/App/App.xaml
+++ b/src/App/App.xaml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Application xmlns="http://xamarin.com/schemas/2014/forms"
+<?xml version="1.0" encoding="utf-8" ?>
+<Application xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
             x:Class="Bit.App.App">
    <Application.Resources>
--- a/src/App/App.xaml.cs
+++ b/src/App/App.xaml.cs
@@ -15,8 +15,9 @@ using Bit.Core.Models.Data;
 using Bit.Core.Models.Response;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
-using Xamarin.Forms;
-using Xamarin.Forms.Xaml;
+using Microsoft.Maui.Controls.Xaml;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 [assembly: XamlCompilation(XamlCompilationOptions.Compile)]
 namespace Bit.App
@@ -93,6 +94,7 @@ namespace Bit.App
                    }
                    else if (message.Command == "resumed")
                    {
+                        // TODO Xamarin.Forms.Device.RuntimePlatform is no longer supported. Use Microsoft.Maui.Devices.DeviceInfo.Platform instead. For more details see https://learn.microsoft.com/en-us/dotnet/maui/migration/forms-projects#device-changes
                        if (Device.RuntimePlatform == Device.iOS)
                        {
                            ResumedAsync().FireAndForget();
@@ -100,6 +102,7 @@ namespace Bit.App
                    }
                    else if (message.Command == "slept")
                    {
+                        // TODO Xamarin.Forms.Device.RuntimePlatform is no longer supported. Use Microsoft.Maui.Devices.DeviceInfo.Platform instead. For more details see https://learn.microsoft.com/en-us/dotnet/maui/migration/forms-projects#device-changes
                        if (Device.RuntimePlatform == Device.iOS)
                        {
                            await SleptAsync();
@@ -121,7 +124,7 @@ namespace Bit.App
                            Options.OtpData = new OtpData((string)message.Data);
                        }

-                        await Device.InvokeOnMainThreadAsync(async () =>
+                        Device.InvokeOnMainThreadAsync(async () =>
                        {
                            if (Current.MainPage is TabsPage tabsPage)
                            {
@@ -293,6 +296,7 @@ namespace Bit.App
            {
                _messagingService.Send(Constants.PasswordlessLoginRequestKey);
            }
+            // TODO Xamarin.Forms.Device.RuntimePlatform is no longer supported. Use Microsoft.Maui.Devices.DeviceInfo.Platform instead. For more details see https://learn.microsoft.com/en-us/dotnet/maui/migration/forms-projects#device-changes
            if (Device.RuntimePlatform == Device.Android)
            {
                await _vaultTimeoutService.CheckVaultTimeoutAsync();
@@ -308,6 +312,7 @@ namespace Bit.App
        {
            System.Diagnostics.Debug.WriteLine("XF App: OnSleep");
            _isResumed = false;
+            // TODO Xamarin.Forms.Device.RuntimePlatform is no longer supported. Use Microsoft.Maui.Devices.DeviceInfo.Platform instead. For more details see https://learn.microsoft.com/en-us/dotnet/maui/migration/forms-projects#device-changes
            if (Device.RuntimePlatform == Device.Android)
            {
                var isLocked = await _vaultTimeoutService.IsLockedAsync();
@@ -331,6 +336,7 @@ namespace Bit.App
            {
                _messagingService.Send(Constants.PasswordlessLoginRequestKey);
            }
+            // TODO Xamarin.Forms.Device.RuntimePlatform is no longer supported. Use Microsoft.Maui.Devices.DeviceInfo.Platform instead. For more details see https://learn.microsoft.com/en-us/dotnet/maui/migration/forms-projects#device-changes
            if (Device.RuntimePlatform == Device.Android)
            {
                ResumedAsync().FireAndForget();
@@ -396,6 +402,7 @@ namespace Bit.App

        private void ClearAutofillUri()
        {
+            // TODO Xamarin.Forms.Device.RuntimePlatform is no longer supported. Use Microsoft.Maui.Devices.DeviceInfo.Platform instead. For more details see https://learn.microsoft.com/en-us/dotnet/maui/migration/forms-projects#device-changes
            if (Device.RuntimePlatform == Device.Android && !string.IsNullOrWhiteSpace(Options.Uri))
            {
                Options.Uri = null;
@@ -404,6 +411,7 @@ namespace Bit.App

        private bool SetTabsPageFromAutofill(bool isLocked)
        {
+            // TODO Xamarin.Forms.Device.RuntimePlatform is no longer supported. Use Microsoft.Maui.Devices.DeviceInfo.Platform instead. For more details see https://learn.microsoft.com/en-us/dotnet/maui/migration/forms-projects#device-changes
            if (Device.RuntimePlatform == Device.Android && !string.IsNullOrWhiteSpace(Options.Uri) &&
                !Options.FromAutofillFramework)
            {
@@ -452,7 +460,7 @@ namespace Bit.App

        private void SyncIfNeeded()
        {
-            if (Xamarin.Essentials.Connectivity.NetworkAccess == Xamarin.Essentials.NetworkAccess.None)
+            if (Microsoft.Maui.Networking.Connectivity.NetworkAccess == Microsoft.Maui.Networking.NetworkAccess.None)
            {
                return;
            }
--- a/src/App/Behaviors/EditorPreventAutoBottomScrollingOnFocusedBehavior.cs
+++ b/src/App/Behaviors/EditorPreventAutoBottomScrollingOnFocusedBehavior.cs
@@ -1,5 +1,5 @@
-using Xamarin.Essentials;
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Behaviors
 {
--- a/src/App/Controls/AccountSwitchingOverlay/AccountSwitchingOverlayView.xaml
+++ b/src/App/Controls/AccountSwitchingOverlay/AccountSwitchingOverlayView.xaml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <ContentView
-    xmlns="http://xamarin.com/schemas/2014/forms"
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
+    xmlns:xct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
    xmlns:controls="clr-namespace:Bit.App.Controls"
    xmlns:effects="clr-namespace:Bit.App.Effects"
    xmlns:view="clr-namespace:Bit.Core.Models.View;assembly=BitwardenCore"
--- a/src/App/Controls/AccountSwitchingOverlay/AccountSwitchingOverlayView.xaml.cs
+++ b/src/App/Controls/AccountSwitchingOverlay/AccountSwitchingOverlayView.xaml.cs
@@ -4,7 +4,8 @@ using System.Windows.Input;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Controls
 {
@@ -61,7 +62,8 @@ namespace Bit.App.Controls

        public ICommand LongPressAccountCommand { get; }

-        public int AccountListRowHeight => Device.RuntimePlatform == Device.Android ? 74 : 70;
+        public int AccountListRowHeight => // TODO Xamarin.Forms.Device.RuntimePlatform is no longer supported. Use Microsoft.Maui.Devices.DeviceInfo.Platform instead. For more details see https://learn.microsoft.com/en-us/dotnet/maui/migration/forms-projects#device-changes
+Device.RuntimePlatform == Device.Android ? 74 : 70;

        public bool LongPressAccountEnabled { get; set; } = true;

--- a/src/App/Controls/AccountSwitchingOverlay/AccountSwitchingOverlayViewModel.cs
+++ b/src/App/Controls/AccountSwitchingOverlay/AccountSwitchingOverlayViewModel.cs
@@ -7,7 +7,8 @@ using Bit.Core.Abstractions;
 using Bit.Core.Models.View;
 using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Controls
 {
--- a/src/App/Controls/AccountViewCell/AccountViewCell.xaml
+++ b/src/App/Controls/AccountViewCell/AccountViewCell.xaml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ViewCell xmlns="http://xamarin.com/schemas/2014/forms"
+<?xml version="1.0" encoding="UTF-8"?>
+<ViewCell xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
          xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-          xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
+          xmlns:xct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
          x:Class="Bit.App.Controls.AccountViewCell"
          xmlns:controls="clr-namespace:Bit.App.Controls"
          xmlns:u="clr-namespace:Bit.App.Utilities"
--- a/src/App/Controls/AccountViewCell/AccountViewCell.xaml.cs
+++ b/src/App/Controls/AccountViewCell/AccountViewCell.xaml.cs
@@ -1,6 +1,7 @@
 using System.Windows.Input;
 using Bit.Core.Models.View;
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Controls
 {
--- a/src/App/Controls/AuthenticatorViewCell/AuthenticatorViewCell.xaml
+++ b/src/App/Controls/AuthenticatorViewCell/AuthenticatorViewCell.xaml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<controls:ExtendedGrid xmlns="http://xamarin.com/schemas/2014/forms"
+<controls:ExtendedGrid xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
                       xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
                       x:Class="Bit.App.Controls.AuthenticatorViewCell"
                       xmlns:controls="clr-namespace:Bit.App.Controls"
--- a/src/App/Controls/AuthenticatorViewCell/AuthenticatorViewCell.xaml.cs
+++ b/src/App/Controls/AuthenticatorViewCell/AuthenticatorViewCell.xaml.cs
@@ -3,7 +3,8 @@ using Bit.App.Pages;
 using Bit.App.Utilities;
 using Bit.Core.Models.View;
 using Bit.Core.Utilities;
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Controls
 {
--- a/src/App/Controls/AvatarImageSource.cs
+++ b/src/App/Controls/AvatarImageSource.cs
@@ -5,7 +5,8 @@ using System.Threading;
 using System.Threading.Tasks;
 using Bit.Core.Utilities;
 using SkiaSharp;
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Controls
 {
@@ -160,7 +161,7 @@ namespace Bit.App.Controls
        {
            if (str == null)
            {
-                return Color.FromHex("#33ffffff");
+                return Color.FromArgb("#33ffffff");
            }
            var hash = 0;
            for (var i = 0; i < str.Length; i++)
@@ -174,7 +175,7 @@ namespace Bit.App.Controls
                var base16 = "00" + Convert.ToString(value, 16);
                color += base16.Substring(base16.Length - 2);
            }
-            return Color.FromHex(color);
+            return Color.FromArgb(color);
        }
    }
 }
--- a/src/App/Controls/CipherViewCell/CipherViewCell.xaml
+++ b/src/App/Controls/CipherViewCell/CipherViewCell.xaml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<controls:ExtendedGrid xmlns="http://xamarin.com/schemas/2014/forms"
+<?xml version="1.0" encoding="UTF-8"?>
+<controls:ExtendedGrid xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
    x:Class="Bit.App.Controls.CipherViewCell"
    xmlns:controls="clr-namespace:Bit.App.Controls"
--- a/src/App/Controls/CipherViewCell/CipherViewCell.xaml.cs
+++ b/src/App/Controls/CipherViewCell/CipherViewCell.xaml.cs
@@ -3,7 +3,8 @@ using System.Windows.Input;
 using Bit.App.Abstractions;
 using Bit.Core.Models.View;
 using Bit.Core.Utilities;
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Controls
 {
--- a/src/App/Controls/CipherViewCell/CipherViewCellViewModel.cs
+++ b/src/App/Controls/CipherViewCell/CipherViewCellViewModel.cs
@@ -31,7 +31,7 @@ namespace Bit.App.Controls
        public bool ShowIconImage
        {
            get => WebsiteIconsEnabled
-                && !string.IsNullOrWhiteSpace(Cipher.Login?.Uri)
+                && !string.IsNullOrWhiteSpace(Cipher.LaunchUri)
                && IconImageSource != null;
        }

@@ -41,7 +41,7 @@ namespace Bit.App.Controls
            {
                if (_iconImageSource == string.Empty) // default value since icon source can return null
                {
-                    _iconImageSource = IconImageHelper.GetLoginIconImage(Cipher);
+                    _iconImageSource = IconImageHelper.GetIconImage(Cipher);
                }
                return _iconImageSource;
            }
--- a/src/App/Controls/CircularProgressbarView.cs
+++ b/src/App/Controls/CircularProgressbarView.cs
@@ -1,9 +1,11 @@
 using System;
 using System.Runtime.CompilerServices;
 using SkiaSharp;
-using SkiaSharp.Views.Forms;
-using Xamarin.Essentials;
-using Xamarin.Forms;
+using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;
+using SkiaSharp.Views.Maui.Controls;
+using SkiaSharp.Views.Maui;

 namespace Bit.App.Controls
 {
@@ -21,13 +23,13 @@ namespace Bit.App.Controls
            nameof(StrokeWidth), typeof(float), typeof(CircularProgressbarView), 3f);

        public static readonly BindableProperty ProgressColorProperty = BindableProperty.Create(
-            nameof(ProgressColor), typeof(Color), typeof(CircularProgressbarView), Color.FromHex("175DDC"));
+            nameof(ProgressColor), typeof(Color), typeof(CircularProgressbarView), Color.FromArgb("175DDC"));

        public static readonly BindableProperty EndingProgressColorProperty = BindableProperty.Create(
-            nameof(EndingProgressColor), typeof(Color), typeof(CircularProgressbarView), Color.FromHex("dd4b39"));
+            nameof(EndingProgressColor), typeof(Color), typeof(CircularProgressbarView), Color.FromArgb("dd4b39"));

        public static readonly BindableProperty BackgroundProgressColorProperty = BindableProperty.Create(
-            nameof(BackgroundProgressColor), typeof(Color), typeof(CircularProgressbarView), Color.White);
+            nameof(BackgroundProgressColor), typeof(Color), typeof(CircularProgressbarView), Colors.White);

        public double Progress
        {
--- a/src/App/Controls/CustomLabel.cs
+++ b/src/App/Controls/CustomLabel.cs
@@ -1,5 +1,5 @@
-using System;
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Controls
 {
@@ -8,6 +8,7 @@ namespace Bit.App.Controls
        public CustomLabel()
        {
        }
+
+        public int? FontWeight { get; set; }
    }
 }
-
--- a/src/App/Controls/DateTime/DateTimePicker.xaml
+++ b/src/App/Controls/DateTime/DateTimePicker.xaml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <Grid
-    xmlns="http://xamarin.com/schemas/2014/forms"
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
    xmlns:controls="clr-namespace:Bit.App.Controls"
    x:Class="Bit.App.Controls.DateTimePicker"
--- a/src/App/Controls/DateTime/DateTimePicker.xaml.cs
+++ b/src/App/Controls/DateTime/DateTimePicker.xaml.cs
@@ -1,6 +1,12 @@
 using System.Runtime.CompilerServices;
-using Xamarin.CommunityToolkit.UI.Views;
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;
+using CommunityToolkit.Maui.Converters;
+using CommunityToolkit.Maui.ImageSources;
+using CommunityToolkit.Maui;
+using CommunityToolkit.Maui.Core;
+using CommunityToolkit.Maui.Layouts;
+using CommunityToolkit.Maui.Views;

 namespace Bit.App.Controls
 {
--- a/src/App/Controls/ExtendedCollectionView.cs
+++ b/src/App/Controls/ExtendedCollectionView.cs
@@ -1,6 +1,7 @@
 using System.Linq;
-using Xamarin.CommunityToolkit.Converters;
-using Xamarin.Forms;
+using CommunityToolkit.Maui.Converters;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Controls
 {
--- a/src/App/Controls/ExtendedDatePicker.cs
+++ b/src/App/Controls/ExtendedDatePicker.cs
@@ -1,5 +1,6 @@
 using System;
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Controls
 {
--- a/src/App/Controls/ExtendedGrid.cs
+++ b/src/App/Controls/ExtendedGrid.cs
@@ -1,4 +1,5 @@
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Controls
 {
--- a/src/App/Controls/ExtendedSearchBar.cs
+++ b/src/App/Controls/ExtendedSearchBar.cs
@@ -1,5 +1,7 @@
 using Bit.App.Utilities;
-using Xamarin.Forms;
+using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Controls
 {
@@ -7,6 +9,7 @@ namespace Bit.App.Controls
    {
        public ExtendedSearchBar()
        {
+            // TODO Xamarin.Forms.Device.RuntimePlatform is no longer supported. Use Microsoft.Maui.Devices.DeviceInfo.Platform instead. For more details see https://learn.microsoft.com/en-us/dotnet/maui/migration/forms-projects#device-changes
            if (Device.RuntimePlatform == Device.iOS)
            {
                if (ThemeManager.UsingLightTheme)
--- a/src/App/Controls/ExtendedSlider.cs
+++ b/src/App/Controls/ExtendedSlider.cs
@@ -1,11 +1,12 @@
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Controls
 {
    public class ExtendedSlider : Slider
    {
        public static readonly BindableProperty ThumbBorderColorProperty = BindableProperty.Create(
-            nameof(ThumbBorderColor), typeof(Color), typeof(ExtendedSlider), Color.FromHex("b5b5b5"));
+            nameof(ThumbBorderColor), typeof(Color), typeof(ExtendedSlider), Color.FromArgb("b5b5b5"));

        public Color ThumbBorderColor
        {
--- a/src/App/Controls/ExtendedStackLayout.cs
+++ b/src/App/Controls/ExtendedStackLayout.cs
@@ -1,4 +1,5 @@
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Controls
 {
--- a/src/App/Controls/ExtendedStepper.cs
+++ b/src/App/Controls/ExtendedStepper.cs
@@ -1,14 +1,16 @@
-using Xamarin.Forms;
+using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Controls
 {
    public class ExtendedStepper : Stepper
    {
        public static readonly BindableProperty StepperBackgroundColorProperty = BindableProperty.Create(
-            nameof(StepperBackgroundColor), typeof(Color), typeof(ExtendedStepper), Color.White);
+            nameof(StepperBackgroundColor), typeof(Color), typeof(ExtendedStepper), Colors.White);

        public static readonly BindableProperty StepperForegroundColorProperty = BindableProperty.Create(
-            nameof(StepperForegroundColor), typeof(Color), typeof(ExtendedStepper), Color.Black);
+            nameof(StepperForegroundColor), typeof(Color), typeof(ExtendedStepper), Colors.Black);

        public Color StepperBackgroundColor
        {
--- a/src/App/Controls/ExtendedTimePicker.cs
+++ b/src/App/Controls/ExtendedTimePicker.cs
@@ -1,5 +1,6 @@
 using System;
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Controls
 {
--- a/src/App/Controls/ExtendedToolbarItem.cs
+++ b/src/App/Controls/ExtendedToolbarItem.cs
@@ -1,5 +1,6 @@
 using System;
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Controls
 {
--- a/src/App/Controls/HybridWebView.cs
+++ b/src/App/Controls/HybridWebView.cs
@@ -1,5 +1,6 @@
 using System;
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Controls
 {
--- a/src/App/Controls/IconButton.cs
+++ b/src/App/Controls/IconButton.cs
@@ -1,5 +1,6 @@
 using Bit.App.Effects;
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Controls
 {
@@ -8,6 +9,7 @@ namespace Bit.App.Controls
        public IconButton()
        {
            Padding = 0;
+            // TODO Xamarin.Forms.Device.RuntimePlatform is no longer supported. Use Microsoft.Maui.Devices.DeviceInfo.Platform instead. For more details see https://learn.microsoft.com/en-us/dotnet/maui/migration/forms-projects#device-changes
            switch (Device.RuntimePlatform)
            {
                case Device.iOS:
--- a/src/App/Controls/IconLabel.cs
+++ b/src/App/Controls/IconLabel.cs
@@ -1,5 +1,6 @@
 using Bit.App.Effects;
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Controls
 {
@@ -9,6 +10,7 @@ namespace Bit.App.Controls

        public IconLabel()
        {
+            // TODO Xamarin.Forms.Device.RuntimePlatform is no longer supported. Use Microsoft.Maui.Devices.DeviceInfo.Platform instead. For more details see https://learn.microsoft.com/en-us/dotnet/maui/migration/forms-projects#device-changes
            switch (Device.RuntimePlatform)
            {
                case Device.iOS:
--- a/src/App/Controls/IconLabelButton/IconLabelButton.xaml
+++ b/src/App/Controls/IconLabelButton/IconLabelButton.xaml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Frame xmlns="http://xamarin.com/schemas/2014/forms" 
+<?xml version="1.0" encoding="UTF-8"?>
+<Frame xmlns="http://schemas.microsoft.com/dotnet/2021/maui" 
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
    x:Class="Bit.App.Controls.IconLabelButton"
    xmlns:controls="clr-namespace:Bit.App.Controls"
--- a/src/App/Controls/IconLabelButton/IconLabelButton.xaml.cs
+++ b/src/App/Controls/IconLabelButton/IconLabelButton.xaml.cs
@@ -5,8 +5,10 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Input;
 using Bit.Core.Models.Domain;
-using Xamarin.Forms;
-using Xamarin.Forms.Xaml;
+using Microsoft.Maui.Controls.Xaml;
+using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Controls
 {
@@ -22,13 +24,13 @@ namespace Bit.App.Controls
            nameof(ButtonCommand), typeof(ICommand), typeof(IconLabelButton));

        public static readonly BindableProperty IconLabelColorProperty = BindableProperty.Create(
-            nameof(IconLabelColor), typeof(Color), typeof(IconLabelButton), Color.White);
+            nameof(IconLabelColor), typeof(Color), typeof(IconLabelButton), Colors.White);

        public static readonly BindableProperty IconLabelBackgroundColorProperty = BindableProperty.Create(
-            nameof(IconLabelBackgroundColor), typeof(Color), typeof(IconLabelButton), Color.White);
+            nameof(IconLabelBackgroundColor), typeof(Color), typeof(IconLabelButton), Colors.White);

        public static readonly BindableProperty IconLabelBorderColorProperty = BindableProperty.Create(
-            nameof(IconLabelBorderColor), typeof(Color), typeof(IconLabelButton), Color.White);
+            nameof(IconLabelBorderColor), typeof(Color), typeof(IconLabelButton), Colors.White);

        public IconLabelButton()
        {
--- a/src/App/Controls/MiButton.cs
+++ b/src/App/Controls/MiButton.cs
@@ -1,4 +1,5 @@
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Controls
 {
@@ -7,6 +8,7 @@ namespace Bit.App.Controls
        public MiButton()
        {
            Padding = 0;
+            // TODO Xamarin.Forms.Device.RuntimePlatform is no longer supported. Use Microsoft.Maui.Devices.DeviceInfo.Platform instead. For more details see https://learn.microsoft.com/en-us/dotnet/maui/migration/forms-projects#device-changes
            switch (Device.RuntimePlatform)
            {
                case Device.iOS:
--- a/src/App/Controls/MiLabel.cs
+++ b/src/App/Controls/MiLabel.cs
@@ -1,4 +1,5 @@
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Controls
 {
@@ -6,6 +7,7 @@ namespace Bit.App.Controls
    {
        public MiLabel()
        {
+            // TODO Xamarin.Forms.Device.RuntimePlatform is no longer supported. Use Microsoft.Maui.Devices.DeviceInfo.Platform instead. For more details see https://learn.microsoft.com/en-us/dotnet/maui/migration/forms-projects#device-changes
            switch (Device.RuntimePlatform)
            {
                case Device.iOS:
--- a/src/App/Controls/MonoEntry.cs
+++ b/src/App/Controls/MonoEntry.cs
@@ -1,4 +1,5 @@
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Controls
 {
@@ -6,6 +7,7 @@ namespace Bit.App.Controls
    {
        public MonoEntry()
        {
+            // TODO Xamarin.Forms.Device.RuntimePlatform is no longer supported. Use Microsoft.Maui.Devices.DeviceInfo.Platform instead. For more details see https://learn.microsoft.com/en-us/dotnet/maui/migration/forms-projects#device-changes
            switch (Device.RuntimePlatform)
            {
                case Device.iOS:
--- a/src/App/Controls/MonoLabel.cs
+++ b/src/App/Controls/MonoLabel.cs
@@ -1,4 +1,5 @@
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Controls
 {
@@ -6,6 +7,7 @@ namespace Bit.App.Controls
    {
        public MonoLabel()
        {
+            // TODO Xamarin.Forms.Device.RuntimePlatform is no longer supported. Use Microsoft.Maui.Devices.DeviceInfo.Platform instead. For more details see https://learn.microsoft.com/en-us/dotnet/maui/migration/forms-projects#device-changes
            switch (Device.RuntimePlatform)
            {
                case Device.iOS:
--- a/src/App/Controls/PasswordStrengthProgressBar/PasswordStrengthProgressBar.xaml
+++ b/src/App/Controls/PasswordStrengthProgressBar/PasswordStrengthProgressBar.xaml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <StackLayout
-    xmlns="http://xamarin.com/schemas/2014/forms"
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
    xmlns:controls="clr-namespace:Bit.App.Controls"
    xmlns:u="clr-namespace:Bit.App.Utilities"
--- a/src/App/Controls/PasswordStrengthProgressBar/PasswordStrengthProgressBar.xaml.cs
+++ b/src/App/Controls/PasswordStrengthProgressBar/PasswordStrengthProgressBar.xaml.cs
@@ -1,5 +1,7 @@
 using System;
-using Xamarin.Forms;
+using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Controls
 {
@@ -100,7 +102,7 @@ namespace Bit.App.Controls
                case Controls.PasswordStrengthLevel.Strong:
                    return StrongColor;
                default:
-                    return Color.Transparent;
+                    return Colors.Transparent;
            }
        }
    }
--- a/src/App/Controls/PasswordStrengthProgressBar/PasswordStrengthViewModel.cs
+++ b/src/App/Controls/PasswordStrengthProgressBar/PasswordStrengthViewModel.cs
@@ -1,7 +1,8 @@
 using System.Collections.Generic;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Controls
 {
--- a/src/App/Controls/RepeaterView.cs
+++ b/src/App/Controls/RepeaterView.cs
@@ -1,7 +1,8 @@
 using System;
 using System.Collections;
 using System.Collections.Specialized;
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Controls
 {
--- a/src/App/Controls/SelectableLabel.cs
+++ b/src/App/Controls/SelectableLabel.cs
@@ -1,5 +1,6 @@
 using System;
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Controls
 {
--- a/src/App/Controls/SendViewCell/SendViewCell.xaml
+++ b/src/App/Controls/SendViewCell/SendViewCell.xaml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<controls:ExtendedGrid xmlns="http://xamarin.com/schemas/2014/forms"
+<?xml version="1.0" encoding="UTF-8"?>
+<controls:ExtendedGrid xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
    x:Class="Bit.App.Controls.SendViewCell"
    xmlns:controls="clr-namespace:Bit.App.Controls"
--- a/src/App/Controls/SendViewCell/SendViewCell.xaml.cs
+++ b/src/App/Controls/SendViewCell/SendViewCell.xaml.cs
@@ -2,7 +2,8 @@
 using Bit.App.Abstractions;
 using Bit.Core.Models.View;
 using Bit.Core.Utilities;
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Controls
 {
--- a/src/App/Effects/FabShadowEffect.cs
+++ b/src/App/Effects/FabShadowEffect.cs
@@ -1,4 +1,5 @@
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Effects
 {
--- a/src/App/Effects/FixedSizeEffect.cs
+++ b/src/App/Effects/FixedSizeEffect.cs
@@ -1,4 +1,5 @@
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Effects
 {
--- a/src/App/Effects/NoEmojiKeyboardEffect.cs
+++ b/src/App/Effects/NoEmojiKeyboardEffect.cs
@@ -1,5 +1,6 @@
 using System;
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Effects
 {
--- a/src/App/Effects/RemoveFontPaddingEffect.cs
+++ b/src/App/Effects/RemoveFontPaddingEffect.cs
@@ -1,5 +1,6 @@
 using System;
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Effects
 {
--- a/src/App/Effects/ScrollEnabledEffect.cs
+++ b/src/App/Effects/ScrollEnabledEffect.cs
@@ -1,4 +1,5 @@
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Effects
 {
--- a/src/App/Effects/ScrollViewContentInsetAdjustmentBehaviorEffect.cs
+++ b/src/App/Effects/ScrollViewContentInsetAdjustmentBehaviorEffect.cs
@@ -1,4 +1,5 @@
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Effects
 {
--- a/src/App/Effects/TabBarEffect.cs
+++ b/src/App/Effects/TabBarEffect.cs
@@ -1,4 +1,5 @@
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Effects
 {
--- a/src/App/Lists/DataTemplateSelectors/CustomFieldItemTemplateSelector.cs
+++ b/src/App/Lists/DataTemplateSelectors/CustomFieldItemTemplateSelector.cs
@@ -1,5 +1,6 @@
 using Bit.App.Lists.ItemViewModels.CustomFields;
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Lists.DataTemplateSelectors
 {
--- a/src/App/Lists/ItemLayouts/CustomFields/BooleanCustomFieldItemLayout.xaml
+++ b/src/App/Lists/ItemLayouts/CustomFields/BooleanCustomFieldItemLayout.xaml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <StackLayout
-    xmlns="http://xamarin.com/schemas/2014/forms"
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
    x:Class="Bit.App.Lists.ItemLayouts.CustomFields.BooleanCustomFieldItemLayout"
    xmlns:u="clr-namespace:Bit.App.Utilities"
--- a/src/App/Lists/ItemLayouts/CustomFields/BooleanCustomFieldItemLayout.xaml.cs
+++ b/src/App/Lists/ItemLayouts/CustomFields/BooleanCustomFieldItemLayout.xaml.cs
@@ -1,4 +1,5 @@
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Lists.ItemLayouts.CustomFields
 {
--- a/src/App/Lists/ItemLayouts/CustomFields/HiddenCustomFieldItemLayout.xaml
+++ b/src/App/Lists/ItemLayouts/CustomFields/HiddenCustomFieldItemLayout.xaml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<StackLayout xmlns="http://xamarin.com/schemas/2014/forms" 
+<?xml version="1.0" encoding="UTF-8"?>
+<StackLayout xmlns="http://schemas.microsoft.com/dotnet/2021/maui" 
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
    x:Class="Bit.App.Lists.ItemLayouts.CustomFields.HiddenCustomFieldItemLayout"
    xmlns:controls="clr-namespace:Bit.App.Controls"
--- a/src/App/Lists/ItemLayouts/CustomFields/HiddenCustomFieldItemLayout.xaml.cs
+++ b/src/App/Lists/ItemLayouts/CustomFields/HiddenCustomFieldItemLayout.xaml.cs
@@ -1,4 +1,5 @@
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Lists.ItemLayouts.CustomFields
 {
--- a/src/App/Lists/ItemLayouts/CustomFields/LinkedCustomFieldItemLayout.xaml
+++ b/src/App/Lists/ItemLayouts/CustomFields/LinkedCustomFieldItemLayout.xaml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<StackLayout xmlns="http://xamarin.com/schemas/2014/forms" 
+<?xml version="1.0" encoding="UTF-8"?>
+<StackLayout xmlns="http://schemas.microsoft.com/dotnet/2021/maui" 
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
    x:Class="Bit.App.Lists.ItemLayouts.CustomFields.LinkedCustomFieldItemLayout"
    xmlns:controls="clr-namespace:Bit.App.Controls"
--- a/src/App/Lists/ItemLayouts/CustomFields/LinkedCustomFieldItemLayout.xaml.cs
+++ b/src/App/Lists/ItemLayouts/CustomFields/LinkedCustomFieldItemLayout.xaml.cs
@@ -1,4 +1,5 @@
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Lists.ItemLayouts.CustomFields
 {
--- a/src/App/Lists/ItemLayouts/CustomFields/TextCustomFieldItemLayout.xaml
+++ b/src/App/Lists/ItemLayouts/CustomFields/TextCustomFieldItemLayout.xaml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<StackLayout xmlns="http://xamarin.com/schemas/2014/forms" 
+<?xml version="1.0" encoding="UTF-8"?>
+<StackLayout xmlns="http://schemas.microsoft.com/dotnet/2021/maui" 
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
    x:Class="Bit.App.Lists.ItemLayouts.CustomFields.TextCustomFieldItemLayout"
    xmlns:controls="clr-namespace:Bit.App.Controls"
--- a/src/App/Lists/ItemLayouts/CustomFields/TextCustomFieldItemLayout.xaml.cs
+++ b/src/App/Lists/ItemLayouts/CustomFields/TextCustomFieldItemLayout.xaml.cs
@@ -1,4 +1,5 @@
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Lists.ItemLayouts.CustomFields
 {
--- a/src/App/Lists/ItemViewModels/CustomFields/BaseCustomFieldItemViewModel.cs
+++ b/src/App/Lists/ItemViewModels/CustomFields/BaseCustomFieldItemViewModel.cs
@@ -1,7 +1,8 @@
 using System.Windows.Input;
 using Bit.Core.Models.View;
 using Bit.Core.Utilities;
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Lists.ItemViewModels.CustomFields
 {
--- a/src/App/Lists/ItemViewModels/CustomFields/HiddenCustomFieldItemViewModel.cs
+++ b/src/App/Lists/ItemViewModels/CustomFields/HiddenCustomFieldItemViewModel.cs
@@ -5,7 +5,8 @@ using Bit.App.Utilities;
 using Bit.Core.Abstractions;
 using Bit.Core.Models.View;
 using Xamarin.CommunityToolkit.ObjectModel;
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Lists.ItemViewModels.CustomFields
 {
--- a/src/App/Lists/ItemViewModels/CustomFields/TextCustomFieldItemViewModel.cs
+++ b/src/App/Lists/ItemViewModels/CustomFields/TextCustomFieldItemViewModel.cs
@@ -1,6 +1,7 @@
 using System.Windows.Input;
 using Bit.Core.Models.View;
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Lists.ItemViewModels.CustomFields
 {
--- a/src/App/Pages/Accounts/BaseChangePasswordViewModel.cs
+++ b/src/App/Pages/Accounts/BaseChangePasswordViewModel.cs
@@ -6,7 +6,6 @@ using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Models.Domain;
 using Bit.Core.Utilities;
-using Xamarin.Essentials;

 namespace Bit.App.Pages
 {
--- a/src/App/Pages/Accounts/DeleteAccountPage.xaml
+++ b/src/App/Pages/Accounts/DeleteAccountPage.xaml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <pages:BaseContentPage
-    xmlns="http://xamarin.com/schemas/2014/forms"
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
    x:Class="Bit.App.Pages.Accounts.DeleteAccountPage"
    xmlns:pages="clr-namespace:Bit.App.Pages"
--- a/src/App/Pages/Accounts/DeleteAccountPage.xaml.cs
+++ b/src/App/Pages/Accounts/DeleteAccountPage.xaml.cs
@@ -1,5 +1,6 @@
 using System;
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Pages.Accounts
 {
--- a/src/App/Pages/Accounts/DeleteAccountViewModel.cs
+++ b/src/App/Pages/Accounts/DeleteAccountViewModel.cs
@@ -27,7 +27,7 @@ namespace Bit.App.Pages
        {
            try
            {
-                if (Xamarin.Essentials.Connectivity.NetworkAccess == Xamarin.Essentials.NetworkAccess.None)
+                if (Microsoft.Maui.Networking.Connectivity.NetworkAccess == Microsoft.Maui.Networking.NetworkAccess.None)
                {
                    await _platformUtilsService.ShowDialogAsync(AppResources.InternetConnectionRequiredMessage,
                        AppResources.InternetConnectionRequiredTitle, AppResources.Ok);
--- a/src/App/Pages/Accounts/EnvironmentPage.xaml
+++ b/src/App/Pages/Accounts/EnvironmentPage.xaml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <pages:BaseContentPage 
-    xmlns="http://xamarin.com/schemas/2014/forms"
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
    x:Class="Bit.App.Pages.EnvironmentPage"
    xmlns:pages="clr-namespace:Bit.App.Pages"
--- a/src/App/Pages/Accounts/EnvironmentPage.xaml.cs
+++ b/src/App/Pages/Accounts/EnvironmentPage.xaml.cs
@@ -3,7 +3,8 @@ using System.Threading.Tasks;
 using Bit.App.Resources;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
-using Xamarin.Forms;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;

 namespace Bit.App.Pages
 {
@@ -18,6 +19,7 @@ namespace Bit.App.Pages
            InitializeComponent();
            _vm = BindingContext as EnvironmentPageViewModel;
            _vm.Page = this;
+            // TODO Xamarin.Forms.Device.RuntimePlatform is no longer supported. Use Microsoft.Maui.Devices.DeviceInfo.Platform instead. For more details see https://learn.microsoft.com/en-us/dotnet/maui/migration/forms-projects#device-changes
            if (Device.RuntimePlatform == Device.Android)
            {
                ToolbarItems.RemoveAt(0);
--- a/src/App/Pages/Accounts/HintPage.xaml
+++ b/src/App/Pages/Accounts/HintPage.xaml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <pages:BaseContentPage 
-    xmlns="http://xamarin.com/schemas/2014/forms"
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
    x:Class="Bit.App.Pages.HintPage"
    xmlns:pages="clr-namespace:Bit.App.Pages"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Federico Maccaroni	553ac4d027	PM-3349 MAUI - Android - Fix crash on converter	2023-09-05 17:40:12 -03:00
Federico Maccaroni	b9414d6384	PM-3349 MAUI - Android - Fix Add/Edit cipher page	2023-09-04 20:37:30 -03:00
Federico Maccaroni	d8e8747478	PM-3349 MAUI - Android - Fix Options page	2023-09-01 19:44:20 -03:00
Federico Maccaroni	19c89ebb5f	PM-3349 MAUI - Android - Fix Send add edit page	2023-09-01 18:48:25 -03:00
Federico Maccaroni	df4672d4cb	PM-3349 MAUI - Android - Fix awful buttons background	2023-09-01 18:46:07 -03:00
Federico Maccaroni	2fe8ae0b46	PM-3349 MAUI - Android - Fix Generator page bindings	2023-09-01 16:04:25 -03:00
Federico Maccaroni	19ba70c9a6	PM-3349 MAUI - Android - Fix Account switching view	2023-08-31 13:33:54 -03:00
Federico Maccaroni	16675c2a66	PM-3349 MAUI Migration Single Project - Android - Handlers and some fixes to avoid crashing	2023-08-30 23:37:10 -03:00
Federico Maccaroni	6ff978cef2	MAUI Migration Single Project - Android - Fonts, renderers, effects	2023-07-31 22:15:14 -03:00
Federico Maccaroni	276081f5f7	MAUI single project migration Android comipling	2023-07-31 11:58:19 -03:00
Federico Maccaroni	d7f52a58f0	MAUI Single project migration initial	2023-07-28 19:44:49 -03:00
github-actions[bot]	0271a4db4c	Autosync the updated translations (#2650 ) Co-authored-by: bitwarden-devops-bot <106330231+bitwarden-devops-bot@users.noreply.github.com>	2023-07-28 08:19:12 +00:00
Federico Maccaroni	375718f945	PM-3227 Avoid clone on discoverable passkeys. (#2648 )	2023-07-27 18:35:09 -03:00
Federico Maccaroni	9eda015371	PM-3165 Finish task completion source when cancelling the dialog tapping on the background. (#2647 )	2023-07-27 17:49:52 -03:00
Federico Maccaroni	ea81acb3bf	[PM-1575] Display Passkeys (#2523 ) * PM-1575 Added new models for Fido2Key * PM-1575 Added discoverable passkeys and WIP non-discoverable ones * PM-1575 Fix format * PM-1575 Added non-discoverable passkeys to login UI * PM-1575 Added copy application icon to Fido2Key UI * PM-1575 Updated bwi font with the updated passkey icon * PM-1575 For now just display Available for two-step login on non-discoverable passkey inside of a cipher login * PM-1575 Fix non-discoverable passkey visibility * PM-1575 remove Passkeys as a filter in the vault list * PM-1575 Display error toast if there is a duplicate passkey when moving a cipher to an org * Revert "PM-1575 Display error toast if there is a duplicate passkey when moving a cipher to an org" This reverts commit `78e6353602`. * [PM-2378] Display error toast on duplicate Passkey when moving cipher to an organization (#2594) * PM-2378 Display error toast if there is a duplicate passkey when moving a cipher to an org * PM-3097 Fix issue when moving cipher with passkey to an org where the uniqueness should be taken into consideration on different passkeys types and also the Username (#2632) * PM-3096 Fix non-discoverable passkey to be taken into account when encrypting a cipher which was causing the passkey to be removed when moving to an org (#2637)	2023-07-26 17:59:49 -03:00
René Wang	174549e5bc	fix image alt text error (#2641 )	2023-07-24 18:27:20 +00:00
Federico Maccaroni	87b1d18872	PM-2320 fix duplicated resource (#2638 )	2023-07-21 15:58:28 -03:00
github-actions[bot]	ae9ba810ff	Autosync the updated translations (#2634 ) Co-authored-by: bitwarden-devops-bot <106330231+bitwarden-devops-bot@users.noreply.github.com>	2023-07-21 09:30:20 +00:00
Federico Maccaroni	dd52ff0dcc	[PM-2320] Improve Android block Auto-fill URIs (#2616 ) * PM-2320 Added new view for block autofill URIs on Android * PM-2320 Fix formatting * PM-2320 Improved validations on block autofill uris * PM-2320 Improved autofill block uris placeholder colors on different themes	2023-07-18 11:25:38 -03:00
github-actions[bot]	c678c17ebc	Bumped version to 2023.7.1 (#2625 ) Co-authored-by: bitwarden-devops-bot <106330231+bitwarden-devops-bot@users.noreply.github.com>	2023-07-18 14:23:08 +00:00
Federico Maccaroni	cd9e49b13b	ac-1425 added main thread invocations when updating the vault properties to fix cases where the screen stays blank and doesn't update (#2604 )	2023-07-17 16:53:30 -03:00
Federico Maccaroni	6d7970f767	[AC-762] Configure Crowdin to localize watch app (#2552 ) * AC-762 Added localization files to watch project * AC-762 Added crowdin config for watchOS localizable files	2023-07-17 13:35:54 -03:00
mpbw2	9adc4d3080	Catch additional exception types when validating intents (#2618 )	2023-07-17 08:40:35 -04:00
ifernandezdiaz	1f20f70d13	Fixing show value id button (#2620 )	2023-07-16 20:13:55 -03:00
Vince Grassia	a25da68437	Fix syntax in Version Auto Bump workflow (#2615 )	2023-07-13 11:55:16 -04:00
Vince Grassia	fdc0313d10	Fix Build Workflow (#2613 )	2023-07-13 10:05:57 -04:00
github-actions[bot]	f31c87b52e	Bumped version to 2023.7.0 (#2612 ) Co-authored-by: bitwarden-devops-bot <106330231+bitwarden-devops-bot@users.noreply.github.com>	2023-07-12 17:34:23 +00:00
Cesar Gonzalez	1e79e1182f	[PM-1063] Re-prompt for Master Password Can be Bypassed When Using Gboard Inline Autofill (#2593 )	2023-07-11 08:15:37 -05:00
github-actions[bot]	11947ce99a	Autosync the updated translations (#2603 ) Co-authored-by: bitwarden-devops-bot <106330231+bitwarden-devops-bot@users.noreply.github.com>	2023-07-07 05:13:18 +00:00