PM-3350 iOS applied workaround on the iOS Autofill and Share extension to maui embed the navigation page with its content page in the Window

Changed App.xaml.cs NavigateImpl to be private

.github/CODEOWNERS

@@ -0,0 +1,34 @@
+# Please sort lines alphabetically, this will ensure we don't accidentally add duplicates.
+#
+# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
+
+# The following owners will be the default owners for everything in the repo.
+# Unless a later match takes precedence
+# @bitwarden/tech-leads
+
+@bitwarden/dept-development-mobile
+
+## Auth team files ##
+
+## Platform team files ##
+appIcons @bitwarden/team-platform-dev
+build.cake @bitwarden/team-platform-dev
+
+## Vault team files ##
+src/watchOS @bitwarden/team-vault-dev
+
+## Tools team files ##
+src/Core/Services/EmailForwarders @bitwarden/team-tools-dev
+
+## Crowdin Sync files ##
+src/App/Resources @bitwarden/team-tools-dev
+src/watchOS/bitwarden/bitwarden\ WatchKit\ Extension/Localization @bitwarden/team-tools-dev
+store/apple @bitwarden/team-tools-dev
+store/google @bitwarden/team-tools-dev
+
+## Locales ## 
+src/App/Resources/AppResources.Designer.cs
+src/App/Resources/AppResources.resx
+src/watchOS/bitwarden/bitwarden\ WatchKit\ Extension/Localization/en.lproj
+store/apple/en
+store/google/en

.github/workflows/build.yml

@@ -11,21 +11,26 @@ on:
   workflow_dispatch:
     inputs: {}
 
+env:
+  main_app_folder_path: src/App
+  main_app_project_path: src/App/App.csproj
+  target-net-version: net8.0
+
 jobs:
-  cloc:
-    name: CLOC
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+  # cloc:
+  #   name: CLOC
+  #   runs-on: ubuntu-20.04
+  #   steps:
+  #     - name: Checkout repo
+  #       uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
 
-      - name: Set up CLOC
-        run: |
-          sudo apt-get update
-          sudo apt-get -y install cloc
+  #     - name: Set up CLOC
+  #       run: |
+  #         sudo apt-get update
+  #         sudo apt-get -y install cloc
 
-      - name: Print lines of code
-        run: cloc --vcs git --exclude-dir Resources,store,test,Properties --include-lang C#,XAML
+  #     - name: Print lines of code
+  #       run: cloc --vcs git --exclude-dir Resources,store,test,Properties --include-lang C#,XAML
 
 
   setup:
@@ -56,7 +61,6 @@ jobs:
           fi
         shell: bash
 
-
   android:
     name: Android
     runs-on: windows-2022
@@ -65,42 +69,30 @@ jobs:
       fail-fast: false
       matrix:
         variant: ["prod", "qa"]
+    env:
+      android_folder_path: src/App/Platforms/Android
     steps:
       - name: Setup NuGet
         uses: nuget/setup-nuget@296fd3ccf8528660c91106efefe2364482f86d6f # v1.2.0
         with:
-          nuget-version: 5.9.0
+          nuget-version: 6.4.0
 
       - name: Set up .NET
         uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0
         with:
-          dotnet-version: '3.1.x'
+          dotnet-version: '8.0.x'
 
       - name: Set up MSBuild
         uses: microsoft/setup-msbuild@1ff57057b5cfdc39105cd07a01d78e9b0ea0c14c # v1.3.1
 
+      # This step might be obsolete at some point as .NET MAUI workloads 
+      # are starting to come pre-installed on the GH Actions build agents.
+      - name: Install MAUI Workload
+        run: dotnet workload install maui --ignore-failed-sources
+
       - name: Setup Windows builder
         run: choco install checksum --no-progress
 
-      - name: Work Around for broken Windows 2022 Runner Image
-        run: |
-          Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\"
-          $InstallPath = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise"
-          $componentsToAdd = @(
-            "Component.Xamarin"
-          )
-          [string]$workloadArgs = $componentsToAdd | ForEach-Object {" --add " +  $_}
-          $Arguments = ('/c', "vs_installer.exe", 'modify', '--installPath', "`"$InstallPath`"",$workloadArgs, '--quiet', '--norestart', '--nocache')
-          $process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden
-          if ($process.ExitCode -eq 0)
-          {
-              Write-Host "components have been successfully added"
-          }
-          else
-          {
-              Write-Host "components were not installed"
-              exit 1
-          }
       - name: Print environment
         run: |
           nuget help | grep Version
@@ -120,9 +112,9 @@ jobs:
           mkdir -p ~/secrets
 
           gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
-            --output ./src/Android/app_play-keystore.jks ./.github/secrets/app_play-keystore.jks.gpg
+            --output ./${{ env.main_app_folder_path }}/app_play-keystore.jks ./.github/secrets/app_play-keystore.jks.gpg
           gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
-            --output ./src/Android/app_upload-keystore.jks ./.github/secrets/app_upload-keystore.jks.gpg
+            --output ./${{ env.main_app_folder_path }}/app_upload-keystore.jks ./.github/secrets/app_upload-keystore.jks.gpg
           gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
             --output $HOME/secrets/play_creds.json ./.github/secrets/play_creds.json.gpg
         shell: bash
@@ -132,7 +124,7 @@ jobs:
           DECRYPT_FILE_PASSWORD: ${{ secrets.DECRYPT_FILE_PASSWORD }}
         run: |
           gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
-            --output ./src/Android/google-services.json ./.github/secrets/google-services.json.gpg
+            --output ./${{ env.android_folder_path }}/google-services.json ./.github/secrets/google-services.json.gpg
         shell: bash
       - name: Increment version
         run: |
@@ -141,9 +133,9 @@ jobs:
           echo "########################################"
           echo "##### Setting Version Code $BUILD_NUMBER"
           echo "########################################"
-
+          
           sed -i "s/android:versionCode=\"1\"/android:versionCode=\"$BUILD_NUMBER\"/" \
-            ./src/Android/Properties/AndroidManifest.xml
+            ./${{ env.android_folder_path }}/AndroidManifest.xml
         shell: bash
 
       - name: Restore packages
@@ -153,22 +145,22 @@ jobs:
         run: dotnet tool restore
         shell: pwsh
 
-      - name: Verify Format
-        run: dotnet tool run dotnet-format --check
-        shell: pwsh
+      # - name: Verify Format
+      #   run: dotnet tool run dotnet-format --check
+      #   shell: pwsh
 
-      - name: Run Core tests
-        run: dotnet test test/Core.Test/Core.Test.csproj --logger "trx;LogFileName=test-results.trx"
-        shell: pwsh
+      #- name: Run Core tests
+      #  run: dotnet test test/Core.Test/Core.Test.csproj --logger "trx;LogFileName=test-results.trx"
+      #  shell: pwsh
 
-      - name: Report test results
-        uses: dorny/test-reporter@c9b3d0e2bd2a4e96aaf424dbaa31c46b42318226 # v1.6.0
-        if: always()
-        with:
-          name: Test Results
-          path: "**/test-results.trx"
-          reporter: dotnet-trx
-          fail-on-error: true
+      #- name: Report test results
+      #  uses: dorny/test-reporter@c9b3d0e2bd2a4e96aaf424dbaa31c46b42318226 # v1.6.0
+      #  if: always()
+      #  with:
+      #    name: Test Results
+      #    path: "**/test-results.trx"
+      #    reporter: dotnet-trx
+      #    fail-on-error: true
 
       - name: Build Play Store publisher
         if: ${{ matrix.variant == 'prod' }}
@@ -180,12 +172,13 @@ jobs:
       - name: Build Android
         run: |
           $configuration = "Release";
+          $projToBuild = $($env:GITHUB_WORKSPACE + "/${{ env.main_app_project_path }}");
 
           Write-Output "########################################"
           Write-Output "##### Build $configuration Configuration"
           Write-Output "########################################"
-          msbuild "$($env:GITHUB_WORKSPACE + "/src/Android/Android.csproj")" "/p:Configuration=$configuration"
-
+          
+          dotnet build $projToBuild -c $configuration -f ${{ env.target-net-version }}-android
         shell: pwsh
 
       - name: Sign Android Build
@@ -193,7 +186,7 @@ jobs:
           PLAY_KEYSTORE_PASSWORD: ${{ secrets.PLAY_KEYSTORE_PASSWORD }}
           UPLOAD_KEYSTORE_PASSWORD: ${{ secrets.UPLOAD_KEYSTORE_PASSWORD }}
         run: |
-          $androidPath = $($env:GITHUB_WORKSPACE + "/src/Android/Android.csproj");
+          $projToBuild = $($env:GITHUB_WORKSPACE + "/${{ env.main_app_project_path }}");
           $packageName = "com.x8bit.bitwarden";
 
           if ("${{ matrix.variant }}" -ne "prod")
@@ -204,16 +197,13 @@ jobs:
           Write-Output "##### Sign Google Play Bundle Release Configuration"
           Write-Output "########################################"
 
-          msbuild "$($androidPath)" "/t:SignAndroidPackage" "/p:Configuration=Release" "/p:AndroidKeyStore=true" `
-              "/p:AndroidSigningKeyAlias=upload" "/p:AndroidSigningKeyPass=$($env:UPLOAD_KEYSTORE_PASSWORD)" `
-              "/p:AndroidSigningKeyStore=$("app_upload-keystore.jks")" `
-              "/p:AndroidSigningStorePass=$($env:UPLOAD_KEYSTORE_PASSWORD)" "/p:AndroidPackageFormat=aab" "/v:quiet"
+          dotnet publish $projToBuild -c Release -f ${{ env.target-net-version }}-android /p:AndroidPackageFormats=aab /p:AndroidKeyStore=true /p:AndroidSigningKeyStore=$("app_upload-keystore.jks") /p:AndroidSigningKeyAlias=upload /p:AndroidSigningKeyPass="$($env:UPLOAD_KEYSTORE_PASSWORD)" /p:AndroidSigningStorePass="$($env:UPLOAD_KEYSTORE_PASSWORD)" --no-restore
 
           Write-Output "########################################"
           Write-Output "##### Copy Google Play Bundle to project root"
           Write-Output "########################################"
 
-          $signedAabPath = $($env:GITHUB_WORKSPACE + "/src/Android/bin/Release/$($packageName)-Signed.aab");
+          $signedAabPath = $($env:GITHUB_WORKSPACE + "/${{ env.main_app_folder_path }}/bin/Release/${{ env.target-net-version }}-android/publish/$($packageName)-Signed.aab");
           $signedAabDestPath = $($env:GITHUB_WORKSPACE + "/$($packageName).aab");
           Copy-Item $signedAabPath $signedAabDestPath
 
@@ -221,16 +211,13 @@ jobs:
           Write-Output "##### Sign APK Release Configuration"
           Write-Output "########################################"
 
-          msbuild "$($androidPath)" "/t:SignAndroidPackage" "/p:Configuration=Release" "/p:AndroidKeyStore=true" `
-              "/p:AndroidSigningKeyAlias=bitwarden" "/p:AndroidSigningKeyPass=$($env:PLAY_KEYSTORE_PASSWORD)" `
-              "/p:AndroidSigningKeyStore=$("app_play-keystore.jks")" `
-              "/p:AndroidSigningStorePass=$($env:PLAY_KEYSTORE_PASSWORD)" "/v:quiet"
+          dotnet publish $projToBuild -c Release -f ${{ env.target-net-version }}-android /p:AndroidKeyStore=true /p:AndroidSigningKeyStore=$("app_play-keystore.jks") /p:AndroidSigningKeyAlias=bitwarden /p:AndroidSigningKeyPass="$($env:PLAY_KEYSTORE_PASSWORD)" /p:AndroidSigningStorePass="$($env:PLAY_KEYSTORE_PASSWORD)" --no-restore
 
           Write-Output "########################################"
           Write-Output "##### Copy Release APK to project root"
           Write-Output "########################################"
 
-          $signedApkPath = $($env:GITHUB_WORKSPACE + "/src/Android/bin/Release/$($packageName)-Signed.apk");
+          $signedApkPath = $($env:GITHUB_WORKSPACE + "/${{ env.main_app_folder_path }}/bin/Release/${{ env.target-net-version }}-android/publish/$($packageName)-Signed.apk");
           $signedApkDestPath = $($env:GITHUB_WORKSPACE + "/$($packageName).apk");
 
           Copy-Item $signedApkPath $signedApkDestPath
@@ -306,38 +293,31 @@ jobs:
   f-droid:
     name: F-Droid Build
     runs-on: windows-2022
+    env:
+      android_folder_path: src/App/Platforms/Android
+      android_manifest_path: src/App/Platforms/Android/AndroidManifest.xml
     steps:
       - name: Setup NuGet
         uses: nuget/setup-nuget@296fd3ccf8528660c91106efefe2364482f86d6f # v1.2.0
         with:
-          nuget-version: 5.9.0
+          nuget-version: 6.4.0
+
+      - name: Set up .NET
+        uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0
+        with:
+          dotnet-version: '8.0.x'
 
       - name: Set up MSBuild
         uses: microsoft/setup-msbuild@1ff57057b5cfdc39105cd07a01d78e9b0ea0c14c # v1.3.1
 
+      # This step might be obsolete at some point as .NET MAUI workloads 
+      # are starting to come pre-installed on the GH Actions build agents.
+      - name: Install MAUI Workload
+        run: dotnet workload install maui --ignore-failed-sources
+
       - name: Setup Windows builder
         run: choco install checksum --no-progress
 
-      - name: Work Around for broken Windows 2022 Runner Image
-        run: |
-          Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\"
-          $InstallPath = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise"
-          $componentsToAdd = @(
-            "Component.Xamarin"
-          )
-          [string]$workloadArgs = $componentsToAdd | ForEach-Object {" --add " +  $_}
-          $Arguments = ('/c', "vs_installer.exe", 'modify', '--installPath', "`"$InstallPath`"",$workloadArgs, '--quiet', '--norestart', '--nocache')
-          $process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden
-          if ($process.ExitCode -eq 0)
-          {
-              Write-Host "components have been successfully added"
-          }
-          else
-          {
-              Write-Host "components were not installed"
-              exit 1
-          }
-
       - name: Print environment
         run: |
           nuget help | grep Version
@@ -356,7 +336,7 @@ jobs:
           mkdir -p ~/secrets
 
           gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
-            --output ./src/Android/app_fdroid-keystore.jks ./.github/secrets/app_fdroid-keystore.jks.gpg
+            --output ./${{ env.main_app_folder_path }}/app_fdroid-keystore.jks ./.github/secrets/app_fdroid-keystore.jks.gpg
         shell: bash
 
       - name: Increment version
@@ -368,30 +348,28 @@ jobs:
           echo "########################################"
 
           sed -i "s/android:versionCode=\"1\"/android:versionCode=\"$BUILD_NUMBER\"/" \
-            ./src/Android/Properties/AndroidManifest.xml
+            ./${{ env.android_manifest_path }}
         shell: bash
 
       - name: Clean for F-Droid
         run: |
-          $androidPath = $($env:GITHUB_WORKSPACE + "/src/Android/Android.csproj");
-          $appPath = $($env:GITHUB_WORKSPACE + "/src/App/App.csproj");
+          $appPath = $($env:GITHUB_WORKSPACE + "/${{ env.main_app_project_path }}");
           $corePath = $($env:GITHUB_WORKSPACE + "/src/Core/Core.csproj");
 
-          $androidManifest = $($env:GITHUB_WORKSPACE + "/src/Android/Properties/AndroidManifest.xml");
+          $androidManifest = $($env:GITHUB_WORKSPACE + "/${{ env.android_manifest_path }}");
 
-          Write-Output "########################################"
-          Write-Output "##### Clean Android and App"
-          Write-Output "########################################"
+          # Write-Output "########################################"
+          # Write-Output "##### Clean Android and App"
+          # Write-Output "########################################"
 
-          msbuild "$($androidPath)" "/t:Clean" "/p:Configuration=FDroid"
-          msbuild "$($appPath)" "/t:Clean" "/p:Configuration=FDroid"
+          # msbuild "$($androidPath)" "/t:Clean" "/p:Configuration=FDroid"
+          # msbuild "$($appPath)" "/t:Clean" "/p:Configuration=FDroid"
 
           Write-Output "########################################"
           Write-Output "##### Backup project files"
           Write-Output "########################################"
 
           Copy-Item $androidManifest $($androidManifest + ".original");
-          Copy-Item $androidPath $($androidPath + ".original");
           Copy-Item $appPath $($appPath + ".original");
 
           Write-Output "########################################"
@@ -406,76 +384,77 @@ jobs:
 
           $xml.Save($androidManifest);
 
-          Write-Output "########################################"
-          Write-Output "##### Uninstall from Android.csproj"
-          Write-Output "########################################"
+          # Write-Output "########################################"
+          # Write-Output "##### Uninstall from App.csproj"
+          # Write-Output "########################################"
 
-          $xml=New-Object XML;
-          $xml.Load($androidPath);
+          # $xml=New-Object XML;
+          # $xml.Load($appPath);
 
-          $ns=New-Object System.Xml.XmlNamespaceManager($xml.NameTable);
-          $ns.AddNamespace("ns", $xml.DocumentElement.NamespaceURI);
+          # $ns=New-Object System.Xml.XmlNamespaceManager($xml.NameTable);
+          # $ns.AddNamespace("ns", $xml.DocumentElement.NamespaceURI);
 
-          $firebaseNode=$xml.SelectSingleNode(`
-              "/ns:Project/ns:ItemGroup/ns:PackageReference[@Include='Xamarin.Firebase.Messaging']", $ns);
-          $firebaseNode.ParentNode.RemoveChild($firebaseNode);
+          # $firebaseNode=$xml.SelectSingleNode(`
+          #     "/ns:Project/ns:ItemGroup/ns:PackageReference[@Include='Xamarin.Firebase.Messaging']", $ns);
+          # $firebaseNode.ParentNode.RemoveChild($firebaseNode);
 
-          $daggerNode=$xml.SelectSingleNode(`
-              "/ns:Project/ns:ItemGroup/ns:PackageReference[@Include='Xamarin.Google.Dagger']", $ns);
-          $daggerNode.ParentNode.RemoveChild($daggerNode);
+          # $daggerNode=$xml.SelectSingleNode(`
+          #     "/ns:Project/ns:ItemGroup/ns:PackageReference[@Include='Xamarin.Google.Dagger']", $ns);
+          # $daggerNode.ParentNode.RemoveChild($daggerNode);
 
-          $safetyNetNode=$xml.SelectSingleNode(`
-              "/ns:Project/ns:ItemGroup/ns:PackageReference[@Include='Xamarin.GooglePlayServices.SafetyNet']", $ns);
-          $safetyNetNode.ParentNode.RemoveChild($safetyNetNode);
+          # $safetyNetNode=$xml.SelectSingleNode(`
+          #     "/ns:Project/ns:ItemGroup/ns:PackageReference[@Include='Xamarin.GooglePlayServices.SafetyNet']", $ns);
+          # $safetyNetNode.ParentNode.RemoveChild($safetyNetNode);
 
-          $xml.Save($androidPath);
+          # $xml.Save($appPath);
 
-          Write-Output "########################################"
-          Write-Output "##### Uninstall from Core.csproj"
-          Write-Output "########################################"
+          # Write-Output "########################################"
+          # Write-Output "##### Uninstall from Core.csproj"
+          # Write-Output "########################################"
 
-          $xml=New-Object XML;
-          $xml.Load($corePath);
+          # $xml=New-Object XML;
+          # $xml.Load($corePath);
 
-          $appCenterNode=$xml.SelectSingleNode("/Project/ItemGroup/PackageReference[@Include='Microsoft.AppCenter.Crashes']");
-          $appCenterNode.ParentNode.RemoveChild($appCenterNode);
+          # $appCenterNode=$xml.SelectSingleNode("/Project/ItemGroup/PackageReference[@Include='Microsoft.AppCenter.Crashes']");
+          # $appCenterNode.ParentNode.RemoveChild($appCenterNode);
 
-          $xml.Save($corePath);
+          # $xml.Save($corePath);
         shell: pwsh
 
       - name: Restore packages
-        run: nuget restore
+        run: dotnet restore
 
       - name: Build for F-Droid
         run: |
-          $configuration = "FDroid";
+          $configuration = "Release";
+          $projToBuild = $($env:GITHUB_WORKSPACE + "/${{ env.main_app_project_path }}");
 
           Write-Output "########################################"
-          Write-Output "##### Build $configuration Configuration"
+          Write-Output "##### Build $configuration FDROID
           Write-Output "########################################"
+          
+          dotnet build $projToBuild -c $configuration -f ${{ env.target-net-version }}-android /p:CustomConstants="FDROID"
 
-          msbuild "$($env:GITHUB_WORKSPACE + "/src/Android/Android.csproj")" "/p:Configuration=$configuration"
         shell: pwsh
 
       - name: Sign for F-Droid
         env:
           FDROID_KEYSTORE_PASSWORD: ${{ secrets.FDROID_KEYSTORE_PASSWORD }}
         run: |
+          $projToBuild = $($env:GITHUB_WORKSPACE + "/${{ env.main_app_project_path }}");
+          $packageName = "com.x8bit.bitwarden";
+
           Write-Output "########################################"
-          Write-Output "##### Sign FDroid Configuration"
+          Write-Output "##### Sign FDroid"
           Write-Output "########################################"
 
-          msbuild "$($env:GITHUB_WORKSPACE + "/src/Android/Android.csproj")" `
-            "/t:SignAndroidPackage" "/p:Configuration=FDroid" "/p:AndroidKeyStore=true" `
-            "/p:AndroidSigningKeyAlias=bitwarden" "/p:AndroidSigningKeyPass=$($env:FDROID_KEYSTORE_PASSWORD)" `
-            "/p:AndroidSigningKeyStore=$("app_fdroid-keystore.jks")" `
-            "/p:AndroidSigningStorePass=$($env:FDROID_KEYSTORE_PASSWORD)" "/v:quiet"
+          dotnet publish $projToBuild -c Release -f ${{ env.target-net-version }}-android /p:AndroidKeyStore=true /p:AndroidSigningKeyStore=$("app_fdroid-keystore.jks") /p:AndroidSigningKeyAlias=bitwarden /p:AndroidSigningKeyPass="$($env:FDROID_KEYSTORE_PASSWORD)" /p:AndroidSigningStorePass="$($env:FDROID_KEYSTORE_PASSWORD)" /p:CustomConstants="FDROID" --no-restore
 
           Write-Output "########################################"
           Write-Output "##### Copy FDroid apk to project root"
           Write-Output "########################################"
 
-          $signedApkPath = $($env:GITHUB_WORKSPACE + "/src/Android/bin/FDroid/com.x8bit.bitwarden-Signed.apk");
+          $signedApkPath = $($env:GITHUB_WORKSPACE + "/${{ env.main_app_folder_path }}/bin/Release/${{ env.target-net-version }}-android/publish/$($packageName)-Signed.apk");
           $signedApkDestPath = $($env:GITHUB_WORKSPACE + "/com.x8bit.bitwarden-fdroid.apk");
 
           Copy-Item $signedApkPath $signedApkDestPath
@@ -500,21 +479,40 @@ jobs:
           path: ./bw-fdroid-apk-sha256.txt
           if-no-files-found: error
 
-
+  # Disabling iOS build from this branch until fixing publish/build
+  # really long time
   ios:
     name: Apple iOS
-    runs-on: macos-12
+    if: github.ref == 'refs/heads/master'
+    runs-on: macos-13
     needs: setup
+    env:
+      ios_folder_path: src/App/Platforms/iOS
+      app_output_name: App
     steps:
+      - name: Set XCode version
+        uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: 15.0.1
+
       - name: Setup NuGet
         uses: nuget/setup-nuget@296fd3ccf8528660c91106efefe2364482f86d6f # v1.2.0
         with:
-          nuget-version: 5.9.0
+          nuget-version: 6.4.0
+      
+      - name: Set up .NET
+        uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0
+        with:
+          dotnet-version: '8.0.x'
+  
+      # This step might be obsolete at some point as .NET MAUI workloads 
+      # are starting to come pre-installed on the GH Actions build agents.
+      - name: Install MAUI Workload
+        run: dotnet workload install maui --ignore-failed-sources
 
       - name: Print environment
         run: |
           nuget help | grep Version
-          msbuild -version
           dotnet --info
           echo "GitHub ref: $GITHUB_REF"
           echo "GitHub event: $GITHUB_EVENT"
@@ -525,7 +523,7 @@ jobs:
           submodules: 'true'
 
       - name: Login to Azure - CI Subscription
-        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf # v1.4.3
+        uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.6
         with:
           creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
 
@@ -580,7 +578,7 @@ jobs:
           echo "##### Setting CFBundleVersion $BUILD_NUMBER"
           echo "########################################"
 
-          perl -0777 -pi.bak -e 's/<key>CFBundleVersion<\/key>\s*<string>1<\/string>/<key>CFBundleVersion<\/key>\n\t<string>'"$BUILD_NUMBER"'<\/string>/' ./src/iOS/Info.plist
+          perl -0777 -pi.bak -e 's/<key>CFBundleVersion<\/key>\s*<string>1<\/string>/<key>CFBundleVersion<\/key>\n\t<string>'"$BUILD_NUMBER"'<\/string>/' ./${{ env.ios_folder_path }}/Info.plist
           perl -0777 -pi.bak -e 's/<key>CFBundleVersion<\/key>\s*<string>1<\/string>/<key>CFBundleVersion<\/key>\n\t<string>'"$BUILD_NUMBER"'<\/string>/' ./src/iOS.Extension/Info.plist
           perl -0777 -pi.bak -e 's/<key>CFBundleVersion<\/key>\s*<string>1<\/string>/<key>CFBundleVersion<\/key>\n\t<string>'"$BUILD_NUMBER"'<\/string>/' ./src/iOS.Autofill/Info.plist
           perl -0777 -pi.bak -e 's/<key>CFBundleVersion<\/key>\s*<string>1<\/string>/<key>CFBundleVersion<\/key>\n\t<string>'"$BUILD_NUMBER"'<\/string>/' ./src/iOS.ShareExtension/Info.plist
@@ -595,7 +593,7 @@ jobs:
           echo "##### Updating Entitlements"
           echo "########################################"
 
-          perl -0777 -pi.bak -e 's/<key>aps-environment<\/key>\s*<string>development<\/string>/<key>aps-environment<\/key>\n\t<string>production<\/string>/' ./src/iOS/Entitlements.plist
+          perl -0777 -pi.bak -e 's/<key>aps-environment<\/key>\s*<string>development<\/string>/<key>aps-environment<\/key>\n\t<string>production<\/string>/' ./${{ env.ios_folder_path }}/Entitlements.plist
         shell: bash
 
       - name: Set up Keychain
@@ -646,6 +644,9 @@ jobs:
           cp $WATCH_APP_EXTENSION_PROFILE_PATH "$PROFILES_DIR_PATH/$WATCH_APP_EXTENSION_UUID.mobileprovision"
         shell: bash
 
+      - name: Restore packages
+        run: dotnet restore
+
       - name: Bulid WatchApp
         run: |
           echo "########################################"
@@ -659,19 +660,26 @@ jobs:
           echo "########################################"
         shell: bash
 
-      - name: Restore packages
-        run: nuget restore
-
       - name: Archive Build for App Store
         run: |
-          $configuration = "AppStore";
-          $platform = "iPhone";
+          Write-Output "########################################"
+          Write-Output "##### Archive for Release ios-arm64
+          Write-Output "########################################"
+
+          dotnet publish ${{ env.main_app_project_path }} -c Release -f ${{ env.target-net-version }}-ios /p:RuntimeIdentifier=ios-arm64 /p:ArchiveOnBuild=true
 
           Write-Output "########################################"
-          Write-Output "##### Archive $configuration Configuration for $platform Platform"
+          Write-Output "##### Done"
           Write-Output "########################################"
-          msbuild "$($env:GITHUB_WORKSPACE + "/src/iOS/iOS.csproj")" "/p:Platform=$platform" `
-            "/p:Configuration=$configuration" "/p:ArchiveOnBuild=true" "/t:`"Build`""
+        shell: pwsh
+
+      - name: Archive Build for Mobile Automation
+        run: |
+          Write-Output "########################################"
+          Write-Output "##### Archive Releae for iossimulator-arm64
+          Write-Output "########################################"
+
+          dotnet publish ${{ env.main_app_project_path }} -c Release -f ${{ env.target-net-version }}-ios /p:RuntimeIdentifier=iossimulator-arm64 /p:ArchiveOnBuild=true
 
           Write-Output "########################################"
           Write-Output "##### Done"
@@ -689,6 +697,15 @@ jobs:
             -exportOptionsPlist $EXPORT_OPTIONS_PATH
         shell: bash
 
+      - name: Export .app for Automation CI
+        run: |
+          ARCHIVE_PATH="./${{ env.main_app_folder_path }}/bin/Release/iossimulator-arm64/publish/${{ env.app_output_name }}.app"
+          EXPORT_PATH="./bitwarden-export"
+
+          zip -r -q ${{ env.app_output_name }}.app.zip $ARCHIVE_PATH
+          mv ${{ env.app_output_name }}.app.zip $EXPORT_PATH
+        shell: bash
+
       - name: Copy all dSYMs files to upload
         run: |
           ARCHIVE_DSYMS_PATH="$HOME/Library/Developer/Xcode/Archives/*/*.xcarchive/dSYMs"
@@ -707,10 +724,17 @@ jobs:
         with:
           name: Bitwarden iOS
           path: |
-            ./bitwarden-export/Bitwarden.ipa
+            ./bitwarden-export/${{ env.app_output_name }}.ipa
             ./bitwarden-export/dSYMs/*.*
           if-no-files-found: error
 
+      - name: Upload .app file for Automation CI
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
+        with:
+          name: ${{ env.app_output_name }}.app.zip
+          path: ./bitwarden-export/${{ env.app_output_name }}.app.zip
+          if-no-files-found: error
+
       - name: Install AppCenter CLI
         if: |
           (github.ref == 'refs/heads/master'
@@ -759,116 +783,116 @@ jobs:
           APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }}
           APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
         run: |
-          xcrun altool --upload-app --type ios --file "./bitwarden-export/Bitwarden.ipa" \
+          xcrun altool --upload-app --type ios --file "./bitwarden-export/${{ env.app_output_name }}.ipa" \
               --username "$APPLE_ID_USERNAME" --password "$APPLE_ID_PASSWORD"
         shell: bash
 
 
-  crowdin-push:
-    name: Crowdin Push
-    if: github.ref == 'refs/heads/master'
-    needs:
-      - android
-      - f-droid
-      - ios
-    runs-on: ubuntu-20.04
-    env:
-      _CROWDIN_PROJECT_ID: "269690"
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+  # crowdin-push:
+  #   name: Crowdin Push
+  #   if: github.ref == 'refs/heads/master'
+  #   needs:
+  #     - android
+  #     - f-droid
+  #     - ios
+  #   runs-on: ubuntu-20.04
+  #   env:
+  #     _CROWDIN_PROJECT_ID: "269690"
+  #   steps:
+  #     - name: Checkout repo
+  #       uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
 
-      - name: Login to Azure - CI Subscription
-        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf # v1.4.3
-        with:
-          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
+  #     - name: Login to Azure - CI Subscription
+  #       uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.6
+  #       with:
+  #         creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
 
-      - name: Retrieve secrets
-        id: retrieve-secrets
-        env:
-          KEYVAULT: bitwarden-ci
-          SECRETS: |
-            crowdin-api-token
-        run: |
-          for i in ${SECRETS//,/ }
-          do
-            VALUE=$(az keyvault secret show --vault-name $KEYVAULT --name $i --query value --output tsv)
-            echo "::add-mask::$VALUE"
-            echo "$i=$VALUE" >> $GITHUB_OUTPUT
-          done
+  #     - name: Retrieve secrets
+  #       id: retrieve-secrets
+  #       env:
+  #         KEYVAULT: bitwarden-ci
+  #         SECRETS: |
+  #           crowdin-api-token
+  #       run: |
+  #         for i in ${SECRETS//,/ }
+  #         do
+  #           VALUE=$(az keyvault secret show --vault-name $KEYVAULT --name $i --query value --output tsv)
+  #           echo "::add-mask::$VALUE"
+  #           echo "$i=$VALUE" >> $GITHUB_OUTPUT
+  #         done
 
-      - name: Upload Sources
-        uses: crowdin/github-action@965d501f160af7b1f88aed4c29154b0caf1e94b9 # v1.9.0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
-        with:
-          config: crowdin.yml
-          crowdin_branch_name: master
-          upload_sources: true
-          upload_translations: false
+  #     - name: Upload Sources
+  #       uses: crowdin/github-action@965d501f160af7b1f88aed4c29154b0caf1e94b9 # v1.9.0
+  #       env:
+  #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  #         CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
+  #       with:
+  #         config: crowdin.yml
+  #         crowdin_branch_name: master
+  #         upload_sources: true
+  #         upload_translations: false
 
 
-  check-failures:
-    name: Check for failures
-    if: always()
-    runs-on: ubuntu-20.04
-    needs:
-      - cloc
-      - android
-      - f-droid
-      - ios
-      - crowdin-push
-    steps:
-      - name: Check if any job failed
-        if: |
-          (github.ref == 'refs/heads/master')
-          || (github.ref == 'refs/heads/rc')
-          || (github.ref == 'refs/heads/hotfix-rc')
-        env:
-          CLOC_STATUS: ${{ needs.cloc.result }}
-          ANDROID_STATUS: ${{ needs.android.result }}
-          F_DROID_STATUS: ${{ needs.f-droid.result }}
-          IOS_STATUS: ${{ needs.ios.result }}
-          CROWDIN_PUSH_STATUS: ${{ needs.crowdin-push.result }}
-        run: |
-          if [ "$CLOC_STATUS" = "failure" ]; then
-              exit 1
-          elif [ "$ANDROID_STATUS" = "failure" ]; then
-              exit 1
-          elif [ "$F_DROID_STATUS" = "failure" ]; then
-              exit 1
-          elif [ "$IOS_STATUS" = "failure" ]; then
-              exit 1
-          elif [ "$CROWDIN_PUSH_STATUS" = "failure" ]; then
-              exit 1
-          fi
+  # check-failures:
+  #   name: Check for failures
+  #   if: always()
+  #   runs-on: ubuntu-20.04
+  #   needs:
+  #     - cloc
+  #     - android
+  #     - f-droid
+  #     - ios
+  #     - crowdin-push
+  #   steps:
+  #     - name: Check if any job failed
+  #       if: |
+  #         (github.ref == 'refs/heads/master')
+  #         || (github.ref == 'refs/heads/rc')
+  #         || (github.ref == 'refs/heads/hotfix-rc')
+  #       env:
+  #         CLOC_STATUS: ${{ needs.cloc.result }}
+  #         ANDROID_STATUS: ${{ needs.android.result }}
+  #         F_DROID_STATUS: ${{ needs.f-droid.result }}
+  #         IOS_STATUS: ${{ needs.ios.result }}
+  #         CROWDIN_PUSH_STATUS: ${{ needs.crowdin-push.result }}
+  #       run: |
+  #         if [ "$CLOC_STATUS" = "failure" ]; then
+  #             exit 1
+  #         elif [ "$ANDROID_STATUS" = "failure" ]; then
+  #             exit 1
+  #         elif [ "$F_DROID_STATUS" = "failure" ]; then
+  #             exit 1
+  #         elif [ "$IOS_STATUS" = "failure" ]; then
+  #             exit 1
+  #         elif [ "$CROWDIN_PUSH_STATUS" = "failure" ]; then
+  #             exit 1
+  #         fi
 
-      - name: Login to Azure - CI Subscription
-        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf # v1.4.3
-        if: failure()
-        with:
-          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
+  #     - name: Login to Azure - CI Subscription
+  #       uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.6
+  #       if: failure()
+  #       with:
+  #         creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
 
-      - name: Retrieve secrets
-        id: retrieve-secrets
-        if: failure()
-        env:
-          KEYVAULT: bitwarden-ci
-          SECRETS: |
-            devops-alerts-slack-webhook-url
-        run: |
-          for i in ${SECRETS//,/ }
-          do
-            VALUE=$(az keyvault secret show --vault-name $KEYVAULT --name $i --query value --output tsv)
-            echo "::add-mask::$VALUE"
-            echo "$i=$VALUE" >> $GITHUB_OUTPUT
-          done
+  #     - name: Retrieve secrets
+  #       id: retrieve-secrets
+  #       if: failure()
+  #       env:
+  #         KEYVAULT: bitwarden-ci
+  #         SECRETS: |
+  #           devops-alerts-slack-webhook-url
+  #       run: |
+  #         for i in ${SECRETS//,/ }
+  #         do
+  #           VALUE=$(az keyvault secret show --vault-name $KEYVAULT --name $i --query value --output tsv)
+  #           echo "::add-mask::$VALUE"
+  #           echo "$i=$VALUE" >> $GITHUB_OUTPUT
+  #         done
 
-      - name: Notify Slack on failure
-        uses: act10ns/slack@ed1309ab9862e57e9e583e51c7889486b9a00b0f # v2.0.0
-        if: failure()
-        env:
-          SLACK_WEBHOOK_URL: ${{ steps.retrieve-secrets.outputs.devops-alerts-slack-webhook-url }}
-        with:
-          status: ${{ job.status }}
+  #     - name: Notify Slack on failure
+  #       uses: act10ns/slack@ed1309ab9862e57e9e583e51c7889486b9a00b0f # v2.0.0
+  #       if: failure()
+  #       env:
+  #         SLACK_WEBHOOK_URL: ${{ steps.retrieve-secrets.outputs.devops-alerts-slack-webhook-url }}
+  #       with:
+  #         status: ${{ job.status }}

.github/workflows/crowdin-pull.yml

@@ -18,13 +18,13 @@ jobs:
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
 
       - name: Login to Azure - CI Subscription
-        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf # v1.4.3
+        uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.6
         with:
           creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
 
       - name: Retrieve secrets
         id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@34ecb67b2a357795dc893549df0795e7383ff50f
+        uses: bitwarden/gh-actions/get-keyvault-secrets@main
         with:
           keyvault: "bitwarden-ci"
           secrets: "crowdin-api-token, github-gpg-private-key, github-gpg-private-key-passphrase"

.github/workflows/pr-labeler.yml

@@ -12,6 +12,6 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/labeler@ba790c862c380240c6d5e7427be5ace9a05c754b  # v4.0.3
+      - uses: actions/labeler@ac9175f8a1f3625fd0d4fb234536d26811351594  # v4.3.0
         with:
           sync-labels: true

.github/workflows/release.yml

@@ -38,11 +38,11 @@ jobs:
           fi
 
       - name: Checkout repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
 
       - name: Check Release Version
         id: version
-        uses: bitwarden/gh-actions/release-version-check@34ecb67b2a357795dc893549df0795e7383ff50f
+        uses: bitwarden/gh-actions/release-version-check@main
         with:
           release-type: ${{ github.event.inputs.release_type }}
           project-type: xamarin
@@ -87,7 +87,7 @@ jobs:
 
       - name: Create release
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        uses: ncipollo/release-action@40bb172bd05f266cf9ba4ff965cb61e9ee5f6d01  # v1.9.0
+        uses: ncipollo/release-action@6c75be85e571768fa31b40abf38de58ba0397db5  # v1.13.0
         with:
           artifacts: "./com.x8bit.bitwarden.aab/com.x8bit.bitwarden.aab,
                       ./com.x8bit.bitwarden.apk/com.x8bit.bitwarden.apk,
@@ -126,7 +126,7 @@ jobs:
     if: inputs.fdroid_publish
     steps:
       - name: Checkout repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
 
       - name: Download F-Droid .apk artifact
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}
@@ -147,9 +147,9 @@ jobs:
           name: com.x8bit.bitwarden-fdroid.apk
 
       - name: Set up Node
-        uses: actions/setup-node@1f8c6b94b26d0feae1e387ca63ccbdc44d27b561  # v2.5.1
+        uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d  # v3.8.1
         with:
-          node-version: '10.x'
+          node-version: '16.x'
 
       - name: Set up F-Droid server
         run: |

.github/workflows/stale-bot.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: 'Run stale action'
-        uses: actions/stale@3cc123766321e9f15a6676375c154ccffb12a358  # v5.0.0
+        uses: actions/stale@f7176fd3007623b69d27091f9b9d4ab7995f0a06  # v5.2.1
         with:
           stale-issue-label: 'needs-reply'
           stale-pr-label: 'needs-changes'

.github/workflows/version-auto-bump.yml

@@ -14,7 +14,7 @@ jobs:
       version_number: ${{ steps.version.outputs.new-version }}
     steps:
       - name: Checkout Branch
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
 
       - name: Calculate bumped version
         id: version
@@ -35,7 +35,5 @@ jobs:
     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 }}

.github/workflows/version-bump.yml

@@ -12,9 +12,6 @@ on:
       version_number:
         required: true
         type: string
-    secrets:
-      AZURE_PROD_KV_CREDENTIALS:
-        required: true
 
 jobs:
   bump_version:
@@ -22,22 +19,22 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout Branch
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
 
       - name: Login to Azure - CI Subscription
-        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf # v1.4.3
+        uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.7
         with:
          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
 
       - name: Retrieve secrets
         id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@34ecb67b2a357795dc893549df0795e7383ff50f
+        uses: bitwarden/gh-actions/get-keyvault-secrets@main
         with:
           keyvault: "bitwarden-ci"
           secrets: "github-gpg-private-key, github-gpg-private-key-passphrase"
 
       - name: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@111c56156bcc6918c056dbef52164cfa583dc549 # v5.2.0
+        uses: crazy-max/ghaction-import-gpg@d6f3f49f3345e29369fe57596a3ca8f94c4d2ca7 # v5.4.0
         with:
           gpg_private_key: ${{ steps.retrieve-secrets.outputs.github-gpg-private-key }}
           passphrase: ${{ steps.retrieve-secrets.outputs.github-gpg-private-key-passphrase }}
@@ -48,31 +45,31 @@ jobs:
         run: git switch -c version_bump_${{ github.event.inputs.version_number }}
 
       - name: Bump Version - Android XML
-        uses: bitwarden/gh-actions/version-bump@34ecb67b2a357795dc893549df0795e7383ff50f
+        uses: bitwarden/gh-actions/version-bump@main
         with:
           version: ${{ github.event.inputs.version_number }}
           file_path: "./src/Android/Properties/AndroidManifest.xml"
 
       - name: Bump Version - iOS.Autofill
-        uses: bitwarden/gh-actions/version-bump@34ecb67b2a357795dc893549df0795e7383ff50f
+        uses: bitwarden/gh-actions/version-bump@main
         with:
           version: ${{ github.event.inputs.version_number }}
           file_path: "./src/iOS.Autofill/Info.plist"
 
       - name: Bump Version - iOS.Extension
-        uses: bitwarden/gh-actions/version-bump@34ecb67b2a357795dc893549df0795e7383ff50f
+        uses: bitwarden/gh-actions/version-bump@main
         with:
           version: ${{ github.event.inputs.version_number }}
           file_path: "./src/iOS.Extension/Info.plist"
 
       - name: Bump Version - iOS.ShareExtension
-        uses: bitwarden/gh-actions/version-bump@34ecb67b2a357795dc893549df0795e7383ff50f
+        uses: bitwarden/gh-actions/version-bump@main
         with:
           version: ${{ github.event.inputs.version_number }}
           file_path: "./src/iOS.ShareExtension/Info.plist"
 
       - name: Bump Version - iOS
-        uses: bitwarden/gh-actions/version-bump@34ecb67b2a357795dc893549df0795e7383ff50f
+        uses: bitwarden/gh-actions/version-bump@main
         with:
           version: ${{ github.event.inputs.version_number }}
           file_path: "./src/iOS/Info.plist"

.github/workflows/workflow-linter.yml

@@ -8,4 +8,4 @@ on:
 
 jobs:
   call-workflow:
-    uses: bitwarden/gh-actions/.github/workflows/workflow-linter.yml@34ecb67b2a357795dc893549df0795e7383ff50f
+    uses: bitwarden/gh-actions/.github/workflows/workflow-linter.yml@main

.gitignore

@@ -31,6 +31,7 @@ Components/
 x64/
 x86/
 !src/lib/x86/
+!src/App/Platforms/Android/lib/x86/
 build/
 bld/
 [Bb]in/

bitwarden-mobile.sln

@@ -1,471 +1,158 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29009.5
+# Visual Studio Version 17
+VisualStudioVersion = 17.8.34112.27
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Android", "src\Android\Android.csproj", "{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "App", "src\App\App.csproj", "{971FDF07-E288-4239-B47A-E9E7E912193B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "App", "src\App\App.csproj", "{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "src\Core\Core.csproj", "{11DBC05E-F8B4-49ED-AAC9-96D92336D21C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "src\Core\Core.csproj", "{4B8A8C41-9820-4341-974C-41E65B7F4366}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Playground", "test\Playground\Playground.csproj", "{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D10CA4A9-F866-40E1-B658-F69051236C71}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{8904C536-C67D-420F-9971-51B26574C3AA}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "store", "store", "{92470CBD-9047-4C3C-8EA3-D972D6622D84}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "google", "google", "{2E399654-26A2-46F6-B9CA-1B496A3F370A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{76690DFB-B7F4-4781-83E4-113FDC450AFE}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-		.gitignore = .gitignore
-		.github\workflows\build.yml = .github\workflows\build.yml
-		CONTRIBUTING.md = CONTRIBUTING.md
-		crowdin.yml = crowdin.yml
-		README.md = README.md
-		SECURITY.md = SECURITY.md
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Publisher", "store\google\Publisher\Publisher.csproj", "{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS.Core", "src\iOS.Core\iOS.Core.csproj", "{E71F3053-056C-4381-9638-048ED73BDFF6}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS", "src\iOS\iOS.csproj", "{599E0201-420A-4C3E-A7BA-5349F72E0B15}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "iOS.Core", "src\iOS.Core\iOS.Core.csproj", "{E71F3053-056C-4381-9638-048ED73BDFF6}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS.Extension", "src\iOS.Extension\iOS.Extension.csproj", "{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "test\Common\Common.csproj", "{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Test", "test\Core.Test\Core.Test.csproj", "{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS.ShareExtension", "src\iOS.ShareExtension\iOS.ShareExtension.csproj", "{F8C3F648-EA5A-4719-8005-85D1690B1655}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS.Autofill", "src\iOS.Autofill\iOS.Autofill.csproj", "{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS.Autofill", "src\iOS.Autofill\iOS.Autofill.csproj", "{83449CC4-1F76-4CFE-92B1-D2E13A62506F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
-		Ad-Hoc|iPhone = Ad-Hoc|iPhone
-		Ad-Hoc|iPhoneSimulator = Ad-Hoc|iPhoneSimulator
-		AppStore|Any CPU = AppStore|Any CPU
-		AppStore|iPhone = AppStore|iPhone
-		AppStore|iPhoneSimulator = AppStore|iPhoneSimulator
 		Debug|Any CPU = Debug|Any CPU
-		Debug|iPhone = Debug|iPhone
-		Debug|iPhoneSimulator = Debug|iPhoneSimulator
-		FDroid|Any CPU = FDroid|Any CPU
-		FDroid|iPhone = FDroid|iPhone
-		FDroid|iPhoneSimulator = FDroid|iPhoneSimulator
 		Release|Any CPU = Release|Any CPU
-		Release|iPhone = Release|iPhone
+		Debug|iPhoneSimulator = Debug|iPhoneSimulator
 		Release|iPhoneSimulator = Release|iPhoneSimulator
+		Debug|iPhone = Debug|iPhone
+		Release|iPhone = Release|iPhone
+		AppStore|iPhoneSimulator = AppStore|iPhoneSimulator
+		AppStore|iPhone = AppStore|iPhone
+		Ad-Hoc|iPhoneSimulator = Ad-Hoc|iPhoneSimulator
+		Ad-Hoc|iPhone = Ad-Hoc|iPhone
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|Any CPU.Deploy.0 = Release|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|iPhone.Deploy.0 = Release|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|Any CPU.Deploy.0 = Release|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|iPhone.Deploy.0 = Release|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|iPhoneSimulator.Deploy.0 = Release|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|iPhone.Deploy.0 = Debug|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|Any CPU.ActiveCfg = FDroid|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|Any CPU.Build.0 = FDroid|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|Any CPU.Deploy.0 = FDroid|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|iPhone.ActiveCfg = FDroid|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|iPhone.Build.0 = FDroid|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|iPhone.Deploy.0 = FDroid|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|iPhoneSimulator.ActiveCfg = FDroid|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|iPhoneSimulator.Build.0 = FDroid|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|iPhoneSimulator.Deploy.0 = FDroid|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|iPhone.Build.0 = Release|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|iPhone.Deploy.0 = Release|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Ad-Hoc|Any CPU.Deploy.0 = Release|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Ad-Hoc|iPhone.Deploy.0 = Release|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.AppStore|Any CPU.Deploy.0 = Release|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.AppStore|iPhone.Deploy.0 = Release|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.AppStore|iPhoneSimulator.Deploy.0 = Release|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Debug|iPhone.Deploy.0 = Debug|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.FDroid|Any CPU.ActiveCfg = FDroid|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.FDroid|Any CPU.Build.0 = FDroid|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.FDroid|iPhone.ActiveCfg = FDroid|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.FDroid|iPhone.Build.0 = FDroid|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.FDroid|iPhoneSimulator.ActiveCfg = FDroid|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.FDroid|iPhoneSimulator.Build.0 = FDroid|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Release|iPhone.Build.0 = Release|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Release|iPhone.Deploy.0 = Release|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
-		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{4B8A8C41-9820-4341-974C-41E65B7F4366}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{4B8A8C41-9820-4341-974C-41E65B7F4366}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{4B8A8C41-9820-4341-974C-41E65B7F4366}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{4B8A8C41-9820-4341-974C-41E65B7F4366}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{4B8A8C41-9820-4341-974C-41E65B7F4366}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{4B8A8C41-9820-4341-974C-41E65B7F4366}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{4B8A8C41-9820-4341-974C-41E65B7F4366}.FDroid|Any CPU.ActiveCfg = FDroid|Any CPU
-		{4B8A8C41-9820-4341-974C-41E65B7F4366}.FDroid|Any CPU.Build.0 = FDroid|Any CPU
-		{4B8A8C41-9820-4341-974C-41E65B7F4366}.FDroid|iPhone.ActiveCfg = FDroid|Any CPU
-		{4B8A8C41-9820-4341-974C-41E65B7F4366}.FDroid|iPhone.Build.0 = FDroid|Any CPU
-		{4B8A8C41-9820-4341-974C-41E65B7F4366}.FDroid|iPhoneSimulator.ActiveCfg = FDroid|Any CPU
-		{4B8A8C41-9820-4341-974C-41E65B7F4366}.FDroid|iPhoneSimulator.Build.0 = FDroid|Any CPU
-		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Release|iPhone.Build.0 = Release|Any CPU
-		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{4B8A8C41-9820-4341-974C-41E65B7F4366}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.FDroid|Any CPU.ActiveCfg = FDroid|Any CPU
-		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.FDroid|Any CPU.Build.0 = FDroid|Any CPU
-		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.FDroid|iPhone.ActiveCfg = FDroid|Any CPU
-		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.FDroid|iPhone.Build.0 = FDroid|Any CPU
-		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.FDroid|iPhoneSimulator.ActiveCfg = FDroid|Any CPU
-		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.FDroid|iPhoneSimulator.Build.0 = FDroid|Any CPU
-		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Release|iPhone.Build.0 = Release|Any CPU
-		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.FDroid|Any CPU.ActiveCfg = FDroid|Any CPU
-		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.FDroid|Any CPU.Build.0 = FDroid|Any CPU
-		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.FDroid|iPhone.ActiveCfg = FDroid|Any CPU
-		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.FDroid|iPhone.Build.0 = FDroid|Any CPU
-		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.FDroid|iPhoneSimulator.ActiveCfg = FDroid|Any CPU
-		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.FDroid|iPhoneSimulator.Build.0 = FDroid|Any CPU
-		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Release|iPhone.Build.0 = Release|Any CPU
-		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|Any CPU.Build.0 = Ad-Hoc|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|Any CPU.ActiveCfg = AppStore|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|Any CPU.Build.0 = AppStore|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhone.Build.0 = AppStore|iPhone
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator
+		{971FDF07-E288-4239-B47A-E9E7E912193B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{971FDF07-E288-4239-B47A-E9E7E912193B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{971FDF07-E288-4239-B47A-E9E7E912193B}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{971FDF07-E288-4239-B47A-E9E7E912193B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{971FDF07-E288-4239-B47A-E9E7E912193B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{971FDF07-E288-4239-B47A-E9E7E912193B}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{971FDF07-E288-4239-B47A-E9E7E912193B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{971FDF07-E288-4239-B47A-E9E7E912193B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{971FDF07-E288-4239-B47A-E9E7E912193B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{971FDF07-E288-4239-B47A-E9E7E912193B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{971FDF07-E288-4239-B47A-E9E7E912193B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{971FDF07-E288-4239-B47A-E9E7E912193B}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{971FDF07-E288-4239-B47A-E9E7E912193B}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{971FDF07-E288-4239-B47A-E9E7E912193B}.Release|iPhone.Build.0 = Release|Any CPU
+		{971FDF07-E288-4239-B47A-E9E7E912193B}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{971FDF07-E288-4239-B47A-E9E7E912193B}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{971FDF07-E288-4239-B47A-E9E7E912193B}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{971FDF07-E288-4239-B47A-E9E7E912193B}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{971FDF07-E288-4239-B47A-E9E7E912193B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{971FDF07-E288-4239-B47A-E9E7E912193B}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{971FDF07-E288-4239-B47A-E9E7E912193B}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{971FDF07-E288-4239-B47A-E9E7E912193B}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.Release|iPhone.Build.0 = Release|Any CPU
+		{11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{11DBC05E-F8B4-49ED-AAC9-96D92336D21C}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
 		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhone.Build.0 = Debug|iPhone
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|Any CPU.ActiveCfg = FDroid|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|Any CPU.Build.0 = FDroid|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|iPhone.ActiveCfg = FDroid|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|iPhone.Build.0 = FDroid|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|iPhoneSimulator.ActiveCfg = FDroid|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|iPhoneSimulator.Build.0 = FDroid|Any CPU
 		{E71F3053-056C-4381-9638-048ED73BDFF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E71F3053-056C-4381-9638-048ED73BDFF6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.Release|iPhone.Build.0 = Release|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{E71F3053-056C-4381-9638-048ED73BDFF6}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{E71F3053-056C-4381-9638-048ED73BDFF6}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.AppStore|iPhone.Build.0 = AppStore|iPhone
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Debug|Any CPU.ActiveCfg = Debug|iPhone
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Debug|iPhone.Build.0 = Debug|iPhone
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.FDroid|Any CPU.ActiveCfg = FDroid|iPhone
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.FDroid|iPhone.ActiveCfg = FDroid|iPhone
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.FDroid|iPhone.Build.0 = FDroid|iPhone
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.FDroid|iPhoneSimulator.ActiveCfg = FDroid|iPhoneSimulator
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.FDroid|iPhoneSimulator.Build.0 = FDroid|iPhoneSimulator
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Release|Any CPU.ActiveCfg = Release|iPhone
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Release|iPhone.ActiveCfg = Release|iPhone
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Release|iPhone.Build.0 = Release|iPhone
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone
-		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Ad-Hoc|Any CPU.Build.0 = Ad-Hoc|iPhone
-		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
-		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
-		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator
-		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator
-		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone
-		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.AppStore|Any CPU.Build.0 = AppStore|iPhone
-		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
-		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.AppStore|iPhone.Build.0 = AppStore|iPhone
-		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
-		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator
-		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Debug|Any CPU.ActiveCfg = Debug|iPhone
-		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Debug|iPhone.Build.0 = Debug|iPhone
-		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.FDroid|Any CPU.ActiveCfg = Release|iPhone
-		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.FDroid|Any CPU.Build.0 = Release|iPhone
-		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.FDroid|iPhone.ActiveCfg = Release|iPhone
-		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.FDroid|iPhone.Build.0 = Release|iPhone
-		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.FDroid|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.FDroid|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Release|Any CPU.ActiveCfg = Release|iPhone
-		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Release|iPhone.ActiveCfg = Release|iPhone
-		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Release|iPhone.Build.0 = Release|iPhone
-		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.FDroid|Any CPU.ActiveCfg = Release|Any CPU
-		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.FDroid|Any CPU.Build.0 = Release|Any CPU
-		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.FDroid|iPhone.ActiveCfg = Release|Any CPU
-		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.FDroid|iPhone.Build.0 = Release|Any CPU
-		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.FDroid|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.FDroid|iPhoneSimulator.Build.0 = Release|Any CPU
-		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Release|iPhone.Build.0 = Release|Any CPU
-		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.FDroid|Any CPU.ActiveCfg = Release|Any CPU
-		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.FDroid|Any CPU.Build.0 = Release|Any CPU
-		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.FDroid|iPhone.ActiveCfg = Release|Any CPU
-		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.FDroid|iPhone.Build.0 = Release|Any CPU
-		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.FDroid|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.FDroid|iPhoneSimulator.Build.0 = Release|Any CPU
-		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Release|iPhone.Build.0 = Release|Any CPU
-		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Ad-Hoc|Any CPU.ActiveCfg = Debug|iPhoneSimulator
-		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Ad-Hoc|Any CPU.Build.0 = Debug|iPhoneSimulator
-		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Ad-Hoc|iPhone.ActiveCfg = Release|iPhone
-		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Ad-Hoc|iPhone.Build.0 = Release|iPhone
-		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{F8C3F648-EA5A-4719-8005-85D1690B1655}.AppStore|Any CPU.ActiveCfg = Debug|iPhoneSimulator
-		{F8C3F648-EA5A-4719-8005-85D1690B1655}.AppStore|Any CPU.Build.0 = Debug|iPhoneSimulator
-		{F8C3F648-EA5A-4719-8005-85D1690B1655}.AppStore|iPhone.ActiveCfg = Release|iPhone
-		{F8C3F648-EA5A-4719-8005-85D1690B1655}.AppStore|iPhone.Build.0 = Release|iPhone
-		{F8C3F648-EA5A-4719-8005-85D1690B1655}.AppStore|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{F8C3F648-EA5A-4719-8005-85D1690B1655}.AppStore|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
-		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
-		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Debug|iPhone.Build.0 = Debug|iPhone
-		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{F8C3F648-EA5A-4719-8005-85D1690B1655}.FDroid|Any CPU.ActiveCfg = Debug|iPhoneSimulator
-		{F8C3F648-EA5A-4719-8005-85D1690B1655}.FDroid|Any CPU.Build.0 = Debug|iPhoneSimulator
-		{F8C3F648-EA5A-4719-8005-85D1690B1655}.FDroid|iPhone.ActiveCfg = Release|iPhone
-		{F8C3F648-EA5A-4719-8005-85D1690B1655}.FDroid|iPhone.Build.0 = Release|iPhone
-		{F8C3F648-EA5A-4719-8005-85D1690B1655}.FDroid|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{F8C3F648-EA5A-4719-8005-85D1690B1655}.FDroid|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Release|Any CPU.ActiveCfg = Release|iPhone
-		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Release|Any CPU.Build.0 = Release|iPhone
-		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Release|iPhone.ActiveCfg = Release|iPhone
-		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Release|iPhone.Build.0 = Release|iPhone
-		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone
-		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Ad-Hoc|Any CPU.Build.0 = Ad-Hoc|iPhone
-		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
-		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
-		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator
-		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator
-		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone
-		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.AppStore|Any CPU.Build.0 = AppStore|iPhone
-		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
-		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.AppStore|iPhone.Build.0 = AppStore|iPhone
-		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
-		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator
-		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Debug|Any CPU.ActiveCfg = Debug|iPhone
-		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Debug|iPhone.Build.0 = Debug|iPhone
-		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.FDroid|Any CPU.ActiveCfg = Release|iPhone
-		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.FDroid|Any CPU.Build.0 = Release|iPhone
-		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.FDroid|iPhone.ActiveCfg = Release|iPhone
-		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.FDroid|iPhone.Build.0 = Release|iPhone
-		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.FDroid|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.FDroid|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Release|Any CPU.ActiveCfg = Release|iPhone
-		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Release|iPhone.ActiveCfg = Release|iPhone
-		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Release|iPhone.Build.0 = Release|iPhone
-		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Release|iPhone.Build.0 = Release|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Release|Any CPU.Build.0 = Release|Any CPU
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Release|iPhone.Build.0 = Release|Any CPU
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Release|iPhone.Build.0 = Release|Any CPU
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{83449CC4-1F76-4CFE-92B1-D2E13A62506F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83449CC4-1F76-4CFE-92B1-D2E13A62506F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83449CC4-1F76-4CFE-92B1-D2E13A62506F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{83449CC4-1F76-4CFE-92B1-D2E13A62506F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{83449CC4-1F76-4CFE-92B1-D2E13A62506F}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{83449CC4-1F76-4CFE-92B1-D2E13A62506F}.Release|iPhone.Build.0 = Release|Any CPU
+		{83449CC4-1F76-4CFE-92B1-D2E13A62506F}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{83449CC4-1F76-4CFE-92B1-D2E13A62506F}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{83449CC4-1F76-4CFE-92B1-D2E13A62506F}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{83449CC4-1F76-4CFE-92B1-D2E13A62506F}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{83449CC4-1F76-4CFE-92B1-D2E13A62506F}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{83449CC4-1F76-4CFE-92B1-D2E13A62506F}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F} = {D10CA4A9-F866-40E1-B658-F69051236C71}
-		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C} = {D10CA4A9-F866-40E1-B658-F69051236C71}
-		{4B8A8C41-9820-4341-974C-41E65B7F4366} = {D10CA4A9-F866-40E1-B658-F69051236C71}
-		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3} = {8904C536-C67D-420F-9971-51B26574C3AA}
-		{2E399654-26A2-46F6-B9CA-1B496A3F370A} = {92470CBD-9047-4C3C-8EA3-D972D6622D84}
-		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D} = {2E399654-26A2-46F6-B9CA-1B496A3F370A}
-		{E71F3053-056C-4381-9638-048ED73BDFF6} = {D10CA4A9-F866-40E1-B658-F69051236C71}
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15} = {D10CA4A9-F866-40E1-B658-F69051236C71}
-		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545} = {D10CA4A9-F866-40E1-B658-F69051236C71}
-		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39} = {8904C536-C67D-420F-9971-51B26574C3AA}
-		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0} = {8904C536-C67D-420F-9971-51B26574C3AA}
-		{F8C3F648-EA5A-4719-8005-85D1690B1655} = {D10CA4A9-F866-40E1-B658-F69051236C71}
-		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A} = {D10CA4A9-F866-40E1-B658-F69051236C71}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {7D436EA3-8B7E-45D2-8D14-0730BD2E0410}
+		SolutionGuid = {3B3A9B6C-D325-4BB3-97D3-8070630C5D3B}
+	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		Policies = $0
+		$0.DotNetNamingPolicy = $1
+		$1.DirectoryNamespaceAssociation = PrefixedHierarchical
 	EndGlobalSection
 EndGlobal

build.cake

@@ -67,7 +67,7 @@ Task("UpdateAndroidManifest")
     .Does(()=> 
     {
         var buildVariant = GetVariant();
-        var manifestPath = Path.Combine(_slnPath, "src", "Android", "Properties", "AndroidManifest.xml");
+        var manifestPath = Path.Combine(_slnPath, "src", "App", "Platforms", "Android", "AndroidManifest.xml");
 
         // Cake.AndroidAppManifest doesn't currently enable us to access nested items so, quick (not ideal) fix:
         var manifestText = FileReadText(manifestPath);
@@ -119,26 +119,26 @@ Task("UpdateAndroidCodeFiles")
         //We're not using _androidPackageName here because the codefile is currently slightly different string than the one in AndroidManifest.xml
         var keyName = "com.8bit.bitwarden";
         var fixedPackageName = buildVariant.AndroidPackageName.Replace("x8bit", "8bit");
-        var filePath = Path.Combine(_slnPath, "src", "Android", "Services", "BiometricService.cs");
+        var filePath = Path.Combine(_slnPath, "src", "App", "Platforms", "Android", "Services", "BiometricService.cs");
         ReplaceInFile(filePath, keyName, fixedPackageName);
 
         var packageFileList = new string[] {
-            Path.Combine(_slnPath, "src", "Android", "MainActivity.cs"),
-            Path.Combine(_slnPath, "src", "Android", "MainApplication.cs"),
-            Path.Combine(_slnPath, "src", "Android", "Constants.cs"),
-            Path.Combine(_slnPath, "src", "Android", "Accessibility", "AccessibilityService.cs"),
-            Path.Combine(_slnPath, "src", "Android", "Autofill", "AutofillHelpers.cs"),
-            Path.Combine(_slnPath, "src", "Android", "Autofill", "AutofillService.cs"),
-            Path.Combine(_slnPath, "src", "Android", "Receivers", "ClearClipboardAlarmReceiver.cs"),
-            Path.Combine(_slnPath, "src", "Android", "Receivers", "EventUploadReceiver.cs"),
-            Path.Combine(_slnPath, "src", "Android", "Receivers", "PackageReplacedReceiver.cs"),
-            Path.Combine(_slnPath, "src", "Android", "Receivers", "RestrictionsChangedReceiver.cs"),
-            Path.Combine(_slnPath, "src", "Android", "Services", "DeviceActionService.cs"),
-            Path.Combine(_slnPath, "src", "Android", "Services", "FileService.cs"),
-            Path.Combine(_slnPath, "src", "Android", "Tiles", "AutofillTileService.cs"),
-            Path.Combine(_slnPath, "src", "Android", "Tiles", "GeneratorTileService.cs"),
-            Path.Combine(_slnPath, "src", "Android", "Tiles", "MyVaultTileService.cs"),
-            Path.Combine(_slnPath, "src", "Android", "google-services.json"),
+            Path.Combine(_slnPath, "src", "App", "Platforms", "Android", "MainActivity.cs"),
+            Path.Combine(_slnPath, "src", "App", "Platforms", "Android", "MainApplication.cs"),
+            Path.Combine(_slnPath, "src", "App", "Platforms", "Android", "Constants.cs"),
+            Path.Combine(_slnPath, "src", "App", "Platforms", "Android", "Accessibility", "AccessibilityService.cs"),
+            Path.Combine(_slnPath, "src", "App", "Platforms", "Android", "Autofill", "AutofillHelpers.cs"),
+            Path.Combine(_slnPath, "src", "App", "Platforms", "Android", "Autofill", "AutofillService.cs"),
+            Path.Combine(_slnPath, "src", "App", "Platforms", "Android", "Receivers", "ClearClipboardAlarmReceiver.cs"),
+            Path.Combine(_slnPath, "src", "App", "Platforms", "Android", "Receivers", "EventUploadReceiver.cs"),
+            Path.Combine(_slnPath, "src", "App", "Platforms", "Android", "Receivers", "PackageReplacedReceiver.cs"),
+            Path.Combine(_slnPath, "src", "App", "Platforms", "Android", "Receivers", "RestrictionsChangedReceiver.cs"),
+            Path.Combine(_slnPath, "src", "App", "Platforms", "Android", "Services", "DeviceActionService.cs"),
+            Path.Combine(_slnPath, "src", "App", "Platforms", "Android", "Services", "FileService.cs"),
+            Path.Combine(_slnPath, "src", "App", "Platforms", "Android", "Tiles", "AutofillTileService.cs"),
+            Path.Combine(_slnPath, "src", "App", "Platforms", "Android", "Tiles", "GeneratorTileService.cs"),
+            Path.Combine(_slnPath, "src", "App", "Platforms", "Android", "Tiles", "MyVaultTileService.cs"),
+            Path.Combine(_slnPath, "src", "App", "Platforms", "Android", "google-services.json"),
             Path.Combine(_slnPath, "store", "google", "Publisher", "Program.cs"),
         };
 
@@ -148,7 +148,7 @@ Task("UpdateAndroidCodeFiles")
         }
 
         var labelFileList = new string[] {
-            Path.Combine(_slnPath, "src", "Android", "Autofill", "AutofillService.cs"),
+            Path.Combine(_slnPath, "src", "App", "Platforms", "Android", "Autofill", "AutofillService.cs"),
         };
 
         foreach(string path in labelFileList)
@@ -315,7 +315,7 @@ private void UpdateAppleIcons(string target, string appiconsetTarget)
 
 Task("UpdateiOSIcons")
     .Does(()=>{
-        UpdateAppleIcons("ios", Path.Combine(_slnPath, "src", "iOS", "Resources", "Assets.xcassets", "AppIcons.appiconset"));
+        UpdateAppleIcons("ios", Path.Combine(_slnPath, "src", "App", "Platforms", "iOS", "Resources", "Assets.xcassets", "AppIcons.appiconset"));
         UpdateAppleIcons("watch", Path.Combine(_slnPath, "src", "watchOS", "bitwarden", "bitwarden WatchKit App", "Assets.xcassets", "AppIcon.appiconset"));
         // TODO: Update complication icons when they start working
     });
@@ -324,8 +324,8 @@ Task("UpdateiOSPlist")
     .IsDependentOn("GetGitInfo")
     .Does(()=> {
         var buildVariant = GetVariant();
-        var infoPath = Path.Combine(_slnPath, "src", "iOS", "Info.plist");
-        var entitlementsPath = Path.Combine(_slnPath, "src", "iOS", "Entitlements.plist");
+        var infoPath = Path.Combine(_slnPath, "src", "App", "Platforms", "iOS", "Info.plist");
+        var entitlementsPath = Path.Combine(_slnPath, "src", "App", "Platforms", "iOS", "Entitlements.plist");
         UpdateiOSInfoPlist(infoPath, buildVariant, _gitVersion, iOSProjectType.MainApp);
         UpdateiOSEntitlementsPlist(entitlementsPath, buildVariant);
     });

global.json

@@ -1,5 +0,0 @@
-{
-  "sdk": {
-    "version": "7.0.306"
-  }
-}

src/Android/Android.csproj

@@ -1,319 +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>
-    <ProjectGuid>{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}</ProjectGuid>
-    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <TemplateGuid>{c9e5eea5-ca05-42a1-839b-61506e0a37df}</TemplateGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Bit.Droid</RootNamespace>
-    <AssemblyName>BitwardenAndroid</AssemblyName>
-    <AndroidApplication>True</AndroidApplication>
-    <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
-    <AndroidResgenClass>Resource</AndroidResgenClass>
-    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
-    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
-    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <TargetFrameworkVersion>v13.0</TargetFrameworkVersion>
-    <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </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>3</WarningLevel>
-    <AndroidSupportedAbis />
-    <JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugSymbols>false</DebugSymbols>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidManagedSymbols>true</AndroidManagedSymbols>
-    <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
-    <AndroidSupportedAbis>armeabi-v7a;x86;x86_64;arm64-v8a</AndroidSupportedAbis>
-    <JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
-    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
-    <AndroidEnableProfiledAot>true</AndroidEnableProfiledAot>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'FDroid|AnyCPU'">
-    <DebugSymbols>false</DebugSymbols>
-    <OutputPath>bin\FDroid\</OutputPath>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <DefineConstants>FDROID</DefineConstants>
-    <AndroidSupportedAbis>armeabi-v7a;x86;x86_64;arm64-v8a</AndroidSupportedAbis>
-    <JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
-    <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
-    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
-    <AndroidEnableProfiledAot>true</AndroidEnableProfiledAot>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Mono.Android" />
-    <Reference Include="Mono.Android.Export" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Net.Http" Condition="'$(Configuration)'=='FDroid'" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Plugin.CurrentActivity">
-      <Version>2.1.0.4</Version>
-    </PackageReference>
-    <PackageReference Include="Portable.BouncyCastle">
-      <Version>1.9.0</Version>
-    </PackageReference>
-    <PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.5.1.1" />
-    <PackageReference Include="Xamarin.AndroidX.AutoFill" Version="1.1.0.16" />
-    <PackageReference Include="Xamarin.AndroidX.CardView" Version="1.0.0.19" />
-    <PackageReference Include="Xamarin.AndroidX.Core" Version="1.10.0" />
-    <PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="1.3.1.1" />
-    <PackageReference Include="Xamarin.Essentials">
-      <Version>1.7.5</Version>
-    </PackageReference>
-    <PackageReference Include="Xamarin.Firebase.Messaging">
-      <Version>123.1.1.1</Version>
-    </PackageReference>
-    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.8.0" />
-    <PackageReference Include="Xamarin.Google.Dagger" Version="2.44.2.1" />
-    <PackageReference Include="Xamarin.GooglePlayServices.SafetyNet">
-      <Version>118.0.1.3</Version>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Accessibility\AccessibilityActivity.cs" />
-    <Compile Include="Accessibility\AccessibilityHelpers.cs" />
-    <Compile Include="Accessibility\Credentials.cs" />
-    <Compile Include="Accessibility\AccessibilityService.cs" />
-    <Compile Include="Accessibility\Browser.cs" />
-    <Compile Include="Accessibility\NodeList.cs" />
-    <Compile Include="Accessibility\KnownUsernameField.cs" />
-    <Compile Include="Autofill\AutofillConstants.cs" />
-    <Compile Include="Autofill\AutofillHelpers.cs" />
-    <Compile Include="Autofill\AutofillService.cs" />
-    <Compile Include="Autofill\AutofillExternalSelectionActivity.cs" />
-    <Compile Include="Autofill\Field.cs" />
-    <Compile Include="Autofill\FieldCollection.cs" />
-    <Compile Include="Autofill\FilledItem.cs" />
-    <Compile Include="Autofill\Parser.cs" />
-    <Compile Include="Autofill\SavedItem.cs" />
-    <Compile Include="Effects\FabShadowEffect.cs" />
-    <Compile Include="Effects\FixedSizeEffect.cs" />
-    <Compile Include="Effects\TabBarEffect.cs" />
-    <Compile Include="Push\FirebaseMessagingService.cs" />
-    <Compile Include="Receivers\ClearClipboardAlarmReceiver.cs" />
-    <Compile Include="Receivers\RestrictionsChangedReceiver.cs" />
-    <Compile Include="Receivers\EventUploadReceiver.cs" />
-    <Compile Include="Receivers\PackageReplacedReceiver.cs" />
-    <Compile Include="Renderers\ExtendedGridRenderer.cs" />
-    <Compile Include="Renderers\ExtendedDatePickerRenderer.cs" />
-    <Compile Include="Renderers\CustomTabbedRenderer.cs" />
-    <Compile Include="Renderers\ExtendedStackLayoutRenderer.cs" />
-    <Compile Include="Renderers\ExtendedStepperRenderer.cs" />
-    <Compile Include="Renderers\CustomSwitchRenderer.cs" />
-    <Compile Include="Renderers\ExtendedTimePickerRenderer.cs" />
-    <Compile Include="Renderers\ExtendedSliderRenderer.cs" />
-    <Compile Include="Renderers\CustomEditorRenderer.cs" />
-    <Compile Include="Renderers\CustomPickerRenderer.cs" />
-    <Compile Include="Renderers\CustomEntryRenderer.cs" />
-    <Compile Include="Renderers\CustomSearchBarRenderer.cs" />
-    <Compile Include="Renderers\HybridWebViewRenderer.cs" />
-    <Compile Include="Services\AndroidPushNotificationService.cs" />
-    <Compile Include="Services\AndroidLogService.cs" />
-    <Compile Include="MainApplication.cs" />
-    <Compile Include="MainActivity.cs" />
-    <Compile Include="Resources\Resource.designer.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Services\BiometricService.cs" />
-    <Compile Include="Services\CryptoPrimitiveService.cs" />
-    <Compile Include="Services\DeviceActionService.cs" />
-    <Compile Include="Services\LocalizeService.cs" />
-    <Compile Include="Tiles\AutofillTileService.cs" />
-    <Compile Include="Tiles\GeneratorTileService.cs" />
-    <Compile Include="Tiles\MyVaultTileService.cs" />
-    <Compile Include="Utilities\AndroidHelpers.cs" />
-    <Compile Include="Utilities\ThemeHelpers.cs" />
-    <Compile Include="WebAuthCallbackActivity.cs" />
-    <Compile Include="Renderers\SelectableLabelRenderer.cs" />
-    <Compile Include="Services\ClipboardService.cs" />
-    <Compile Include="Utilities\IntentExtensions.cs" />
-    <Compile Include="Renderers\CustomPageRenderer.cs" />
-    <Compile Include="Effects\NoEmojiKeyboardEffect.cs" />
-    <Compile Include="Receivers\NotificationDismissReceiver.cs" />
-    <Compile Include="Services\FileService.cs" />
-    <Compile Include="Services\AutofillHandler.cs" />
-    <Compile Include="Constants.cs" />
-    <Compile Include="Effects\RemoveFontPaddingEffect.cs" />
-    <Compile Include="Services\WatchDeviceService.cs" />
-    <Compile Include="Renderers\CustomLabelRenderer.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidAsset Include="Assets\bwi-font.ttf" />
-    <AndroidAsset Include="Assets\RobotoMono_Regular.ttf" />
-    <AndroidAsset Include="Assets\MaterialIcons_Regular.ttf" />
-    <None Include="8bit.keystore.enc" />
-    <GoogleServicesJson Include="google-services.json" />
-    <GoogleServicesJson Include="google-services.json.enc" />
-    <None Include="fdroid-keystore.jks.enc" />
-    <AndroidNativeLibrary Include="lib\arm64-v8a\libargon2.so" />
-    <AndroidNativeLibrary Include="lib\armeabi-v7a\libargon2.so" />
-    <AndroidNativeLibrary Include="lib\x86\libargon2.so" />
-    <AndroidNativeLibrary Include="lib\x86_64\libargon2.so" />
-    <None Include="Properties\AndroidManifest.xml" />
-    <None Include="upload-keystore.jks.enc" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\logo_legacy.png" />
-    <AndroidResource Include="Resources\drawable-hdpi\logo_white_legacy.png" />
-    <AndroidResource Include="Resources\drawable-xhdpi\logo_legacy.png" />
-    <AndroidResource Include="Resources\drawable-xhdpi\logo_white_legacy.png" />
-    <AndroidResource Include="Resources\drawable-xxhdpi\logo_legacy.png" />
-    <AndroidResource Include="Resources\drawable-xxhdpi\logo_white_legacy.png" />
-    <AndroidResource Include="Resources\drawable\card.xml" />
-    <AndroidResource Include="Resources\drawable\cog_environment.xml" />
-    <AndroidResource Include="Resources\drawable\cog_settings.xml" />
-    <AndroidResource Include="Resources\drawable\icon.xml" />
-    <AndroidResource Include="Resources\drawable\ic_launcher_foreground.xml" />
-    <AndroidResource Include="Resources\drawable\ic_launcher_monochrome.xml" />
-    <AndroidResource Include="Resources\drawable\ic_warning.xml" />
-    <AndroidResource Include="Resources\drawable\id.xml" />
-    <AndroidResource Include="Resources\drawable\info.xml" />
-    <AndroidResource Include="Resources\drawable\list_item_bg.xml" />
-    <AndroidResource Include="Resources\drawable\lock.xml" />
-    <AndroidResource Include="Resources\drawable\login.xml" />
-    <AndroidResource Include="Resources\drawable\logo.xml" />
-    <AndroidResource Include="Resources\drawable\logo_white.xml" />
-    <AndroidResource Include="Resources\drawable\send.xml" />
-    <AndroidResource Include="Resources\drawable\pencil.xml" />
-    <AndroidResource Include="Resources\drawable\plus.xml" />
-    <AndroidResource Include="Resources\drawable\generate.xml" />
-    <AndroidResource Include="Resources\drawable\search.xml" />
-    <AndroidResource Include="Resources\drawable\shield.xml" />
-    <AndroidResource Include="Resources\drawable-v23\splash_screen.xml" />
-    <AndroidResource Include="Resources\drawable-v23\splash_screen_dark.xml" />
-    <AndroidResource Include="Resources\drawable\switch_thumb.xml" />
-    <AndroidResource Include="Resources\layout\progress_dialog_layout.xml" />
-    <AndroidResource Include="Resources\layout\Tabbar.axml" />
-    <AndroidResource Include="Resources\layout\Toolbar.axml" />
-    <AndroidResource Include="Resources\mipmap-anydpi-v26\ic_launcher.xml" />
-    <AndroidResource Include="Resources\mipmap-anydpi-v26\ic_launcher_round.xml" />
-    <AndroidResource Include="Resources\mipmap-hdpi\ic_launcher.png" />
-    <AndroidResource Include="Resources\mipmap-hdpi\ic_launcher_round.png" />
-    <AndroidResource Include="Resources\mipmap-mdpi\ic_launcher.png" />
-    <AndroidResource Include="Resources\mipmap-mdpi\ic_launcher_round.png" />
-    <AndroidResource Include="Resources\mipmap-xhdpi\ic_launcher.png" />
-    <AndroidResource Include="Resources\mipmap-xhdpi\ic_launcher_round.png" />
-    <AndroidResource Include="Resources\mipmap-xxhdpi\ic_launcher.png" />
-    <AndroidResource Include="Resources\mipmap-xxhdpi\ic_launcher_round.png" />
-    <AndroidResource Include="Resources\mipmap-xxxhdpi\ic_launcher.png" />
-    <AndroidResource Include="Resources\mipmap-xxxhdpi\ic_launcher_round.png" />
-    <AndroidResource Include="Resources\values-night\styles.xml" />
-    <AndroidResource Include="Resources\values\styles.xml" />
-    <AndroidResource Include="Resources\values\colors.xml" />
-    <AndroidResource Include="Resources\values\manifest.xml" />
-    <AndroidResource Include="Resources\values-v30\manifest.xml" />
-    <AndroidResource Include="Resources\drawable-v26\splash_screen_round.xml" />
-    <AndroidResource Include="Resources\drawable\logo_rounded.xml" />
-    <AndroidResource Include="Resources\drawable-night-v26\splash_screen_round.xml" />
-    <AndroidResource Include="Resources\drawable\ic_notification.xml">
-      <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" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\App\App.csproj">
-      <Project>{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}</Project>
-      <Name>App</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Core\Core.csproj">
-      <Project>{4b8a8c41-9820-4341-974c-41e65b7f4366}</Project>
-      <Name>Core</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\xml\accessibilityservice.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\xml\autofillservice.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\xml\filepaths.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\xml\network_security_config.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\values\strings.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\values\ic_launcher_background.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\layout\autofill_listitem.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\yubikey.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xhdpi\yubikey.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi\yubikey.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\slider_thumb.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\splash_screen_dark.xml">
-      <Generator>MSBuild:UpdateGeneratedFiles</Generator>
-      <SubType>Designer</SubType>
-    </AndroidResource>
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\values\dimens.xml">
-      <Generator>MSBuild:UpdateGeneratedFiles</Generator>
-      <SubType>Designer</SubType>
-    </AndroidResource>
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\xml\app_restrictions.xml">
-      <Generator>MSBuild:UpdateGeneratedFiles</Generator>
-      <SubType>Designer</SubType>
-    </AndroidResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Resources\values-v30\" />
-    <Folder Include="Resources\drawable-v26\" />
-    <Folder Include="Resources\drawable-night-v26\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-</Project>

src/Android/Autofill/AutofillExternalSelectionActivity.cs

@@ -1,42 +0,0 @@
-using System.Threading.Tasks;
-using Android.App;
-using Android.Content.PM;
-using Android.OS;
-using Bit.Core.Abstractions;
-using Bit.Core.Utilities;
-using Bit.Droid.Utilities;
-
-namespace Bit.Droid.Autofill
-{
-    [Activity(
-        NoHistory = true,
-        LaunchMode = LaunchMode.SingleTop)]
-    public class AutofillExternalSelectionActivity : Xamarin.Forms.Platform.Android.FormsAppCompatActivity
-    {
-        protected override void OnCreate(Bundle bundle)
-        {
-            Intent?.Validate();
-            base.OnCreate(bundle);
-
-            var cipherId = Intent?.GetStringExtra(AutofillConstants.AutofillFrameworkCipherId);
-            if (string.IsNullOrEmpty(cipherId))
-            {
-                SetResult(Result.Canceled);
-                Finish();
-                return;
-            }
-
-            GetCipherAndPerformAutofillAsync(cipherId).FireAndForget();
-        }
-
-        private async Task GetCipherAndPerformAutofillAsync(string cipherId)
-        {
-            var cipherService = ServiceContainer.Resolve<ICipherService>();
-            var cipher = await cipherService.GetAsync(cipherId);
-            var decCipher = await cipher.DecryptAsync();
-
-            var autofillHandler = ServiceContainer.Resolve<IAutofillHandler>();
-            autofillHandler.Autofill(decCipher);
-        }
-    }
-}

src/Android/Autofill/AutofillHelpers.cs

@@ -1,438 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Android.Content;
-using Android.Service.Autofill;
-using Android.Widget;
-using System.Linq;
-using Android.App;
-using System.Threading.Tasks;
-using Android.App.Slices;
-using Android.Graphics;
-using Android.Graphics.Drawables;
-using Android.OS;
-using Android.Runtime;
-using Android.Widget.Inline;
-using Bit.App.Resources;
-using Bit.Core.Enums;
-using Android.Views.Autofill;
-using AndroidX.AutoFill.Inline;
-using AndroidX.AutoFill.Inline.V1;
-using Bit.Core.Abstractions;
-using SaveFlags = Android.Service.Autofill.SaveFlags;
-using Bit.Droid.Utilities;
-
-namespace Bit.Droid.Autofill
-{
-    public static class AutofillHelpers
-    {
-        private static int _pendingIntentId = 0;
-
-        // These browsers work natively with the Autofill Framework
-        //
-        // Be sure:
-        //   - to keep these entries sorted alphabetically and
-        //
-        //   - ... to keep this list in sync with values in AccessibilityHelpers.SupportedBrowsers [Section A], too.
-        public static HashSet<string> TrustedBrowsers = new HashSet<string>
-        {
-            "com.duckduckgo.mobile.android",
-            "com.google.android.googlequicksearchbox",
-            "org.mozilla.focus",
-            "org.mozilla.focus.beta",
-            "org.mozilla.focus.nightly",
-            "org.mozilla.klar",
-        };
-
-        // These browsers work using the compatibility shim for the Autofill Framework
-        //
-        // Be sure:
-        //   - to keep these entries sorted alphabetically,
-        //   - to keep this list in sync with values in Resources/xml/autofillservice.xml, and
-        //
-        //   - ... to keep this list in sync with values in AccessibilityHelpers.SupportedBrowsers [Section A], too.
-        public static HashSet<string> CompatBrowsers = new HashSet<string>
-        {
-            "alook.browser",
-            "alook.browser.google",
-            "app.vanadium.browser",
-            "com.amazon.cloud9",
-            "com.android.browser",
-            "com.android.chrome",
-            "com.android.htmlviewer",
-            "com.avast.android.secure.browser",
-            "com.avg.android.secure.browser",
-            "com.brave.browser",
-            "com.brave.browser_beta",
-            "com.brave.browser_default",
-            "com.brave.browser_dev",
-            "com.brave.browser_nightly",
-            "com.chrome.beta",
-            "com.chrome.canary",
-            "com.chrome.dev",
-            "com.cookiegames.smartcookie",
-            "com.cookiejarapps.android.smartcookieweb",
-            "com.ecosia.android",
-            "com.google.android.apps.chrome",
-            "com.google.android.apps.chrome_dev",
-            "com.google.android.captiveportallogin",
-            "com.iode.firefox",
-            "com.jamal2367.styx",
-            "com.kiwibrowser.browser",
-            "com.kiwibrowser.browser.dev",
-            "com.lemurbrowser.exts",
-            "com.microsoft.emmx",
-            "com.microsoft.emmx.beta",
-            "com.microsoft.emmx.canary",
-            "com.microsoft.emmx.dev",
-            "com.mmbox.browser",
-            "com.mmbox.xbrowser",
-            "com.mycompany.app.soulbrowser",
-            "com.naver.whale",
-            "com.neeva.app",
-            "com.opera.browser",
-            "com.opera.browser.beta",
-            "com.opera.gx",
-            "com.opera.mini.native",
-            "com.opera.mini.native.beta",
-            "com.opera.touch",
-            "com.qflair.browserq",
-            "com.qwant.liberty",
-            "com.rainsee.create",
-            "com.sec.android.app.sbrowser",
-            "com.sec.android.app.sbrowser.beta",
-            "com.stoutner.privacybrowser.free",
-            "com.stoutner.privacybrowser.standard",
-            "com.vivaldi.browser",
-            "com.vivaldi.browser.snapshot",
-            "com.vivaldi.browser.sopranos",
-            "com.yandex.browser",
-            "com.yjllq.internet",
-            "com.yjllq.kito",
-            "com.yujian.ResideMenuDemo",
-            "com.z28j.feel",
-            "idm.internet.download.manager",
-            "idm.internet.download.manager.adm.lite",
-            "idm.internet.download.manager.plus",
-            "io.github.forkmaintainers.iceraven",
-            "mark.via",
-            "mark.via.gp",
-            "net.dezor.browser",
-            "net.slions.fulguris.full.download",
-            "net.slions.fulguris.full.download.debug",            
-            "net.slions.fulguris.full.playstore",
-            "net.slions.fulguris.full.playstore.debug",
-            "org.adblockplus.browser",
-            "org.adblockplus.browser.beta",
-            "org.bromite.bromite",
-            "org.bromite.chromium",
-            "org.chromium.chrome",
-            "org.codeaurora.swe.browser",
-            "org.gnu.icecat",
-            "org.mozilla.fenix",
-            "org.mozilla.fenix.nightly",
-            "org.mozilla.fennec_aurora",
-            "org.mozilla.fennec_fdroid",
-            "org.mozilla.firefox",
-            "org.mozilla.firefox_beta",
-            "org.mozilla.reference.browser",
-            "org.mozilla.rocket",
-            "org.torproject.torbrowser",
-            "org.torproject.torbrowser_alpha",
-            "org.ungoogled.chromium.extensions.stable",
-            "org.ungoogled.chromium.stable",
-            "us.spotco.fennec_dos",
-        };
-
-        // The URLs are blacklisted from autofilling
-        public static HashSet<string> BlacklistedUris = new HashSet<string>
-        {
-            "androidapp://android",
-            "androidapp://com.android.settings",
-            "androidapp://com.x8bit.bitwarden",
-            "androidapp://com.oneplus.applocker",
-        };
-
-        public static async Task<List<FilledItem>> GetFillItemsAsync(Parser parser, ICipherService cipherService)
-        {
-            if (parser.FieldCollection.FillableForLogin)
-            {
-                var ciphers = await cipherService.GetAllDecryptedByUrlAsync(parser.Uri);
-                if (ciphers.Item1.Any() || ciphers.Item2.Any())
-                {
-                    var allCiphers = ciphers.Item1.ToList();
-                    allCiphers.AddRange(ciphers.Item2.ToList());
-                    var nonPromptCiphers = allCiphers.Where(cipher => cipher.Reprompt == CipherRepromptType.None);
-                    return nonPromptCiphers.Select(c => new FilledItem(c)).ToList();
-                }
-            }
-            else if (parser.FieldCollection.FillableForCard)
-            {
-                var ciphers = await cipherService.GetAllDecryptedAsync();
-                return ciphers.Where(c => c.Type == CipherType.Card && c.Reprompt == CipherRepromptType.None).Select(c => new FilledItem(c)).ToList();
-            }
-            return new List<FilledItem>();
-        }
-
-        public static FillResponse.Builder CreateFillResponse(Parser parser, List<FilledItem> items, bool locked,
-            bool inlineAutofillEnabled, FillRequest fillRequest = null)
-        {
-            // Acquire inline presentation specs on Android 11+
-            IList<InlinePresentationSpec> inlinePresentationSpecs = null;
-            var inlinePresentationSpecsCount = 0;
-            var inlineMaxSuggestedCount = 0;
-            if (inlineAutofillEnabled && fillRequest != null && (int)Build.VERSION.SdkInt >= 30)
-            {
-                var inlineSuggestionsRequest = fillRequest.InlineSuggestionsRequest;
-                inlineMaxSuggestedCount = inlineSuggestionsRequest?.MaxSuggestionCount ?? 0;
-                inlinePresentationSpecs = inlineSuggestionsRequest?.InlinePresentationSpecs;
-                inlinePresentationSpecsCount = inlinePresentationSpecs?.Count ?? 0;
-            }
-            
-            // Build response
-            var responseBuilder = new FillResponse.Builder();
-            if (items != null && items.Count > 0)
-            {
-                var maxItems = items.Count;
-                if (inlineMaxSuggestedCount > 0)
-                {
-                    // -1 to adjust for 'open vault' option
-                    maxItems = Math.Min(maxItems, inlineMaxSuggestedCount - 1);
-                }
-                for (int i = 0; i < maxItems; i++)
-                {
-                    InlinePresentationSpec inlinePresentationSpec = null;
-                    if (inlinePresentationSpecs != null)
-                    {
-                        if (i < inlinePresentationSpecsCount)
-                        {
-                            inlinePresentationSpec = inlinePresentationSpecs[i];
-                        }
-                        else
-                        {
-                            // If the max suggestion count is larger than the number of specs in the list, then
-                            // the last spec is used for the remainder of the suggestions
-                            inlinePresentationSpec = inlinePresentationSpecs[inlinePresentationSpecsCount - 1];
-                        }
-                    }
-                    var dataset = BuildDataset(parser.ApplicationContext, parser.FieldCollection, items[i], 
-                        true, inlinePresentationSpec);
-                    if (dataset != null)
-                    {
-                        responseBuilder.AddDataset(dataset);
-                    }
-                }
-            }
-            responseBuilder.AddDataset(BuildVaultDataset(parser.ApplicationContext, parser.FieldCollection,
-                parser.Uri, locked, inlinePresentationSpecs));
-            responseBuilder.SetIgnoredIds(parser.FieldCollection.IgnoreAutofillIds.ToArray());
-            return responseBuilder;
-        }
-
-        public static Dataset BuildDataset(Context context, FieldCollection fields, FilledItem filledItem,
-            bool includeAuthIntent, InlinePresentationSpec inlinePresentationSpec = null)
-        {
-            var overlayPresentation = BuildOverlayPresentation(
-                filledItem.Name,
-                filledItem.Subtitle,
-                filledItem.Icon,
-                context);
-            
-            var inlinePresentation = BuildInlinePresentation(
-                inlinePresentationSpec, 
-                filledItem.Name, 
-                filledItem.Subtitle, 
-                filledItem.Icon, 
-                null, 
-                context);
-
-            var datasetBuilder = new Dataset.Builder(overlayPresentation);
-            if (inlinePresentation != null)
-            {
-                datasetBuilder.SetInlinePresentation(inlinePresentation);
-            }
-            if (includeAuthIntent)
-            {
-                var intent = new Intent(context, typeof(AutofillExternalSelectionActivity));
-                intent.PutExtra(AutofillConstants.AutofillFramework, true);
-                intent.PutExtra(AutofillConstants.AutofillFrameworkCipherId, filledItem.Id);
-                var pendingIntent = PendingIntent.GetActivity(context, ++_pendingIntentId, intent,
-                AndroidHelpers.AddPendingIntentMutabilityFlag(PendingIntentFlags.CancelCurrent, true));
-                datasetBuilder.SetAuthentication(pendingIntent?.IntentSender);
-            }
-            if (filledItem.ApplyToFields(fields, datasetBuilder))
-            {
-                return datasetBuilder.Build();
-            }
-            return null;
-        }
-
-        public static Dataset BuildVaultDataset(Context context, FieldCollection fields, string uri, bool locked,
-            IList<InlinePresentationSpec> inlinePresentationSpecs = null)
-        {
-            var intent = new Intent(context, typeof(MainActivity));
-            intent.PutExtra(AutofillConstants.AutofillFramework, true);
-            if (fields.FillableForLogin)
-            {
-                intent.PutExtra(AutofillConstants.AutofillFrameworkFillType, (int)CipherType.Login);
-            }
-            else if (fields.FillableForCard)
-            {
-                intent.PutExtra(AutofillConstants.AutofillFrameworkFillType, (int)CipherType.Card);
-            }
-            else if (fields.FillableForIdentity)
-            {
-                intent.PutExtra(AutofillConstants.AutofillFrameworkFillType, (int)CipherType.Identity);
-            }
-            else
-            {
-                return null;
-            }
-            intent.PutExtra(AutofillConstants.AutofillFrameworkUri, uri);
-            var pendingIntent = PendingIntent.GetActivity(context, ++_pendingIntentId, intent,
-                AndroidHelpers.AddPendingIntentMutabilityFlag(PendingIntentFlags.CancelCurrent, true));
-
-            var overlayPresentation = BuildOverlayPresentation(
-                AppResources.AutofillWithBitwarden,
-                locked ? AppResources.VaultIsLocked : AppResources.GoToMyVault,
-                Resource.Drawable.icon,
-                context);
-
-            var inlinePresentation = BuildInlinePresentation(
-                inlinePresentationSpecs?.Last(), 
-                AppResources.Bitwarden, 
-                locked ? AppResources.VaultIsLocked : AppResources.MyVault, 
-                Resource.Drawable.icon, 
-                pendingIntent, 
-                context);
-
-            var datasetBuilder = new Dataset.Builder(overlayPresentation);
-            if (inlinePresentation != null)
-            {
-                datasetBuilder.SetInlinePresentation(inlinePresentation);
-            }
-            datasetBuilder.SetAuthentication(pendingIntent?.IntentSender);
-
-            // Dataset must have a value set. We will reset this in the main activity when the real item is chosen.
-            foreach (var autofillId in fields.AutofillIds)
-            {
-                datasetBuilder.SetValue(autofillId, AutofillValue.ForText("PLACEHOLDER"));
-            }
-            return datasetBuilder.Build();
-        }
-
-        public static RemoteViews BuildOverlayPresentation(string text, string subtext, int iconId, Context context)
-        {
-            var packageName = context.PackageName;
-            var view = new RemoteViews(packageName, Resource.Layout.autofill_listitem);
-            view.SetTextViewText(Resource.Id.text1, text);
-            view.SetTextViewText(Resource.Id.text2, subtext);
-            view.SetImageViewResource(Resource.Id.icon, iconId);
-            return view;
-        }
-
-        public static InlinePresentation BuildInlinePresentation(InlinePresentationSpec inlinePresentationSpec,
-            string text, string subtext, int iconId, PendingIntent pendingIntent, Context context)
-        {
-            if ((int)Build.VERSION.SdkInt < 30 || inlinePresentationSpec == null)
-            {
-                return null;
-            }
-            if (pendingIntent == null)
-            {
-                // InlinePresentation requires nonNull pending intent (even though we only utilize one for the
-                // "my vault" presentation) so we're including an empty one here
-                pendingIntent = PendingIntent.GetService(context, 0, new Intent(),
-                    AndroidHelpers.AddPendingIntentMutabilityFlag(PendingIntentFlags.OneShot | PendingIntentFlags.UpdateCurrent, true));
-            }
-            var slice = CreateInlinePresentationSlice(
-                inlinePresentationSpec,
-                text,
-                subtext,
-                iconId,
-                "Autofill option",
-                pendingIntent,
-                context);
-            if (slice != null)
-            {
-                return new InlinePresentation(slice, inlinePresentationSpec, false);
-            }
-            return null;
-        }
-
-        private static Slice CreateInlinePresentationSlice(
-            InlinePresentationSpec inlinePresentationSpec,
-            string text,
-            string subtext,
-            int iconId,
-            string contentDescription,
-            PendingIntent pendingIntent,
-            Context context)
-        {
-            var imeStyle = inlinePresentationSpec.Style;
-            if (!UiVersions.GetVersions(imeStyle).Contains(UiVersions.InlineUiVersion1))
-            {
-                return null;
-            }
-            var contentBuilder = InlineSuggestionUi.NewContentBuilder(pendingIntent)
-                .SetContentDescription(contentDescription);
-            if (!string.IsNullOrWhiteSpace(text))
-            {
-                contentBuilder.SetTitle(text);
-            }
-            if (!string.IsNullOrWhiteSpace(subtext))
-            {
-                contentBuilder.SetSubtitle(subtext);
-            }
-            if (iconId > 0)
-            {
-                var icon = Icon.CreateWithResource(context, iconId);
-                if (icon != null)
-                {
-                    if (iconId == Resource.Drawable.icon)
-                    {
-                        // Don't tint our logo
-                        icon.SetTintBlendMode(BlendMode.Dst);
-                    }
-                    contentBuilder.SetStartIcon(icon);
-                }
-            }
-            return contentBuilder.Build().JavaCast<InlineSuggestionUi.Content>()?.Slice;
-        }
-
-        public static void AddSaveInfo(Parser parser, FillRequest fillRequest, FillResponse.Builder responseBuilder, 
-            FieldCollection fields)
-        {
-            // Docs state that password fields cannot be reliably saved in Compat mode since they will show as
-            // masked values.
-            bool? compatRequest = null;
-            if (Build.VERSION.SdkInt >= BuildVersionCodes.Q && fillRequest != null)
-            {
-                // Attempt to automatically establish compat request mode on Android 10+
-                compatRequest = (fillRequest.Flags | FillRequest.FlagCompatibilityModeRequest) == fillRequest.Flags;
-            }
-            var compatBrowser = compatRequest ?? CompatBrowsers.Contains(parser.PackageName);
-            if (compatBrowser && fields.SaveType == SaveDataType.Password)
-            {
-                return;
-            }
-
-            var requiredIds = fields.GetRequiredSaveFields();
-            if (fields.SaveType == SaveDataType.Generic || requiredIds.Length == 0)
-            {
-                return;
-            }
-
-            var saveBuilder = new SaveInfo.Builder(fields.SaveType, requiredIds);
-            var optionalIds = fields.GetOptionalSaveIds();
-            if (optionalIds.Length > 0)
-            {
-                saveBuilder.SetOptionalIds(optionalIds);
-            }
-            if (compatBrowser)
-            {
-                saveBuilder.SetFlags(SaveFlags.SaveOnAllViewsInvisible);
-            }
-            responseBuilder.SetSaveInfo(saveBuilder.Build());
-        }
-    }
-}

src/Android/Autofill/Field.cs

@@ -1,195 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Android.Service.Autofill;
-using Android.Views;
-using Android.Views.Autofill;
-using static Android.App.Assist.AssistStructure;
-using Android.Text;
-using static Android.Views.ViewStructure;
-
-namespace Bit.Droid.Autofill
-{
-    public class Field
-    {
-        private List<string> _hints;
-
-        public Field(ViewNode node)
-        {
-            Id = node.Id;
-            TrackingId = $"{node.Id}_{node.GetHashCode()}";
-            IdEntry = node.IdEntry;
-            AutofillId = node.AutofillId;
-            AutofillType = node.AutofillType;
-            InputType = node.InputType;
-            Focused = node.IsFocused;
-            Selected = node.IsSelected;
-            Clickable = node.IsClickable;
-            Visible = node.Visibility == ViewStates.Visible;
-            Hints = FilterForSupportedHints(node.GetAutofillHints());
-            Hint = node.Hint;
-            AutofillOptions = node.GetAutofillOptions()?.ToList();
-            HtmlInfo = node.HtmlInfo;
-            Node = node;
-
-            if (node.AutofillValue != null)
-            {
-                if (node.AutofillValue.IsList)
-                {
-                    var autofillOptions = node.GetAutofillOptions();
-                    if (autofillOptions != null && autofillOptions.Length > 0)
-                    {
-                        ListValue = node.AutofillValue.ListValue;
-                        TextValue = autofillOptions[node.AutofillValue.ListValue];
-                    }
-                }
-                else if (node.AutofillValue.IsDate)
-                {
-                    DateValue = node.AutofillValue.DateValue;
-                }
-                else if (node.AutofillValue.IsText)
-                {
-                    TextValue = node.AutofillValue.TextValue;
-                }
-                else if (node.AutofillValue.IsToggle)
-                {
-                    ToggleValue = node.AutofillValue.ToggleValue;
-                }
-            }
-        }
-
-        public SaveDataType SaveType { get; set; } = SaveDataType.Generic;
-        public List<string> Hints
-        {
-            get => _hints;
-            set
-            {
-                _hints = value;
-                UpdateSaveTypeFromHints();
-            }
-        }
-        public string Hint { get; set; }
-        public int Id { get; private set; }
-        public string TrackingId { get; private set; }
-        public string IdEntry { get; set; }
-        public AutofillId AutofillId { get; private set; }
-        public AutofillType AutofillType { get; private set; }
-        public InputTypes InputType { get; private set; }
-        public bool Focused { get; private set; }
-        public bool Selected { get; private set; }
-        public bool Clickable { get; private set; }
-        public bool Visible { get; private set; }
-        public List<string> AutofillOptions { get; set; }
-        public string TextValue { get; set; }
-        public long? DateValue { get; set; }
-        public int? ListValue { get; set; }
-        public bool? ToggleValue { get; set; }
-        public HtmlInfo HtmlInfo { get; private set; }
-        public ViewNode Node { get; private set; }
-
-        public bool ValueIsNull()
-        {
-            return TextValue == null && DateValue == null && ToggleValue == null;
-        }
-
-        public override bool Equals(object obj)
-        {
-            if (this == obj)
-            {
-                return true;
-            }
-            if (obj == null || GetType() != obj.GetType())
-            {
-                return false;
-            }
-            var field = obj as Field;
-            if (TextValue != null ? !TextValue.Equals(field.TextValue) : field.TextValue != null)
-            {
-                return false;
-            }
-            if (DateValue != null ? !DateValue.Equals(field.DateValue) : field.DateValue != null)
-            {
-                return false;
-            }
-            return ToggleValue != null ? ToggleValue.Equals(field.ToggleValue) : field.ToggleValue == null;
-        }
-
-        public override int GetHashCode()
-        {
-            var result = TextValue != null ? TextValue.GetHashCode() : 0;
-            result = 31 * result + (DateValue != null ? DateValue.GetHashCode() : 0);
-            result = 31 * result + (ToggleValue != null ? ToggleValue.GetHashCode() : 0);
-            return result;
-        }
-
-        private static List<string> FilterForSupportedHints(string[] hints)
-        {
-            return hints?.Where(h => IsValidHint(h)).ToList() ?? new List<string>();
-        }
-
-        private static bool IsValidHint(string hint)
-        {
-            switch (hint)
-            {
-                case View.AutofillHintCreditCardExpirationDate:
-                case View.AutofillHintCreditCardExpirationDay:
-                case View.AutofillHintCreditCardExpirationMonth:
-                case View.AutofillHintCreditCardExpirationYear:
-                case View.AutofillHintCreditCardNumber:
-                case View.AutofillHintCreditCardSecurityCode:
-                case View.AutofillHintEmailAddress:
-                case View.AutofillHintPhone:
-                case View.AutofillHintName:
-                case View.AutofillHintPassword:
-                case View.AutofillHintPostalAddress:
-                case View.AutofillHintPostalCode:
-                case View.AutofillHintUsername:
-                    return true;
-                default:
-                    return false;
-            }
-        }
-
-        private void UpdateSaveTypeFromHints()
-        {
-            SaveType = SaveDataType.Generic;
-            if (_hints == null)
-            {
-                return;
-            }
-
-            foreach (var hint in _hints)
-            {
-                switch (hint)
-                {
-                    case View.AutofillHintCreditCardExpirationDate:
-                    case View.AutofillHintCreditCardExpirationDay:
-                    case View.AutofillHintCreditCardExpirationMonth:
-                    case View.AutofillHintCreditCardExpirationYear:
-                    case View.AutofillHintCreditCardNumber:
-                    case View.AutofillHintCreditCardSecurityCode:
-                        SaveType |= SaveDataType.CreditCard;
-                        break;
-                    case View.AutofillHintEmailAddress:
-                        SaveType |= SaveDataType.EmailAddress;
-                        break;
-                    case View.AutofillHintPhone:
-                    case View.AutofillHintName:
-                        SaveType |= SaveDataType.Generic;
-                        break;
-                    case View.AutofillHintPassword:
-                        SaveType |= SaveDataType.Password;
-                        SaveType &= ~SaveDataType.EmailAddress;
-                        SaveType &= ~SaveDataType.Username;
-                        break;
-                    case View.AutofillHintPostalAddress:
-                    case View.AutofillHintPostalCode:
-                        SaveType |= SaveDataType.Address;
-                        break;
-                    case View.AutofillHintUsername:
-                        SaveType |= SaveDataType.Username;
-                        break;
-                }
-            }
-        }
-    }
-}

src/Android/Constants.cs

@@ -1,7 +0,0 @@
-namespace Bit.Droid
-{
-    public static class Constants
-    {
-        public const string PACKAGE_NAME = "com.x8bit.bitwarden";
-    }
-}

src/Android/Effects/FabShadowEffect.cs

@@ -1,30 +0,0 @@
-using Android.Graphics.Drawables;
-using Bit.Droid.Effects;
-using Bit.Droid.Utilities;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-
-[assembly: ExportEffect(typeof(FabShadowEffect), "FabShadowEffect")]
-namespace Bit.Droid.Effects
-{
-    public class FabShadowEffect : PlatformEffect
-    {
-        protected override void OnAttached ()
-        {
-            if (Control is Android.Widget.Button button)
-            {
-                var gd = new GradientDrawable();
-                gd.SetColor(ThemeHelpers.FabColor);
-                gd.SetCornerRadius(100);
-                
-                button.SetBackground(gd);
-                button.Elevation = 6;
-                button.TranslationZ = 20;
-            }
-        }
-
-        protected override void OnDetached ()
-        {
-        }
-    }
-}

src/Android/Effects/FixedSizeEffect.cs

@@ -1,23 +0,0 @@
-using Android.Widget;
-using Bit.Droid.Effects;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-
-[assembly: ExportEffect(typeof(FixedSizeEffect), "FixedSizeEffect")]
-namespace Bit.Droid.Effects
-{
-    public class FixedSizeEffect : PlatformEffect
-    {
-        protected override void OnAttached()
-        {
-            if (Element is Label label && Control is TextView textView)
-            {
-                textView.SetTextSize(Android.Util.ComplexUnitType.Pt, (float)label.FontSize);
-            }
-        }
-
-        protected override void OnDetached()
-        {
-        }
-    }
-}

src/Android/Effects/NoEmojiKeyboardEffect.cs

@@ -1,24 +0,0 @@
-using Android.Widget;
-using Bit.Droid.Effects;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-
-[assembly: ExportEffect(typeof(NoEmojiKeyboardEffect), nameof(NoEmojiKeyboardEffect))]
-namespace Bit.Droid.Effects
-{
-    public class NoEmojiKeyboardEffect : PlatformEffect
-    {
-        protected override void OnAttached()
-        {
-            if (Control is EditText editText)
-            {
-                editText.InputType = Android.Text.InputTypes.ClassText | Android.Text.InputTypes.TextVariationVisiblePassword | Android.Text.InputTypes.TextFlagMultiLine;
-            }
-        }
-
-        protected override void OnDetached()
-        {
-        }
-    }
-}
-

src/Android/Effects/RemoveFontPaddingEffect.cs

@@ -1,23 +0,0 @@
-using Android.Widget;
-using Bit.Droid.Effects;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-
-[assembly: ExportEffect(typeof(RemoveFontPaddingEffect), nameof(RemoveFontPaddingEffect))]
-namespace Bit.Droid.Effects
-{
-    public class RemoveFontPaddingEffect : PlatformEffect
-    {
-        protected override void OnAttached()
-        {
-            if (Control is TextView textView)
-            {
-                textView.SetIncludeFontPadding(false);
-            }
-        }
-
-        protected override void OnDetached()
-        {
-        }
-    }
-}

src/Android/Effects/TabBarEffect.cs

@@ -1,30 +0,0 @@
-using Android.Views;
-using Bit.Droid.Effects;
-using Google.Android.Material.BottomNavigation;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-
-[assembly: ResolutionGroupName("Bitwarden")]
-[assembly: ExportEffect(typeof(TabBarEffect), "TabBarEffect")]
-namespace Bit.Droid.Effects
-{
-    public class TabBarEffect : PlatformEffect
-    {
-        protected override void OnAttached()
-        {
-            if (!(Container.GetChildAt(0) is ViewGroup layout))
-            {
-                return;
-            }
-            if (!(layout.GetChildAt(1) is BottomNavigationView bottomNavigationView))
-            {
-                return;
-            }
-            bottomNavigationView.LabelVisibilityMode = LabelVisibilityMode.LabelVisibilityLabeled;
-        }
-
-        protected override void OnDetached()
-        {
-        }
-    }
-}

src/Android/MainActivity.cs

@@ -1,461 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Android.App;
-using Android.Content;
-using Android.Content.PM;
-using Android.Content.Res;
-using Android.Nfc;
-using Android.OS;
-using Android.Runtime;
-using Android.Views;
-using Bit.App.Abstractions;
-using Bit.App.Models;
-using Bit.App.Resources;
-using Bit.App.Utilities;
-using Bit.Core;
-using Bit.Core.Abstractions;
-using Bit.Core.Enums;
-using Bit.Core.Utilities;
-using Bit.Droid.Autofill;
-using Bit.Droid.Receivers;
-using Bit.Droid.Utilities;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Xamarin.Essentials;
-using ZXing.Net.Mobile.Android;
-using FileProvider = AndroidX.Core.Content.FileProvider;
-
-namespace Bit.Droid
-{
-    // Activity and IntentFilter declarations have been moved to Properties/AndroidManifest.xml
-    // They have been hardcoded so we can use the default LaunchMode on Android 11+
-    // LaunchMode defined in values/manifest.xml for Android 10- and values-v30/manifest.xml for Android 11+
-    // See https://github.com/bitwarden/mobile/pull/1673 for details
-    [Register("com.x8bit.bitwarden.MainActivity")]
-    public class MainActivity : Xamarin.Forms.Platform.Android.FormsAppCompatActivity
-    {
-        private IDeviceActionService _deviceActionService;
-        private IFileService _fileService;        
-        private IMessagingService _messagingService;
-        private IBroadcasterService _broadcasterService;
-        private IStateService _stateService;
-        private IAppIdService _appIdService;
-        private IEventService _eventService;
-        private IPushNotificationListenerService _pushNotificationListenerService;
-        private ILogger _logger;
-        private PendingIntent _eventUploadPendingIntent;
-        private AppOptions _appOptions;
-        private string _activityKey = $"{nameof(MainActivity)}_{Java.Lang.JavaSystem.CurrentTimeMillis().ToString()}";
-        private Java.Util.Regex.Pattern _otpPattern =
-            Java.Util.Regex.Pattern.Compile("^.*?([cbdefghijklnrtuv]{32,64})$");
-
-        protected override void OnCreate(Bundle savedInstanceState)
-        {
-            var eventUploadIntent = new Intent(this, typeof(EventUploadReceiver));
-            _eventUploadPendingIntent = PendingIntent.GetBroadcast(this, 0, eventUploadIntent,
-                AndroidHelpers.AddPendingIntentMutabilityFlag(PendingIntentFlags.UpdateCurrent, false));
-
-            var policy = new StrictMode.ThreadPolicy.Builder().PermitAll().Build();
-            StrictMode.SetThreadPolicy(policy);
-
-            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
-            _fileService = ServiceContainer.Resolve<IFileService>();
-            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
-            _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
-            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
-            _appIdService = ServiceContainer.Resolve<IAppIdService>("appIdService");
-            _eventService = ServiceContainer.Resolve<IEventService>("eventService");
-            _pushNotificationListenerService = ServiceContainer.Resolve<IPushNotificationListenerService>();
-            _logger = ServiceContainer.Resolve<ILogger>("logger");
-
-            TabLayoutResource = Resource.Layout.Tabbar;
-            ToolbarResource = Resource.Layout.Toolbar;
-
-            // this needs to be called here before base.OnCreate(...)
-            Intent?.Validate();
-
-            base.OnCreate(savedInstanceState);
-
-            _deviceActionService.SetScreenCaptureAllowedAsync().FireAndForget(_ =>
-            {
-                Window.AddFlags(Android.Views.WindowManagerFlags.Secure);
-            });
-
-            _logger.InitAsync();
-
-            var toplayout = Window?.DecorView?.RootView;
-            if (toplayout != null)
-            {
-                toplayout.FilterTouchesWhenObscured = true;
-            }
-
-            Xamarin.Essentials.Platform.Init(this, savedInstanceState);
-            Xamarin.Forms.Forms.Init(this, savedInstanceState);
-            _appOptions = GetOptions();
-            CreateNotificationChannel();
-            LoadApplication(new App.App(_appOptions));
-            DisableAndroidFontScale();
-
-            _broadcasterService.Subscribe(_activityKey, (message) =>
-            {
-                if (message.Command == "startEventTimer")
-                {
-                    StartEventAlarm();
-                }
-                else if (message.Command == "stopEventTimer")
-                {
-                    var task = StopEventAlarmAsync();
-                }
-                else if (message.Command == "finishMainActivity")
-                {
-                    Xamarin.Forms.Device.BeginInvokeOnMainThread(() => Finish());
-                }
-                else if (message.Command == "listenYubiKeyOTP")
-                {
-                    ListenYubiKey((bool)message.Data);
-                }
-                else if (message.Command == "updatedTheme")
-                {
-                    Xamarin.Forms.Device.BeginInvokeOnMainThread(() => AppearanceAdjustments());
-                }
-                else if (message.Command == "exit")
-                {
-                    ExitApp();
-                }
-            });
-        }
-
-        protected override void OnPause()
-        {
-            base.OnPause();
-            ListenYubiKey(false);
-        }
-
-        protected override void OnResume()
-        {
-            base.OnResume();
-            Xamarin.Essentials.Platform.OnResume();
-            AppearanceAdjustments();
-
-            ThemeManager.UpdateThemeOnPagesAsync();
-
-            if (_deviceActionService.SupportsNfc())
-            {
-                try
-                {
-                    _messagingService.Send("resumeYubiKey");
-                }
-                catch { }
-            }
-            AndroidHelpers.SetPreconfiguredRestrictionSettingsAsync(this)
-                .GetAwaiter()
-                .GetResult();
-
-            if (Intent?.GetStringExtra(Core.Constants.NotificationData) is string notificationDataJson)
-            {
-                var notificationType = JToken.Parse(notificationDataJson).SelectToken(Core.Constants.NotificationDataType);
-                if (notificationType.ToString() == PasswordlessNotificationData.TYPE)
-                {
-                    _pushNotificationListenerService.OnNotificationTapped(JsonConvert.DeserializeObject<PasswordlessNotificationData>(notificationDataJson)).FireAndForget();
-                }
-            }
-        }
-
-        protected override void OnNewIntent(Intent intent)
-        {
-            base.OnNewIntent(intent);
-            try
-            {
-                if (intent?.GetStringExtra("uri") is string uri)
-                {
-                    _messagingService.Send(App.App.POP_ALL_AND_GO_TO_AUTOFILL_CIPHERS_MESSAGE);
-                    if (_appOptions != null)
-                    {
-                       _appOptions.Uri = uri;
-                    }
-                }
-                else if (intent.GetBooleanExtra("generatorTile", false))
-                {
-                    _messagingService.Send(App.App.POP_ALL_AND_GO_TO_TAB_GENERATOR_MESSAGE);
-                    if (_appOptions != null)
-                    {
-                        _appOptions.GeneratorTile = true;
-                    }
-                }
-                else if (intent.GetBooleanExtra("myVaultTile", false))
-                {
-                    _messagingService.Send(App.App.POP_ALL_AND_GO_TO_TAB_MYVAULT_MESSAGE);
-                    if (_appOptions != null)
-                    {
-                        _appOptions.MyVaultTile = true;
-                    }
-                }
-                else if (intent.Action == Intent.ActionSend && intent.Type != null)
-                {
-                    if (_appOptions != null)
-                    {
-                        _appOptions.CreateSend = GetCreateSendRequest(intent);
-                    }
-                    _messagingService.Send(App.App.POP_ALL_AND_GO_TO_TAB_SEND_MESSAGE);
-                }
-                else
-                {
-                    ParseYubiKey(intent.DataString);
-                }
-            }
-            catch (Exception e)
-            {
-                System.Diagnostics.Debug.WriteLine(">>> {0}: {1}", e.GetType(), e.StackTrace);
-            }
-        }
-
-        public async override void OnRequestPermissionsResult(int requestCode, string[] permissions,
-            [GeneratedEnum] Permission[] grantResults)
-        {
-            if (requestCode == Core.Constants.SelectFilePermissionRequestCode)
-            {
-                if (grantResults.Any(r => r != Permission.Granted))
-                {
-                    _messagingService.Send("selectFileCameraPermissionDenied");
-                }
-                await _fileService.SelectFileAsync();
-            }
-            else
-            {
-                Xamarin.Essentials.Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults);
-                PermissionsHandler.OnRequestPermissionsResult(requestCode, permissions, grantResults);
-            }
-            base.OnRequestPermissionsResult(requestCode, permissions, grantResults);
-        }
-
-        protected override void OnActivityResult(int requestCode, Result resultCode, Intent data)
-        {
-            if (resultCode == Result.Ok &&
-               (requestCode == Core.Constants.SelectFileRequestCode || requestCode == Core.Constants.SaveFileRequestCode))
-            {
-                Android.Net.Uri uri = null;
-                string fileName = null;
-                if (data != null && data.Data != null)
-                {
-                    uri = data.Data;
-                    fileName = AndroidHelpers.GetFileName(ApplicationContext, uri);
-                }
-                else
-                {
-                    // camera
-                    var file = new Java.IO.File(FilesDir, "temp_camera_photo.jpg");
-                    uri = FileProvider.GetUriForFile(this, "com.x8bit.bitwarden.fileprovider", file);
-                    fileName = $"photo_{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}.jpg";
-                }
-
-                if (uri == null)
-                {
-                    return;
-                }
-
-                if (requestCode == Core.Constants.SaveFileRequestCode)
-                {
-                    _messagingService.Send("selectSaveFileResult",
-                        new Tuple<string, string>(uri.ToString(), fileName));
-                    return;
-                }
-                
-                try
-                {
-                    using (var stream = ContentResolver.OpenInputStream(uri))
-                    using (var memoryStream = new MemoryStream())
-                    {
-                        stream.CopyTo(memoryStream);
-                        _messagingService.Send("selectFileResult",
-                            new Tuple<byte[], string>(memoryStream.ToArray(), fileName ?? "unknown_file_name"));
-                    }
-                }
-                catch (Java.IO.FileNotFoundException)
-                {
-                    return;
-                }
-            }
-        }
-
-        protected override void OnDestroy()
-        {
-            base.OnDestroy();
-            _broadcasterService.Unsubscribe(_activityKey);
-        }
-
-        private void ListenYubiKey(bool listen)
-        {
-            if (!_deviceActionService.SupportsNfc())
-            {
-                return;
-            }
-            var adapter = NfcAdapter.GetDefaultAdapter(this);
-            if (listen)
-            {
-                var intent = new Intent(this, Class);
-                intent.AddFlags(ActivityFlags.SingleTop);
-                var pendingIntent = PendingIntent.GetActivity(this, 0, intent, AndroidHelpers.AddPendingIntentMutabilityFlag(0, true));
-                // register for all NDEF tags starting with http och https
-                var ndef = new IntentFilter(NfcAdapter.ActionNdefDiscovered);
-                ndef.AddDataScheme("http");
-                ndef.AddDataScheme("https");
-                var filters = new IntentFilter[] { ndef };
-                try
-                {
-                    // register for foreground dispatch so we'll receive tags according to our intent filters
-                    adapter.EnableForegroundDispatch(this, pendingIntent, filters, null);
-                }
-                catch { }
-            }
-            else
-            {
-                try
-                {
-                    adapter.DisableForegroundDispatch(this);
-                }
-                catch { }
-            }
-        }
-
-        private AppOptions GetOptions()
-        {
-            var options = new AppOptions
-            {
-                Uri = Intent.GetStringExtra("uri") ?? Intent.GetStringExtra(AutofillConstants.AutofillFrameworkUri),
-                MyVaultTile = Intent.GetBooleanExtra("myVaultTile", false),
-                GeneratorTile = Intent.GetBooleanExtra("generatorTile", false),
-                FromAutofillFramework = Intent.GetBooleanExtra(AutofillConstants.AutofillFramework, false),
-                CreateSend = GetCreateSendRequest(Intent)
-            };
-            var fillType = Intent.GetIntExtra(AutofillConstants.AutofillFrameworkFillType, 0);
-            if (fillType > 0)
-            {
-                options.FillType = (CipherType)fillType;
-            }
-            if (Intent.GetBooleanExtra("autofillFrameworkSave", false))
-            {
-                options.SaveType = (CipherType)Intent.GetIntExtra("autofillFrameworkType", 0);
-                options.SaveName = Intent.GetStringExtra("autofillFrameworkName");
-                options.SaveUsername = Intent.GetStringExtra("autofillFrameworkUsername");
-                options.SavePassword = Intent.GetStringExtra("autofillFrameworkPassword");
-                options.SaveCardName = Intent.GetStringExtra("autofillFrameworkCardName");
-                options.SaveCardNumber = Intent.GetStringExtra("autofillFrameworkCardNumber");
-                options.SaveCardExpMonth = Intent.GetStringExtra("autofillFrameworkCardExpMonth");
-                options.SaveCardExpYear = Intent.GetStringExtra("autofillFrameworkCardExpYear");
-                options.SaveCardCode = Intent.GetStringExtra("autofillFrameworkCardCode");
-            }
-            return options;
-        }
-
-        private Tuple<SendType, string, byte[], string> GetCreateSendRequest(Intent intent)
-        {
-            if (intent.Action == Intent.ActionSend && intent.Type != null)
-            {
-                if ((intent.Flags & ActivityFlags.LaunchedFromHistory) == ActivityFlags.LaunchedFromHistory)
-                {
-                    // don't re-deliver intent if resuming from app switcher
-                    return null;
-                }
-                var type = intent.Type;
-                if (type.Contains("text/"))
-                {
-                    var subject = intent.GetStringExtra(Intent.ExtraSubject);
-                    var text = intent.GetStringExtra(Intent.ExtraText);
-                    return new Tuple<SendType, string, byte[], string>(SendType.Text, subject, null, text);
-                }
-                else
-                {
-                    var data = intent.ClipData?.GetItemAt(0);
-                    var uri = data?.Uri;
-                    var filename = AndroidHelpers.GetFileName(ApplicationContext, uri);
-                    try
-                    {
-                        using (var stream = ContentResolver.OpenInputStream(uri))
-                        using (var memoryStream = new MemoryStream())
-                        {
-                            stream.CopyTo(memoryStream);
-                            return new Tuple<SendType, string, byte[], string>(SendType.File, filename, memoryStream.ToArray(), null);
-                        }
-                    }
-                    catch (Java.IO.FileNotFoundException) { }
-                }
-            }
-            return null;
-        }
-
-        private void ParseYubiKey(string data)
-        {
-            if (data == null)
-            {
-                return;
-            }
-            var otpMatch = _otpPattern.Matcher(data);
-            if (otpMatch.Matches())
-            {
-                var otp = otpMatch.Group(1);
-                _messagingService.Send("gotYubiKeyOTP", otp);
-            }
-        }
-
-        private void AppearanceAdjustments()
-        {
-            Window?.SetStatusBarColor(ThemeHelpers.NavBarBackgroundColor);
-            Window?.DecorView.SetBackgroundColor(ThemeHelpers.BackgroundColor);
-            ThemeHelpers.SetAppearance(ThemeManager.GetTheme(), ThemeManager.OsDarkModeEnabled());
-        }
-
-        private void ExitApp()
-        {
-            FinishAffinity();
-            Java.Lang.JavaSystem.Exit(0);
-        }
-
-        private void StartEventAlarm()
-        {
-            var alarmManager = GetSystemService(AlarmService) as AlarmManager;
-            alarmManager.SetInexactRepeating(AlarmType.ElapsedRealtime, 120000, 300000, _eventUploadPendingIntent);
-        }
-
-        private async Task StopEventAlarmAsync()
-        {
-            var alarmManager = GetSystemService(AlarmService) as AlarmManager;
-            alarmManager.Cancel(_eventUploadPendingIntent);
-            await _eventService.UploadEventsAsync();
-        }
-
-        private void CreateNotificationChannel()
-        {
-#if !FDROID
-            if (Build.VERSION.SdkInt < BuildVersionCodes.O)
-            {
-                // Notification channels are new in API 26 (and not a part of the
-                // support library). There is no need to create a notification
-                // channel on older versions of Android.
-                return;
-            }
-
-            var channel = new NotificationChannel(Core.Constants.AndroidNotificationChannelId, AppResources.AllNotifications, NotificationImportance.Default);
-            if(GetSystemService(NotificationService) is NotificationManager notificationManager)
-            {
-                notificationManager.CreateNotificationChannel(channel);
-            }
-#endif
-        }
-
-        private void DisableAndroidFontScale()
-        {
-            try
-            {
-                //As we are using NamedSizes the xamarin will change the font size. So we are disabling the Android scaling.
-                Resources.Configuration.FontScale = 1f;
-                BaseContext.Resources.DisplayMetrics.ScaledDensity = Resources.Configuration.FontScale * (float)DeviceDisplay.MainDisplayInfo.Density;
-            }
-            catch (Exception e)
-            {
-                _logger.Exception(e);
-            }
-        }
-    }
-}

src/Android/MainApplication.cs

@@ -1,225 +0,0 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using Android.App;
-using Android.Content;
-using Android.OS;
-using Android.Runtime;
-using Bit.App.Abstractions;
-using Bit.App.Services;
-using Bit.Core;
-using Bit.Core.Abstractions;
-using Bit.Core.Services;
-using Bit.Core.Utilities;
-using Bit.Droid.Services;
-using Plugin.CurrentActivity;
-using Plugin.Fingerprint;
-using Xamarin.Android.Net;
-using System.Net.Http;
-using System.Net;
-using Bit.App.Utilities;
-using Bit.App.Pages;
-using Bit.App.Utilities.AccountManagement;
-using Bit.App.Controls;
-using Bit.Core.Enums;
-#if !FDROID
-using Android.Gms.Security;
-#endif
-
-namespace Bit.Droid
-{
-#if DEBUG
-    [Application(Debuggable = true)]
-#else
-    [Application(Debuggable = false)]
-#endif
-    [Register("com.x8bit.bitwarden.MainApplication")]
-#if FDROID
-    public class MainApplication : Application
-#else
-    public class MainApplication : Application, ProviderInstaller.IProviderInstallListener
-#endif
-    {
-        public MainApplication(IntPtr handle, JniHandleOwnership transer)
-          : base(handle, transer)
-        {
-            if (ServiceContainer.RegisteredServices.Count == 0)
-            {
-                RegisterLocalServices();
-
-                var deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
-                ServiceContainer.Init(deviceActionService.DeviceUserAgent, Core.Constants.ClearCiphersCacheKey,
-                    Core.Constants.AndroidAllClearCipherCacheKeys);
-
-                ServiceContainer.Register<IWatchDeviceService>(new WatchDeviceService(ServiceContainer.Resolve<ICipherService>(),
-                    ServiceContainer.Resolve<IEnvironmentService>(),
-                    ServiceContainer.Resolve<IStateService>(),
-                    ServiceContainer.Resolve<IVaultTimeoutService>()));
-
-                InitializeAppSetup();
-
-                // TODO: Update when https://github.com/bitwarden/mobile/pull/1662 gets merged
-                var deleteAccountActionFlowExecutioner = new DeleteAccountActionFlowExecutioner(
-                    ServiceContainer.Resolve<IApiService>("apiService"),
-                    ServiceContainer.Resolve<IMessagingService>("messagingService"),
-                    ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService"),
-                    ServiceContainer.Resolve<IDeviceActionService>("deviceActionService"),
-                    ServiceContainer.Resolve<ILogger>("logger"));
-                ServiceContainer.Register<IDeleteAccountActionFlowExecutioner>("deleteAccountActionFlowExecutioner", deleteAccountActionFlowExecutioner);
-
-                var verificationActionsFlowHelper = new VerificationActionsFlowHelper(
-                    ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService"),
-                    ServiceContainer.Resolve<IPasswordRepromptService>("passwordRepromptService"),
-                    ServiceContainer.Resolve<ICryptoService>("cryptoService"));
-                ServiceContainer.Register<IVerificationActionsFlowHelper>("verificationActionsFlowHelper", verificationActionsFlowHelper);
-
-                var accountsManager = new AccountsManager(
-                    ServiceContainer.Resolve<IBroadcasterService>("broadcasterService"),
-                    ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService"),
-                    ServiceContainer.Resolve<IStorageService>("secureStorageService"),
-                    ServiceContainer.Resolve<IStateService>("stateService"),
-                    ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService"),
-                    ServiceContainer.Resolve<IAuthService>("authService"),
-                    ServiceContainer.Resolve<ILogger>("logger"),
-                    ServiceContainer.Resolve<IMessagingService>("messagingService"),
-                    ServiceContainer.Resolve<IWatchDeviceService>(),
-                    ServiceContainer.Resolve<IConditionedAwaiterManager>());
-                ServiceContainer.Register<IAccountsManager>("accountsManager", accountsManager);
-            }
-#if !FDROID
-            if (Build.VERSION.SdkInt <= BuildVersionCodes.Kitkat)
-            {
-                ProviderInstaller.InstallIfNeededAsync(ApplicationContext, this);
-            }
-#endif
-        }
-
-        public override void OnCreate()
-        {
-            base.OnCreate();
-            Bootstrap();
-            CrossCurrentActivity.Current.Init(this);
-        }
-
-        public void OnProviderInstallFailed(int errorCode, Intent recoveryIntent)
-        {
-        }
-
-        public void OnProviderInstalled()
-        {
-        }
-
-        private void RegisterLocalServices()
-        {
-            ServiceContainer.Register<INativeLogService>("nativeLogService", new AndroidLogService());
-#if FDROID
-            var logger = new StubLogger();
-#elif DEBUG
-            var logger = DebugLogger.Instance;
-#else
-            var logger = Logger.Instance;
-#endif
-            ServiceContainer.Register("logger", logger);
-
-            // Note: This might cause a race condition. Investigate more.
-            Task.Run(() =>
-            {
-                FFImageLoading.Forms.Platform.CachedImageRenderer.Init(true);
-                FFImageLoading.ImageService.Instance.Initialize(new FFImageLoading.Config.Configuration
-                {
-                    FadeAnimationEnabled = false,
-                    FadeAnimationForCachedImages = false,
-                    HttpClient = new HttpClient(new AndroidClientHandler() { AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate })
-                });
-                ZXing.Net.Mobile.Forms.Android.Platform.Init();
-            });
-            CrossFingerprint.SetCurrentActivityResolver(() => CrossCurrentActivity.Current.Activity);
-
-            var preferencesStorage = new PreferencesStorageService(null);
-            var documentsPath = System.Environment.GetFolderPath(System.Environment.SpecialFolder.Personal);
-            var liteDbStorage = new LiteDbStorageService(Path.Combine(documentsPath, "bitwarden.db"));
-            var localizeService = new LocalizeService();
-            var broadcasterService = new BroadcasterService(logger);
-            var messagingService = new MobileBroadcasterMessagingService(broadcasterService);
-            var i18nService = new MobileI18nService(localizeService.GetCurrentCultureInfo());
-            var secureStorageService = new SecureStorageService();
-            var cryptoPrimitiveService = new CryptoPrimitiveService();
-            var mobileStorageService = new MobileStorageService(preferencesStorage, liteDbStorage);
-            var storageMediatorService = new StorageMediatorService(mobileStorageService, secureStorageService, preferencesStorage);
-            var stateService = new StateService(mobileStorageService, secureStorageService, storageMediatorService, messagingService);
-            var stateMigrationService =
-                new StateMigrationService(DeviceType.Android, liteDbStorage, preferencesStorage, secureStorageService);
-            var clipboardService = new ClipboardService(stateService);
-            var deviceActionService = new DeviceActionService(stateService, messagingService);
-            var fileService = new FileService(stateService, broadcasterService);
-            var platformUtilsService = new MobilePlatformUtilsService(deviceActionService, clipboardService,
-                messagingService, broadcasterService);
-            var autofillHandler = new AutofillHandler(stateService, messagingService, clipboardService,
-                platformUtilsService, new LazyResolve<IEventService>());
-            var biometricService = new BiometricService(stateService);
-            var cryptoFunctionService = new PclCryptoFunctionService(cryptoPrimitiveService);
-            var cryptoService = new CryptoService(stateService, cryptoFunctionService);
-            var passwordRepromptService = new MobilePasswordRepromptService(platformUtilsService, cryptoService);
-
-            ServiceContainer.Register<ISynchronousStorageService>(preferencesStorage);
-            ServiceContainer.Register<IBroadcasterService>("broadcasterService", broadcasterService);
-            ServiceContainer.Register<IMessagingService>("messagingService", messagingService);
-            ServiceContainer.Register<ILocalizeService>("localizeService", localizeService);
-            ServiceContainer.Register<II18nService>("i18nService", i18nService);
-            ServiceContainer.Register<ICryptoPrimitiveService>("cryptoPrimitiveService", cryptoPrimitiveService);
-            ServiceContainer.Register<IStorageService>("storageService", mobileStorageService);
-            ServiceContainer.Register<IStorageService>("secureStorageService", secureStorageService);
-            ServiceContainer.Register<IStorageMediatorService>(storageMediatorService);
-            ServiceContainer.Register<IStateService>("stateService", stateService);
-            ServiceContainer.Register<IStateMigrationService>("stateMigrationService", stateMigrationService);
-            ServiceContainer.Register<IClipboardService>("clipboardService", clipboardService);
-            ServiceContainer.Register<IDeviceActionService>("deviceActionService", deviceActionService);
-            ServiceContainer.Register<IFileService>(fileService);
-            ServiceContainer.Register<IAutofillHandler>(autofillHandler);            
-            ServiceContainer.Register<IPlatformUtilsService>("platformUtilsService", platformUtilsService);
-            ServiceContainer.Register<IBiometricService>("biometricService", biometricService);
-            ServiceContainer.Register<ICryptoFunctionService>("cryptoFunctionService", cryptoFunctionService);
-            ServiceContainer.Register<ICryptoService>("cryptoService", cryptoService);
-            ServiceContainer.Register<IPasswordRepromptService>("passwordRepromptService", passwordRepromptService);
-            ServiceContainer.Register<IAvatarImageSourcePool>("avatarImageSourcePool", new AvatarImageSourcePool());
-
-            // Push
-#if FDROID
-            ServiceContainer.Register<IPushNotificationListenerService>(
-                "pushNotificationListenerService", new NoopPushNotificationListenerService());
-            ServiceContainer.Register<IPushNotificationService>(
-                "pushNotificationService", new NoopPushNotificationService());
-#else
-            var notificationListenerService = new PushNotificationListenerService();
-            ServiceContainer.Register<IPushNotificationListenerService>(
-                "pushNotificationListenerService", notificationListenerService);
-            var androidPushNotificationService = new AndroidPushNotificationService(
-                stateService, notificationListenerService);
-            ServiceContainer.Register<IPushNotificationService>(
-                "pushNotificationService", androidPushNotificationService);
-#endif
-        }
-
-        private void Bootstrap()
-        {
-            var locale = ServiceContainer.Resolve<IStateService>().GetLocale();
-            (ServiceContainer.Resolve<II18nService>("i18nService") as MobileI18nService)
-                .Init(locale != null ? new System.Globalization.CultureInfo(locale) : null);
-            ServiceContainer.Resolve<IAuthService>("authService").Init();
-            // Note: This is not awaited
-            var bootstrapTask = BootstrapAsync();
-        }
-
-        private async Task BootstrapAsync()
-        {
-            await ServiceContainer.Resolve<IEnvironmentService>("environmentService").SetUrlsFromStorageAsync();
-        }
-
-        private void InitializeAppSetup()
-        {
-            var appSetup = new AppSetup();
-            appSetup.InitializeServicesLastChance();
-            ServiceContainer.Register<IAppSetup>("appSetup", appSetup);
-        }
-    }
-}

src/Android/Properties/AssemblyInfo.cs

@@ -1,28 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("BitwardenAndroid")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Bitwarden Inc.")]
-[assembly: AssemblyProduct("Bitwarden")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

src/Android/Renderers/CustomEditorRenderer.cs

@@ -1,69 +0,0 @@
-using System.ComponentModel;
-using Android.Content;
-using Android.Content.Res;
-using Android.Views.InputMethods;
-using Bit.Droid.Renderers;
-using Bit.Droid.Utilities;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-
-[assembly: ExportRenderer(typeof(Editor), typeof(CustomEditorRenderer))]
-namespace Bit.Droid.Renderers
-{
-    public class CustomEditorRenderer : EditorRenderer
-    {
-        public CustomEditorRenderer(Context context)
-            : base(context)
-        { }
-        
-        // Workaround for issue described here:
-        // https://github.com/xamarin/Xamarin.Forms/issues/8291#issuecomment-617456651
-        protected override void OnAttachedToWindow()
-        {
-            base.OnAttachedToWindow();
-            EditText.Enabled = false;
-            EditText.Enabled = true;
-        }
-
-        protected override void OnElementChanged(ElementChangedEventArgs<Editor> e)
-        {
-            base.OnElementChanged(e);
-            UpdateBorderColor();
-            if (Control != null && e.NewElement != null)
-            {
-                Control.SetPadding(Control.PaddingLeft, Control.PaddingTop - 10, Control.PaddingRight,
-                    Control.PaddingBottom + 20);
-                Control.ImeOptions = Control.ImeOptions | (ImeAction)ImeFlags.NoPersonalizedLearning |
-                    (ImeAction)ImeFlags.NoExtractUi;
-            }
-        }
-        
-        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            base.OnElementPropertyChanged(sender, e);
-            
-            if (e.PropertyName == Entry.TextColorProperty.PropertyName)
-            {
-                UpdateBorderColor();
-            }
-        }
-
-        private void UpdateBorderColor()
-        {
-            if (Control != null)
-            {
-                var states = new[]
-                {
-                    new[] { Android.Resource.Attribute.StateFocused }, // focused
-                    new[] { -Android.Resource.Attribute.StateFocused }, // unfocused
-                };
-                var colors = new int[]
-                {
-                    ThemeHelpers.PrimaryColor, 
-                    ThemeHelpers.MutedColor
-                };
-                Control.BackgroundTintList = new ColorStateList(states, colors);
-            }
-        }
-    }
-}

src/Android/Renderers/CustomEntryRenderer.cs

@@ -1,107 +0,0 @@
-using System.ComponentModel;
-using Android.Content;
-using Android.Content.Res;
-using Android.Graphics;
-using Android.Text;
-using Android.Views.InputMethods;
-using Android.Widget;
-using Bit.Droid.Renderers;
-using Bit.Droid.Utilities;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-
-[assembly: ExportRenderer(typeof(Entry), typeof(CustomEntryRenderer))]
-namespace Bit.Droid.Renderers
-{
-    public class CustomEntryRenderer : EntryRenderer
-    {
-        public CustomEntryRenderer(Context context)
-            : base(context)
-        { }
-
-        protected override void OnElementChanged(ElementChangedEventArgs<Entry> e)
-        {
-            base.OnElementChanged(e);
-            UpdateBorderColor();
-            if (Control != null && e.NewElement != null)
-            {
-                Control.SetPadding(Control.PaddingLeft, Control.PaddingTop - 10, Control.PaddingRight,
-                    Control.PaddingBottom + 20);
-                Control.ImeOptions = Control.ImeOptions | (ImeAction)ImeFlags.NoPersonalizedLearning |
-                    (ImeAction)ImeFlags.NoExtractUi;
-            }   
-        }
-
-        // Workaround for bug preventing long-press -> copy/paste on Android 11
-        // See https://issuetracker.google.com/issues/37095917
-        protected override void OnAttachedToWindow()
-        {
-            base.OnAttachedToWindow();
-            Control.Enabled = false;
-            Control.Enabled = true;
-        }
-
-        // Workaround for failure to disable text prediction on non-password fields
-        // see https://github.com/xamarin/Xamarin.Forms/issues/10857
-        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            base.OnElementPropertyChanged(sender, e);
-            
-            // Check if changed property is "IsPassword", otherwise ignore
-            if (e.PropertyName == Entry.IsPasswordProperty.PropertyName)
-            {
-                // Check if field type is text, otherwise ignore (numeric passwords, etc.)
-                EditText.InputType = Element.Keyboard.ToInputType();
-                bool isText = (EditText.InputType & InputTypes.ClassText) == InputTypes.ClassText,
-                    isNumber = (EditText.InputType & InputTypes.ClassNumber) == InputTypes.ClassNumber;
-                if (isText || isNumber)
-                {
-                    if (Element.IsPassword)
-                    {
-                        // Element is a password field, set inputType to TextVariationPassword which disables
-                        // predictive text by default
-                        EditText.InputType = EditText.InputType |
-                            (isText ? InputTypes.TextVariationPassword : InputTypes.NumberVariationPassword);
-                    }
-                    else
-                    {
-                        // Element is not a password field, set inputType to TextVariationVisiblePassword to
-                        // disable predictive text while still displaying the content.
-                        EditText.InputType = EditText.InputType |
-                            (isText ? InputTypes.TextVariationVisiblePassword : InputTypes.NumberVariationNormal);
-                    }
-                    
-                    // The workaround above forces a reset of the style properties, so we need to re-apply the font.
-                    // see https://xamarin.github.io/bugzilla-archives/33/33666/bug.html
-                    var typeface = Typeface.CreateFromAsset(Context.Assets, "RobotoMono_Regular.ttf");
-                    if (Control is TextView label)
-                    {
-                        label.Typeface = typeface;
-                    }
-                }
-            }
-            else if (e.PropertyName == Entry.TextColorProperty.PropertyName)
-            {
-                UpdateBorderColor();
-            }
-        }
-
-        private void UpdateBorderColor()
-        {
-            if (Control != null)
-            {
-                var states = new[]
-                {
-                    new[] { Android.Resource.Attribute.StateFocused }, // focused
-                    new[] { -Android.Resource.Attribute.StateFocused }, // unfocused
-                };
-                var colors = new int[]
-                {
-                    ThemeHelpers.PrimaryColor, 
-                    ThemeHelpers.MutedColor
-                };
-                Control.BackgroundTintList = new ColorStateList(states, colors);
-            }
-        }
-    }
-}

src/Android/Renderers/CustomLabelRenderer.cs

@@ -1,43 +0,0 @@
-using System.ComponentModel;
-using Android.Content;
-using Android.OS;
-using Bit.App.Controls;
-using Bit.Droid.Renderers;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-
-[assembly: ExportRenderer(typeof(CustomLabel), typeof(CustomLabelRenderer))]
-namespace Bit.Droid.Renderers
-{
-    public class CustomLabelRenderer : LabelRenderer
-    {
-        public CustomLabelRenderer(Context context)
-            : base(context)
-        { }
-
-        protected override void OnElementChanged(ElementChangedEventArgs<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;
-            switch (e.PropertyName)
-            {
-                case nameof(CustomLabel.AutomationId):
-                    Control.ContentDescription = label.AutomationId;
-                    break;
-            }
-            base.OnElementPropertyChanged(sender, e);
-        }
-    }
-}

src/Android/Renderers/CustomPageRenderer.cs

@@ -1,31 +0,0 @@
-using System;
-using Android.App;
-using Android.Content;
-using AndroidX.AppCompat.Widget;
-using Bit.App.Resources;
-using Bit.Droid.Renderers;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-
-[assembly: ExportRenderer(typeof(ContentPage), typeof(CustomPageRenderer))]
-namespace Bit.Droid.Renderers
-{
-    public class CustomPageRenderer : PageRenderer
-    {
-        public CustomPageRenderer(Context context) : base(context)
-        {
-        }
-
-        protected override void OnElementChanged(ElementChangedEventArgs<Page> e)
-        {
-            base.OnElementChanged(e);
-
-            Activity context = (Activity)this.Context;
-            var toolbar = context.FindViewById<Toolbar>(Resource.Id.toolbar);
-            if(toolbar != null)
-            {
-                toolbar.NavigationContentDescription = AppResources.TapToGoBack;
-            }
-        }
-    }
-}

src/Android/Renderers/CustomPickerRenderer.cs

@@ -1,57 +0,0 @@
-using System.ComponentModel;
-using Android.Content;
-using Android.Content.Res;
-using Bit.Droid.Renderers;
-using Bit.Droid.Utilities;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-
-[assembly: ExportRenderer(typeof(Picker), typeof(CustomPickerRenderer))]
-namespace Bit.Droid.Renderers
-{
-    public class CustomPickerRenderer : PickerRenderer
-    {
-        public CustomPickerRenderer(Context context)
-            : base(context)
-        { }
-
-        protected override void OnElementChanged(ElementChangedEventArgs<Picker> e)
-        {
-            base.OnElementChanged(e);
-            UpdateBorderColor();
-            if (Control != null && e.NewElement != null)
-            {
-                Control.SetPadding(Control.PaddingLeft, Control.PaddingTop - 10, Control.PaddingRight,
-                    Control.PaddingBottom + 20);
-            }
-        }
-        
-        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            base.OnElementPropertyChanged(sender, e);
-            
-            if (e.PropertyName == Picker.TextColorProperty.PropertyName)
-            {
-                UpdateBorderColor();
-            }
-        }
-        
-        private void UpdateBorderColor()
-        {
-            if (Control != null)
-            {
-                var states = new[]
-                {
-                    new[] { Android.Resource.Attribute.StateFocused }, // focused
-                    new[] { -Android.Resource.Attribute.StateFocused }, // unfocused
-                };
-                var colors = new int[]
-                {
-                    ThemeHelpers.PrimaryColor, 
-                    ThemeHelpers.MutedColor
-                };
-                Control.BackgroundTintList = new ColorStateList(states, colors);
-            }
-        }
-    }
-}

src/Android/Renderers/CustomSearchBarRenderer.cs

@@ -1,33 +0,0 @@
-using Android.Content;
-using Android.Views.InputMethods;
-using Bit.Droid.Renderers;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-
-[assembly: ExportRenderer(typeof(SearchBar), typeof(CustomSearchBarRenderer))]
-namespace Bit.Droid.Renderers
-{
-    public class CustomSearchBarRenderer : SearchBarRenderer
-    {
-        public CustomSearchBarRenderer(Context context)
-            : base(context)
-        { }
-
-        protected override void OnElementChanged(ElementChangedEventArgs<SearchBar> e)
-        {
-            base.OnElementChanged(e);
-            if (Control != null && e.NewElement != null)
-            {
-                try
-                {
-                    var magId = Resources.GetIdentifier("android:id/search_mag_icon", null, null);
-                    var magImage = (Android.Widget.ImageView)Control.FindViewById(magId);
-                    magImage.LayoutParameters = new Android.Widget.LinearLayout.LayoutParams(0, 0);
-                }
-                catch { }
-                Control.SetImeOptions(Control.ImeOptions | (ImeAction)ImeFlags.NoPersonalizedLearning |
-                    (ImeAction)ImeFlags.NoExtractUi);
-            }
-        }
-    }
-}

src/Android/Renderers/CustomSwitchRenderer.cs

@@ -1,67 +0,0 @@
-using System.ComponentModel;
-using Android.Content;
-using Android.Content.Res;
-using Android.Graphics.Drawables;
-using Android.OS;
-using AndroidX.Core.Content.Resources;
-using Bit.Droid.Renderers;
-using Bit.Droid.Utilities;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-
-[assembly: ExportRenderer(typeof(Switch), typeof(CustomSwitchRenderer))]
-namespace Bit.Droid.Renderers
-{
-    public class CustomSwitchRenderer : SwitchRenderer
-    {
-        public CustomSwitchRenderer(Context context)
-            : base(context) 
-        {}
-        
-        protected override void OnElementChanged(ElementChangedEventArgs<Switch> e)
-        {
-            base.OnElementChanged(e);
-            UpdateColors();
-        }
-        
-        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            base.OnElementPropertyChanged(sender, e);
-
-            if (e.PropertyName == Switch.OnColorProperty.PropertyName)
-            {
-                UpdateColors();
-            }
-        }
-        
-        private void UpdateColors()
-        {
-            if (Build.VERSION.SdkInt <= BuildVersionCodes.LollipopMr1)
-            {
-                // Android 5.x doesn't support ThumbTintList, and using SwitchCompat on every version after 5.x
-                // doesn't apply tinting the way we want. Let 5.x to do its own thing here.
-                return;
-            }
-            if (Control != null)
-            {
-                Control.SetHintTextColor(ThemeHelpers.MutedColor);
-                var t = ResourcesCompat.GetDrawable(Resources, Resource.Drawable.switch_thumb, null);
-                if (t is GradientDrawable thumb)
-                {
-                    Control.ThumbDrawable = thumb;
-                }
-                var thumbStates = new[]
-                {
-                    new[] { Android.Resource.Attribute.StateChecked }, // checked
-                    new[] { -Android.Resource.Attribute.StateChecked }, // unchecked
-                };
-                var thumbColors = new int[]
-                {
-                    ThemeHelpers.SwitchOnColor,
-                    ThemeHelpers.SwitchThumbColor
-                };
-                Control.ThumbTintList = new ColorStateList(thumbStates, thumbColors);
-            }
-        }
-    }
-}

src/Android/Renderers/CustomTabbedRenderer.cs

@@ -1,66 +0,0 @@
-using Android.Content;
-using Android.Views;
-using Bit.App.Pages;
-using Bit.Droid.Renderers;
-using Google.Android.Material.BottomNavigation;
-using Google.Android.Material.Navigation;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-using Xamarin.Forms.Platform.Android.AppCompat;
-
-[assembly: ExportRenderer(typeof(TabbedPage), typeof(CustomTabbedRenderer))]
-namespace Bit.Droid.Renderers
-{
-    public class CustomTabbedRenderer : TabbedPageRenderer, NavigationBarView.IOnItemReselectedListener
-    {
-        private TabbedPage _page;
-
-        public CustomTabbedRenderer(Context context) : base(context) { }
-
-        protected override void OnElementChanged(ElementChangedEventArgs<TabbedPage> e)
-        {
-            base.OnElementChanged(e);
-            if (e.NewElement != null)
-            {
-                _page = e.NewElement;
-                GetBottomNavigationView()?.SetOnItemReselectedListener(this);
-            }
-            else
-            {
-                _page = e.OldElement;
-            }
-        }
-
-        private BottomNavigationView GetBottomNavigationView()
-        {
-            for (var i = 0; i < ViewGroup.ChildCount; i++)
-            {
-                var childView = ViewGroup.GetChildAt(i);
-                if (childView is ViewGroup viewGroup)
-                {
-                    for (var j = 0; j < viewGroup.ChildCount; j++)
-                    {
-                        var childRelativeLayoutView = viewGroup.GetChildAt(j);
-                        if (childRelativeLayoutView is BottomNavigationView bottomNavigationView)
-                        {
-                            return bottomNavigationView;
-                        }
-                    }
-                }
-            }
-            return null;
-        }
-
-        public void OnNavigationItemReselected(IMenuItem item)
-        {
-            if (_page?.CurrentPage?.Navigation != null && _page.CurrentPage.Navigation.NavigationStack.Count > 0)
-            {
-                if (_page is TabsPage tabsPage)
-                {
-                    tabsPage.OnPageReselected();
-                }
-                Device.BeginInvokeOnMainThread(async () => await _page.CurrentPage.Navigation.PopToRootAsync());
-            }
-        }
-    }
-}

src/Android/Renderers/ExtendedDatePickerRenderer.cs

@@ -1,50 +0,0 @@
-using System.ComponentModel;
-using Android.Content;
-using Android.Views;
-using Bit.App.Controls;
-using Bit.Droid.Renderers;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-
-[assembly: ExportRenderer(typeof(ExtendedDatePicker), typeof(ExtendedDatePickerRenderer))]
-namespace Bit.Droid.Renderers
-{
-    public class ExtendedDatePickerRenderer : DatePickerRenderer
-    {
-        public ExtendedDatePickerRenderer(Context context)
-            : base(context) { }
-
-        protected override void OnElementChanged(ElementChangedEventArgs<DatePicker> e)
-        {
-            base.OnElementChanged(e);
-            if (Control != null && Element is ExtendedDatePicker element)
-            {
-                // center text
-                Control.Gravity = GravityFlags.CenterHorizontal;
-
-                // use placeholder until NullableDate set 
-                if (!element.NullableDate.HasValue)
-                {
-                    Control.Text = element.PlaceHolder;
-                }
-            }
-        }
-
-        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            if (e.PropertyName == DatePicker.DateProperty.PropertyName ||
-                e.PropertyName == DatePicker.FormatProperty.PropertyName)
-            {
-                if (Control != null && Element is ExtendedDatePicker element)
-                {
-                    if (Element.Format == element.PlaceHolder)
-                    {
-                        Control.Text = element.PlaceHolder;
-                        return;
-                    }
-                }
-            }
-            base.OnElementPropertyChanged(sender, e);
-        }
-    }
-}

src/Android/Renderers/ExtendedGridRenderer.cs

@@ -1,23 +0,0 @@
-using Android.Content;
-using Bit.App.Controls;
-using Bit.Droid.Renderers;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-
-[assembly: ExportRenderer(typeof(ExtendedGrid), typeof(ExtendedGridRenderer))]
-namespace Bit.Droid.Renderers
-{
-    public class ExtendedGridRenderer : ViewRenderer
-    {
-        public ExtendedGridRenderer(Context context) : base(context) { }
-
-        protected override void OnElementChanged(ElementChangedEventArgs<View> elementChangedEvent)
-        {
-            base.OnElementChanged(elementChangedEvent);
-            if (elementChangedEvent.NewElement != null)
-            {
-                SetBackgroundResource(Resource.Drawable.list_item_bg);
-            }
-        }
-    }
-}

src/Android/Renderers/ExtendedSliderRenderer.cs

@@ -1,56 +0,0 @@
-using System.ComponentModel;
-using Android.Content;
-using Android.Graphics.Drawables;
-using AndroidX.Core.Content.Resources;
-using Bit.App.Controls;
-using Bit.Droid.Renderers;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-
-[assembly: ExportRenderer(typeof(ExtendedSlider), typeof(ExtendedSliderRenderer))]
-namespace Bit.Droid.Renderers
-{
-    public class ExtendedSliderRenderer : SliderRenderer
-    {
-        public ExtendedSliderRenderer(Context context)
-            : base(context)
-        {}
-
-        protected override void OnElementChanged(ElementChangedEventArgs<Slider> e)
-        {
-            base.OnElementChanged(e);
-            UpdateColor();
-        }
-
-        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            base.OnElementPropertyChanged(sender, e);
-
-            if (e.PropertyName == ExtendedSlider.ThumbBorderColorProperty.PropertyName)
-            {
-                UpdateColor();
-            }
-        }
-        
-        private void UpdateColor()
-        {
-            if (Control != null && Element is ExtendedSlider view)
-            {
-                var t = ResourcesCompat.GetDrawable(Resources, Resource.Drawable.slider_thumb, null);
-                if (t is GradientDrawable thumb)
-                {
-                    if (view.ThumbColor == Color.Default)
-                    {
-                        thumb.SetColor(Color.White.ToAndroid());
-                    }
-                    else
-                    {
-                        thumb.SetColor(view.ThumbColor.ToAndroid());
-                    }
-                    thumb.SetStroke(3, view.ThumbBorderColor.ToAndroid());
-                    Control.SetThumb(thumb);
-                }
-            }
-        }
-    }
-}

src/Android/Renderers/ExtendedStackLayoutRenderer.cs

@@ -1,23 +0,0 @@
-using Android.Content;
-using Bit.App.Controls;
-using Bit.Droid.Renderers;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-
-[assembly: ExportRenderer(typeof(ExtendedStackLayout), typeof(ExtendedStackLayoutRenderer))]
-namespace Bit.Droid.Renderers
-{
-    public class ExtendedStackLayoutRenderer : ViewRenderer
-    {
-        public ExtendedStackLayoutRenderer(Context context) : base(context) { }
-
-        protected override void OnElementChanged(ElementChangedEventArgs<View> elementChangedEvent)
-        {
-            base.OnElementChanged(elementChangedEvent);
-            if (elementChangedEvent.NewElement != null)
-            {
-                SetBackgroundResource(Resource.Drawable.list_item_bg);
-            }
-        }
-    }
-}

src/Android/Renderers/ExtendedStepperRenderer.cs

@@ -1,72 +0,0 @@
-using System.ComponentModel;
-using Android.Content;
-using Android.Graphics;
-using Android.OS;
-using Bit.App.Controls;
-using Bit.Droid.Renderers;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-
-[assembly: ExportRenderer(typeof(ExtendedStepper), typeof(ExtendedStepperRenderer))]
-namespace Bit.Droid.Renderers
-{
-    public class ExtendedStepperRenderer : StepperRenderer
-    {
-        public ExtendedStepperRenderer(Context context)
-            : base(context) 
-        {}
-
-        protected override void OnElementChanged(ElementChangedEventArgs<Stepper> e)
-        {
-            base.OnElementChanged(e);
-            UpdateBgColor();
-            UpdateFgColor();
-        }
-
-        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            base.OnElementPropertyChanged(sender, e);
-
-            if (e.PropertyName == ExtendedStepper.StepperBackgroundColorProperty.PropertyName)
-            {
-                UpdateBgColor();
-            }
-            else if (e.PropertyName == ExtendedStepper.StepperForegroundColorProperty.PropertyName)
-            {
-                UpdateFgColor();
-            }
-        }
-
-        private void UpdateBgColor()
-        {
-            if (Control != null && Element is ExtendedStepper view)
-            {
-                if (Build.VERSION.SdkInt >= BuildVersionCodes.Q)
-                {
-                    Control.GetChildAt(0)?.Background?.SetColorFilter(
-                        new BlendModeColorFilter(view.StepperBackgroundColor.ToAndroid(), BlendMode.Multiply));
-                    Control.GetChildAt(1)?.Background?.SetColorFilter(
-                        new BlendModeColorFilter(view.StepperBackgroundColor.ToAndroid(), BlendMode.Multiply));
-                }
-                else
-                {
-                    Control.GetChildAt(0)?.Background?.SetColorFilter(
-                        view.StepperBackgroundColor.ToAndroid(), PorterDuff.Mode.Multiply);
-                    Control.GetChildAt(1)?.Background?.SetColorFilter(
-                        view.StepperBackgroundColor.ToAndroid(), PorterDuff.Mode.Multiply);
-                }
-            }
-        }
-
-        private void UpdateFgColor()
-        {
-            if (Control != null && Element is ExtendedStepper view)
-            {
-                var btn0 = Control.GetChildAt(0) as Android.Widget.Button;
-                btn0?.SetTextColor(view.StepperForegroundColor.ToAndroid());
-                var btn1 = Control.GetChildAt(1) as Android.Widget.Button;
-                btn1?.SetTextColor(view.StepperForegroundColor.ToAndroid());
-            }
-        }
-    }
-}

src/Android/Renderers/ExtendedTimePickerRenderer.cs

@@ -1,50 +0,0 @@
-using System.ComponentModel;
-using Android.Content;
-using Android.Views;
-using Bit.App.Controls;
-using Bit.Droid.Renderers;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-
-[assembly: ExportRenderer(typeof(ExtendedTimePicker), typeof(ExtendedTimePickerRenderer))]
-namespace Bit.Droid.Renderers
-{
-    public class ExtendedTimePickerRenderer : TimePickerRenderer
-    {
-        public ExtendedTimePickerRenderer(Context context)
-            : base(context) { }
-
-        protected override void OnElementChanged(ElementChangedEventArgs<TimePicker> e)
-        {
-            base.OnElementChanged(e);
-            if (Control != null && Element is ExtendedTimePicker element)
-            {
-                // center text
-                Control.Gravity = GravityFlags.CenterHorizontal;
-
-                // use placeholder until NullableTime set 
-                if (!element.NullableTime.HasValue)
-                {
-                    Control.Text = element.PlaceHolder;
-                }
-            }
-        }
-
-        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            if (e.PropertyName == TimePicker.TimeProperty.PropertyName ||
-                e.PropertyName == TimePicker.FormatProperty.PropertyName)
-            {
-                if (Control != null && Element is ExtendedTimePicker element)
-                {
-                    if (Element.Format == element.PlaceHolder)
-                    {
-                        Control.Text = element.PlaceHolder;
-                        return;
-                    }
-                }
-            }
-            base.OnElementPropertyChanged(sender, e);
-        }
-    }
-}

src/Android/Renderers/HybridWebViewRenderer.cs

@@ -1,98 +0,0 @@
-using System;
-using Bit.App.Controls;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-using Android.Webkit;
-using AWebkit = Android.Webkit;
-using Java.Interop;
-using Android.Content;
-using Bit.Droid.Renderers;
-using System.ComponentModel;
-
-[assembly: ExportRenderer(typeof(HybridWebView), typeof(HybridWebViewRenderer))]
-namespace Bit.Droid.Renderers
-{
-    public class HybridWebViewRenderer : ViewRenderer<HybridWebView, AWebkit.WebView>
-    {
-        private const string JSFunction = "function invokeCSharpAction(data){jsBridge.invokeAction(data);}";
-
-        private readonly Context _context;
-
-        public HybridWebViewRenderer(Context context)
-            : base(context)
-        {
-            _context = context;
-        }
-
-        protected override void OnElementChanged(ElementChangedEventArgs<HybridWebView> e)
-        {
-            base.OnElementChanged(e);
-
-            if (Control == null)
-            {
-                var webView = new AWebkit.WebView(_context);
-                webView.Settings.JavaScriptEnabled = true;
-                webView.SetWebViewClient(new JSWebViewClient(string.Format("javascript: {0}", JSFunction)));
-                SetNativeControl(webView);
-            }
-            if (e.OldElement != null)
-            {
-                Control.RemoveJavascriptInterface("jsBridge");
-                var hybridWebView = e.OldElement as HybridWebView;
-                hybridWebView.Cleanup();
-            }
-            if (e.NewElement != null)
-            {
-                Control.AddJavascriptInterface(new JSBridge(this), "jsBridge");
-                Control.LoadUrl(Element.Uri);
-            }
-        }
-
-        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            base.OnElementPropertyChanged(sender, e);
-            if (e.PropertyName == HybridWebView.UriProperty.PropertyName)
-            {
-                Control.LoadUrl(Element.Uri);
-            }
-        }
-
-        public class JSBridge : Java.Lang.Object
-        {
-            private readonly WeakReference<HybridWebViewRenderer> _hybridWebViewRenderer;
-
-            public JSBridge(HybridWebViewRenderer hybridRenderer)
-            {
-                _hybridWebViewRenderer = new WeakReference<HybridWebViewRenderer>(hybridRenderer);
-            }
-
-            [JavascriptInterface]
-            [Export("invokeAction")]
-            public void InvokeAction(string data)
-            {
-                if (_hybridWebViewRenderer != null &&
-                    _hybridWebViewRenderer.TryGetTarget(out HybridWebViewRenderer hybridRenderer))
-                {
-                    hybridRenderer.Element.InvokeAction(data);
-                }
-            }
-        }
-
-        public class JSWebViewClient : WebViewClient
-        {
-            private readonly string _javascript;
-
-            public JSWebViewClient(string javascript)
-            {
-                _javascript = javascript;
-
-            }
-
-            public override void OnPageFinished(AWebkit.WebView view, string url)
-            {
-                base.OnPageFinished(view, url);
-                view.EvaluateJavascript(_javascript, null);
-            }
-        }
-    }
-}

src/Android/Renderers/SelectableLabelRenderer.cs

@@ -1,25 +0,0 @@
-using System;
-using Android.Content;
-using Bit.App.Controls;
-using Bit.Droid.Renderers;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-
-[assembly: ExportRenderer(typeof(SelectableLabel), typeof(SelectableLabelRenderer))]
-namespace Bit.Droid.Renderers
-{
-    public class SelectableLabelRenderer : LabelRenderer
-    {
-        public SelectableLabelRenderer(Context context) : base(context) { }
-
-        protected override void OnElementChanged(ElementChangedEventArgs<Label> e)
-        {
-            base.OnElementChanged(e);
-
-            if (Control != null)
-            {
-                Control.SetTextIsSelectable(true);
-            }
-        }
-    }
-}

src/Android/Resources/values/styles.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<resources>
-  <!-- Launch theme (for auto dark/light based on system) -->
-  <style name="LaunchTheme" parent="BaseTheme">
-    <item name="android:windowBackground">@drawable/splash_screen</item>
-    <item name="android:windowNoTitle">true</item>
-   <item name="android:windowSplashScreenBackground">@color/ic_launcher_background</item>
-   <item name="android:windowSplashScreenAnimatedIcon">@drawable/splash_screen_round</item>
-  </style>
-
-  <style name="BaseTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-    <item name="windowNoTitle">true</item>
-    <item name="windowActionBar">false</item>
-    <item name="colorPrimary">@color/primary</item>
-    <item name="colorPrimaryDark">@color/notificationBar</item>
-    <item name="colorAccent">@color/primary</item>
-    <item name="colorControlNormal">@color/border</item>
-    <item name="android:navigationBarColor">@android:color/black</item>
-    <item name="windowActionModeOverlay">true</item>
-    <item name="android:colorActivatedHighlight">@android:color/transparent</item>
-    <item name="android:textCursorDrawable">@null</item>
-    <item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item>
-    <item name="buttonStyle">@style/ButtonStyle</item>
-  </style>
-
-  <style name="ButtonStyle" parent="Widget.AppCompat.Button">
-    <item name="android:textAllCaps">false</item>
-  </style>      
-</resources>

src/Android/Services/AndroidPushNotificationService.cs

@@ -1,112 +0,0 @@
-#if !FDROID
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Android.App;
-using Android.Content;
-using Android.OS;
-using AndroidX.Core.App;
-using Bit.App.Abstractions;
-using Bit.App.Models;
-using Bit.Core;
-using Bit.Core.Abstractions;
-using Bit.Droid.Receivers;
-using Bit.Droid.Utilities;
-using Newtonsoft.Json;
-using Xamarin.Forms;
-using static Xamarin.Essentials.Platform;
-using Intent = Android.Content.Intent;
-
-namespace Bit.Droid.Services
-{
-    public class AndroidPushNotificationService : IPushNotificationService
-    {
-        private readonly IStateService _stateService;
-        private readonly IPushNotificationListenerService _pushNotificationListenerService;
-
-        public AndroidPushNotificationService(
-            IStateService stateService,
-            IPushNotificationListenerService pushNotificationListenerService)
-        {
-            _stateService = stateService;
-            _pushNotificationListenerService = pushNotificationListenerService;
-        }
-
-        public bool IsRegisteredForPush => NotificationManagerCompat.From(Android.App.Application.Context)?.AreNotificationsEnabled() ?? false;
-
-        public Task<bool> AreNotificationsSettingsEnabledAsync()
-        {
-            return Task.FromResult(IsRegisteredForPush);
-        }
-
-        public async Task<string> GetTokenAsync()
-        {
-            return await _stateService.GetPushCurrentTokenAsync();
-        }
-
-        public async Task RegisterAsync()
-        {
-            var registeredToken = await _stateService.GetPushRegisteredTokenAsync();
-            var currentToken = await GetTokenAsync();
-            if (!string.IsNullOrWhiteSpace(registeredToken) && registeredToken != currentToken)
-            {
-                await _pushNotificationListenerService.OnRegisteredAsync(registeredToken, Device.Android);
-            }
-            else
-            {
-                await _stateService.SetPushLastRegistrationDateAsync(DateTime.UtcNow);
-            }
-        }
-
-        public Task UnregisterAsync()
-        {
-            // Do we ever need to unregister?
-            return Task.FromResult(0);
-        }
-
-        public void DismissLocalNotification(string notificationId)
-        {
-            if (int.TryParse(notificationId, out int intNotificationId))
-            {
-                var notificationManager = NotificationManagerCompat.From(Android.App.Application.Context);
-                notificationManager.Cancel(intNotificationId);
-            }
-        }
-
-        public void SendLocalNotification(string title, string message, BaseNotificationData data)
-        {
-            if (string.IsNullOrEmpty(data.Id))
-            {
-                throw new ArgumentNullException("notificationId cannot be null or empty.");
-            }
-            
-            var context = Android.App.Application.Context;
-            var intent = new Intent(context, typeof(MainActivity));
-            intent.PutExtra(Bit.Core.Constants.NotificationData, JsonConvert.SerializeObject(data));
-            var pendingIntentFlags = AndroidHelpers.AddPendingIntentMutabilityFlag(PendingIntentFlags.UpdateCurrent, true);
-            var pendingIntent = PendingIntent.GetActivity(context, 20220801, intent, pendingIntentFlags);
-
-            var deleteIntent = new Intent(context, typeof(NotificationDismissReceiver));
-            deleteIntent.PutExtra(Bit.Core.Constants.NotificationData, JsonConvert.SerializeObject(data));
-            var deletePendingIntent = PendingIntent.GetBroadcast(context, 20220802, deleteIntent, pendingIntentFlags);
-
-            var builder = new NotificationCompat.Builder(context, Bit.Core.Constants.AndroidNotificationChannelId)
-               .SetContentIntent(pendingIntent)
-               .SetContentTitle(title)
-               .SetContentText(message)
-               .SetSmallIcon(Resource.Drawable.ic_notification)
-               .SetColor((int)Android.Graphics.Color.White)
-               .SetDeleteIntent(deletePendingIntent)
-               .SetAutoCancel(true);
-
-            if (data is PasswordlessNotificationData passwordlessNotificationData && passwordlessNotificationData.TimeoutInMinutes > 0)
-            {
-                builder.SetTimeoutAfter(passwordlessNotificationData.TimeoutInMinutes * 60000);
-            }
-
-            var notificationManager = NotificationManagerCompat.From(context);
-            notificationManager.Notify(int.Parse(data.Id), builder.Build());
-        }
-    }
-}
-#endif

src/Android/Services/AutofillHandler.cs

@@ -1,215 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using Android.App;
-using Android.App.Assist;
-using Android.Content;
-using Android.OS;
-using Android.Provider;
-using Android.Views.Autofill;
-using Bit.App.Resources;
-using Bit.Core.Abstractions;
-using Bit.Core.Enums;
-using Bit.Core.Models.View;
-using Bit.Core.Utilities;
-using Bit.Droid.Autofill;
-using Plugin.CurrentActivity;
-
-namespace Bit.Droid.Services
-{
-    public class AutofillHandler : IAutofillHandler
-    {
-        private readonly IStateService _stateService;
-        private readonly IMessagingService _messagingService;
-        private readonly IClipboardService _clipboardService;
-        private readonly IPlatformUtilsService _platformUtilsService;
-        private readonly LazyResolve<IEventService> _eventService;
-
-        public AutofillHandler(IStateService stateService,
-            IMessagingService messagingService,
-            IClipboardService clipboardService,
-            IPlatformUtilsService platformUtilsService,
-            LazyResolve<IEventService> eventService)
-        {
-            _stateService = stateService;
-            _messagingService = messagingService;
-            _clipboardService = clipboardService;
-            _platformUtilsService = platformUtilsService;
-            _eventService = eventService;
-        }
-
-        public bool AutofillServiceEnabled()
-        {
-            if (Build.VERSION.SdkInt < BuildVersionCodes.O)
-            {
-                return false;
-            }
-            try
-            {
-                var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
-                var afm = (AutofillManager)activity.GetSystemService(
-                    Java.Lang.Class.FromType(typeof(AutofillManager)));
-                return afm.IsEnabled && afm.HasEnabledAutofillServices;
-            }
-            catch
-            {
-                return false;
-            }
-        }
-
-        public bool SupportsAutofillService()
-        {
-            if (Build.VERSION.SdkInt < BuildVersionCodes.O)
-            {
-                return false;
-            }
-            try
-            {
-                var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
-                var type = Java.Lang.Class.FromType(typeof(AutofillManager));
-                var manager = activity.GetSystemService(type) as AutofillManager;
-                return manager.IsAutofillSupported;
-            }
-            catch
-            {
-                return false;
-            }
-        }
-
-        public void Autofill(CipherView cipher)
-        {
-            var activity = CrossCurrentActivity.Current.Activity as Xamarin.Forms.Platform.Android.FormsAppCompatActivity;
-            if (activity == null)
-            {
-                return;
-            }
-            if (activity.Intent?.GetBooleanExtra(AutofillConstants.AutofillFramework, false) ?? false)
-            {
-                if (cipher == null)
-                {
-                    activity.SetResult(Result.Canceled);
-                    activity.Finish();
-                    return;
-                }
-                var structure = activity.Intent.GetParcelableExtra(
-                    AutofillManager.ExtraAssistStructure) as AssistStructure;
-                if (structure == null)
-                {
-                    activity.SetResult(Result.Canceled);
-                    activity.Finish();
-                    return;
-                }
-                var parser = new Parser(structure, activity.ApplicationContext);
-                parser.Parse();
-                if ((!parser.FieldCollection?.Fields?.Any() ?? true) || string.IsNullOrWhiteSpace(parser.Uri))
-                {
-                    activity.SetResult(Result.Canceled);
-                    activity.Finish();
-                    return;
-                }
-                var task = CopyTotpAsync(cipher);
-                var dataset = AutofillHelpers.BuildDataset(activity, parser.FieldCollection, new FilledItem(cipher), false);
-                var replyIntent = new Intent();
-                replyIntent.PutExtra(AutofillManager.ExtraAuthenticationResult, dataset);
-                activity.SetResult(Result.Ok, replyIntent);
-                activity.Finish();
-                var eventTask = _eventService.Value.CollectAsync(EventType.Cipher_ClientAutofilled, cipher.Id);
-            }
-            else
-            {
-                var data = new Intent();
-                if (cipher?.Login == null)
-                {
-                    data.PutExtra("canceled", "true");
-                }
-                else
-                {
-                    var task = CopyTotpAsync(cipher);
-                    data.PutExtra("uri", cipher.Login.Uri);
-                    data.PutExtra("username", cipher.Login.Username);
-                    data.PutExtra("password", cipher.Login.Password);
-                }
-                if (activity.Parent == null)
-                {
-                    activity.SetResult(Result.Ok, data);
-                }
-                else
-                {
-                    activity.Parent.SetResult(Result.Ok, data);
-                }
-                activity.Finish();
-                _messagingService.Send("finishMainActivity");
-                if (cipher != null)
-                {
-                    var eventTask = _eventService.Value.CollectAsync(EventType.Cipher_ClientAutofilled, cipher.Id);
-                }
-            }
-        }
-
-        public void CloseAutofill()
-        {
-            Autofill(null);
-        }
-
-        public bool AutofillAccessibilityServiceRunning()
-        {
-            var enabledServices = Settings.Secure.GetString(Application.Context.ContentResolver,
-                Settings.Secure.EnabledAccessibilityServices);
-            return Application.Context.PackageName != null &&
-                   (enabledServices?.Contains(Application.Context.PackageName) ?? false);
-        }
-
-        public bool AutofillAccessibilityOverlayPermitted()
-        {
-            return Accessibility.AccessibilityHelpers.OverlayPermitted();
-        }
-
-        
-
-        public void DisableAutofillService()
-        {
-            try
-            {
-                var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
-                var type = Java.Lang.Class.FromType(typeof(AutofillManager));
-                var manager = activity.GetSystemService(type) as AutofillManager;
-                manager.DisableAutofillServices();
-            }
-            catch { }
-        }
-
-        public bool AutofillServicesEnabled()
-        {
-            if (Build.VERSION.SdkInt <= BuildVersionCodes.M)
-            {
-                // Android 5-6: Both accessibility & overlay are required or nothing happens
-                return AutofillAccessibilityServiceRunning() && AutofillAccessibilityOverlayPermitted();
-            }
-            if (Build.VERSION.SdkInt == BuildVersionCodes.N)
-            {
-                // Android 7: Only accessibility is required (overlay is optional when using quick-action tile)
-                return AutofillAccessibilityServiceRunning();
-            }
-            // Android 8+: Either autofill or accessibility is required
-            return AutofillServiceEnabled() || AutofillAccessibilityServiceRunning();
-        }
-
-        private async Task CopyTotpAsync(CipherView cipher)
-        {
-            if (!string.IsNullOrWhiteSpace(cipher?.Login?.Totp))
-            {
-                var autoCopyDisabled = await _stateService.GetDisableAutoTotpCopyAsync();
-                var canAccessPremium = await _stateService.CanAccessPremiumAsync();
-                if ((canAccessPremium || cipher.OrganizationUseTotp) && !autoCopyDisabled.GetValueOrDefault())
-                {
-                    var totpService = ServiceContainer.Resolve<ITotpService>("totpService");
-                    var totp = await totpService.GetCodeAsync(cipher.Login.Totp);
-                    if (totp != null)
-                    {
-                        await _clipboardService.CopyTextAsync(totp);
-                        _platformUtilsService.ShowToastForCopiedValue(AppResources.VerificationCodeTotp);
-                    }
-                }
-            }
-        }
-    }
-}

src/Android/Services/DeviceActionService.cs

@@ -1,628 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Android.App;
-using Android.Content;
-using Android.Content.PM;
-using Android.Nfc;
-using Android.OS;
-using Android.Provider;
-using Android.Text;
-using Android.Text.Method;
-using Android.Views;
-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.Droid.Utilities;
-using Plugin.CurrentActivity;
-using Xamarin.Forms.Platform.Android;
-
-namespace Bit.Droid.Services
-{
-    public class DeviceActionService : IDeviceActionService
-    {
-        private readonly IStateService _stateService;
-        private readonly IMessagingService _messagingService;
-        private AlertDialog _progressDialog;
-        object _progressDialogLock = new object();
-
-        private Toast _toast;
-        private string _userAgent;
-
-        public DeviceActionService(
-            IStateService stateService,
-            IMessagingService messagingService)
-        {
-            _stateService = stateService;
-            _messagingService = messagingService;
-        }
-
-        public string DeviceUserAgent
-        {
-            get
-            {
-                if (string.IsNullOrWhiteSpace(_userAgent))
-                {
-                    _userAgent = $"Bitwarden_Mobile/{Xamarin.Essentials.AppInfo.VersionString} " +
-                        $"(Android {Build.VERSION.Release}; SDK {Build.VERSION.Sdk}; Model {Build.Model})";
-                }
-                return _userAgent;
-            }
-        }
-
-        public DeviceType DeviceType => DeviceType.Android;
-
-        public void Toast(string text, bool longDuration = false)
-        {
-            if (_toast != null)
-            {
-                _toast.Cancel();
-                _toast.Dispose();
-                _toast = null;
-            }
-            _toast = Android.Widget.Toast.MakeText(CrossCurrentActivity.Current.Activity, text,
-                longDuration ? ToastLength.Long : ToastLength.Short);
-            _toast.Show();
-        }
-
-        public bool LaunchApp(string appName)
-        {
-            if ((int)Build.VERSION.SdkInt < 33)
-            {
-                // API 33 required to avoid using wildcard app visibility or dangerous permissions
-                // https://developer.android.com/reference/android/content/pm/PackageManager#getLaunchIntentSenderForPackage(java.lang.String)
-                return false;
-            }
-            var activity = CrossCurrentActivity.Current.Activity;
-            appName = appName.Replace("androidapp://", string.Empty);
-            var launchIntentSender = activity?.PackageManager?.GetLaunchIntentSenderForPackage(appName);
-            launchIntentSender?.SendIntent(activity, Result.Ok, null, null, null);
-            return launchIntentSender != null;
-        }
-
-        public async Task ShowLoadingAsync(string text)
-        {
-            if (_progressDialog != null)
-            {
-                await HideLoadingAsync();
-            }
-
-            var activity = CrossCurrentActivity.Current.Activity;
-            var inflater = (LayoutInflater)activity.GetSystemService(Context.LayoutInflaterService);
-            var dialogView = inflater.Inflate(Resource.Layout.progress_dialog_layout, null);
-            
-            var txtLoading = dialogView.FindViewById<TextView>(Resource.Id.txtLoading);
-            txtLoading.Text = text;
-            txtLoading.SetTextColor(ThemeHelpers.TextColor);
-
-            _progressDialog = new AlertDialog.Builder(activity)
-                .SetView(dialogView)
-                .SetCancelable(false)
-                .Create();
-            _progressDialog.Show();
-        }
-
-        public Task HideLoadingAsync()
-        {
-            // Based on https://github.com/redth-org/AndHUD/blob/master/AndHUD/AndHUD.cs
-            lock (_progressDialogLock)
-            {
-                if (_progressDialog is null)
-                {
-                    return Task.CompletedTask;
-                }
-
-                void actionDismiss()
-                {
-                    try
-                    {
-                        if (IsAlive(_progressDialog) && IsAlive(_progressDialog.Window))
-                        {
-                            _progressDialog.Hide();
-                            _progressDialog.Dismiss();
-                        }
-                    }
-                    catch
-                    {
-                        // ignore
-                    }
-
-                    _progressDialog = null;
-                }
-
-                // First try the SynchronizationContext
-                if (Application.SynchronizationContext != null)
-                {
-                    Application.SynchronizationContext.Send(state => actionDismiss(), null);
-                    return Task.CompletedTask;
-                }
-
-                // Otherwise try OwnerActivity on dialog
-                var ownerActivity = _progressDialog?.OwnerActivity;
-                if (IsAlive(ownerActivity))
-                {
-                    ownerActivity.RunOnUiThread(actionDismiss);
-                    return Task.CompletedTask;
-                }
-
-                // Otherwise try get it from the Window Context
-                if (_progressDialog?.Window?.Context is Activity windowActivity && IsAlive(windowActivity))
-                {
-                    windowActivity.RunOnUiThread(actionDismiss);
-                    return Task.CompletedTask;
-                }
-
-                // Finally if all else fails, let's see if current activity is MainActivity
-                if (CrossCurrentActivity.Current.Activity is MainActivity activity && IsAlive(activity))
-                {
-                    activity.RunOnUiThread(actionDismiss);
-                    return Task.CompletedTask;
-                }
-
-                return Task.CompletedTask;
-            }
-        }
-
-        bool IsAlive(Java.Lang.Object @object)
-        {
-            if (@object == null)
-                return false;
-
-            if (@object.Handle == IntPtr.Zero)
-                return false;
-
-            if (@object is Activity activity)
-            {
-                if (activity.IsFinishing)
-                    return false;
-
-                if (activity.IsDestroyed)
-                    return false;
-            }
-
-            return true;
-        }
-
-        public 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)
-        {
-            var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
-            if (activity == null)
-            {
-                return Task.FromResult<string>(null);
-            }
-
-            var alertBuilder = new AlertDialog.Builder(activity);
-            alertBuilder.SetTitle(title);
-            alertBuilder.SetMessage(description);
-            var input = new EditText(activity)
-            {
-                InputType = InputTypes.ClassText
-            };
-            if (text == null)
-            {
-                text = string.Empty;
-            }
-            if (numericKeyboard)
-            {
-                SetNumericKeyboardTo(input);
-            }
-            if (password)
-            {
-                input.InputType = InputTypes.TextVariationPassword | InputTypes.ClassText;
-            }
-
-            input.ImeOptions = input.ImeOptions | (ImeAction)ImeFlags.NoPersonalizedLearning |
-                (ImeAction)ImeFlags.NoExtractUi;
-            input.Text = text;
-            input.SetSelection(text.Length);
-            var container = new FrameLayout(activity);
-            var lp = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MatchParent,
-                LinearLayout.LayoutParams.MatchParent);
-            lp.SetMargins(25, 0, 25, 0);
-            input.LayoutParameters = lp;
-            container.AddView(input);
-            alertBuilder.SetView(container);
-
-            okButtonText = okButtonText ?? AppResources.Ok;
-            cancelButtonText = cancelButtonText ?? AppResources.Cancel;
-            var result = new TaskCompletionSource<string>();
-            alertBuilder.SetPositiveButton(okButtonText,
-                (sender, args) => result.TrySetResult(input.Text ?? string.Empty));
-            alertBuilder.SetNegativeButton(cancelButtonText, (sender, args) => result.TrySetResult(null));
-
-            var alert = alertBuilder.Create();
-            alert.Window.SetSoftInputMode(Android.Views.SoftInput.StateVisible);
-            alert.Show();
-            if (autofocus)
-            {
-                input.RequestFocus();
-            }
-            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;
-            try
-            {
-                var rateIntent = RateIntentForUrl("market://details", activity);
-                activity.StartActivity(rateIntent);
-            }
-            catch (ActivityNotFoundException)
-            {
-                var rateIntent = RateIntentForUrl("https://play.google.com/store/apps/details", activity);
-                activity.StartActivity(rateIntent);
-            }
-        }
-
-        public string GetBuildNumber()
-        {
-            return Application.Context.ApplicationContext.PackageManager.GetPackageInfo(
-                Application.Context.PackageName, 0).VersionCode.ToString();
-        }
-
-        public bool SupportsFaceBiometric()
-        {
-            // only used by iOS
-            return false;
-        }
-
-        public Task<bool> SupportsFaceBiometricAsync()
-        {
-            // only used by iOS
-            return Task.FromResult(SupportsFaceBiometric());
-        }
-
-        public bool SupportsNfc()
-        {
-            var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
-            var manager = activity.GetSystemService(Context.NfcService) as NfcManager;
-            return manager.DefaultAdapter?.IsEnabled ?? false;
-        }
-
-        public bool SupportsCamera()
-        {
-            var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
-            return activity.PackageManager.HasSystemFeature(PackageManager.FeatureCamera);
-        }
-
-        public int SystemMajorVersion()
-        {
-            return (int)Build.VERSION.SdkInt;
-        }
-
-        public string SystemModel()
-        {
-            return Build.Model;
-        }
-
-        public Task<string> DisplayAlertAsync(string title, string message, string cancel, params string[] buttons)
-        {
-            var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
-            if (activity == null)
-            {
-                return Task.FromResult<string>(null);
-            }
-
-            var result = new TaskCompletionSource<string>();
-            var alertBuilder = new AlertDialog.Builder(activity);
-            alertBuilder.SetTitle(title);
-
-            if (!string.IsNullOrWhiteSpace(message))
-            {
-                if (buttons != null && buttons.Length > 2)
-                {
-                    if (!string.IsNullOrWhiteSpace(title))
-                    {
-                        alertBuilder.SetTitle($"{title}: {message}");
-                    }
-                    else
-                    {
-                        alertBuilder.SetTitle(message);
-                    }
-                }
-                else
-                {
-                    alertBuilder.SetMessage(message);
-                }
-            }
-
-            if (buttons != null)
-            {
-                if (buttons.Length > 2)
-                {
-                    alertBuilder.SetItems(buttons, (sender, args) =>
-                    {
-                        result.TrySetResult(buttons[args.Which]);
-                    });
-                }
-                else
-                {
-                    if (buttons.Length > 0)
-                    {
-                        alertBuilder.SetPositiveButton(buttons[0], (sender, args) =>
-                        {
-                            result.TrySetResult(buttons[0]);
-                        });
-                    }
-                    if (buttons.Length > 1)
-                    {
-                        alertBuilder.SetNeutralButton(buttons[1], (sender, args) =>
-                        {
-                            result.TrySetResult(buttons[1]);
-                        });
-                    }
-                }
-            }
-
-            if (!string.IsNullOrWhiteSpace(cancel))
-            {
-                alertBuilder.SetNegativeButton(cancel, (sender, args) =>
-                {
-                    result.TrySetResult(cancel);
-                });
-            }
-
-            var alert = alertBuilder.Create();
-            alert.CancelEvent += (o, args) => { result.TrySetResult(null); };
-            alert.Show();
-            return result.Task;
-        }
-
-        public async Task<string> DisplayActionSheetAsync(string title, string cancel, string destruction,
-            params string[] buttons)
-        {
-            return await Xamarin.Forms.Application.Current.MainPage.DisplayActionSheet(
-                title, cancel, destruction, buttons);
-        }
-
-
-        public void OpenAccessibilityOverlayPermissionSettings()
-        {
-            var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
-            try
-            {
-                var intent = new Intent(Settings.ActionManageOverlayPermission);
-                intent.SetData(Android.Net.Uri.Parse("package:com.x8bit.bitwarden"));
-                activity.StartActivity(intent);
-            }
-            catch (ActivityNotFoundException)
-            {
-                // can't open overlay permission management, fall back to app settings
-                var intent = new Intent(Settings.ActionApplicationDetailsSettings);
-                intent.SetData(Android.Net.Uri.Parse("package:com.x8bit.bitwarden"));
-                activity.StartActivity(intent);
-            }
-            catch
-            {
-                var alertBuilder = new AlertDialog.Builder(activity);
-                alertBuilder.SetMessage(AppResources.BitwardenAutofillGoToSettings);
-                alertBuilder.SetCancelable(true);
-                alertBuilder.SetPositiveButton(AppResources.Ok, (sender, args) =>
-                {
-                    (sender as AlertDialog)?.Cancel();
-                });
-                alertBuilder.Create().Show();
-            }
-        }
-
-        public void OpenAccessibilitySettings()
-        {
-            try
-            {
-                var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
-                var intent = new Intent(Settings.ActionAccessibilitySettings);
-                activity.StartActivity(intent);
-            }
-            catch { }
-        }
-
-        public void OpenAutofillSettings()
-        {
-            var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
-            try
-            {
-                var intent = new Intent(Settings.ActionRequestSetAutofillService);
-                intent.SetData(Android.Net.Uri.Parse("package:com.x8bit.bitwarden"));
-                activity.StartActivity(intent);
-            }
-            catch (ActivityNotFoundException)
-            {
-                var alertBuilder = new AlertDialog.Builder(activity);
-                alertBuilder.SetMessage(AppResources.BitwardenAutofillGoToSettings);
-                alertBuilder.SetCancelable(true);
-                alertBuilder.SetPositiveButton(AppResources.Ok, (sender, args) =>
-                {
-                    (sender as AlertDialog)?.Cancel();
-                });
-                alertBuilder.Create().Show();
-            }
-        }
-
-        public long GetActiveTime()
-        {
-            // Returns milliseconds since the system was booted, and includes deep sleep. This clock is guaranteed to
-            // be monotonic, and continues to tick even when the CPU is in power saving modes, so is the recommend
-            // basis for general purpose interval timing.
-            // ref: https://developer.android.com/reference/android/os/SystemClock#elapsedRealtime()
-            return SystemClock.ElapsedRealtime();
-        }
-        
-        public void CloseMainApp()
-        {
-            var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
-            if (activity == null)
-            {
-                return;
-            }
-            activity.Finish();
-            _messagingService.Send("finishMainActivity");
-        }
-
-        public bool SupportsFido2()
-        {
-            return true;
-        }
-
-        private Intent RateIntentForUrl(string url, Activity activity)
-        {
-            var intent = new Intent(Intent.ActionView, Android.Net.Uri.Parse($"{url}?id={activity.PackageName}"));
-            var flags = ActivityFlags.NoHistory | ActivityFlags.MultipleTask;
-            if ((int)Build.VERSION.SdkInt >= 21)
-            {
-                flags |= ActivityFlags.NewDocument;
-            }
-            else
-            {
-                // noinspection deprecation
-                flags |= ActivityFlags.ClearWhenTaskReset;
-            }
-            intent.AddFlags(flags);
-            return intent;
-        }
-
-        public float GetSystemFontSizeScale()
-        {
-            var activity = CrossCurrentActivity.Current?.Activity as MainActivity;
-            return activity?.Resources?.Configuration?.FontScale ?? 1;
-        }
-        
-        public async Task OnAccountSwitchCompleteAsync()
-        {
-            // for any Android-specific cleanup required after switching accounts
-        }
-
-        public async Task SetScreenCaptureAllowedAsync()
-        {
-            var activity = CrossCurrentActivity.Current?.Activity;
-            if (await _stateService.GetScreenCaptureAllowedAsync())
-            {
-                activity.RunOnUiThread(() => activity.Window.ClearFlags(WindowManagerFlags.Secure));
-                return;
-            }
-            activity.RunOnUiThread(() => activity.Window.AddFlags(WindowManagerFlags.Secure));
-        }
-
-        public void OpenAppSettings()
-        {
-            var intent = new Intent(Android.Provider.Settings.ActionApplicationDetailsSettings);
-            intent.AddFlags(ActivityFlags.NewTask);
-            var uri = Android.Net.Uri.FromParts("package", Application.Context.PackageName, null);
-            intent.SetData(uri);
-            Application.Context.StartActivity(intent);
-        }
-
-        public void CloseExtensionPopUp()
-        {
-            // 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();
-        }
-    }
-}

src/Android/Services/FileService.cs

@@ -1,278 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading.Tasks;
-using Android;
-using Android.Content;
-using Android.Content.PM;
-using Android.OS;
-using Android.Provider;
-using Android.Webkit;
-using AndroidX.Core.App;
-using AndroidX.Core.Content;
-using Bit.App.Resources;
-using Bit.Core;
-using Bit.Core.Abstractions;
-using Plugin.CurrentActivity;
-
-namespace Bit.Droid.Services
-{
-    public class FileService : IFileService
-    {
-        private readonly IStateService _stateService;
-        private readonly IBroadcasterService _broadcasterService;
-
-        private bool _cameraPermissionsDenied;
-
-        public FileService(IStateService stateService, IBroadcasterService broadcasterService)
-        {
-            _stateService = stateService;
-            _broadcasterService = broadcasterService;
-
-            _broadcasterService.Subscribe(nameof(FileService), (message) =>
-            {
-                if (message.Command == "selectFileCameraPermissionDenied")
-                {
-                    _cameraPermissionsDenied = true;
-                }
-            });
-        }
-
-        public bool OpenFile(byte[] fileData, string id, string fileName)
-        {
-            try
-            {
-                var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
-                var intent = BuildOpenFileIntent(fileData, fileName);
-                if (intent == null)
-                {
-                    return false;
-                }
-                activity.StartActivity(intent);
-                return true;
-            }
-            catch { }
-            return false;
-        }
-
-        public bool CanOpenFile(string fileName)
-        {
-            try
-            {
-                var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
-                var intent = BuildOpenFileIntent(new byte[0], string.Concat("opentest_", fileName));
-                if (intent == null)
-                {
-                    return false;
-                }
-                var activities = activity.PackageManager.QueryIntentActivities(intent,
-                    PackageInfoFlags.MatchDefaultOnly);
-                return (activities?.Count ?? 0) > 0;
-            }
-            catch { }
-            return false;
-        }
-
-        private Intent BuildOpenFileIntent(byte[] fileData, string fileName)
-        {
-            var extension = MimeTypeMap.GetFileExtensionFromUrl(fileName.Replace(' ', '_').ToLower());
-            if (extension == null)
-            {
-                return null;
-            }
-            var mimeType = MimeTypeMap.Singleton.GetMimeTypeFromExtension(extension);
-            if (mimeType == null)
-            {
-                return null;
-            }
-
-            var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
-            var cachePath = activity.CacheDir;
-            var filePath = Path.Combine(cachePath.Path, fileName);
-            File.WriteAllBytes(filePath, fileData);
-            var file = new Java.IO.File(cachePath, fileName);
-            if (!file.IsFile)
-            {
-                return null;
-            }
-
-            try
-            {
-                var intent = new Intent(Intent.ActionView);
-                var uri = FileProvider.GetUriForFile(activity.ApplicationContext,
-                    "com.x8bit.bitwarden.fileprovider", file);
-                intent.SetDataAndType(uri, mimeType);
-                intent.SetFlags(ActivityFlags.GrantReadUriPermission);
-                return intent;
-            }
-            catch { }
-            return null;
-        }
-
-        public bool SaveFile(byte[] fileData, string id, string fileName, string contentUri)
-        {
-            try
-            {
-                var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
-
-                if (contentUri != null)
-                {
-                    var uri = Android.Net.Uri.Parse(contentUri);
-                    var stream = activity.ContentResolver.OpenOutputStream(uri);
-                    // Using java bufferedOutputStream due to this issue:
-                    // https://github.com/xamarin/xamarin-android/issues/3498
-                    var javaStream = new Java.IO.BufferedOutputStream(stream);
-                    javaStream.Write(fileData);
-                    javaStream.Flush();
-                    javaStream.Close();
-                    return true;
-                }
-
-                // Prompt for location to save file
-                var extension = MimeTypeMap.GetFileExtensionFromUrl(fileName.Replace(' ', '_').ToLower());
-                if (extension == null)
-                {
-                    return false;
-                }
-
-                string mimeType = MimeTypeMap.Singleton.GetMimeTypeFromExtension(extension);
-                if (mimeType == null)
-                {
-                    // Unable to identify so fall back to generic "any" type
-                    mimeType = "*/*";
-                }
-
-                var intent = new Intent(Intent.ActionCreateDocument);
-                intent.SetType(mimeType);
-                intent.AddCategory(Intent.CategoryOpenable);
-                intent.PutExtra(Intent.ExtraTitle, fileName);
-
-                activity.StartActivityForResult(intent, Core.Constants.SaveFileRequestCode);
-                return true;
-            }
-            catch (Exception ex)
-            {
-                System.Diagnostics.Debug.WriteLine(">>> {0}: {1}", ex.GetType(), ex.StackTrace);
-            }
-            return false;
-        }
-
-        public async Task ClearCacheAsync()
-        {
-            try
-            {
-                DeleteDir(CrossCurrentActivity.Current.Activity.CacheDir);
-                await _stateService.SetLastFileCacheClearAsync(DateTime.UtcNow);
-            }
-            catch (Exception) { }
-        }
-
-        public Task SelectFileAsync()
-        {
-            var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
-            var hasStorageWritePermission = !_cameraPermissionsDenied &&
-                HasPermission(Manifest.Permission.WriteExternalStorage);
-            var additionalIntents = new List<IParcelable>();
-            if (activity.PackageManager.HasSystemFeature(PackageManager.FeatureCamera))
-            {
-                var hasCameraPermission = !_cameraPermissionsDenied && HasPermission(Manifest.Permission.Camera);
-                if (!_cameraPermissionsDenied && !hasStorageWritePermission)
-                {
-                    AskPermission(Manifest.Permission.WriteExternalStorage);
-                    return Task.FromResult(0);
-                }
-                if (!_cameraPermissionsDenied && !hasCameraPermission)
-                {
-                    AskPermission(Manifest.Permission.Camera);
-                    return Task.FromResult(0);
-                }
-                if (!_cameraPermissionsDenied && hasCameraPermission && hasStorageWritePermission)
-                {
-                    try
-                    {
-                        var file = new Java.IO.File(activity.FilesDir, "temp_camera_photo.jpg");
-                        if (!file.Exists())
-                        {
-                            file.ParentFile.Mkdirs();
-                            file.CreateNewFile();
-                        }
-                        var outputFileUri = FileProvider.GetUriForFile(activity,
-                            "com.x8bit.bitwarden.fileprovider", file);
-                        additionalIntents.AddRange(GetCameraIntents(outputFileUri));
-                    }
-                    catch (Java.IO.IOException) { }
-                }
-            }
-
-            var docIntent = new Intent(Intent.ActionOpenDocument);
-            docIntent.AddCategory(Intent.CategoryOpenable);
-            docIntent.SetType("*/*");
-            var chooserIntent = Intent.CreateChooser(docIntent, AppResources.FileSource);
-            if (additionalIntents.Count > 0)
-            {
-                chooserIntent.PutExtra(Intent.ExtraInitialIntents, additionalIntents.ToArray());
-            }
-            activity.StartActivityForResult(chooserIntent, Core.Constants.SelectFileRequestCode);
-            return Task.FromResult(0);
-        }
-
-        private bool DeleteDir(Java.IO.File dir)
-        {
-            if (dir is null)
-            {
-                return false;
-            }
-
-            if (dir.IsDirectory)
-            {
-                var children = dir.List();
-                for (int i = 0; i < children.Length; i++)
-                {
-                    var success = DeleteDir(new Java.IO.File(dir, children[i]));
-                    if (!success)
-                    {
-                        return false;
-                    }
-                }
-                return dir.Delete();
-            }
-
-            if (dir.IsFile)
-            {
-                return dir.Delete();
-            }
-
-            return false;
-        }
-
-        private bool HasPermission(string permission)
-        {
-            return ContextCompat.CheckSelfPermission(
-                CrossCurrentActivity.Current.Activity, permission) == Permission.Granted;
-        }
-
-        private void AskPermission(string permission)
-        {
-            ActivityCompat.RequestPermissions(CrossCurrentActivity.Current.Activity, new string[] { permission },
-                Core.Constants.SelectFilePermissionRequestCode);
-        }
-
-        private List<IParcelable> GetCameraIntents(Android.Net.Uri outputUri)
-        {
-            var intents = new List<IParcelable>();
-            var pm = CrossCurrentActivity.Current.Activity.PackageManager;
-            var captureIntent = new Intent(MediaStore.ActionImageCapture);
-            var listCam = pm.QueryIntentActivities(captureIntent, 0);
-            foreach (var res in listCam)
-            {
-                var packageName = res.ActivityInfo.PackageName;
-                var intent = new Intent(captureIntent);
-                intent.SetComponent(new ComponentName(packageName, res.ActivityInfo.Name));
-                intent.SetPackage(packageName);
-                intent.PutExtra(MediaStore.ExtraOutput, outputUri);
-                intents.Add(intent);
-            }
-            return intents;
-        }
-    }
-}

src/Android/Utilities/AndroidHelpers.cs

@@ -1,70 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Android.App;
-using Android.Content;
-using Android.OS;
-using Android.Provider;
-using Bit.App.Utilities;
-
-namespace Bit.Droid.Utilities
-{
-    public static class AndroidHelpers
-    {
-        private static string BaseEnvironmentUrlRestrictionKey = "baseEnvironmentUrl";
-
-        public static string GetFileName(Context context, Android.Net.Uri uri)
-        {
-            string name = null;
-            string[] projection = { MediaStore.MediaColumns.DisplayName };
-            var metaCursor = context.ContentResolver.Query(uri, projection, null, null, null);
-            if (metaCursor != null)
-            {
-                try
-                {
-                    if (metaCursor.MoveToFirst())
-                    {
-                        name = metaCursor.GetString(0);
-                    }
-                }
-                finally
-                {
-                    metaCursor.Close();
-                }
-            }
-            return name;
-        }
-
-        public static async Task SetPreconfiguredRestrictionSettingsAsync(Context context)
-        {
-            var restrictionsManager = (RestrictionsManager)context.GetSystemService(Context.RestrictionsService);
-            var restrictions = restrictionsManager.ApplicationRestrictions;
-            var dict = new Dictionary<string, string>();
-            if (restrictions.ContainsKey(BaseEnvironmentUrlRestrictionKey))
-            {
-                dict.Add(BaseEnvironmentUrlRestrictionKey, restrictions.GetString(BaseEnvironmentUrlRestrictionKey));
-            }
-
-            if (dict.Count > 0)
-            {
-                await AppHelpers.SetPreconfiguredSettingsAsync(dict);
-            }
-        }
-
-        public static PendingIntentFlags AddPendingIntentMutabilityFlag(PendingIntentFlags pendingIntentFlags, bool isMutable)
-        {
-            //Mutable flag was added on API level 31
-            if (isMutable && Build.VERSION.SdkInt >= BuildVersionCodes.S)
-            {
-                return pendingIntentFlags | PendingIntentFlags.Mutable;
-            }
-
-            //Immutable flag was added on API level 23
-            if (!isMutable && Build.VERSION.SdkInt >= BuildVersionCodes.M)
-            {
-                return pendingIntentFlags | PendingIntentFlags.Immutable;
-            }
-
-            return pendingIntentFlags;
-        }
-    }
-}

src/Android/Utilities/ThemeHelpers.cs

@@ -1,75 +0,0 @@
-using Android.Graphics;
-using Bit.App.Utilities;
-using Xamarin.Forms.Platform.Android;
-
-namespace Bit.Droid.Utilities
-{
-    public class ThemeHelpers
-    {
-        public static bool LightTheme = true;
-        
-        public static Color PrimaryColor
-        {
-            get => ThemeManager.GetResourceColor("PrimaryColor").ToAndroid();
-        }
-        public static Color MutedColor
-        {
-            get => ThemeManager.GetResourceColor("MutedColor").ToAndroid();
-        }
-        public static Color BackgroundColor
-        {
-            get => ThemeManager.GetResourceColor("BackgroundColor").ToAndroid();
-        }
-        public static Color NavBarBackgroundColor
-        {
-            get => ThemeManager.GetResourceColor("NavigationBarBackgroundColor").ToAndroid();
-        }
-        public static Color FabColor
-        {
-            get => ThemeManager.GetResourceColor("FabColor").ToAndroid();
-        }
-        public static Color SwitchOnColor
-        {
-            get => ThemeManager.GetResourceColor("SwitchOnColor").ToAndroid();
-        }
-        public static Color SwitchThumbColor
-        {
-            get => ThemeManager.GetResourceColor("SwitchThumbColor").ToAndroid();
-        }
-        public static Color TextColor
-        {
-            get => ThemeManager.GetResourceColor("TextColor").ToAndroid();
-        }
-        
-        public static void SetAppearance(string theme, bool osDarkModeEnabled)
-        {
-            SetThemeVariables(theme, osDarkModeEnabled);
-        }
-        
-        public static int GetDialogTheme()
-        {
-            if (LightTheme)
-            {
-                return Android.Resource.Style.ThemeMaterialLightDialog;
-            }
-            return Android.Resource.Style.ThemeMaterialDialog;
-        }
-        
-        private static void SetThemeVariables(string theme, bool osDarkModeEnabled)
-        {
-            if (string.IsNullOrWhiteSpace(theme) && osDarkModeEnabled)
-            {
-                theme = ThemeManager.Dark;
-            }
-
-            if (theme == ThemeManager.Dark || theme == ThemeManager.Black || theme == ThemeManager.Nord || theme == ThemeManager.SolarizedDark)
-            {
-                LightTheme = false;
-            }
-            else
-            {
-                LightTheme = true;
-            }
-        }
-    }
-}

src/Android/WebAuthCallbackActivity.cs

@@ -1,23 +0,0 @@
-using Android.App;
-using Android.Content.PM;
-using Android.OS;
-using Bit.Droid.Utilities;
-
-namespace Bit.Droid
-{
-    [Activity(
-        NoHistory = true, 
-        LaunchMode = LaunchMode.SingleTop,
-        Exported = true)]
-    [IntentFilter(new[] { Android.Content.Intent.ActionView },
-        Categories = new[] { Android.Content.Intent.CategoryDefault, Android.Content.Intent.CategoryBrowsable },
-        DataScheme = "bitwarden")]
-    public class WebAuthCallbackActivity : Xamarin.Essentials.WebAuthenticatorCallbackActivity
-    {
-        protected override void OnCreate(Bundle savedInstanceState)
-        {
-            Intent?.Validate();
-            base.OnCreate(savedInstanceState);
-        }
-    }
-}

src/App/Abstractions/IDeviceActionService.cs

@@ -1,45 +0,0 @@
-using System.Threading.Tasks;
-using Bit.App.Utilities.Prompts;
-using Bit.Core.Enums;
-using Bit.Core.Models;
-
-namespace Bit.App.Abstractions
-{
-    public interface IDeviceActionService
-    {
-        string DeviceUserAgent { get; }
-        DeviceType DeviceType { get; }
-        int SystemMajorVersion();
-        string SystemModel();
-        string GetBuildNumber();
-
-        void Toast(string text, bool longDuration = false);
-        Task ShowLoadingAsync(string text);
-        Task HideLoadingAsync();
-        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);
-
-        bool SupportsFaceBiometric();
-        Task<bool> SupportsFaceBiometricAsync();
-        bool SupportsNfc();
-        bool SupportsCamera();
-        bool SupportsFido2();
-
-        bool LaunchApp(string appName);
-        void RateApp();
-        void OpenAccessibilitySettings();
-        void OpenAccessibilityOverlayPermissionSettings();
-        void OpenAutofillSettings();
-        long GetActiveTime();
-        void CloseMainApp();
-        float GetSystemFontSizeScale();
-        Task OnAccountSwitchCompleteAsync();
-        Task SetScreenCaptureAllowedAsync();
-        void OpenAppSettings();
-        void CloseExtensionPopUp();
-    }
-}

src/App/App.csproj

@@ -1,437 +1,240 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <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>
+		<TargetFrameworks>net8.0-android;net8.0-ios</TargetFrameworks>
+
+    <!-- Uncomment to also build for Windows platform.-->
+    <!--<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>-->
+
+    <!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
+    <!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
+
+		<OutputType>Exe</OutputType>
+		<RootNamespace>Bit.App</RootNamespace>
+		<UseMaui>true</UseMaui>
+		<SingleProject>true</SingleProject>
+		<ImplicitUsings>enable</ImplicitUsings>
+
+		<!-- Display name -->
+		<ApplicationTitle>Bitwarden</ApplicationTitle>
+
+		<!-- App Identifier -->
+		<ApplicationId Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">com.8bit.bitwarden</ApplicationId>
+		<ApplicationId Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">com.x8bit.bitwarden</ApplicationId>
+		<ApplicationIdGuid>ccf4766c-a36c-4647-900c-0ea7d323ccc6</ApplicationIdGuid>
+
+		<!-- Versions -->
+		<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
+		<ApplicationVersion>1</ApplicationVersion>
+
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
+
+		<ForceSimulatorX64ArchitectureInIDE>true</ForceSimulatorX64ArchitectureInIDE>
+	</PropertyGroup>
+	<PropertyGroup>
+    <DefineConstants Condition=" '$(CustomConstants)' != '' ">$(DefineConstants);$(CustomConstants)</DefineConstants>
   </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Plugin.Fingerprint" Version="2.1.5" />
-    <PackageReference Include="Xamarin.FFImageLoading.Forms" Version="2.4.11.982" />
-    <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>
-    </Compile>
-    <Compile Update="Pages\Accounts\HintPage.xaml.cs">
-      <DependentUpon>HintPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Pages\Accounts\LockPage.xaml.cs">
-      <DependentUpon>LockPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Pages\Accounts\TwoFactorPage.xaml.cs">
-      <DependentUpon>TwoFactorPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Pages\Accounts\RegisterPage.xaml.cs">
-      <DependentUpon>RegisterPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Pages\Accounts\LoginPage.xaml.cs">
-      <DependentUpon>LoginPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Pages\Generator\GeneratorPage.xaml.cs">
-      <DependentUpon>GeneratorPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Pages\Generator\GeneratorHistoryPage.xaml.cs">
-      <DependentUpon>GeneratorHistoryPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Pages\Settings\AutofillPage.xaml.cs">
-      <DependentUpon>AutofillPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Pages\Settings\ExtensionPage.xaml.cs">
-      <DependentUpon>ExtensionPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Pages\Settings\AutofillServicesPage.xaml.cs">
-      <DependentUpon>AutofillServicesPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Pages\Settings\FolderAddEditPage.xaml.cs">
-      <DependentUpon>FolderAddEditPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Pages\Settings\FoldersPage.xaml.cs">
-      <DependentUpon>FoldersPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Pages\Settings\ExportVaultPage.xaml.cs">
-      <DependentUpon>ExportVaultPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Pages\Settings\OptionsPage.xaml.cs">
-      <DependentUpon>OptionsPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Pages\Settings\SyncPage.xaml.cs">
-      <DependentUpon>SyncPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Pages\Vault\AttachmentsPage.xaml.cs">
-      <DependentUpon>AttachmentsPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Pages\Vault\AutofillCiphersPage.xaml.cs">
-      <DependentUpon>AutofillCiphersPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Pages\Vault\CollectionsPage.xaml.cs">
-      <DependentUpon>CollectionsPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Pages\Vault\ScanPage.xaml.cs">
-      <DependentUpon>ScanPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Pages\Vault\SharePage.xaml.cs">
-      <DependentUpon>SharePage.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Pages\Vault\CiphersPage.xaml.cs">
-      <DependentUpon>CiphersPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Pages\Vault\PasswordHistoryPage.xaml.cs">
-      <DependentUpon>PasswordHistoryPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Pages\Vault\CipherDetailsPage.xaml.cs">
-      <DependentUpon>CipherDetailsPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Pages\Vault\CipherAddEditPage.xaml.cs">
-      <DependentUpon>CipherAddEditPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Pages\Settings\SettingsPage\SettingsPage.xaml.cs">
-      <DependentUpon>SettingsPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Pages\Vault\GroupingsPage\GroupingsPage.xaml.cs">
-      <DependentUpon>GroupingsPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Pages\Accounts\LoginSsoPage.xaml.cs">
-      <DependentUpon>LoginSsoPage.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Update="Pages\Accounts\SetPasswordPage.xaml.cs">
-      <DependentUpon>ResetMasterPasswordPage.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Update="Pages\Send\SendGroupingsPage\SendGroupingsPage.xaml.cs">
-      <DependentUpon>SendGroupingsPage.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Remove="Pages\Accounts\AccountsPopupPage.xaml.cs" />
-    <Compile Update="Pages\Accounts\LoginPasswordlessPage.xaml.cs">
-      <DependentUpon>LoginPasswordlessPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Pages\Accounts\LoginPasswordlessRequestPage.xaml.cs">
-      <DependentUpon>LoginPasswordlessRequestPage.xaml</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Resources\" />
-    <Folder Include="Behaviors\" />
-    <Folder Include="Lists\" />
-    <Folder Include="Lists\ItemLayouts\" />
-    <Folder Include="Lists\DataTemplateSelectors\" />
-    <Folder Include="Lists\ItemLayouts\CustomFields\" />
-    <Folder Include="Lists\ItemViewModels\" />
-    <Folder Include="Lists\ItemViewModels\CustomFields\" />
-    <Folder Include="Controls\AccountSwitchingOverlay\" />
-    <Folder Include="Utilities\AccountManagement\" />
-    <Folder Include="Controls\DateTime\" />
-    <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>
-    </Compile>
-    <Compile Update="Styles\Nord.xaml.cs">
-      <DependentUpon>Nord.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Styles\Variables.xaml.cs">
-      <DependentUpon>Variables.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Styles\Light.xaml.cs">
-      <DependentUpon>Light.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Styles\Dark.xaml.cs">
-      <DependentUpon>Dark.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Styles\iOS.xaml.cs">
-      <DependentUpon>iOS.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Styles\Android.xaml.cs">
-      <DependentUpon>Android.xaml</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Update="Resources\AppResources.cs.Designer.cs">
-      <DependentUpon>AppResources.cs.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Update="Resources\AppResources.da.Designer.cs">
-      <DependentUpon>AppResources.da.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Update="Resources\AppResources.de.Designer.cs">
-      <DependentUpon>AppResources.de.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Update="Resources\AppResources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>AppResources.resx</DependentUpon>
-    </Compile>
-    <Compile Update="Resources\AppResources.es.Designer.cs">
-      <DependentUpon>AppResources.es.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Update="Resources\AppResources.fi.Designer.cs">
-      <DependentUpon>AppResources.fi.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Update="Resources\AppResources.fr.Designer.cs">
-      <DependentUpon>AppResources.fr.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Update="Resources\AppResources.hi.Designer.cs">
-      <DependentUpon>AppResources.hi.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Update="Resources\AppResources.hr.Designer.cs">
-      <DependentUpon>AppResources.hr.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Update="Resources\AppResources.hu.Designer.cs">
-      <DependentUpon>AppResources.hu.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Update="Resources\AppResources.id.Designer.cs">
-      <DependentUpon>AppResources.id.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Update="Resources\AppResources.it.Designer.cs">
-      <DependentUpon>AppResources.it.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Update="Resources\AppResources.ja.Designer.cs">
-      <DependentUpon>AppResources.ja.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Update="Resources\AppResources.nl.Designer.cs">
-      <DependentUpon>AppResources.nl.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Update="Resources\AppResources.pl.Designer.cs">
-      <DependentUpon>AppResources.pl.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Update="Resources\AppResources.pt-BR.Designer.cs">
-      <DependentUpon>AppResources.pt-BR.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Update="Resources\AppResources.pt-PT.Designer.cs">
-      <DependentUpon>AppResources.pt-PT.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Update="Resources\AppResources.ro.Designer.cs">
-      <DependentUpon>AppResources.ro.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Update="Resources\AppResources.ru.Designer.cs">
-      <DependentUpon>AppResources.ru.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Update="Resources\AppResources.sk.Designer.cs">
-      <DependentUpon>AppResources.sk.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Update="Resources\AppResources.sv.Designer.cs">
-      <DependentUpon>AppResources.sv.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Update="Resources\AppResources.th.Designer.cs">
-      <DependentUpon>AppResources.th.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Update="Resources\AppResources.tr.Designer.cs">
-      <DependentUpon>AppResources.tr.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Update="Resources\AppResources.uk.Designer.cs">
-      <DependentUpon>AppResources.uk.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Update="Resources\AppResources.vi.Designer.cs">
-      <DependentUpon>AppResources.vi.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Update="Resources\AppResources.zh-Hans.Designer.cs">
-      <DependentUpon>AppResources.zh-Hans.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Update="Resources\AppResources.zh-Hant.Designer.cs">
-      <DependentUpon>AppResources.zh-Hant.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Update="Resources\AppResources.cs.resx">
-      <LastGenOutput>AppResources.cs.Designer.cs</LastGenOutput>
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Resources\AppResources.da.resx">
-      <LastGenOutput>AppResources.da.Designer.cs</LastGenOutput>
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Resources\AppResources.de.resx">
-      <LastGenOutput>AppResources.de.Designer.cs</LastGenOutput>
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Resources\AppResources.es.resx">
-      <LastGenOutput>AppResources.es.Designer.cs</LastGenOutput>
-      <Generator>PublicResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Resources\AppResources.fi.resx">
-      <LastGenOutput>AppResources.fi.Designer.cs</LastGenOutput>
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Resources\AppResources.fr.resx">
-      <LastGenOutput>AppResources.fr.Designer.cs</LastGenOutput>
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Resources\AppResources.hi.resx">
-      <LastGenOutput>AppResources.hi.Designer.cs</LastGenOutput>
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Resources\AppResources.hr.resx">
-      <LastGenOutput>AppResources.hr.Designer.cs</LastGenOutput>
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Resources\AppResources.hu.resx">
-      <LastGenOutput>AppResources.hu.Designer.cs</LastGenOutput>
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Resources\AppResources.id.resx">
-      <LastGenOutput>AppResources.id.Designer.cs</LastGenOutput>
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Resources\AppResources.it.resx">
-      <LastGenOutput>AppResources.it.Designer.cs</LastGenOutput>
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Resources\AppResources.ja.resx">
-      <LastGenOutput>AppResources.ja.Designer.cs</LastGenOutput>
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Resources\AppResources.nl.resx">
-      <LastGenOutput>AppResources.nl.Designer.cs</LastGenOutput>
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Resources\AppResources.pl.resx">
-      <LastGenOutput>AppResources.pl.Designer.cs</LastGenOutput>
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Resources\AppResources.pt-BR.resx">
-      <LastGenOutput>AppResources.pt-BR.Designer.cs</LastGenOutput>
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Resources\AppResources.pt-PT.resx">
-      <LastGenOutput>AppResources.pt-PT.Designer.cs</LastGenOutput>
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Resources\AppResources.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>AppResources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Resources\AppResources.ro.resx">
-      <LastGenOutput>AppResources.ro.Designer.cs</LastGenOutput>
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Resources\AppResources.ru.resx">
-      <LastGenOutput>AppResources.ru.Designer.cs</LastGenOutput>
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Resources\AppResources.sk.resx">
-      <LastGenOutput>AppResources.sk.Designer.cs</LastGenOutput>
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Resources\AppResources.sv.resx">
-      <LastGenOutput>AppResources.sv.Designer.cs</LastGenOutput>
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Resources\AppResources.th.resx">
-      <LastGenOutput>AppResources.th.Designer.cs</LastGenOutput>
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Resources\AppResources.tr.resx">
-      <LastGenOutput>AppResources.tr.Designer.cs</LastGenOutput>
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Resources\AppResources.uk.resx">
-      <LastGenOutput>AppResources.uk.Designer.cs</LastGenOutput>
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Resources\AppResources.vi.resx">
-      <LastGenOutput>AppResources.vi.Designer.cs</LastGenOutput>
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Resources\AppResources.zh-Hans.resx">
-      <LastGenOutput>AppResources.zh-Hans.Designer.cs</LastGenOutput>
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Resources\AppResources.zh-Hant.resx">
-      <LastGenOutput>AppResources.zh-Hant.Designer.cs</LastGenOutput>
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <None Remove="Behaviors\" />
-    <None Remove="Xamarin.CommunityToolkit" />
-    <None Remove="Lists\" />
-    <None Remove="Lists\DataTemplates\" />
-    <None Remove="Lists\DataTemplateSelectors\" />
-    <None Remove="Lists\DataTemplates\CustomFields\" />
-    <None Remove="Lists\ItemViewModels\" />
-    <None Remove="Lists\ItemViewModels\CustomFields\" />
-    <None Remove="Controls\AccountSwitchingOverlay\" />
-    <None Remove="Utilities\AccountManagement\" />
-    <None Remove="Controls\DateTime\" />
-    <None Remove="Controls\IconLabelButton\" />
-    <None Remove="MessagePack" />
-    <None Remove="MessagePack.MSBuild.Tasks" />
-    <None Remove="Controls\PasswordStrengthProgressBar\" />
-    <None Remove="Utilities\Automation\" />
-    <None Remove="Utilities\Prompts\" />
-  </ItemGroup>
-</Project>
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-android|AnyCPU'">
+    <AndroidEnableMultiDex>True</AndroidEnableMultiDex>
+    <UseInterpreter>False</UseInterpreter>
+    <DebugSymbols>True</DebugSymbols>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-android|AnyCPU'">
+    <AndroidEnableMultiDex>True</AndroidEnableMultiDex>
+    <UseInterpreter>False</UseInterpreter>
+    <DebugSymbols>False</DebugSymbols>
+    <RunAOTCompilation>False</RunAOTCompilation>
+    <AndroidSupportedAbis>armeabi-v7a;x86;x86_64;arm64-v8a</AndroidSupportedAbis>
+    <JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
+    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
+    <AndroidEnableProfiledAot>true</AndroidEnableProfiledAot>
+  </PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-ios|AnyCPU'">
+	  <CreatePackage>false</CreatePackage>
+	  <CodesignProvision>Automatic</CodesignProvision>
+    <CodesignKey>iPhone Developer</CodesignKey>
+	  <CodesignEntitlements>Platforms\iOS\Entitlements.plist</CodesignEntitlements>
+	  <MtouchInterpreter>all</MtouchInterpreter>
+	  <MtouchLink>None</MtouchLink>
+		<!--TODO: add argon2id load when library is built with the corresponding architecture for iOS Simulator-->
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(RuntimeIdentifier)'=='Debug|net8.0-ios|ios-arm64'">
+		<MtouchExtraArgs>-gcc_flags "-L$(ProjectDir)../../lib/ios -largon2 -force_load $(ProjectDir)../../lib/ios/libargon2.a"</MtouchExtraArgs>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-ios|AnyCPU'">
+	  <CreatePackage>false</CreatePackage>
+    <CodesignProvision>Automatic:AppStore</CodesignProvision>
+    <CodesignKey>iPhone Distribution</CodesignKey>
+	  <CodesignEntitlements>Platforms\iOS\Entitlements.plist</CodesignEntitlements>
+	  <MtouchInterpreter>all</MtouchInterpreter>
+	  <MtouchLink>None</MtouchLink>
+		<MtouchExtraArgs>--weak-framework=NewsstandKit.framework/NewsstandKit --linkskip=LiteDB --linkskip=CsvHelper --linkskip=Core --linkskip=iOS.Core --linkskip=iOS.Autofill --linkskip=iOS.Extension --linkskip=iOS.ShareExtension --linkskip=App -gcc_flags "-L$(ProjectDir)../../lib/ios -largon2 -force_load $(ProjectDir)../../lib/ios/libargon2.a"</MtouchExtraArgs>
+	</PropertyGroup>
+	<ItemGroup>
+	  <AndroidNativeLibrary Include="Platforms\Android\lib\arm64-v8a\libargon2.so" />
+	  <AndroidNativeLibrary Include="Platforms\Android\lib\armeabi-v7a\libargon2.so" />
+	  <AndroidNativeLibrary Include="Platforms\Android\lib\x86\libargon2.so" />
+	  <AndroidNativeLibrary Include="Platforms\Android\lib\x86_64\libargon2.so" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Camera.MAUI" Version="1.4.4" />
+		<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
+		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
+		<PackageReference Include="CsvHelper" Version="30.0.1" />
+		<PackageReference Include="LiteDB" Version="5.0.17" />
+		<PackageReference Include="MessagePack" Version="2.5.124" />
+		<PackageReference Include="MessagePack.MSBuild.Tasks" Version="2.5.124">
+		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		  <PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+		<PackageReference Include="zxcvbn-core" Version="7.0.92" />
+		<PackageReference Include="CommunityToolkit.Maui" Version="5.2.0" />
+		<PackageReference Include="Plugin.Fingerprint" Version="2.1.5" />
+		<PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="2.88.4-preview.84" />
+		<PackageReference Include="SkiaSharp.Views.Maui.Controls.Compatibility" Version="2.88.4-preview.84" />
+		<PackageReference Include="FFImageLoadingCompat.Maui" Version="0.1.1" />
+		<PackageReference Include="AsyncAwaitBestPractices.MVVM" Version="6.0.6" />
+		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
+		<PackageReference Include="PCLCrypto" Version="2.1.40-alpha" />
+		<PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
+	</ItemGroup>
+	<ItemGroup>
+	  <Folder Include="Effects\" />
+	  <Folder Include="Resources\" />
+	  <Folder Include="Resources\AppIcon\" />
+	  <Folder Include="Resources\Splash\" />
+	  <Folder Include="Platforms\Android\Accessibility\" />
+	  <Folder Include="Platforms\Android\Autofill\" />
+	  <Folder Include="Platforms\Android\Push\" />
+	  <Folder Include="Platforms\Android\Receivers\" />
+	  <Folder Include="Platforms\Android\Services\" />
+	  <Folder Include="Platforms\Android\Tiles\" />
+	  <Folder Include="Platforms\Android\Utilities\" />
+	</ItemGroup>
+	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
+	  <PackageReference Include="Plugin.CurrentActivity" Version="2.1.0.4" />
+	  <PackageReference Include="Xamarin.AndroidX.AutoFill" Version="1.1.0.18" />
+	  <PackageReference Include="Xamarin.AndroidX.Activity.Ktx" Version="1.7.2.1" />
+	</ItemGroup>
+	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android' AND !$(DefineConstants.Contains(FDROID))">
+	  <PackageReference Include="Xamarin.GooglePlayServices.SafetyNet" Version="118.0.1.5" />
+	  <PackageReference Include="Xamarin.Firebase.Messaging" Version="123.1.2.2" />
+	</ItemGroup>
+	<ItemGroup Condition="!$(DefineConstants.Contains(FDROID))">
+		<PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.3" />
+	</ItemGroup>
+	<ItemGroup>
+	  <BundleResource Include="Platforms\Android\Resources\mipmap-mdpi\ic_launcher.png" />
+	  <BundleResource Include="Platforms\Android\Resources\mipmap-mdpi\ic_launcher_round.png" />
+	  <BundleResource Include="Platforms\Android\Resources\mipmap-xxhdpi\ic_launcher.png" />
+	  <BundleResource Include="Platforms\Android\Resources\mipmap-xxhdpi\ic_launcher_round.png" />
+	  <BundleResource Include="Platforms\Android\Resources\mipmap-xxxhdpi\ic_launcher.png" />
+	  <BundleResource Include="Platforms\Android\Resources\mipmap-xxxhdpi\ic_launcher_round.png" />
+	  <BundleResource Include="Platforms\Android\Resources\mipmap-hdpi\ic_launcher.png" />
+	  <BundleResource Include="Platforms\Android\Resources\mipmap-hdpi\ic_launcher_round.png" />
+	  <BundleResource Include="Platforms\Android\Resources\mipmap-mdpi\ic_launcher.png" />
+	  <BundleResource Include="Platforms\Android\Resources\mipmap-mdpi\ic_launcher_round.png" />
+	  <BundleResource Include="Platforms\Android\Resources\mipmap-hdpi\ic_launcher.png" />
+	  <BundleResource Include="Platforms\Android\Resources\mipmap-hdpi\ic_launcher_round.png" />
+	  <BundleResource Include="Platforms\Android\Resources\mipmap-xxxhdpi\ic_launcher.png" />
+	  <BundleResource Include="Platforms\Android\Resources\mipmap-xxxhdpi\ic_launcher_round.png" />
+	  <BundleResource Include="Platforms\Android\Resources\mipmap-xxhdpi\ic_launcher.png" />
+	  <BundleResource Include="Platforms\Android\Resources\mipmap-xxhdpi\ic_launcher_round.png" />
+	  <BundleResource Include="Platforms\Android\Resources\drawable-xhdpi\logo_legacy.png" />
+	  <BundleResource Include="Platforms\Android\Resources\drawable-xhdpi\yubikey.png" />
+	  <BundleResource Include="Platforms\Android\Resources\drawable-xhdpi\logo_white_legacy.png" />
+	  <BundleResource Include="Platforms\Android\Resources\drawable-xxhdpi\logo_legacy.png" />
+	  <BundleResource Include="Platforms\Android\Resources\drawable-xxhdpi\yubikey.png" />
+	  <BundleResource Include="Platforms\Android\Resources\drawable-xxhdpi\logo_white_legacy.png" />
+	  <BundleResource Include="Platforms\Android\Resources\drawable-hdpi\logo_legacy.png" />
+	  <BundleResource Include="Platforms\Android\Resources\drawable-hdpi\yubikey.png" />
+	  <BundleResource Include="Platforms\Android\Resources\drawable-hdpi\logo_white_legacy.png" />
+	  <BundleResource Include="Platforms\Android\Resources\mipmap-xhdpi\ic_launcher.png" />
+	  <BundleResource Include="Platforms\Android\Resources\mipmap-xhdpi\ic_launcher_round.png" />
+	</ItemGroup>
+	<ItemGroup>
+	  <ProjectReference Include="..\iOS.Core\iOS.Core.csproj" Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'" />
+	  <ProjectReference Include="..\Core\Core.csproj" />
+	</ItemGroup>
+	<ItemGroup>
+				<!-- App Icon -->
+		<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
+	</ItemGroup>
+	<ItemGroup>
+	  <MauiImage Include="Resources\cog_settings.svg">
+	    <BaseSize>24,24</BaseSize>
+	  </MauiImage>
+	  <MauiImage Include="Resources\ext_act.png" />
+	  <MauiImage Include="Resources\ext_more.png" />
+	  <MauiImage Include="Resources\ext_use.png" />
+	  <MauiImage Include="Resources\generate.svg">
+	    <BaseSize>24,24</BaseSize>
+	  </MauiImage>
+	  <MauiImage Include="Resources\info.svg">
+	    <BaseSize>24,24</BaseSize>
+	  </MauiImage>
+	  <MauiImage Include="Resources\lock.svg">
+	    <BaseSize>24,24</BaseSize>
+	  </MauiImage>
+	  <MauiImage Include="Resources\login.svg">
+	    <BaseSize>24,24</BaseSize>
+	  </MauiImage>
+	  <MauiImage Include="Resources\logo_white.png" />
+	  <MauiImage Include="Resources\logo.png" />
+	  <MauiImage Include="Resources\more_vert.svg">
+	    <BaseSize>24,24</BaseSize>
+	  </MauiImage>
+	  <MauiImage Include="Resources\more.svg">
+	    <BaseSize>24,24</BaseSize>
+	  </MauiImage>
+	  <MauiImage Include="Resources\plus.svg" TintColor="#FFFFFFFF">
+	    <BaseSize>24,24</BaseSize>
+	  </MauiImage>
+	  <MauiImage Include="Resources\search.svg" TintColor="#FFFFFFFF">
+	    <BaseSize>24,24</BaseSize>
+	  </MauiImage>
+	  <MauiImage Include="Resources\send.svg">
+	    <BaseSize>24,24</BaseSize>
+	  </MauiImage>
+	  <MauiImage Include="Resources\yubikey.png" />
+	</ItemGroup>
+	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">
+		<ProjectReference Include="..\iOS.Autofill\iOS.Autofill.csproj">
+			<IsAppExtension>true</IsAppExtension>
+			<IsWatchApp>false</IsWatchApp>
+		</ProjectReference>
+		<ProjectReference Include="..\iOS.Extension\iOS.Extension.csproj">
+			<IsAppExtension>true</IsAppExtension>
+			<IsWatchApp>false</IsWatchApp>
+		</ProjectReference>
+		<ProjectReference Include="..\iOS.ShareExtension\iOS.ShareExtension.csproj">
+			<IsAppExtension>true</IsAppExtension>
+			<IsWatchApp>false</IsWatchApp>
+		</ProjectReference>
+	</ItemGroup>
+	<PropertyGroup Condition="'$(TargetFramework)'=='net8.0-ios'">
+    <WatchAppBuildPath Condition=" '$(Configuration)' == 'Debug' ">$(Home)/Library/Developer/Xcode/DerivedData/bitwarden-acgkbpwvmebfiofokotvoerzkqcl/Build/Products</WatchAppBuildPath>
+    <WatchAppBuildPath Condition=" '$(Configuration)' != 'Debug' ">$([System.IO.Path]::GetFullPath('$(MSBuildProjectDirectory)\..'))/watchOS/bitwarden.xcarchive/Products/Applications/bitwarden.app/Watch</WatchAppBuildPath>
+    <WatchAppBundle>Bitwarden.app</WatchAppBundle>
+		<WatchAppConfiguration Condition="'$(RuntimeIdentifier)'!='ios-arm64'"> >watchsimulator</WatchAppConfiguration>
+		<WatchAppConfiguration Condition="'$(RuntimeIdentifier)'=='ios-arm64'"> >watchos</WatchAppConfiguration>
+    <WatchAppBundleFullPath Condition=" '$(Configuration)' == 'Debug' ">$(WatchAppBuildPath)/$(Configuration)-$(WatchAppConfiguration)/$(WatchAppBundle)</WatchAppBundleFullPath>
+    <WatchAppBundleFullPath Condition=" '$(Configuration)' != 'Debug' ">$(WatchAppBuildPath)/$(WatchAppBundle)</WatchAppBundleFullPath>
+  </PropertyGroup>
+	<ItemGroup Condition="'$(TargetFramework)'=='net8.0-ios' AND Exists('$(WatchAppBundleFullPath)') ">
+		<_ResolvedWatchAppReferences Include="$(WatchAppBundleFullPath)" />
+	</ItemGroup>
+	<PropertyGroup Condition="'$(TargetFramework)'=='net8.0-ios' AND Exists('$(WatchAppBundleFullPath)') ">
+		<CreateAppBundleDependsOn>
+			_CopyWatchOS2AppsToBundle;
+			$(CreateAppBundleDependsOn);
+		</CreateAppBundleDependsOn>
+	</PropertyGroup>
+	<ItemGroup>
+	  <GoogleServicesJson Include="Platforms\Android\google-services.json" />
+	  <GoogleServicesJson Include="Platforms\Android\google-services.json.enc" />
+	</ItemGroup>
+</Project>

src/App/Behaviors/EditorPreventAutoBottomScrollingOnFocusedBehavior.cs

@@ -1,43 +0,0 @@
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
-
-namespace Bit.App.Behaviors
-{
-    /// <summary>
-    /// This behavior prevents the Editor to be automatically scrolled to the bottom on focus.
-    /// This is needed due to this Xamarin Forms issue: https://github.com/xamarin/Xamarin.Forms/issues/2233
-    /// </summary>
-    public class EditorPreventAutoBottomScrollingOnFocusedBehavior : Behavior<Editor>
-    {
-        public static readonly BindableProperty ParentScrollViewProperty
-            = BindableProperty.Create(nameof(ParentScrollView), typeof(ScrollView), typeof(EditorPreventAutoBottomScrollingOnFocusedBehavior));
-
-        public ScrollView ParentScrollView
-        {
-            get => (ScrollView)GetValue(ParentScrollViewProperty);
-            set => SetValue(ParentScrollViewProperty, value);
-        }
-
-        protected override void OnAttachedTo(Editor bindable)
-        {
-            base.OnAttachedTo(bindable);
-
-            bindable.Focused += OnFocused;
-        }
-
-        private void OnFocused(object sender, FocusEventArgs e)
-        {
-            if (DeviceInfo.Platform.Equals(DevicePlatform.iOS) && ParentScrollView != null)
-            {
-                ParentScrollView.ScrollToAsync(ParentScrollView.ScrollX, ParentScrollView.ScrollY, true);
-            }
-        }
-
-        protected override void OnDetachingFrom(Editor bindable)
-        {
-            bindable.Focused -= OnFocused;
-
-            base.OnDetachingFrom(bindable);
-        }
-    }
-}

src/App/Controls/AccountSwitchingOverlay/AccountSwitchingOverlayView.xaml

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ContentView
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    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"
-    x:Name="_mainOverlay"
-    x:DataType="controls:AccountSwitchingOverlayViewModel"
-    x:Class="Bit.App.Controls.AccountSwitchingOverlayView"
-    BackgroundColor="#22000000"
-    Padding="0"
-    IsVisible="False">
-    <StackLayout
-        x:Name="_accountListContainer"
-        VerticalOptions="Fill"
-        HorizontalOptions="FillAndExpand"
-        BackgroundColor="Transparent">
-        <Frame
-            Padding="0"
-            HorizontalOptions="Fill"
-            VerticalOptions="Start"
-            xct:ShadowEffect.Color="Black"
-            xct:ShadowEffect.Radius="10"
-            xct:ShadowEffect.OffsetY="3">
-            <ListView
-                x:Name="_accountListView"
-                ItemsSource="{Binding BindingContext.AccountViews, Source={x:Reference _mainOverlay}}"
-                BackgroundColor="{DynamicResource BackgroundColor}"
-                VerticalOptions="Start"
-                RowHeight="{Binding AccountListRowHeight, Source={x:Reference _mainOverlay}}"
-                effects:ScrollViewContentInsetAdjustmentBehaviorEffect.ContentInsetAdjustmentBehavior="Never"
-                AutomationId="AccountListView">
-                <ListView.ItemTemplate>
-                    <DataTemplate x:DataType="view:AccountView">
-                        <controls:AccountViewCell
-                            Account="{Binding .}"
-                            SelectAccountCommand="{Binding SelectAccountCommand, Source={x:Reference _mainOverlay}}"
-                            LongPressAccountCommand="{Binding LongPressAccountCommand, Source={x:Reference _mainOverlay}}"
-                            AutomationId="AccountViewCell"
-                            />
-                    </DataTemplate>
-                </ListView.ItemTemplate>
-                <ListView.Effects>
-                    <effects:ScrollViewContentInsetAdjustmentBehaviorEffect />
-                </ListView.Effects>
-            </ListView>
-        </Frame>
-        <BoxView
-            BackgroundColor="Transparent"
-            HorizontalOptions="Fill"
-            VerticalOptions="FillAndExpand">
-            <BoxView.GestureRecognizers>
-                <TapGestureRecognizer Tapped="FreeSpaceOverlay_Tapped" />
-            </BoxView.GestureRecognizers>
-        </BoxView>
-    </StackLayout>
-</ContentView>

src/App/Controls/AccountSwitchingOverlay/AccountSwitchingOverlayView.xaml.cs

@@ -1,196 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Bit.Core.Abstractions;
-using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
-
-namespace Bit.App.Controls
-{
-    public partial class AccountSwitchingOverlayView : ContentView
-    {
-        public static readonly BindableProperty MainPageProperty = BindableProperty.Create(
-            nameof(MainPage),
-            typeof(ContentPage),
-            typeof(AccountSwitchingOverlayView),
-            defaultBindingMode: BindingMode.OneWay);
-
-        public static readonly BindableProperty MainFabProperty = BindableProperty.Create(
-            nameof(MainFab),
-            typeof(View),
-            typeof(AccountSwitchingOverlayView),
-            defaultBindingMode: BindingMode.OneWay);
-
-        public ContentPage MainPage
-        {
-            get => (ContentPage)GetValue(MainPageProperty);
-            set => SetValue(MainPageProperty, value);
-        }
-
-        public View MainFab
-        {
-            get => (View)GetValue(MainFabProperty);
-            set => SetValue(MainFabProperty, value);
-        }
-
-        readonly LazyResolve<ILogger> _logger = new LazyResolve<ILogger>("logger");
-
-        public AccountSwitchingOverlayView()
-        {
-            InitializeComponent();
-
-            ToggleVisibililtyCommand = new AsyncCommand(ToggleVisibilityAsync,
-                onException: ex => _logger.Value.Exception(ex),
-                allowsMultipleExecutions: false);
-
-            SelectAccountCommand = new AsyncCommand<AccountViewCellViewModel>(SelectAccountAsync,
-                onException: ex => _logger.Value.Exception(ex),
-                allowsMultipleExecutions: false);
-
-            LongPressAccountCommand = new AsyncCommand<AccountViewCellViewModel>(LongPressAccountAsync,
-                onException: ex => _logger.Value.Exception(ex),
-                allowsMultipleExecutions: false);
-        }
-
-        public AccountSwitchingOverlayViewModel ViewModel => BindingContext as AccountSwitchingOverlayViewModel;
-
-        public ICommand ToggleVisibililtyCommand { get; }
-
-        public ICommand SelectAccountCommand { get; }
-
-        public ICommand LongPressAccountCommand { get; }
-
-        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;
-
-        public Action AfterHide { get; set; }
-
-        public async Task ToggleVisibilityAsync()
-        {
-            if (IsVisible)
-            {
-                await HideAsync();
-            }
-            else
-            {
-                await ShowAsync();
-            }
-        }
-
-        public async Task ShowAsync()
-        {
-            if (ViewModel == null)
-            {
-                return;
-            }
-
-            await ViewModel.RefreshAccountViewsAsync();
-
-            await Device.InvokeOnMainThreadAsync(async () =>
-            {
-                // start listView in default (off-screen) position
-                await _accountListContainer.TranslateTo(0, _accountListContainer.Height * -1, 0);
-
-                // re-measure in case accounts have been removed without changing screens
-                if (ViewModel.AccountViews != null)
-                {
-                    _accountListView.HeightRequest = AccountListRowHeight * ViewModel.AccountViews.Count;
-                }
-
-                // set overlay opacity to zero before making visible and start fade-in
-                Opacity = 0;
-                IsVisible = true;
-                this.FadeTo(1, 100);
-
-                if (Device.RuntimePlatform == Device.Android && MainFab != null)
-                {
-                    // start fab fade-out
-                    MainFab.FadeTo(0, 200);
-                }
-
-                // slide account list into view
-                await _accountListContainer.TranslateTo(0, 0, 200, Easing.SinOut);
-            });
-        }
-
-        public async Task HideAsync()
-        {
-            if (!IsVisible)
-            {
-                // already hidden, don't animate again
-                return;
-            }
-            // Not all animations are awaited. This is intentional to allow multiple simultaneous animations.
-            await Device.InvokeOnMainThreadAsync(async () =>
-            {
-                // start overlay fade-out
-                this.FadeTo(0, 200);
-
-                if (Device.RuntimePlatform == Device.Android && MainFab != null)
-                {
-                    // start fab fade-in
-                    MainFab.FadeTo(1, 200);
-                }
-
-                // slide account list out of view
-                await _accountListContainer.TranslateTo(0, _accountListContainer.Height * -1, 200, Easing.SinIn);
-
-                // remove overlay
-                IsVisible = false;
-
-                AfterHide?.Invoke();
-            });
-        }
-
-        private async void FreeSpaceOverlay_Tapped(object sender, EventArgs e)
-        {
-            try
-            {
-                await HideAsync();
-            }
-            catch (Exception ex)
-            {
-                _logger.Value.Exception(ex);
-            }
-        }
-
-        private async Task SelectAccountAsync(AccountViewCellViewModel item)
-        {
-            try
-            {
-                await Task.Delay(100);
-                await HideAsync();
-
-                ViewModel?.SelectAccountCommand?.Execute(item);
-            }
-            catch (Exception ex)
-            {
-                _logger.Value.Exception(ex);
-            }
-        }
-
-        private async Task LongPressAccountAsync(AccountViewCellViewModel item)
-        {
-            if (!LongPressAccountEnabled || !item.IsAccount)
-            {
-                return;
-            }
-            try
-            {
-                await Task.Delay(100);
-                await HideAsync();
-
-                ViewModel?.LongPressAccountCommand?.Execute(
-                    new Tuple<ContentPage, AccountViewCellViewModel>(MainPage, item));
-            }
-            catch (Exception ex)
-            {
-                _logger.Value.Exception(ex);
-            }
-        }
-    }
-}

src/App/Controls/AccountSwitchingOverlay/AccountSwitchingOverlayViewModel.cs

@@ -1,90 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Bit.App.Utilities;
-using Bit.Core.Abstractions;
-using Bit.Core.Models.View;
-using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
-
-namespace Bit.App.Controls
-{
-    public class AccountSwitchingOverlayViewModel : ExtendedViewModel
-    {
-        private readonly IStateService _stateService;
-        private readonly IMessagingService _messagingService;
-
-        public AccountSwitchingOverlayViewModel(IStateService stateService,
-            IMessagingService messagingService,
-            ILogger logger)
-        {
-            _stateService = stateService;
-            _messagingService = messagingService;
-
-            SelectAccountCommand = new AsyncCommand<AccountViewCellViewModel>(SelectAccountAsync,
-                onException: ex => logger.Exception(ex),
-                allowsMultipleExecutions: false);
-
-            LongPressAccountCommand = new AsyncCommand<Tuple<ContentPage, AccountViewCellViewModel>>(LongPressAccountAsync,
-                onException: ex => logger.Exception(ex),
-                allowsMultipleExecutions: false);
-        }
-
-        // this needs to be a new list every time for the binding to get updated,
-        // XF doesn't currentlyl provide a direct way to update on same instance
-        // https://github.com/xamarin/Xamarin.Forms/issues/1950
-        public List<AccountView> AccountViews => _stateService?.AccountViews is null ? null : new List<AccountView>(_stateService.AccountViews);
-
-        public bool AllowActiveAccountSelection { get; set; }
-
-        public bool AllowAddAccountRow { get; set; }
-
-        public ICommand SelectAccountCommand { get; }
-
-        public ICommand LongPressAccountCommand { get; }
-
-        public bool FromIOSExtension { get; set; }
-
-        private async Task SelectAccountAsync(AccountViewCellViewModel item)
-        {
-            if (!item.AccountView.IsAccount)
-            {
-                _messagingService.Send(AccountsManagerMessageCommands.ADD_ACCOUNT);
-                return;
-            }
-
-            if (!item.AccountView.IsActive)
-            {
-                await _stateService.SetActiveUserAsync(item.AccountView.UserId);
-                _messagingService.Send(AccountsManagerMessageCommands.SWITCHED_ACCOUNT);
-                if (FromIOSExtension)
-                {
-                    await _stateService.SaveExtensionActiveUserIdToStorageAsync(item.AccountView.UserId);
-                }
-            }
-            else if (AllowActiveAccountSelection)
-            {
-                _messagingService.Send(AccountsManagerMessageCommands.SWITCHED_ACCOUNT);
-            }
-        }
-
-        private async Task LongPressAccountAsync(Tuple<ContentPage, AccountViewCellViewModel> item)
-        {
-            var (page, account) = item;
-            if (account.AccountView.IsAccount)
-            {
-                await AppHelpers.AccountListOptions(page, account);
-            }
-        }
-
-        public async Task RefreshAccountViewsAsync()
-        {
-            await _stateService.RefreshAccountViewsAsync(AllowAddAccountRow);
-
-            Device.BeginInvokeOnMainThread(() => TriggerPropertyChanged(nameof(AccountViews)));
-        }
-    }
-}

src/App/Controls/AccountViewCell/AccountViewCell.xaml

@@ -1,162 +0,0 @@
-<?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://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"
-          x:Name="_accountView"
-          x:DataType="controls:AccountViewCellViewModel">
-    <Grid RowSpacing="0"
-          ColumnSpacing="0"
-          xct:TouchEffect.NativeAnimation="True"
-          xct:TouchEffect.Command="{Binding SelectAccountCommand, Source={x:Reference _accountView}}"
-          xct:TouchEffect.CommandParameter="{Binding .}"
-          xct:TouchEffect.LongPressCommand="{Binding LongPressAccountCommand, Source={x:Reference _accountView}}"
-          xct:TouchEffect.LongPressCommandParameter="{Binding .}">
-
-        <Grid.Resources>
-            <u:InverseBoolConverter x:Key="inverseBool" />
-        </Grid.Resources>
-
-        <Grid
-            IsVisible="{Binding IsAccount}"
-            VerticalOptions="CenterAndExpand">
-            
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-
-            <Image
-                Grid.Column="0"
-                Source="{Binding AvatarImageSource}"
-                HorizontalOptions="Center"
-                Margin="10,0"
-                VerticalOptions="Center" />
-
-            <Grid
-                Grid.Column="1"
-                RowSpacing="1"
-                VerticalOptions="Center">
-
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-
-                <Label
-                    Grid.Row="0"
-                    Text="{Binding AccountView.Email}"
-                    IsVisible="{Binding IsActive}"
-                    StyleClass="accountlist-title, accountlist-title-platform"
-                    LineBreakMode="TailTruncation"
-                    AutomationId="AccountEmailLabel" />
-                <Label
-                    Grid.Row="0"
-                    Text="{Binding AccountView.Email}"
-                    IsVisible="{Binding IsActive, Converter={StaticResource inverseBool}}"
-                    StyleClass="accountlist-title, accountlist-title-platform"
-                    TextColor="{DynamicResource MutedColor}"
-                    LineBreakMode="TailTruncation"
-                    AutomationId="AccountEmailLabel" />
-                <Label
-                    Grid.Row="1"
-                    IsVisible="{Binding ShowHostname}"
-                    Text="{Binding AccountView.Hostname}"
-                    StyleClass="accountlist-sub, accountlist-sub-platform"
-                    LineBreakMode="TailTruncation"
-                    AutomationId="AccountHostUrlLabel" />
-                <Label
-                    Grid.Row="2"
-                    Text="{u:I18n AccountUnlocked}"
-                    IsVisible="{Binding IsUnlockedAndNotActive}"
-                    StyleClass="accountlist-sub, accountlist-sub-platform"
-                    FontAttributes="Italic"
-                    TextTransform="Lowercase"
-                    LineBreakMode="TailTruncation"
-                    AutomationId="AccountStatusLabel" />
-                <Label
-                    Grid.Row="2"
-                    Text="{u:I18n AccountLocked}"
-                    IsVisible="{Binding IsLockedAndNotActive}"
-                    StyleClass="accountlist-sub, accountlist-sub-platform"
-                    FontAttributes="Italic"
-                    TextTransform="Lowercase"
-                    LineBreakMode="TailTruncation"
-                    AutomationId="AccountStatusLabel" />
-                <Label
-                    Grid.Row="2"
-                    Text="{u:I18n AccountLoggedOut}"
-                    IsVisible="{Binding IsLoggedOutAndNotActive}"
-                    StyleClass="accountlist-sub, accountlist-sub-platform"
-                    FontAttributes="Italic"
-                    TextTransform="Lowercase"
-                    LineBreakMode="TailTruncation"
-                    AutomationId="AccountStatusLabel" />
-            </Grid>
-
-            <controls:IconLabel
-                Grid.Column="2"
-                Text="{Binding AuthStatusIconNotActive}" 
-                IsVisible="{Binding IsActive, Converter={StaticResource inverseBool}}"
-                Margin="12,0"
-                HorizontalOptions="Center"
-                VerticalOptions="Center"
-                StyleClass="list-icon, list-icon-platform"
-                AutomationId="InactiveVaultIcon" />
-            <controls:IconLabel
-                Grid.Column="2"
-                Text="{Binding AuthStatusIconActive}" 
-                IsVisible="{Binding IsActive}"
-                Margin="12,0"
-                HorizontalOptions="Center"
-                VerticalOptions="Center"
-                StyleClass="list-icon, list-icon-platform"
-                TextColor="{DynamicResource TextColor}"
-                AutomationId="ActiveVaultIcon" />
-        </Grid>
-
-        <Grid
-            IsVisible="{Binding IsAccount, Converter={StaticResource inverseBool}}"
-            VerticalOptions="CenterAndExpand">
-            
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-
-            <Image
-                Grid.Column="0"
-                VerticalOptions="Center"
-                HorizontalOptions="Center"
-                Margin="14,0"
-                WidthRequest="{OnPlatform 24, iOS=24, Android=26}"
-                HeightRequest="{OnPlatform 24, iOS=24, Android=26}"
-                Source="plus.png"
-                xct:IconTintColorEffect.TintColor="{DynamicResource TextColor}"
-                AutomationProperties.IsInAccessibleTree="False" />
-            <Label
-                Text="{u:I18n AddAccount}"
-                StyleClass="accountlist-title, accountlist-title-platform"
-                LineBreakMode="TailTruncation"
-                VerticalOptions="Center"
-                Grid.Column="1"
-                AutomationId="AddAccountButton" />
-        </Grid>
-    </Grid>
-</ViewCell>

src/App/Controls/AuthenticatorViewCell/AuthenticatorViewCell.xaml

@@ -1,127 +0,0 @@
-<?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.AuthenticatorViewCell"
-                       xmlns:controls="clr-namespace:Bit.App.Controls"
-                       xmlns:pages="clr-namespace:Bit.App.Pages"
-                       xmlns:u="clr-namespace:Bit.App.Utilities"
-                       xmlns:ff="clr-namespace:FFImageLoading.Forms;assembly=FFImageLoading.Forms"
-                       xmlns:core="clr-namespace:Bit.Core;assembly=BitwardenCore"
-                       StyleClass="list-row, list-row-platform"
-                       HorizontalOptions="FillAndExpand"
-                       x:DataType="pages:GroupingsPageTOTPListItem"
-                       ColumnDefinitions="40,*,40,Auto,40"
-                       RowSpacing="0"
-                       Padding="0,10,0,0"
-                       RowDefinitions="*,*">
-
-    <Grid.Resources>
-        <u:IconGlyphConverter x:Key="iconGlyphConverter" />
-        <u:InverseBoolConverter x:Key="inverseBool" />
-    </Grid.Resources>
-
-    <controls:IconLabel
-        Grid.Column="0"
-        HorizontalOptions="Center"
-        VerticalOptions="Center"
-        StyleClass="list-icon, list-icon-platform"
-        Grid.RowSpan="2"
-        IsVisible="{Binding ShowIconImage, Converter={StaticResource inverseBool}}"
-        Text="{Binding Cipher, Converter={StaticResource iconGlyphConverter}}"
-        AutomationProperties.IsInAccessibleTree="False" />
-
-    <ff:CachedImage
-        Grid.Column="0"
-        BitmapOptimizations="True"
-        ErrorPlaceholder="login.png"
-        LoadingPlaceholder="login.png"
-        HorizontalOptions="Center"
-        VerticalOptions="Center"
-        WidthRequest="22"
-        HeightRequest="22"
-        Grid.RowSpan="2"
-        IsVisible="{Binding ShowIconImage}"
-        Source="{Binding IconImageSource, Mode=OneTime}"
-        AutomationProperties.IsInAccessibleTree="False" />
-
-    <Label
-        LineBreakMode="TailTruncation"
-        Grid.Column="1"
-        Grid.Row="0"
-        VerticalTextAlignment="Center"
-        VerticalOptions="Fill"
-        StyleClass="list-title, list-title-platform"
-        Text="{Binding Cipher.Name}" />
-
-    <Label
-        LineBreakMode="TailTruncation"
-        Grid.Column="1"
-        Grid.Row="1"
-        VerticalTextAlignment="Center"
-        VerticalOptions="Fill"
-        StyleClass="list-subtitle, list-subtitle-platform"
-        Text="{Binding Cipher.SubTitle}" />
-
-    <controls:CircularProgressbarView
-        Progress="{Binding Progress}"
-        Grid.Row="0"
-        Grid.Column="2"
-        Grid.RowSpan="2"
-        HorizontalOptions="Fill"
-        VerticalOptions="CenterAndExpand" />
-
-    <Label
-        Text="{Binding TotpSec, Mode=OneWay}"
-        Style="{DynamicResource textTotp}"
-        Grid.Row="0"
-        Grid.Column="2"
-        Grid.RowSpan="2"
-        StyleClass="text-sm"
-        HorizontalTextAlignment="Center"
-        HorizontalOptions="Fill"
-        VerticalTextAlignment="Center"
-        VerticalOptions="Fill" />
-    
-    <StackLayout
-        Grid.Row="0"
-        Grid.Column="3"
-        Margin="3,0,2,0"
-        Spacing="5"
-        Grid.RowSpan="2"
-        Orientation="Horizontal"
-        HorizontalOptions="Fill"
-        VerticalOptions="Fill">
-
-        <controls:MonoLabel
-            Text="{Binding TotpCodeFormattedStart, Mode=OneWay}"
-            Style="{DynamicResource textTotp}"
-            StyleClass="text-lg"
-            HorizontalTextAlignment="Center"
-            VerticalTextAlignment="Center"
-            HorizontalOptions="Center"
-            VerticalOptions="FillAndExpand" />
-        
-        <controls:MonoLabel
-            Text="{Binding TotpCodeFormattedEnd, Mode=OneWay}"
-            Style="{DynamicResource textTotp}"
-            StyleClass="text-lg"
-            HorizontalTextAlignment="Center"
-            VerticalTextAlignment="Center"
-            HorizontalOptions="Center"
-            VerticalOptions="FillAndExpand" />
-    </StackLayout>
-
-    <controls:IconButton
-        StyleClass="box-row-button, box-row-button-platform"
-        Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
-        Command="{Binding CopyCommand}"
-        CommandParameter="LoginTotp"
-        Grid.Row="0"
-        Grid.Column="4"
-        Grid.RowSpan="2"
-        Padding="0,0,1,0"
-        HorizontalOptions="Center"
-        VerticalOptions="Center"
-        AutomationProperties.IsInAccessibleTree="True"
-        AutomationProperties.Name="{u:I18n CopyTotp}" />
-</controls:ExtendedGrid>

src/App/Controls/AvatarImageSource.cs

@@ -1,181 +0,0 @@
-using System;
-using System.IO;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Bit.Core.Utilities;
-using SkiaSharp;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
-
-namespace Bit.App.Controls
-{
-    public class AvatarImageSource : StreamImageSource
-    {
-        private readonly string _text;
-        private readonly string _id;
-        private readonly string _color;
-
-        public override bool Equals(object obj)
-        {
-            if (obj is null)
-            {
-                return false;
-            }
-
-            if (obj is AvatarImageSource avatar)
-            {
-                return avatar._id == _id && avatar._text == _text && avatar._color == _color;
-            }
-
-            return base.Equals(obj);
-        }
-
-        public override int GetHashCode() => _id?.GetHashCode() ?? _text?.GetHashCode() ?? -1;
-
-        public AvatarImageSource(string userId = null, string name = null, string email = null, string color = null)
-        {
-            _id = userId;
-            _text = name;
-            if (string.IsNullOrWhiteSpace(_text))
-            {
-                _text = email;
-            }
-            _color = color;
-        }
-
-        public override Func<CancellationToken, Task<Stream>> Stream => GetStreamAsync;
-
-        private Task<Stream> GetStreamAsync(CancellationToken userToken = new CancellationToken())
-        {
-            OnLoadingStarted();
-            userToken.Register(CancellationTokenSource.Cancel);
-            var result = Draw();
-            OnLoadingCompleted(CancellationTokenSource.IsCancellationRequested);
-            return Task.FromResult(result);
-        }
-
-        private Stream Draw()
-        {
-            string chars;
-            string upperCaseText = null;
-
-            if (string.IsNullOrEmpty(_text))
-            {
-                chars = "..";
-            }
-            else if (_text?.Length > 1)
-            {
-                upperCaseText = _text.ToUpper();
-                chars = GetFirstLetters(upperCaseText, 2);
-            }
-            else
-            {
-                chars = upperCaseText = _text.ToUpper();
-            }
-
-            var bgColor = _color ?? CoreHelpers.StringToColor(_id ?? upperCaseText, "#33ffffff");
-            var textColor = CoreHelpers.TextColorFromBgColor(bgColor);
-            var size = 50;
-
-            using (var bitmap = new SKBitmap(size * 2,
-                size * 2,
-                SKImageInfo.PlatformColorType,
-                SKAlphaType.Premul))
-            {
-                using (var canvas = new SKCanvas(bitmap))
-                {
-                    canvas.Clear(SKColors.Transparent);
-                    using (var paint = new SKPaint
-                    {
-                        IsAntialias = true,
-                        Style = SKPaintStyle.Fill,
-                        StrokeJoin = SKStrokeJoin.Miter,
-                        Color = SKColor.Parse(bgColor)
-                    })
-                    {
-                        var midX = canvas.LocalClipBounds.Size.ToSizeI().Width / 2;
-                        var midY = canvas.LocalClipBounds.Size.ToSizeI().Height / 2;
-                        var radius = midX - midX / 5;
-
-                        using (var circlePaint = new SKPaint
-                        {
-                            IsAntialias = true,
-                            Style = SKPaintStyle.Fill,
-                            StrokeJoin = SKStrokeJoin.Miter,
-                            Color = SKColor.Parse(bgColor)
-                        })
-                        {
-                            canvas.DrawCircle(midX, midY, radius, circlePaint);
-
-                            var typeface = SKTypeface.FromFamilyName("Arial", SKFontStyle.Normal);
-                            var textSize = midX / 1.3f;
-                            using (var textPaint = new SKPaint
-                            {
-                                IsAntialias = true,
-                                Style = SKPaintStyle.Fill,
-                                Color = SKColor.Parse(textColor),
-                                TextSize = textSize,
-                                TextAlign = SKTextAlign.Center,
-                                Typeface = typeface
-                            })
-                            {
-                                var rect = new SKRect();
-                                textPaint.MeasureText(chars, ref rect);
-                                canvas.DrawText(chars, midX, midY + rect.Height / 2, textPaint);
-
-                                using (var img = SKImage.FromBitmap(bitmap))
-                                {
-                                    var data = img.Encode(SKEncodedImageFormat.Png, 100);
-                                    return data?.AsStream(true);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        private string GetFirstLetters(string data, int charCount)
-        {
-            var sanitizedData = data.Trim();
-            var parts = sanitizedData.Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
-
-            if (parts.Length > 1 && charCount <= 2)
-            {
-                var text = string.Empty;
-                for (var i = 0; i < charCount; i++)
-                {
-                    text += parts[i][0];
-                }
-                return text;
-            }
-            if (sanitizedData.Length > 2)
-            {
-                return sanitizedData.Substring(0, 2);
-            }
-            return sanitizedData;
-        }
-
-        private Color StringToColor(string str)
-        {
-            if (str == null)
-            {
-                return Color.FromArgb("#33ffffff");
-            }
-            var hash = 0;
-            for (var i = 0; i < str.Length; i++)
-            {
-                hash = str[i] + ((hash << 5) - hash);
-            }
-            var color = "#FF";
-            for (var i = 0; i < 3; i++)
-            {
-                var value = (hash >> (i * 8)) & 0xff;
-                var base16 = "00" + Convert.ToString(value, 16);
-                color += base16.Substring(base16.Length - 2);
-            }
-            return Color.FromArgb(color);
-        }
-    }
-}

src/App/Controls/CipherViewCell/CipherViewCell.xaml

@@ -1,127 +0,0 @@
-<?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"
-    xmlns:u="clr-namespace:Bit.App.Utilities"
-    xmlns:ff="clr-namespace:FFImageLoading.Forms;assembly=FFImageLoading.Forms"
-    xmlns:core="clr-namespace:Bit.Core;assembly=BitwardenCore"
-    StyleClass="list-row, list-row-platform"
-    RowSpacing="0"
-    ColumnSpacing="0"
-    x:DataType="controls:CipherViewCellViewModel"
-    AutomationId="CipherCell">
-
-    <Grid.Resources>
-        <u:IconGlyphConverter x:Key="iconGlyphConverter"/>
-        <u:IconImageConverter x:Key="iconImageConverter"/>
-        <u:InverseBoolConverter x:Key="inverseBool" />
-        <u:StringHasValueConverter x:Key="stringHasValueConverter" />
-    </Grid.Resources>
-
-    <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" />
-    </Grid.RowDefinitions>
-
-    <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="40" x:Name="_iconColumn" />
-        <ColumnDefinition Width="*" />
-        <ColumnDefinition Width="60" />
-    </Grid.ColumnDefinitions>
-
-    <controls:IconLabel
-        Grid.Column="0"
-        HorizontalOptions="Center"
-        VerticalOptions="Center"
-        StyleClass="list-icon, list-icon-platform"
-        IsVisible="{Binding ShowIconImage, Converter={StaticResource inverseBool}}"
-        Text="{Binding Cipher, Converter={StaticResource iconGlyphConverter}}"
-        ShouldUpdateFontSizeDynamicallyForAccesibility="True"
-        AutomationProperties.IsInAccessibleTree="False"
-        AutomationId="CipherTypeIcon" />
-
-    <ff:CachedImage
-        x:Name="_iconImage"
-        Grid.Column="0"
-        BitmapOptimizations="True"
-        ErrorPlaceholder="login.png"
-        LoadingPlaceholder="login.png"
-        HorizontalOptions="CenterAndExpand"
-        VerticalOptions="CenterAndExpand"
-        Margin="9"
-        WidthRequest="22"
-        HeightRequest="22"
-        Aspect="AspectFit"
-        IsVisible="{Binding ShowIconImage}"
-        Source="{Binding IconImageSource, Mode=OneTime}"
-        AutomationProperties.IsInAccessibleTree="False"
-        AutomationId="CipherWebsiteIcon" />
-
-    <Grid RowSpacing="0" ColumnSpacing="0" Grid.Row="0" Grid.Column="1" VerticalOptions="Center" Padding="0, 7">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="*" />
-        </Grid.ColumnDefinitions>
-
-        <Label 
-            LineBreakMode="TailTruncation"
-            Grid.Column="0"
-            Grid.Row="0"
-            StyleClass="list-title, list-title-platform"
-            Text="{Binding Cipher.Name}"
-            AutomationId="CipherNameLabel" />
-        <Label
-            LineBreakMode="TailTruncation"
-            Grid.Column="0"
-            Grid.Row="1"
-            Grid.ColumnSpan="3"
-            StyleClass="list-subtitle, list-subtitle-platform"
-            Text="{Binding Cipher.SubTitle}"
-            IsVisible="{Binding Source={RelativeSource Self}, Path=Text,
-                        Converter={StaticResource stringHasValueConverter}}"
-            AutomationId="CipherSubTitleLabel" />
-        <controls:IconLabel
-            Grid.Column="1"
-            Grid.Row="0"
-            HorizontalOptions="Start"
-            VerticalOptions="Center"
-            StyleClass="list-title-icon"
-            Margin="5, 0, 0, 0"
-            Text="{Binding Source={x:Static core:BitwardenIcons.Collection}}"
-            IsVisible="{Binding Cipher.Shared, Mode=OneTime}"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Shared}"
-            AutomationId="CipherInCollectionIcon" />
-        <controls:IconLabel
-            Grid.Column="2"
-            Grid.Row="0"
-            HorizontalOptions="Start"
-            VerticalOptions="Center"
-            StyleClass="list-title-icon"
-            Margin="5, 0, 0, 0"
-            Text="{Binding Source={x:Static core:BitwardenIcons.Paperclip}}"
-            IsVisible="{Binding Cipher.HasAttachments, Mode=OneTime}"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Attachments}"
-            AutomationId="CipherWithAttachmentsIcon" />
-    </Grid>
-
-    <controls:MiButton
-        Grid.Row="0"
-        Grid.Column="2"
-        Text="{Binding Source={x:Static core:BitwardenIcons.ViewCellMenu}}"
-        StyleClass="list-row-button, list-row-button-platform, btn-disabled"
-        Clicked="MoreButton_Clicked"
-        VerticalOptions="CenterAndExpand"
-        HorizontalOptions="EndAndExpand"
-        AutomationProperties.IsInAccessibleTree="True"
-        AutomationProperties.Name="{u:I18n Options}"
-        AutomationId="CipherOptionsButton" />
-
-</controls:ExtendedGrid>

src/App/Controls/CipherViewCell/CipherViewCell.xaml.cs

@@ -1,83 +0,0 @@
-using System;
-using System.Windows.Input;
-using Bit.App.Abstractions;
-using Bit.Core.Models.View;
-using Bit.Core.Utilities;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
-
-namespace Bit.App.Controls
-{
-    public partial class CipherViewCell : ExtendedGrid
-    {
-        private const int ICON_COLUMN_DEFAULT_WIDTH = 40;
-        private const int ICON_IMAGE_DEFAULT_WIDTH = 22;
-
-        public static readonly BindableProperty CipherProperty = BindableProperty.Create(
-            nameof(Cipher), typeof(CipherView), typeof(CipherViewCell), default(CipherView), BindingMode.OneWay);
-
-        public static readonly BindableProperty WebsiteIconsEnabledProperty = BindableProperty.Create(
-            nameof(WebsiteIconsEnabled), typeof(bool?), typeof(CipherViewCell));
-
-        public static readonly BindableProperty ButtonCommandProperty = BindableProperty.Create(
-            nameof(ButtonCommand), typeof(ICommand), typeof(CipherViewCell));
-
-        public CipherViewCell()
-        {
-            InitializeComponent();
-
-            var fontScale = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService").GetSystemFontSizeScale();
-            _iconColumn.Width = new GridLength(ICON_COLUMN_DEFAULT_WIDTH * fontScale, GridUnitType.Absolute);
-            _iconImage.WidthRequest = ICON_IMAGE_DEFAULT_WIDTH * fontScale;
-            _iconImage.HeightRequest = ICON_IMAGE_DEFAULT_WIDTH * fontScale;
-        }
-
-        public bool? WebsiteIconsEnabled
-        {
-            get => (bool)GetValue(WebsiteIconsEnabledProperty);
-            set => SetValue(WebsiteIconsEnabledProperty, value);
-        }
-
-        public CipherView Cipher
-        {
-            get => GetValue(CipherProperty) as CipherView;
-            set => SetValue(CipherProperty, value);
-        }
-
-        public ICommand ButtonCommand
-        {
-            get => GetValue(ButtonCommandProperty) as ICommand;
-            set => SetValue(ButtonCommandProperty, value);
-        }
-
-        protected override void OnPropertyChanged(string propertyName = null)
-        {
-            base.OnPropertyChanged(propertyName);
-            if (propertyName == CipherProperty.PropertyName)
-            {
-                if (Cipher == null)
-                {
-                    return;
-                }
-                BindingContext = new CipherViewCellViewModel(Cipher, WebsiteIconsEnabled ?? false);
-            }
-            else if (propertyName == WebsiteIconsEnabledProperty.PropertyName)
-            {
-                if (Cipher == null)
-                {
-                    return;
-                }
-                ((CipherViewCellViewModel)BindingContext).WebsiteIconsEnabled = WebsiteIconsEnabled ?? false;
-            }
-        }
-
-        private void MoreButton_Clicked(object sender, EventArgs e)
-        {
-            var cipher = ((sender as MiButton)?.BindingContext as CipherViewCellViewModel)?.Cipher;
-            if (cipher != null)
-            {
-                ButtonCommand?.Execute(cipher);
-            }
-        }
-    }
-}

src/App/Controls/CircularProgressbarView.cs

@@ -1,141 +0,0 @@
-using System;
-using System.Runtime.CompilerServices;
-using SkiaSharp;
-using Microsoft.Maui.Graphics;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
-using SkiaSharp.Views.Maui.Controls;
-using SkiaSharp.Views.Maui;
-
-namespace Bit.App.Controls
-{
-    public class CircularProgressbarView : SKCanvasView
-    {
-        private Circle _circle;
-
-        public static readonly BindableProperty ProgressProperty = BindableProperty.Create(
-            nameof(Progress), typeof(double), typeof(CircularProgressbarView), propertyChanged: OnProgressChanged);
-
-        public static readonly BindableProperty RadiusProperty = BindableProperty.Create(
-            nameof(Radius), typeof(float), typeof(CircularProgressbarView), 15f);
-
-        public static readonly BindableProperty StrokeWidthProperty = BindableProperty.Create(
-            nameof(StrokeWidth), typeof(float), typeof(CircularProgressbarView), 3f);
-
-        public static readonly BindableProperty ProgressColorProperty = BindableProperty.Create(
-            nameof(ProgressColor), typeof(Color), typeof(CircularProgressbarView), Color.FromArgb("175DDC"));
-
-        public static readonly BindableProperty EndingProgressColorProperty = BindableProperty.Create(
-            nameof(EndingProgressColor), typeof(Color), typeof(CircularProgressbarView), Color.FromArgb("dd4b39"));
-
-        public static readonly BindableProperty BackgroundProgressColorProperty = BindableProperty.Create(
-            nameof(BackgroundProgressColor), typeof(Color), typeof(CircularProgressbarView), Colors.White);
-
-        public double Progress
-        {
-            get { return (double)GetValue(ProgressProperty); }
-            set { SetValue(ProgressProperty, value); }
-        }
-
-        public float Radius
-        {
-            get => (float)GetValue(RadiusProperty);
-            set => SetValue(RadiusProperty, value);
-        }
-        public float StrokeWidth
-        {
-            get => (float)GetValue(StrokeWidthProperty);
-            set => SetValue(StrokeWidthProperty, value);
-        }
-
-        public Color ProgressColor
-        {
-            get => (Color)GetValue(ProgressColorProperty);
-            set => SetValue(ProgressColorProperty, value);
-        }
-
-        public Color EndingProgressColor
-        {
-            get => (Color)GetValue(EndingProgressColorProperty);
-            set => SetValue(EndingProgressColorProperty, value);
-        }
-
-        public Color BackgroundProgressColor
-        {
-            get => (Color)GetValue(BackgroundProgressColorProperty);
-            set => SetValue(BackgroundProgressColorProperty, value);
-        }
-
-        private static void OnProgressChanged(BindableObject bindable, object oldvalue, object newvalue)
-        {
-            var context = bindable as CircularProgressbarView;
-            context.InvalidateSurface();
-        }
-
-        protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
-        {
-            base.OnPropertyChanged(propertyName);
-            if (propertyName == nameof(Progress))
-            {
-                _circle = new Circle(Radius * (float)DeviceDisplay.MainDisplayInfo.Density, (info) => new SKPoint((float)info.Width / 2, (float)info.Height / 2));
-            }
-        }
-
-        protected override void OnPaintSurface(SKPaintSurfaceEventArgs e)
-        {
-            base.OnPaintSurface(e);
-            if (_circle != null)
-            {
-                _circle.CalculateCenter(e.Info);
-                e.Surface.Canvas.Clear();
-                DrawCircle(e.Surface.Canvas, _circle, StrokeWidth * (float)DeviceDisplay.MainDisplayInfo.Density, BackgroundProgressColor.ToSKColor());
-                DrawArc(e.Surface.Canvas, _circle, () => (float)Progress, StrokeWidth * (float)DeviceDisplay.MainDisplayInfo.Density, ProgressColor.ToSKColor(), EndingProgressColor.ToSKColor());
-            }
-        }
-
-        private void DrawCircle(SKCanvas canvas, Circle circle, float strokewidth, SKColor color)
-        {
-            canvas.DrawCircle(circle.Center, circle.Redius,
-                new SKPaint()
-                {
-                    StrokeWidth = strokewidth,
-                    Color = color,
-                    IsStroke = true,
-                    IsAntialias = true
-                });
-        }
-
-        private void DrawArc(SKCanvas canvas, Circle circle, Func<float> progress, float strokewidth, SKColor color, SKColor progressEndColor)
-        {
-            var progressValue = progress();
-            var angle = progressValue * 3.6f;
-            canvas.DrawArc(circle.Rect, 270, angle, false,
-                new SKPaint()
-                {
-                    StrokeWidth = strokewidth,
-                    Color = progressValue < 20f ? progressEndColor : color,
-                    IsStroke = true,
-                    IsAntialias = true
-                });
-        }
-    }
-
-    public class Circle
-    {
-        private readonly Func<SKImageInfo, SKPoint> _centerFunc;
-
-        public Circle(float redius, Func<SKImageInfo, SKPoint> centerFunc)
-        {
-            _centerFunc = centerFunc;
-            Redius = redius;
-        }
-        public SKPoint Center { get; set; }
-        public float Redius { get; set; }
-        public SKRect Rect => new SKRect(Center.X - Redius, Center.Y - Redius, Center.X + Redius, Center.Y + Redius);
-
-        public void CalculateCenter(SKImageInfo argsInfo)
-        {
-            Center = _centerFunc(argsInfo);
-        }
-    }
-}

src/App/Controls/ExtendedCollectionView.cs

@@ -1,21 +0,0 @@
-using System.Linq;
-using CommunityToolkit.Maui.Converters;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
-
-namespace Bit.App.Controls
-{
-    public class ExtendedCollectionView : CollectionView
-    {
-        public string ExtraDataForLogging { get; set; }
-    }
-
-    public class SelectionChangedEventArgsConverter : BaseNullableConverterOneWay<SelectionChangedEventArgs, object>
-    {
-        public override object? ConvertFrom(SelectionChangedEventArgs? value)
-        {
-            return value?.CurrentSelection.FirstOrDefault();
-        }
-    }
-
-}

src/App/Controls/ExtendedGrid.cs

@@ -1,9 +0,0 @@
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
-
-namespace Bit.App.Controls
-{
-    public class ExtendedGrid : Grid
-    {
-    }
-}

src/App/Controls/ExtendedSearchBar.cs

@@ -1,22 +0,0 @@
-using Bit.App.Utilities;
-using Microsoft.Maui.Graphics;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
-
-namespace Bit.App.Controls
-{
-    public class ExtendedSearchBar : SearchBar
-    {
-        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)
-                {
-                    TextColor = Color.Black;
-                }
-            }
-        }
-    }
-}

src/App/Controls/ExtendedStackLayout.cs

@@ -1,9 +0,0 @@
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
-
-namespace Bit.App.Controls
-{
-    public class ExtendedStackLayout : StackLayout
-    {
-    }
-}

src/App/Controls/HybridWebView.cs

@@ -1,35 +0,0 @@
-using System;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
-
-namespace Bit.App.Controls
-{
-    public class HybridWebView : View
-    {
-        private Action<string> _func;
-
-        public static readonly BindableProperty UriProperty = BindableProperty.Create(propertyName: nameof(Uri),
-            returnType: typeof(string), declaringType: typeof(HybridWebView), defaultValue: default(string));
-
-        public string Uri
-        {
-            get { return (string)GetValue(UriProperty); }
-            set { SetValue(UriProperty, value); }
-        }
-
-        public void RegisterAction(Action<string> callback)
-        {
-            _func = callback;
-        }
-
-        public void Cleanup()
-        {
-            _func = null;
-        }
-
-        public void InvokeAction(string data)
-        {
-            _func?.Invoke(data);
-        }
-    }
-}

src/App/Controls/IconLabelButton/IconLabelButton.xaml

@@ -1,42 +0,0 @@
-<?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"
-    x:Name="_iconLabelButton"
-    HeightRequest="45"
-    Padding="1"
-    StyleClass="btn-icon-secondary"
-    BackgroundColor="{Binding IconLabelBorderColor, Source={x:Reference _iconLabelButton}}"
-    BorderColor="Transparent"
-    HasShadow="False">
-    <Frame.GestureRecognizers>
-        <TapGestureRecognizer Command="{Binding ButtonCommand, Source={x:Reference _iconLabelButton}}" />
-    </Frame.GestureRecognizers>
-    <Frame
-        Margin="0"
-        Padding="0"
-        CornerRadius="{Binding CornerRadius, Source={x:Reference _iconLabelButton}}"
-        BackgroundColor="{Binding IconLabelBackgroundColor, Source={x:Reference _iconLabelButton}}"
-        BorderColor="Transparent"
-        IsClippedToBounds="True"
-        HasShadow="False">
-        <StackLayout
-            Orientation="Horizontal"
-            HorizontalOptions="Center">
-            <controls:IconLabel
-                VerticalOptions="Center"
-                HorizontalTextAlignment="Center"
-                FontSize="Large"
-                TextColor="{Binding IconLabelColor, Source={x:Reference _iconLabelButton}}"
-                Text="{Binding Icon, Source={x:Reference _iconLabelButton}}">
-            </controls:IconLabel>
-            <Label
-                VerticalOptions="Center"
-                HorizontalTextAlignment="Center"
-                TextColor="{Binding IconLabelColor, Source={x:Reference _iconLabelButton}}"
-                FontSize="Medium"
-                Text="{Binding Label, Source={x:Reference _iconLabelButton}}"/>
-        </StackLayout>
-    </Frame>
-</Frame>

src/App/Controls/IconLabelButton/IconLabelButton.xaml.cs

@@ -1,77 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Bit.Core.Models.Domain;
-using Microsoft.Maui.Controls.Xaml;
-using Microsoft.Maui.Graphics;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
-
-namespace Bit.App.Controls
-{
-    public partial class IconLabelButton : Frame
-    {
-        public static readonly BindableProperty IconProperty = BindableProperty.Create(
-            nameof(Icon), typeof(string), typeof(IconLabelButton));
-
-        public static readonly BindableProperty LabelProperty = BindableProperty.Create(
-            nameof(Label), typeof(string), typeof(IconLabelButton));
-
-        public static readonly BindableProperty ButtonCommandProperty = BindableProperty.Create(
-            nameof(ButtonCommand), typeof(ICommand), typeof(IconLabelButton));
-
-        public static readonly BindableProperty IconLabelColorProperty = BindableProperty.Create(
-            nameof(IconLabelColor), typeof(Color), typeof(IconLabelButton), Colors.White);
-
-        public static readonly BindableProperty IconLabelBackgroundColorProperty = BindableProperty.Create(
-            nameof(IconLabelBackgroundColor), typeof(Color), typeof(IconLabelButton), Colors.White);
-
-        public static readonly BindableProperty IconLabelBorderColorProperty = BindableProperty.Create(
-            nameof(IconLabelBorderColor), typeof(Color), typeof(IconLabelButton), Colors.White);
-
-        public IconLabelButton()
-        {
-            InitializeComponent();
-        }
-
-        public string Icon
-        {
-            get => GetValue(IconProperty) as string;
-            set => SetValue(IconProperty, value);
-        }
-
-        public string Label
-        {
-            get => GetValue(LabelProperty) as string;
-            set => SetValue(LabelProperty, value);
-        }
-
-        public ICommand ButtonCommand
-        {
-            get => GetValue(ButtonCommandProperty) as ICommand;
-            set => SetValue(ButtonCommandProperty, value);
-        }
-
-        public Color IconLabelColor
-        {
-            get { return (Color)GetValue(IconLabelColorProperty); }
-            set { SetValue(IconLabelColorProperty, value); }
-        }
-
-        public Color IconLabelBackgroundColor
-        {
-            get { return (Color)GetValue(IconLabelBackgroundColorProperty); }
-            set { SetValue(IconLabelBackgroundColorProperty, value); }
-        }
-
-        public Color IconLabelBorderColor
-        {
-            get { return (Color)GetValue(IconLabelBorderColorProperty); }
-            set { SetValue(IconLabelBorderColorProperty, value); }
-        }
-    }
-}
-

src/App/Controls/MiLabel.cs

@@ -1,22 +0,0 @@
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
-
-namespace Bit.App.Controls
-{
-    public class MiLabel : Label
-    {
-        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:
-                    FontFamily = "Material Icons";
-                    break;
-                case Device.Android:
-                    FontFamily = "MaterialIcons_Regular.ttf#Material Icons";
-                    break;
-            }
-        }
-    }
-}

src/App/Controls/MonoEntry.cs

@@ -1,22 +0,0 @@
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
-
-namespace Bit.App.Controls
-{
-    public class MonoEntry : Entry
-    {
-        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:
-                    FontFamily = "Menlo-Regular";
-                    break;
-                case Device.Android:
-                    FontFamily = "RobotoMono_Regular.ttf#Roboto Mono";
-                    break;
-            }
-        }
-    }
-}

src/App/Controls/MonoLabel.cs

@@ -1,22 +0,0 @@
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
-
-namespace Bit.App.Controls
-{
-    public class MonoLabel : Label
-    {
-        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:
-                    FontFamily = "Menlo-Regular";
-                    break;
-                case Device.Android:
-                    FontFamily = "RobotoMono_Regular.ttf#Roboto Mono";
-                    break;
-            }
-        }
-    }
-}

src/App/Controls/SendViewCell/SendViewCell.xaml

@@ -1,142 +0,0 @@
-<?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"
-    xmlns:u="clr-namespace:Bit.App.Utilities"
-    xmlns:core="clr-namespace:Bit.Core;assembly=BitwardenCore"
-    StyleClass="list-row, list-row-platform"
-    RowSpacing="0"
-    ColumnSpacing="0"
-    x:DataType="controls:SendViewCellViewModel">
-
-    <Grid.Resources>
-          <u:SendIconGlyphConverter x:Key="sendIconGlyphConverter"/>
-    </Grid.Resources>
-
-    <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" />
-    </Grid.RowDefinitions>
-
-    <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="40" x:Name="_iconColumn" />
-        <ColumnDefinition Width="*" />
-        <ColumnDefinition Width="60" />
-    </Grid.ColumnDefinitions>
-
-    <controls:IconLabel
-        Grid.Row="0"
-        Grid.Column="0"
-        HorizontalOptions="Center"
-        VerticalOptions="Center"
-        StyleClass="list-icon, list-icon-platform"
-        Text="{Binding Send, Converter={StaticResource sendIconGlyphConverter}}"
-        ShouldUpdateFontSizeDynamicallyForAccesibility="True"
-        AutomationProperties.IsInAccessibleTree="False" />
-
-    <Grid RowSpacing="0" ColumnSpacing="0" Grid.Row="0" Grid.Column="1" VerticalOptions="Center" Padding="0, 7">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="*" />
-        </Grid.ColumnDefinitions>
-
-        <Label
-            LineBreakMode="TailTruncation"
-            Grid.Column="0"
-            Grid.Row="0"
-            StyleClass="list-title, list-title-platform"
-            Text="{Binding Send.Name}"
-            AutomationId="SendNameLabel" />
-        <Label
-            LineBreakMode="TailTruncation"
-            Grid.Column="0"
-            Grid.Row="1"
-            Grid.ColumnSpan="6"
-            StyleClass="list-subtitle, list-subtitle-platform"
-            Text="{Binding Send.DisplayDate}"
-            AutomationId="SendDateLabel" />
-        <controls:IconLabel
-            Grid.Column="1"
-            Grid.Row="0"
-            HorizontalOptions="Start"
-            VerticalOptions="Center"
-            StyleClass="list-title-icon"
-            Margin="5, 0, 0, 0"
-            Text="{Binding Source={x:Static core:BitwardenIcons.ExclamationTriangle}}"
-            IsVisible="{Binding Send.Disabled, Mode=OneTime}"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Disabled}"
-            AutomationId="DisabledSendLabel" />
-        <controls:IconLabel
-            Grid.Column="2"
-            Grid.Row="0"
-            HorizontalOptions="Start"
-            VerticalOptions="Center"
-            StyleClass="list-title-icon"
-            Margin="5, 0, 0, 0"
-            Text="{Binding Source={x:Static core:BitwardenIcons.Key}}"
-            IsVisible="{Binding Send.HasPassword, Mode=OneTime}"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Password}"
-            AutomationId="PasswordProtectedSendLabel" />
-        <controls:IconLabel
-            Grid.Column="3"
-            Grid.Row="0"
-            HorizontalOptions="Start"
-            VerticalOptions="Center"
-            StyleClass="list-title-icon"
-            Margin="5, 0, 0, 0"
-            Text="{Binding Source={x:Static core:BitwardenIcons.Ban}}"
-            IsVisible="{Binding Send.MaxAccessCountReached, Mode=OneTime}"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n MaxAccessCountReached}"
-            AutomationId="SendMaxAccessCountReachedLabel" />
-        <controls:IconLabel
-            Grid.Column="4"
-            Grid.Row="0"
-            HorizontalOptions="Start"
-            VerticalOptions="Center"
-            StyleClass="list-title-icon"
-            Margin="5, 0, 0, 0"
-            Text="{Binding Source={x:Static core:BitwardenIcons.Clock}}"
-            IsVisible="{Binding Send.Expired, Mode=OneTime}"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Expired}"
-            AutomationId="ExpiredSendLabel" />
-        <controls:IconLabel
-            Grid.Column="5"
-            Grid.Row="0"
-            HorizontalOptions="Start"
-            VerticalOptions="Center"
-            StyleClass="list-title-icon"
-            Margin="5, 0, 0, 0"
-            Text="{Binding Source={x:Static core:BitwardenIcons.Trash}}"
-            IsVisible="{Binding Send.PendingDelete, Mode=OneTime}"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n PendingDelete}"
-            AutomationId="SendWithPendingDeletionLabel" />
-    </Grid>
-
-    <controls:MiButton
-        Grid.Row="0"
-        Grid.Column="2"
-        Text="{Binding Source={x:Static core:BitwardenIcons.ViewCellMenu}}"
-        IsVisible="{Binding ShowOptions, Mode=OneWay}"
-        StyleClass="list-row-button, list-row-button-platform, btn-disabled"
-        Clicked="MoreButton_Clicked"
-        VerticalOptions="CenterAndExpand"
-        HorizontalOptions="EndAndExpand"
-        AutomationProperties.IsInAccessibleTree="True"
-        AutomationProperties.Name="{u:I18n Options}"
-        AutomationId="SendOptionsButton" />
-
-</controls:ExtendedGrid>

src/App/Controls/SendViewCell/SendViewCell.xaml.cs

@@ -1,69 +0,0 @@
-using System;
-using Bit.App.Abstractions;
-using Bit.Core.Models.View;
-using Bit.Core.Utilities;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
-
-namespace Bit.App.Controls
-{
-    public partial class SendViewCell : ExtendedGrid
-    {
-        public static readonly BindableProperty SendProperty = BindableProperty.Create(
-            nameof(Send), typeof(SendView), typeof(SendViewCell), default(SendView), BindingMode.OneWay);
-
-        public static readonly BindableProperty ButtonCommandProperty = BindableProperty.Create(
-            nameof(ButtonCommand), typeof(Command<SendView>), typeof(SendViewCell));
-
-        public static readonly BindableProperty ShowOptionsProperty = BindableProperty.Create(
-            nameof(ShowOptions), typeof(bool), typeof(SendViewCell), true, BindingMode.OneWay);
-
-        public SendViewCell()
-        {
-            InitializeComponent();
-
-            var deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
-            _iconColumn.Width = new GridLength(40 * deviceActionService.GetSystemFontSizeScale(), GridUnitType.Absolute);
-        }
-
-        public SendView Send
-        {
-            get => GetValue(SendProperty) as SendView;
-            set => SetValue(SendProperty, value);
-        }
-
-        public Command<SendView> ButtonCommand
-        {
-            get => GetValue(ButtonCommandProperty) as Command<SendView>;
-            set => SetValue(ButtonCommandProperty, value);
-        }
-
-        public bool ShowOptions
-        {
-            get => (bool)GetValue(ShowOptionsProperty);
-            set => SetValue(ShowOptionsProperty, value);
-        }
-
-        protected override void OnPropertyChanged(string propertyName = null)
-        {
-            base.OnPropertyChanged(propertyName);
-            if (propertyName == SendProperty.PropertyName)
-            {
-                if (Send == null)
-                {
-                    return;
-                }
-                BindingContext = new SendViewCellViewModel(Send, ShowOptions);
-            }
-        }
-
-        private void MoreButton_Clicked(object sender, EventArgs e)
-        {
-            var send = ((sender as MiButton)?.BindingContext as SendViewCellViewModel)?.Send;
-            if (send != null)
-            {
-                ButtonCommand?.Execute(send);
-            }
-        }
-    }
-}

src/App/Controls/SendViewCell/SendViewCellViewModel.cs

@@ -1,29 +0,0 @@
-using Bit.Core.Models.View;
-using Bit.Core.Utilities;
-
-namespace Bit.App.Controls
-{
-    public class SendViewCellViewModel : ExtendedViewModel
-    {
-        private SendView _send;
-        private bool _showOptions;
-
-        public SendViewCellViewModel(SendView sendView, bool showOptions)
-        {
-            Send = sendView;
-            ShowOptions = showOptions;
-        }
-
-        public SendView Send
-        {
-            get => _send;
-            set => SetProperty(ref _send, value);
-        }
-
-        public bool ShowOptions
-        {
-            get => _showOptions;
-            set => SetProperty(ref _showOptions, value);
-        }
-    }
-}

src/App/Effects/FabShadowEffect.cs

@@ -1,12 +0,0 @@
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
-
-namespace Bit.App.Effects
-{
-    public class FabShadowEffect : RoutingEffect
-    {
-        public FabShadowEffect()
-            : base("Bitwarden.FabShadowEffect")
-        { }
-    }
-}

src/App/Effects/FixedSizeEffect.cs

@@ -1,12 +0,0 @@
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
-
-namespace Bit.App.Effects
-{
-    public class FixedSizeEffect : RoutingEffect
-    {
-        public FixedSizeEffect()
-            : base("Bitwarden.FixedSizeEffect")
-        { }
-    }
-}

src/App/Effects/NoEmojiKeyboardEffect.cs

@@ -1,13 +0,0 @@
-using System;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
-
-namespace Bit.App.Effects
-{
-    public class NoEmojiKeyboardEffect : RoutingEffect
-    {
-        public NoEmojiKeyboardEffect()
-            : base("Bitwarden.NoEmojiKeyboardEffect")
-        { }
-    }
-}

src/App/Effects/RemoveFontPaddingEffect.cs

@@ -1,14 +0,0 @@
-using System;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
-
-namespace Bit.App.Effects
-{
-    public class RemoveFontPaddingEffect : RoutingEffect
-    {
-        public RemoveFontPaddingEffect()
-            : base("Bitwarden.RemoveFontPaddingEffect")
-        { }
-    }
-}
-

src/App/Effects/ScrollViewContentInsetAdjustmentBehaviorEffect.cs

@@ -1,34 +0,0 @@
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
-
-namespace Bit.App.Effects
-{
-    public enum ScrollContentInsetAdjustmentBehavior
-    {
-        Automatic,
-        ScrollableAxes,
-        Never,
-        Always
-    }
-
-    public class ScrollViewContentInsetAdjustmentBehaviorEffect : RoutingEffect
-    {
-        public static readonly BindableProperty ContentInsetAdjustmentBehaviorProperty =
-          BindableProperty.CreateAttached("ContentInsetAdjustmentBehavior", typeof(ScrollContentInsetAdjustmentBehavior), typeof(ScrollViewContentInsetAdjustmentBehaviorEffect), ScrollContentInsetAdjustmentBehavior.Automatic);
-
-        public static ScrollContentInsetAdjustmentBehavior GetContentInsetAdjustmentBehavior(BindableObject view)
-        {
-            return (ScrollContentInsetAdjustmentBehavior)view.GetValue(ContentInsetAdjustmentBehaviorProperty);
-        }
-
-        public static void SetContentInsetAdjustmentBehavior(BindableObject view, ScrollContentInsetAdjustmentBehavior value)
-        {
-            view.SetValue(ContentInsetAdjustmentBehaviorProperty, value);
-        }
-
-        public ScrollViewContentInsetAdjustmentBehaviorEffect()
-            : base($"Bitwarden.{nameof(ScrollViewContentInsetAdjustmentBehaviorEffect)}")
-        {
-        }
-    }
-}

src/App/Effects/TabBarEffect.cs

@@ -1,12 +0,0 @@
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
-
-namespace Bit.App.Effects
-{
-    public class TabBarEffect : RoutingEffect
-    {
-        public TabBarEffect()
-            : base("Bitwarden.TabBarEffect")
-        { }
-    }
-}

src/App/Handlers/HybridWebViewHandler.cs

@@ -0,0 +1,25 @@
+#if IOS || MACCATALYST
+using PlatformView = WebKit.WKWebView;
+#elif ANDROID
+using PlatformView = Android.Webkit.WebView;
+#elif (NETSTANDARD || !PLATFORM) || (NET6_0_OR_GREATER && !IOS && !ANDROID)
+using PlatformView = System.Object;
+#endif
+
+using Bit.App.Controls;
+using Microsoft.Maui.Handlers;
+
+namespace Bit.App.Handlers
+{
+    public partial class HybridWebViewHandler
+    {
+        public static PropertyMapper<HybridWebView, HybridWebViewHandler> PropertyMapper = new PropertyMapper<HybridWebView, HybridWebViewHandler>(ViewHandler.ViewMapper)
+        {
+            [nameof(HybridWebView.Uri)] = MapUri
+        };
+
+        public HybridWebViewHandler() : base(PropertyMapper)
+        {
+        }
+    }
+}

src/App/Lists/ItemLayouts/CustomFields/BooleanCustomFieldItemLayout.xaml

@@ -1,74 +0,0 @@
-<?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.BooleanCustomFieldItemLayout"
-    xmlns:u="clr-namespace:Bit.App.Utilities"
-    xmlns:controls="clr-namespace:Bit.App.Controls"
-    xmlns:cfvm="clr-namespace:Bit.App.Lists.ItemViewModels.CustomFields"
-    xmlns:core="clr-namespace:Bit.Core;assembly=BitwardenCore"
-    x:DataType="cfvm:BooleanCustomFieldItemViewModel"
-    Spacing="0" Padding="0">
-    <StackLayout.Resources>
-        <ResourceDictionary>
-            <u:InverseBoolConverter x:Key="inverseBool" />
-            <u:IconGlyphConverter x:Key="iconGlyphConverter" />
-            <u:BooleanToBoxRowInputPaddingConverter x:Key="booleanToBoxRowInputPaddingConverter" />
-        </ResourceDictionary>
-    </StackLayout.Resources>
-    <Grid
-        StyleClass="box-row"
-        Padding="{Binding IsEditing, Converter={StaticResource booleanToBoxRowInputPaddingConverter}}">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-        </Grid.ColumnDefinitions>
-        <Label
-            Text="{Binding Field.Name, Mode=OneWay}"
-            StyleClass="box-label"
-            Grid.Row="0"
-            Grid.Column="0"
-            IsVisible="{Binding IsEditing, Mode=OneWay, Converter={StaticResource inverseBool}}"
-            AutomationId="BooleanCustomFieldNameLabel" />
-        <Label
-            Text="{Binding Field.Name, Mode=OneWay}"
-            IsVisible="{Binding IsEditing}"
-            StyleClass="box-value"
-            VerticalOptions="FillAndExpand"
-            VerticalTextAlignment="Center"
-            Grid.Row="0"
-            Grid.Column="0"
-            Grid.RowSpan="2" />
-        <controls:IconLabel
-            Text="{Binding BooleanValue, Mode=OneWay, Converter={StaticResource iconGlyphConverter}, ConverterParameter={x:Static u:BooleanGlyphType.Checkbox}}"
-            StyleClass="box-value"
-            Grid.Row="1"
-            Grid.Column="0"
-            Margin="0, 5, 0, 0"
-            IsVisible="{Binding IsEditing, Mode=OneWay, Converter={StaticResource inverseBool}}"
-            AutomationId="BooleanCustomFieldValueLabel" />
-        <Switch
-            IsToggled="{Binding BooleanValue}"
-            IsVisible="{Binding IsEditing}"
-            Grid.Row="0"
-            Grid.Column="1"
-            Grid.RowSpan="2"
-            AutomationId="BooleanCustomFieldValueToggle" />
-        <controls:IconButton 
-            StyleClass="box-row-button, box-row-button-platform"
-            Text="{Binding Source={x:Static core:BitwardenIcons.Cog}}"
-            Command="{Binding FieldOptionsCommand}"
-            IsVisible="{Binding IsEditing}"
-            Grid.Row="0"
-            Grid.Column="2"
-            Grid.RowSpan="2"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Options}" />
-    </Grid>
-    <BoxView StyleClass="box-row-separator" />
-</StackLayout>

src/App/Lists/ItemLayouts/CustomFields/HiddenCustomFieldItemLayout.xaml

@@ -1,104 +0,0 @@
-<?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"
-    xmlns:u="clr-namespace:Bit.App.Utilities"
-    xmlns:cfvm="clr-namespace:Bit.App.Lists.ItemViewModels.CustomFields"
-    xmlns:core="clr-namespace:Bit.Core;assembly=BitwardenCore"
-    x:DataType="cfvm:HiddenCustomFieldItemViewModel"
-    Spacing="0" Padding="0">
-    <StackLayout.Resources>
-        <ResourceDictionary>
-            <u:InverseBoolConverter x:Key="inverseBool" />
-            <u:IconGlyphConverter x:Key="iconGlyphConverter" />
-            <u:BooleanToBoxRowInputPaddingConverter x:Key="booleanToBoxRowInputPaddingConverter" />
-        </ResourceDictionary>
-    </StackLayout.Resources>
-    <Grid
-        StyleClass="box-row"
-        Padding="{Binding IsEditing, Converter={StaticResource booleanToBoxRowInputPaddingConverter}}">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-        </Grid.ColumnDefinitions>
-        <Label
-            Text="{Binding Field.Name, Mode=OneWay}"
-            StyleClass="box-label"
-            Grid.Row="0"
-            Grid.Column="0"
-            AutomationId="HiddenCustomFieldNameLabel" />
-        <StackLayout
-            Grid.Row="1"
-            Grid.Column="0"
-            IsVisible="{Binding IsEditing, Converter={StaticResource inverseBool}}">
-            <controls:MonoLabel
-                Text="{Binding ValueText, Mode=OneWay}"
-                StyleClass="box-value"
-                IsVisible="{Binding ShowHiddenValue}"
-                AutomationId="HiddenCustomFieldValueLabel" />
-            <controls:MonoLabel
-                Text="{Binding Field.MaskedValue, Mode=OneWay}"
-                StyleClass="box-value"
-                IsVisible="{Binding ShowHiddenValue, Converter={StaticResource inverseBool}}" />
-        </StackLayout>
-        <controls:MonoEntry
-            Text="{Binding Field.Value}"
-            StyleClass="box-value"
-            Grid.Row="1"
-            Grid.Column="0"
-            IsVisible="{Binding IsEditing}"
-            IsPassword="{Binding ShowHiddenValue, Converter={StaticResource inverseBool}}"
-            IsEnabled="{Binding ShowViewHidden}"
-            IsSpellCheckEnabled="False"
-            IsTextPredictionEnabled="False"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{Binding Field.Name}"
-            AutomationId="HiddenCustomFieldValueEntry">
-            <Entry.Keyboard>
-                <Keyboard x:FactoryMethod="Create">
-                    <x:Arguments>
-                        <KeyboardFlags>None</KeyboardFlags>
-                    </x:Arguments>
-                </Keyboard>
-            </Entry.Keyboard>
-        </controls:MonoEntry>
-        <controls:IconButton 
-            StyleClass="box-row-button, box-row-button-platform"
-            Text="{Binding ShowHiddenValue, Converter={StaticResource iconGlyphConverter}, ConverterParameter={x:Static u:BooleanGlyphType.Eye}}"
-            Command="{Binding ToggleHiddenValueCommand}"
-            IsVisible="{Binding ShowViewHidden}"
-            Grid.Row="0"
-            Grid.Column="1"
-            Grid.RowSpan="2"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n ToggleVisibility}"
-            AutomationId="HiddenCustomFieldShowValueButton" />
-        <controls:IconButton
-            StyleClass="box-row-button, box-row-button-platform"
-            Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
-            Command="{Binding CopyFieldCommand}"
-            IsVisible="{Binding ShowCopyButton}"
-            Grid.Row="0"
-            Grid.Column="2"
-            Grid.RowSpan="2"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Copy}" />
-        <controls:IconButton 
-            StyleClass="box-row-button, box-row-button-platform"
-            Text="{Binding Source={x:Static core:BitwardenIcons.Cog}}"
-            Command="{Binding FieldOptionsCommand}"
-            IsVisible="{Binding IsEditing}"
-            Grid.Row="0"
-            Grid.Column="2"
-            Grid.RowSpan="2"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Options}" />
-    </Grid>
-    <BoxView StyleClass="box-row-separator" IsVisible="{Binding IsEditing, Mode=OneWay, Converter={StaticResource inverseBool}}" />
-</StackLayout>

src/App/Lists/ItemLayouts/CustomFields/LinkedCustomFieldItemLayout.xaml

@@ -1,65 +0,0 @@
-<?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"
-    xmlns:u="clr-namespace:Bit.App.Utilities"
-    xmlns:cfvm="clr-namespace:Bit.App.Lists.ItemViewModels.CustomFields"
-    xmlns:core="clr-namespace:Bit.Core;assembly=BitwardenCore"
-    x:DataType="cfvm:LinkedCustomFieldItemViewModel"
-    Spacing="0" Padding="0">
-    <StackLayout.Resources>
-        <ResourceDictionary>
-            <u:InverseBoolConverter x:Key="inverseBool" />
-            <u:BooleanToBoxRowInputPaddingConverter x:Key="booleanToBoxRowInputPaddingConverter" />
-        </ResourceDictionary>
-    </StackLayout.Resources>
-    <Grid
-        StyleClass="box-row"
-        Padding="{Binding IsEditing, Converter={StaticResource booleanToBoxRowInputPaddingConverter}}">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="Auto" />
-        </Grid.ColumnDefinitions>
-        <Label
-            Text="{Binding Field.Name, Mode=OneWay}"
-            StyleClass="box-label"
-            Grid.Row="0"
-            Grid.Column="0"
-            AutomationId="LinkedCustomFieldNameLabel" />
-        <controls:IconLabel
-            Text="{Binding ValueText, Mode=OneWay}"
-            StyleClass="box-value"
-            Grid.Row="1"
-            Grid.Column="0"
-            IsVisible="{Binding IsEditing, Mode=OneWay, Converter={StaticResource inverseBool}}"
-            AutomationId="LinkedCustomFieldValueLabel" />
-        <StackLayout
-            StyleClass="box-row, box-row-input"
-            IsVisible="{Binding IsEditing}">
-            <Picker
-                x:Name="_linkedFieldOptionPicker"
-                ItemsSource="{Binding LinkedFieldOptions, Mode=OneTime}"
-                SelectedIndex="{Binding LinkedFieldOptionSelectedIndex}"
-                ItemDisplayBinding="{Binding Key}"
-                StyleClass="box-value"
-                AutomationId="LinkedCustomFieldValuePicker" />
-        </StackLayout>
-        <controls:IconButton 
-            StyleClass="box-row-button, box-row-button-platform"
-            Text="{Binding Source={x:Static core:BitwardenIcons.Cog}}"
-            Command="{Binding FieldOptionsCommand}"
-            IsVisible="{Binding IsEditing}"
-            Grid.Row="0"
-            Grid.Column="1"
-            Grid.RowSpan="2"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Options}"
-            AutomationId="LinkedCustomFieldOptionsButton" />
-    </Grid>
-    <BoxView StyleClass="box-row-separator" IsVisible="{Binding IsEditing, Mode=OneWay, Converter={StaticResource inverseBool}}" />
-</StackLayout>

src/App/Lists/ItemLayouts/CustomFields/TextCustomFieldItemLayout.xaml

@@ -1,74 +0,0 @@
-<?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"
-    xmlns:u="clr-namespace:Bit.App.Utilities"
-    xmlns:cfvm="clr-namespace:Bit.App.Lists.ItemViewModels.CustomFields"
-    xmlns:core="clr-namespace:Bit.Core;assembly=BitwardenCore"
-    x:DataType="cfvm:TextCustomFieldItemViewModel"
-    Spacing="0" Padding="0">
-    <StackLayout.Resources>
-        <ResourceDictionary>
-            <u:InverseBoolConverter x:Key="inverseBool" />
-            <u:BooleanToBoxRowInputPaddingConverter x:Key="booleanToBoxRowInputPaddingConverter" />
-        </ResourceDictionary>
-    </StackLayout.Resources>
-    <Grid
-        StyleClass="box-row"
-        Padding="{Binding IsEditing, Converter={StaticResource booleanToBoxRowInputPaddingConverter}}">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="Auto" />
-        </Grid.ColumnDefinitions>
-        <Label
-            Text="{Binding Field.Name, Mode=OneWay}"
-            StyleClass="box-label"
-            Grid.Row="0"
-            Grid.Column="0"
-            AutomationId="TextCustomFieldNameLabel" />
-        <Label
-            Text="{Binding ValueText, Mode=OneWay}"
-            StyleClass="box-value"
-            Grid.Row="1"
-            Grid.Column="0"
-            IsVisible="{Binding IsEditing, Mode=OneWay, Converter={StaticResource inverseBool}}"
-            AutomationId="TextCustomFieldValueLabel" />
-        <Entry
-            Text="{Binding Field.Value}"
-            StyleClass="box-value"
-            Grid.Row="1"
-            Grid.Column="0"
-            IsVisible="{Binding IsEditing}"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{Binding Field.Name}"
-            AutomationId="TextCustomFieldValueEntry" />
-        <controls:IconButton
-            StyleClass="box-row-button, box-row-button-platform"
-            Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
-            Command="{Binding CopyFieldCommand}"
-            IsVisible="{Binding ShowCopyButton}"
-            Grid.Row="0"
-            Grid.Column="1"
-            Grid.RowSpan="2"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Copy}"
-            AutomationId="TextCustomFieldCopyValue" />
-        <controls:IconButton 
-            StyleClass="box-row-button, box-row-button-platform"
-            Text="{Binding Source={x:Static core:BitwardenIcons.Cog}}"
-            Command="{Binding FieldOptionsCommand}"
-            IsVisible="{Binding IsEditing}"
-            Grid.Row="0"
-            Grid.Column="1"
-            Grid.RowSpan="2"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Options}"
-            AutomationId="TextCustomFieldOptionsButton" />
-    </Grid>
-    <BoxView StyleClass="box-row-separator" IsVisible="{Binding IsEditing, Mode=OneWay, Converter={StaticResource inverseBool}}" />
-</StackLayout>

src/App/Lists/ItemViewModels/CustomFields/HiddenCustomFieldItemViewModel.cs

@@ -1,71 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Bit.App.Utilities;
-using Bit.Core.Abstractions;
-using Bit.Core.Models.View;
-using Xamarin.CommunityToolkit.ObjectModel;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
-
-namespace Bit.App.Lists.ItemViewModels.CustomFields
-{
-    public class HiddenCustomFieldItemViewModel : BaseCustomFieldItemViewModel
-    {
-        private readonly CipherView _cipher;
-        private readonly IPasswordPromptable _passwordPromptable;
-        private readonly IEventService _eventService;
-        private bool _showHiddenValue;
-
-        public HiddenCustomFieldItemViewModel(FieldView field,
-                                              bool isEditing,
-                                              ICommand fieldOptionsCommand,
-                                              CipherView cipher,
-                                              IPasswordPromptable passwordPromptable,
-                                              IEventService eventService,
-                                              ICommand copyFieldCommand)
-            : base(field, isEditing, fieldOptionsCommand)
-        {
-            _cipher = cipher;
-            _passwordPromptable = passwordPromptable;
-            _eventService = eventService;
-
-            CopyFieldCommand = new Command(() => copyFieldCommand?.Execute(Field));
-            ToggleHiddenValueCommand = new AsyncCommand(ToggleHiddenValueAsync, (Func<bool>)null, ex =>
-            {
-#if !FDROID
-                Microsoft.AppCenter.Crashes.Crashes.TrackError(ex);
-#endif
-            });
-        }
-
-        public ICommand CopyFieldCommand { get; }
-
-        public ICommand ToggleHiddenValueCommand { get; set; }
-
-        public bool ShowHiddenValue
-        {
-            get => _showHiddenValue;
-            set => SetProperty(ref _showHiddenValue, value);
-        }
-
-        public bool ShowViewHidden => _cipher.ViewPassword || (_isEditing && _field.NewField);
-
-        public override bool ShowCopyButton => !_isEditing && _cipher.ViewPassword && !string.IsNullOrWhiteSpace(Field.Value);
-
-        public async Task ToggleHiddenValueAsync()
-        {
-            if (!_isEditing && !await _passwordPromptable.PromptPasswordAsync())
-            {
-                return;
-            }
-
-            ShowHiddenValue = !ShowHiddenValue;
-            if (ShowHiddenValue && (!_isEditing || _cipher?.Id != null))
-            {
-                await _eventService.CollectAsync(
-                    Core.Enums.EventType.Cipher_ClientToggledHiddenFieldVisible, _cipher.Id);
-            }
-        }
-    }
-}

src/App/MauiProgram.cs

@@ -0,0 +1,41 @@
+namespace Bit.App
+{
+    public class MauiProgram
+    {
+        public static MauiApp CreateMauiApp()
+        {
+            return Core.MauiProgram.ConfigureMauiAppBuilder(
+                effects =>
+                {
+#if IOS
+                    iOS.Core.Utilities.iOSCoreHelpers.ConfigureMAUIEffects(effects);
+#endif
+                },
+                handlers =>
+                {
+                    handlers.AddHandler(typeof(Bit.App.Controls.HybridWebView), typeof(Bit.App.Handlers.HybridWebViewHandler));
+#if ANDROID
+                    Bit.App.Handlers.EntryHandlerMappings.Setup();
+                    Bit.App.Handlers.EditorHandlerMappings.Setup();
+                    Bit.App.Handlers.LabelHandlerMappings.Setup();
+                    Bit.App.Handlers.PickerHandlerMappings.Setup();
+                    Bit.App.Handlers.SearchBarHandlerMappings.Setup();
+                    Bit.App.Handlers.SwitchHandlerMappings.Setup();
+                    Bit.App.Handlers.DatePickerHandlerMappings.Setup();
+                    Bit.App.Handlers.SliderHandlerMappings.Setup();
+                    Bit.App.Handlers.StepperHandlerMappings.Setup();
+                    Bit.App.Handlers.TimePickerHandlerMappings.Setup();
+                    Bit.App.Handlers.ButtonHandlerMappings.Setup();
+                    Bit.App.Handlers.ToolbarHandlerMappings.Setup();
+
+                    handlers.AddHandler(typeof(Bit.App.Pages.TabsPage), typeof(Bit.App.Handlers.CustomTabbedPageHandler));
+                    handlers.AddHandler(typeof(Bit.App.Controls.ExtendedDatePicker), typeof(Bit.App.Handlers.ExtendedDatePickerHandler));
+#else
+                    iOS.Core.Utilities.iOSCoreHelpers.ConfigureMAUIHandlers(handlers);
+#endif
+                },
+               initUseMauiApp: true
+            ).Build();
+        }
+    }
+}

src/App/Pages/Accounts/BaseChangePasswordViewModel.cs

@@ -1,176 +0,0 @@
-using System.Text;
-using System.Threading.Tasks;
-using Bit.App.Abstractions;
-using Bit.App.Resources;
-using Bit.Core;
-using Bit.Core.Abstractions;
-using Bit.Core.Models.Domain;
-using Bit.Core.Utilities;
-
-namespace Bit.App.Pages
-{
-    public class BaseChangePasswordViewModel : BaseViewModel
-    {
-        protected readonly IPlatformUtilsService _platformUtilsService;
-        protected readonly IStateService _stateService;
-        protected readonly IPolicyService _policyService;
-        protected readonly IPasswordGenerationService _passwordGenerationService;
-        protected readonly II18nService _i18nService;
-        protected readonly ICryptoService _cryptoService;
-        protected readonly IDeviceActionService _deviceActionService;
-        protected readonly IApiService _apiService;
-        protected readonly ISyncService _syncService;
-
-        private bool _showPassword;
-        private bool _isPolicyInEffect;
-        private string _policySummary;
-        private MasterPasswordPolicyOptions _policy;
-
-        protected BaseChangePasswordViewModel()
-        {
-            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
-            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
-            _policyService = ServiceContainer.Resolve<IPolicyService>("policyService");
-            _passwordGenerationService =
-                ServiceContainer.Resolve<IPasswordGenerationService>("passwordGenerationService");
-            _i18nService = ServiceContainer.Resolve<II18nService>("i18nService");
-            _cryptoService = ServiceContainer.Resolve<ICryptoService>("cryptoService");
-            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
-            _apiService = ServiceContainer.Resolve<IApiService>("apiService");
-            _syncService = ServiceContainer.Resolve<ISyncService>("syncService");
-        }
-
-        public bool ShowPassword
-        {
-            get => _showPassword;
-            set => SetProperty(ref _showPassword, value,
-                additionalPropertyNames: new[]
-                {
-                    nameof(ShowPasswordIcon),
-                    nameof(PasswordVisibilityAccessibilityText)
-                });
-        }
-
-        public bool IsPolicyInEffect
-        {
-            get => _isPolicyInEffect;
-            set => SetProperty(ref _isPolicyInEffect, value);
-        }
-
-        public string PolicySummary
-        {
-            get => _policySummary;
-            set => SetProperty(ref _policySummary, value);
-        }
-
-        public MasterPasswordPolicyOptions Policy
-        {
-            get => _policy;
-            set => SetProperty(ref _policy, value);
-        }
-
-        public string ShowPasswordIcon => ShowPassword ? BitwardenIcons.EyeSlash : BitwardenIcons.Eye;
-        public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow;
-        public string MasterPassword { get; set; }
-        public string ConfirmMasterPassword { get; set; }
-        public string Hint { get; set; }
-
-        public virtual async Task InitAsync(bool forceSync = false)
-        {
-            if (forceSync)
-            {
-                var task = Task.Run(async () => await _syncService.FullSyncAsync(true));
-                await task.ContinueWith(async (t) => await CheckPasswordPolicy());
-            }
-            else
-            {
-                await CheckPasswordPolicy();
-            }
-        }
-
-        private async Task CheckPasswordPolicy()
-        {
-            Policy = await _policyService.GetMasterPasswordPolicyOptions();
-            IsPolicyInEffect = Policy?.InEffect() ?? false;
-            if (!IsPolicyInEffect)
-            {
-                return;
-            }
-
-            var bullet = "\n" + "".PadLeft(4) + "\u2022 ";
-            var sb = new StringBuilder();
-            sb.Append(_i18nService.T("MasterPasswordPolicyInEffect"));
-            if (Policy.MinComplexity > 0)
-            {
-                sb.Append(bullet)
-                    .Append(string.Format(_i18nService.T("PolicyInEffectMinComplexity"), Policy.MinComplexity));
-            }
-            if (Policy.MinLength > 0)
-            {
-                sb.Append(bullet).Append(string.Format(_i18nService.T("PolicyInEffectMinLength"), Policy.MinLength));
-            }
-            if (Policy.RequireUpper)
-            {
-                sb.Append(bullet).Append(_i18nService.T("PolicyInEffectUppercase"));
-            }
-            if (Policy.RequireLower)
-            {
-                sb.Append(bullet).Append(_i18nService.T("PolicyInEffectLowercase"));
-            }
-            if (Policy.RequireNumbers)
-            {
-                sb.Append(bullet).Append(_i18nService.T("PolicyInEffectNumbers"));
-            }
-            if (Policy.RequireSpecial)
-            {
-                sb.Append(bullet).Append(string.Format(_i18nService.T("PolicyInEffectSpecial"), "!@#$%^&*"));
-            }
-            PolicySummary = sb.ToString();
-        }
-
-        protected async Task<bool> ValidateMasterPasswordAsync()
-        {
-            if (Connectivity.NetworkAccess == NetworkAccess.None)
-            {
-                await _platformUtilsService.ShowDialogAsync(AppResources.InternetConnectionRequiredMessage,
-                    AppResources.InternetConnectionRequiredTitle, AppResources.Ok);
-                return false;
-            }
-            if (string.IsNullOrWhiteSpace(MasterPassword))
-            {
-                await _platformUtilsService.ShowDialogAsync(
-                    string.Format(AppResources.ValidationFieldRequired, AppResources.MasterPassword),
-                    AppResources.AnErrorHasOccurred, AppResources.Ok);
-                return false;
-            }
-            if (IsPolicyInEffect)
-            {
-                var userInputs = _passwordGenerationService.GetPasswordStrengthUserInput(await _stateService.GetEmailAsync());
-                var passwordStrength = _passwordGenerationService.PasswordStrength(MasterPassword, userInputs);
-                if (!await _policyService.EvaluateMasterPassword(passwordStrength.Score, MasterPassword, Policy))
-                {
-                    await _platformUtilsService.ShowDialogAsync(AppResources.MasterPasswordPolicyValidationMessage,
-                        AppResources.MasterPasswordPolicyValidationTitle, AppResources.Ok);
-                    return false;
-                }
-            }
-            else
-            {
-                if (MasterPassword.Length < Constants.MasterPasswordMinimumChars)
-                {
-                    await _platformUtilsService.ShowDialogAsync(string.Format(AppResources.MasterPasswordLengthValMessageX, Constants.MasterPasswordMinimumChars),
-                        AppResources.MasterPasswordPolicyValidationTitle, AppResources.Ok);
-                    return false;
-                }
-            }
-            if (MasterPassword != ConfirmMasterPassword)
-            {
-                await _platformUtilsService.ShowDialogAsync(AppResources.MasterPasswordConfirmationValMessage,
-                    AppResources.AnErrorHasOccurred, AppResources.Ok);
-                return false;
-            }
-
-            return true;
-        }
-    }
-}

src/App/Pages/Accounts/DeleteAccountViewModel.cs

@@ -1,110 +0,0 @@
-using System.Threading.Tasks;
-using Bit.App.Abstractions;
-using Bit.App.Resources;
-using Bit.App.Utilities;
-using Bit.Core.Abstractions;
-using Bit.Core.Exceptions;
-using Bit.Core.Utilities;
-
-namespace Bit.App.Pages
-{
-    public class DeleteAccountViewModel : BaseViewModel
-    {
-        readonly IPlatformUtilsService _platformUtilsService;
-        readonly IVerificationActionsFlowHelper _verificationActionsFlowHelper;
-        readonly ILogger _logger;
-
-        public DeleteAccountViewModel()
-        {
-            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
-            _verificationActionsFlowHelper = ServiceContainer.Resolve<IVerificationActionsFlowHelper>("verificationActionsFlowHelper");
-            _logger = ServiceContainer.Resolve<ILogger>("logger");
-
-            PageTitle = AppResources.DeleteAccount;
-        }
-
-        public async Task DeleteAccountAsync()
-        {
-            try
-            {
-                if (Microsoft.Maui.Networking.Connectivity.NetworkAccess == Microsoft.Maui.Networking.NetworkAccess.None)
-                {
-                    await _platformUtilsService.ShowDialogAsync(AppResources.InternetConnectionRequiredMessage,
-                        AppResources.InternetConnectionRequiredTitle, AppResources.Ok);
-                    return;
-                }
-
-                await _verificationActionsFlowHelper
-                    .Configure(VerificationFlowAction.DeleteAccount,
-                               null,
-                               AppResources.DeleteAccount,
-                               true)
-                    .ValidateAndExecuteAsync();
-            }
-            catch (System.Exception ex)
-            {
-                _logger.Exception(ex);
-                await _platformUtilsService.ShowDialogAsync(AppResources.AnErrorHasOccurred);
-            }
-        }
-    }
-
-    public interface IDeleteAccountActionFlowExecutioner : IActionFlowExecutioner { }
-
-    public class DeleteAccountActionFlowExecutioner : IDeleteAccountActionFlowExecutioner
-    {
-        readonly IApiService _apiService;
-        readonly IMessagingService _messagingService;
-        readonly IPlatformUtilsService _platformUtilsService;
-        readonly IDeviceActionService _deviceActionService;
-        readonly ILogger _logger;
-
-        public DeleteAccountActionFlowExecutioner(IApiService apiService,
-            IMessagingService messagingService,
-            IPlatformUtilsService platformUtilsService,
-            IDeviceActionService deviceActionService,
-            ILogger logger)
-        {
-            _apiService = apiService;
-            _messagingService = messagingService;
-            _platformUtilsService = platformUtilsService;
-            _deviceActionService = deviceActionService;
-            _logger = logger;
-        }
-
-        public async Task Execute(IActionFlowParmeters parameters)
-        {
-            try
-            {
-                await _deviceActionService.ShowLoadingAsync(AppResources.DeletingYourAccount);
-
-                await _apiService.DeleteAccountAsync(new Core.Models.Request.DeleteAccountRequest
-                {
-                    MasterPasswordHash = parameters.VerificationType == Core.Enums.VerificationType.MasterPassword ? parameters.Secret : (string)null,
-                    OTP = parameters.VerificationType == Core.Enums.VerificationType.OTP ? parameters.Secret : (string)null
-                });
-
-                await _deviceActionService.HideLoadingAsync();
-
-                _messagingService.Send("logout");
-
-                await _platformUtilsService.ShowDialogAsync(AppResources.YourAccountHasBeenPermanentlyDeleted);
-            }
-            catch (ApiException apiEx)
-            {
-                await _deviceActionService.HideLoadingAsync();
-
-                if (apiEx?.Error != null)
-                {
-                    await _platformUtilsService.ShowDialogAsync(apiEx.Error.GetSingleMessage(), AppResources.AnErrorHasOccurred);
-                }
-            }
-            catch (System.Exception ex)
-            {
-                await _deviceActionService.HideLoadingAsync();
-                _logger.Exception(ex);
-                await _platformUtilsService.ShowDialogAsync(AppResources.AnErrorHasOccurred);
-            }
-        }
-    }
-}

src/App/Pages/Accounts/EnvironmentPageViewModel.cs

@@ -1,91 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Bit.App.Resources;
-using Bit.Core.Abstractions;
-using Bit.Core.Models.Data;
-using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
-
-namespace Bit.App.Pages
-{
-    public class EnvironmentPageViewModel : BaseViewModel
-    {
-        private readonly IEnvironmentService _environmentService;
-        readonly LazyResolve<ILogger> _logger = new LazyResolve<ILogger>("logger");
-
-        public EnvironmentPageViewModel()
-        {
-            _environmentService = ServiceContainer.Resolve<IEnvironmentService>("environmentService");
-
-            PageTitle = AppResources.Settings;
-            BaseUrl = _environmentService.BaseUrl == EnvironmentUrlData.DefaultEU.Base || EnvironmentUrlData.DefaultUS.Base == _environmentService.BaseUrl ?
-                string.Empty : _environmentService.BaseUrl;
-            WebVaultUrl = _environmentService.WebVaultUrl;
-            ApiUrl = _environmentService.ApiUrl;
-            IdentityUrl = _environmentService.IdentityUrl;
-            IconsUrl = _environmentService.IconsUrl;
-            NotificationsUrls = _environmentService.NotificationsUrl;
-            SubmitCommand = new AsyncCommand(SubmitAsync, onException: ex => OnSubmitException(ex), allowsMultipleExecutions: false);
-        }
-
-        public ICommand SubmitCommand { get; }
-        public string BaseUrl { get; set; }
-        public string ApiUrl { get; set; }
-        public string IdentityUrl { get; set; }
-        public string WebVaultUrl { get; set; }
-        public string IconsUrl { get; set; }
-        public string NotificationsUrls { get; set; }
-        public Action SubmitSuccessAction { get; set; }
-        public Action CloseAction { get; set; }
-
-        public async Task SubmitAsync()
-        {
-            if (!ValidateUrls())
-            {
-                await Page.DisplayAlert(AppResources.AnErrorHasOccurred, AppResources.EnvironmentPageUrlsError, AppResources.Ok);
-                return;
-            }
-
-            var resUrls = await _environmentService.SetUrlsAsync(new Core.Models.Data.EnvironmentUrlData
-            {
-                Base = BaseUrl,
-                Api = ApiUrl,
-                Identity = IdentityUrl,
-                WebVault = WebVaultUrl,
-                Icons = IconsUrl,
-                Notifications = NotificationsUrls
-            });
-
-            // re-set urls since service can change them, ex: prefixing https://
-            BaseUrl = resUrls.Base;
-            WebVaultUrl = resUrls.WebVault;
-            ApiUrl = resUrls.Api;
-            IdentityUrl = resUrls.Identity;
-            IconsUrl = resUrls.Icons;
-            NotificationsUrls = resUrls.Notifications;
-
-            SubmitSuccessAction?.Invoke();
-        }
-
-        public bool ValidateUrls()
-        {
-            bool IsUrlValid(string url)
-            {
-                return string.IsNullOrEmpty(url) || Uri.IsWellFormedUriString(url, UriKind.RelativeOrAbsolute);
-            }
-
-            return IsUrlValid(BaseUrl)
-                && IsUrlValid(ApiUrl)
-                && IsUrlValid(IdentityUrl)
-                && IsUrlValid(WebVaultUrl)
-                && IsUrlValid(IconsUrl);
-        }
-
-        private void OnSubmitException(Exception ex)
-        {
-            _logger.Value.Exception(ex);
-            Page.DisplayAlert(AppResources.AnErrorHasOccurred, AppResources.GenericErrorMessage, AppResources.Ok);
-        }
-    }
-}

src/App/Pages/Accounts/HintPageViewModel.cs

@@ -1,86 +0,0 @@
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Bit.App.Abstractions;
-using Bit.App.Resources;
-using Bit.Core.Abstractions;
-using Bit.Core.Exceptions;
-using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
-
-namespace Bit.App.Pages
-{
-    public class HintPageViewModel : BaseViewModel
-    {
-        private readonly IDeviceActionService _deviceActionService;
-        private readonly IPlatformUtilsService _platformUtilsService;
-        private readonly IApiService _apiService;
-        private readonly ILogger _logger;
-        private string _email;
-
-        public HintPageViewModel()
-        {
-            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
-            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
-            _apiService = ServiceContainer.Resolve<IApiService>("apiService");
-            _logger = ServiceContainer.Resolve<ILogger>();
-
-            PageTitle = AppResources.PasswordHint;
-            SubmitCommand = new AsyncCommand(SubmitAsync,
-                onException: ex =>
-                {
-                    _logger.Exception(ex);
-                    _deviceActionService.DisplayAlertAsync(AppResources.AnErrorHasOccurred, AppResources.GenericErrorMessage, AppResources.Ok).FireAndForget();
-                },
-                allowsMultipleExecutions: false);
-        }
-
-        public ICommand SubmitCommand { get; }
-
-        public string Email
-        {
-            get => _email;
-            set => SetProperty(ref _email, value);
-        }
-
-        public async Task SubmitAsync()
-        {
-            if (Microsoft.Maui.Networking.Connectivity.NetworkAccess == Microsoft.Maui.Networking.NetworkAccess.None)
-            {
-                await _platformUtilsService.ShowDialogAsync(AppResources.InternetConnectionRequiredMessage,
-                    AppResources.InternetConnectionRequiredTitle);
-                return;
-            }
-            if (string.IsNullOrWhiteSpace(Email))
-            {
-                await _deviceActionService.DisplayAlertAsync(AppResources.AnErrorHasOccurred,
-                    string.Format(AppResources.ValidationFieldRequired, AppResources.EmailAddress),
-                    AppResources.Ok);
-                return;
-            }
-            if (!Email.Contains("@"))
-            {
-                await _deviceActionService.DisplayAlertAsync(AppResources.AnErrorHasOccurred, AppResources.InvalidEmail, AppResources.Ok);
-                return;
-            }
-
-            try
-            {
-                await _deviceActionService.ShowLoadingAsync(AppResources.Submitting);
-                await _apiService.PostPasswordHintAsync(
-                    new Core.Models.Request.PasswordHintRequest { Email = Email });
-                await _deviceActionService.HideLoadingAsync();
-                await _deviceActionService.DisplayAlertAsync(null, AppResources.PasswordHintAlert, AppResources.Ok);
-                await Page.Navigation.PopModalAsync();
-            }
-            catch (ApiException e)
-            {
-                await _deviceActionService.HideLoadingAsync();
-                if (e?.Error != null)
-                {
-                    await _platformUtilsService.ShowDialogAsync(e.Error.GetSingleMessage(),
-                        AppResources.AnErrorHasOccurred);
-                }
-            }
-        }
-    }
-}

src/App/Pages/Accounts/HomePage.xaml

@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<pages:BaseContentPage 
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    x:Class="Bit.App.Pages.HomePage"
-    xmlns:pages="clr-namespace:Bit.App.Pages"
-    xmlns:controls="clr-namespace:Bit.App.Controls"
-    xmlns:u="clr-namespace:Bit.App.Utilities"
-    x:DataType="pages:HomeViewModel"
-    x:Name="_page"
-    Title="{Binding PageTitle}">
-    <ContentPage.BindingContext>
-        <pages:HomeViewModel />
-    </ContentPage.BindingContext>
-
-    <ContentPage.ToolbarItems>
-        <controls:ExtendedToolbarItem
-            x:Name="_accountAvatar"
-            x:Key="accountAvatar"
-            IconImageSource="{Binding AvatarImageSource}"
-            Command="{Binding Source={x:Reference _accountListOverlay}, Path=ToggleVisibililtyCommand}"
-            Order="Primary"
-            Priority="-1"
-            UseOriginalImage="True"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Account}"
-            AutomationId="AccountIconButton" />
-        <ToolbarItem x:Name="_closeButton" Text="{u:I18n Close}" Command="{Binding CloseCommand}" Order="Primary" Priority="-1"/>
-    </ContentPage.ToolbarItems>
-
-    <ContentPage.Resources>
-        <ResourceDictionary>
-            <u:InverseBoolConverter x:Key="inverseBool" />
-            <StackLayout x:Name="_mainLayout" x:Key="mainLayout" Spacing="30" Padding="20, 50, 20, 0">
-                <Image
-                    x:Name="_logo"
-                    Source="logo.png"
-                    VerticalOptions="Center" />
-                <Label Text="{u:I18n LoginOrCreateNewAccount}"
-                        StyleClass="text-lg"
-                        HorizontalTextAlignment="Center"/>
-                <StackLayout
-                    StyleClass="box-row">
-                    <Label
-                        Text="{u:I18n EmailAddress}"
-                        StyleClass="box-label" />
-                    <Entry
-                        x:Name="_email"
-                        Text="{Binding Email}"
-                        Keyboard="Email"
-                        StyleClass="box-value"
-                        ReturnType="Go"
-                        ReturnCommand="{Binding ContinueCommand}"
-                        AutomationId="EmailAddressEntry"
-                        >
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Disabled">
-                                    <VisualState.Setters>
-                                        <Setter Property="TextColor" Value="{DynamicResource MutedColor}" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                    </Entry>
-                    <StackLayout
-                        Orientation="Horizontal"
-                        Margin="0, 6, 0 ,0">
-                        <StackLayout.GestureRecognizers>
-                            <TapGestureRecognizer
-                                Command="{Binding ShowEnvironmentPickerCommand}" />
-                        </StackLayout.GestureRecognizers>
-                        <Label
-                            Text="{Binding RegionText}"
-                            FontSize="13"
-                            TextColor="{DynamicResource MutedColor}"
-                            VerticalOptions="Center"
-                            VerticalTextAlignment="Center"/>
-                        <controls:IconLabel
-                            Text="{Binding SelectedEnvironmentName}"
-                            FontSize="13"
-                            TextColor="{DynamicResource PrimaryColor}"
-                            VerticalOptions="Center"
-                            VerticalTextAlignment="Center"
-                            AutomationId="RegionSelectorDropdown"/>
-                    </StackLayout>
-                    <StackLayout
-                        Orientation="Horizontal"
-                        Margin="0, 20, 0 ,0">
-                        <StackLayout.GestureRecognizers>
-                            <TapGestureRecognizer
-                                Command="{Binding RememberEmailCommand}" />
-                        </StackLayout.GestureRecognizers>
-                        <Label
-                            Text="{u:I18n RememberMe}"
-                            StyleClass="text-sm"
-                            HorizontalOptions="FillAndExpand"
-                            VerticalOptions="Center"
-                            VerticalTextAlignment="Center"
-                            />
-                        <Switch
-                            Scale="0.8"
-                            IsToggled="{Binding RememberEmail}"
-                            VerticalOptions="Center"
-                            AutomationId="RememberMeSwitch"
-                            />
-                    </StackLayout>
-                </StackLayout>
-                <Button Text="{u:I18n Continue}"
-                        StyleClass="btn-primary"
-                        IsEnabled="{Binding CanContinue}"
-                        Command="{Binding ContinueCommand}"
-                        AutomationId="ContinueButton"
-                        />
-                        
-                <Label FormattedText="{Binding CreateAccountText}"
-                       Margin="0, 10"
-                        StyleClass="box-footer-label"
-                        AutomationId="CreateAccountLabel">
-                    <Label.GestureRecognizers>
-                        <TapGestureRecognizer Command="{Binding CreateAccountCommand}" />
-                    </Label.GestureRecognizers>
-                </Label>
-            </StackLayout>
-        </ResourceDictionary>
-    </ContentPage.Resources>
-
-    <AbsoluteLayout
-        x:Name="_absLayout"
-        VerticalOptions="FillAndExpand"
-        HorizontalOptions="FillAndExpand">
-        <ContentView
-            x:Name="_mainContent"
-            AbsoluteLayout.LayoutFlags="All"
-            AbsoluteLayout.LayoutBounds="0, 0, 1, 1">
-        </ContentView>
-
-        <controls:AccountSwitchingOverlayView
-            x:Name="_accountListOverlay"
-            AbsoluteLayout.LayoutBounds="0, 0, 1, 1"
-            AbsoluteLayout.LayoutFlags="All"
-            MainPage="{Binding Source={x:Reference _page}}"
-            BindingContext="{Binding AccountSwitchingOverlayViewModel}"/>
-    </AbsoluteLayout>
-</pages:BaseContentPage>

src/App/Pages/Accounts/HomePageViewModel.cs

@@ -1,220 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Bit.App.Abstractions;
-using Bit.App.Controls;
-using Bit.App.Resources;
-using Bit.App.Utilities;
-using Bit.Core;
-using Bit.Core.Abstractions;
-using Bit.Core.Models.Data;
-using Bit.Core.Models.Response;
-using Bit.Core.Services;
-using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
-
-namespace Bit.App.Pages
-{
-    public class HomeViewModel : BaseViewModel
-    {
-        private readonly IStateService _stateService;
-        private readonly IMessagingService _messagingService;
-        private readonly IPlatformUtilsService _platformUtilsService;
-        private readonly ILogger _logger;
-        private readonly IEnvironmentService _environmentService;
-        private readonly IAccountsManager _accountManager;
-        private readonly IConfigService _configService;
-
-        private bool _showCancelButton;
-        private bool _rememberEmail;
-        private string _email;
-        private string _selectedEnvironmentName;
-        private bool _isEmailEnabled;
-        private bool _canLogin;
-        private bool _displayEuEnvironment;
-
-        public HomeViewModel()
-        {
-            _stateService = ServiceContainer.Resolve<IStateService>();
-            _messagingService = ServiceContainer.Resolve<IMessagingService>();
-            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>();
-            _logger = ServiceContainer.Resolve<ILogger>();
-            _environmentService = ServiceContainer.Resolve<IEnvironmentService>();
-            _accountManager = ServiceContainer.Resolve<IAccountsManager>();
-            _configService = ServiceContainer.Resolve<IConfigService>();
-
-            PageTitle = AppResources.Bitwarden;
-
-            AccountSwitchingOverlayViewModel = new AccountSwitchingOverlayViewModel(_stateService, _messagingService, _logger)
-            {
-                AllowActiveAccountSelection = true
-            };
-            RememberEmailCommand = new Command(() => RememberEmail = !RememberEmail);
-            ContinueCommand = new AsyncCommand(ContinueToLoginStepAsync, allowsMultipleExecutions: false);
-            CreateAccountCommand = new AsyncCommand(async () => Device.InvokeOnMainThreadAsync(StartRegisterAction),
-                onException: _logger.Exception, allowsMultipleExecutions: false);
-            CloseCommand = new AsyncCommand(async () => Device.InvokeOnMainThreadAsync(CloseAction),
-                onException: _logger.Exception, allowsMultipleExecutions: false);
-            ShowEnvironmentPickerCommand = new AsyncCommand(ShowEnvironmentPickerAsync,
-                onException: _logger.Exception, allowsMultipleExecutions: false);
-            InitAsync().FireAndForget();
-        }
-
-        public bool ShowCancelButton
-        {
-            get => _showCancelButton;
-            set => SetProperty(ref _showCancelButton, value);
-        }
-
-        public bool RememberEmail
-        {
-            get => _rememberEmail;
-            set => SetProperty(ref _rememberEmail, value);
-        }
-
-        public string Email
-        {
-            get => _email;
-            set => SetProperty(ref _email, value,
-                additionalPropertyNames: new[] { nameof(CanContinue) });
-        }
-
-        public string SelectedEnvironmentName
-        {
-            get => $"{_selectedEnvironmentName} {BitwardenIcons.AngleDown}";
-            set => SetProperty(ref _selectedEnvironmentName, value);
-        }
-
-        public string RegionText => $"{AppResources.Region}:";
-        public bool CanContinue => !string.IsNullOrEmpty(Email);
-
-        public FormattedString CreateAccountText
-        {
-            get
-            {
-                var fs = new FormattedString();
-                fs.Spans.Add(new Span
-                {
-                    Text = $"{AppResources.NewAroundHere} "
-                });
-                fs.Spans.Add(new Span
-                {
-                    Text = AppResources.CreateAccount,
-                    TextColor = ThemeManager.GetResourceColor("PrimaryColor")
-                });
-                return fs;
-            }
-        }
-
-        public AccountSwitchingOverlayViewModel AccountSwitchingOverlayViewModel { get; }
-        public Action StartLoginAction { get; set; }
-        public Action StartRegisterAction { get; set; }
-        public Action StartSsoLoginAction { get; set; }
-        public Action StartEnvironmentAction { get; set; }
-        public Action CloseAction { get; set; }
-        public Command RememberEmailCommand { get; set; }
-        public AsyncCommand ContinueCommand { get; }
-        public AsyncCommand CloseCommand { get; }
-        public AsyncCommand CreateAccountCommand { get; }
-        public AsyncCommand ShowEnvironmentPickerCommand { get; }
-
-        public async Task InitAsync()
-        {
-            Email = await _stateService.GetRememberedEmailAsync();
-            RememberEmail = !string.IsNullOrEmpty(Email);
-            _displayEuEnvironment = await _configService.GetFeatureFlagBoolAsync(Constants.DisplayEuEnvironmentFlag, forceRefresh: true);
-        }
-
-        public async Task ContinueToLoginStepAsync()
-        {
-            try
-            {
-                if (string.IsNullOrWhiteSpace(Email))
-                {
-                    await _platformUtilsService.ShowDialogAsync(
-                        string.Format(AppResources.ValidationFieldRequired, AppResources.EmailAddress),
-                        AppResources.AnErrorHasOccurred, AppResources.Ok);
-                    return;
-                }
-                if (!Email.Contains("@"))
-                {
-                    await _platformUtilsService.ShowDialogAsync(AppResources.InvalidEmail, AppResources.AnErrorHasOccurred,
-                        AppResources.Ok);
-                    return;
-                }
-
-                await _stateService.SetRememberedEmailAsync(RememberEmail ? Email : null);
-                var userId = await _stateService.GetUserIdAsync(Email);
-
-                if (!string.IsNullOrWhiteSpace(userId) &&
-                    (await _stateService.GetEnvironmentUrlsAsync(userId))?.Base == _environmentService.BaseUrl &&
-                    await _stateService.IsAuthenticatedAsync(userId))
-                {
-                    await _accountManager.PromptToSwitchToExistingAccountAsync(userId);
-                    return;
-                }
-                StartLoginAction();
-            }
-            catch (Exception ex)
-            {
-                _logger.Exception(ex);
-                await _platformUtilsService.ShowDialogAsync(AppResources.GenericErrorMessage, AppResources.AnErrorHasOccurred, AppResources.Ok);
-            }
-        }
-
-        public async Task ShowEnvironmentPickerAsync()
-        {
-            _displayEuEnvironment = await _configService.GetFeatureFlagBoolAsync(Constants.DisplayEuEnvironmentFlag);
-            var options = _displayEuEnvironment
-                    ? new string[] { AppResources.US, AppResources.EU, AppResources.SelfHosted }
-                    : new string[] { AppResources.US, AppResources.SelfHosted };
-
-            await Device.InvokeOnMainThreadAsync(async () =>
-            {
-                var result = await Page.DisplayActionSheet(AppResources.DataRegion, AppResources.Cancel, null, options);
-
-                if (result is null || result == AppResources.Cancel)
-                {
-                    return;
-                }
-
-                if (result == AppResources.SelfHosted)
-                {
-                    StartEnvironmentAction?.Invoke();
-                    return;
-                }
-
-                await _environmentService.SetUrlsAsync(result == AppResources.EU ? EnvironmentUrlData.DefaultEU : EnvironmentUrlData.DefaultUS);
-                await _configService.GetAsync(true);
-                SelectedEnvironmentName = result;
-            });
-        }
-
-        public async Task UpdateEnvironment()
-        {
-            var environmentsSaved = await _stateService.GetPreAuthEnvironmentUrlsAsync();
-            if (environmentsSaved == null || environmentsSaved.IsEmpty)
-            {
-                await _environmentService.SetUrlsAsync(EnvironmentUrlData.DefaultUS);
-                environmentsSaved = EnvironmentUrlData.DefaultUS;
-                SelectedEnvironmentName = AppResources.US;
-                return;
-            }
-
-            if (environmentsSaved.Base == EnvironmentUrlData.DefaultUS.Base)
-            {
-                SelectedEnvironmentName = AppResources.US;
-            }
-            else if (environmentsSaved.Base == EnvironmentUrlData.DefaultEU.Base)
-            {
-                SelectedEnvironmentName = AppResources.EU;
-            }
-            else
-            {
-                await _configService.GetAsync(true);
-                SelectedEnvironmentName = AppResources.SelfHosted;
-            }
-        }
-    }
-}

src/App/Pages/Accounts/LockPage.xaml

@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<pages:BaseContentPage 
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    x:Class="Bit.App.Pages.LockPage"
-    xmlns:pages="clr-namespace:Bit.App.Pages"
-    xmlns:controls="clr-namespace:Bit.App.Controls"
-    xmlns:u="clr-namespace:Bit.App.Utilities"
-    x:DataType="pages:LockPageViewModel"
-    x:Name="_page"
-    Title="{Binding PageTitle}">
-
-    <ContentPage.BindingContext>
-        <pages:LockPageViewModel />
-    </ContentPage.BindingContext>
-
-    <ContentPage.ToolbarItems>
-        <controls:ExtendedToolbarItem
-                x:Name="_accountAvatar"
-                x:Key="accountAvatar"
-                IconImageSource="{Binding AvatarImageSource}"
-                Command="{Binding Source={x:Reference _accountListOverlay}, Path=ToggleVisibililtyCommand}"
-                Order="Primary"
-                Priority="-1"
-                UseOriginalImage="True"
-                AutomationProperties.IsInAccessibleTree="True"
-                AutomationProperties.Name="{u:I18n Account}"
-                AutomationId="AccountIconButton" />
-    </ContentPage.ToolbarItems>
-    
-    <ContentPage.Resources>
-        <ResourceDictionary>
-            <u:InverseBoolConverter x:Key="inverseBool" />
-            <ToolbarItem Icon="more_vert.png" Clicked="More_Clicked" Order="Primary"
-                x:Name="_moreItem" x:Key="moreItem"
-                AutomationProperties.IsInAccessibleTree="True"
-                AutomationProperties.Name="{u:I18n Options}" />
-            <ToolbarItem Text="{u:I18n LogOut}"
-                x:Key="logOut"
-                x:Name="_logOut"
-                Clicked="LogOut_Clicked"
-                Order="Secondary"/>
-
-            <ScrollView x:Name="_mainLayout" x:Key="mainLayout">
-                <StackLayout Spacing="20">
-                    <StackLayout StyleClass="box">
-                        <Grid
-                            StyleClass="box-row"
-                            IsVisible="{Binding PinLock}"
-                            Padding="0, 10, 0, 0">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="*" />
-                            </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <Label
-                                Text="{u:I18n PIN}"
-                                StyleClass="box-label"
-                                Grid.Row="0"
-                                Grid.Column="0" />
-                            <controls:MonoEntry
-                                x:Name="_pin"
-                                Text="{Binding Pin}"
-                                StyleClass="box-value"
-                                Keyboard="Numeric"
-                                IsSpellCheckEnabled="False"
-                                IsTextPredictionEnabled="False"
-                                IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
-                                Grid.Row="1"
-                                Grid.Column="0"
-                                ReturnType="Go"
-                                ReturnCommand="{Binding SubmitCommand}" 
-                                AutomationId="PinEntry" />
-                            <controls:IconButton
-                                StyleClass="box-row-button, box-row-button-platform"
-                                Text="{Binding ShowPasswordIcon}"
-                                Command="{Binding TogglePasswordCommand}"
-                                Grid.Row="0"
-                                Grid.Column="1"
-                                Grid.RowSpan="2"
-                                AutomationProperties.IsInAccessibleTree="True"
-                                AutomationProperties.Name="{u:I18n ToggleVisibility}" 
-                                AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
-                                AutomationId="PinVisibilityToggle" />
-                        </Grid>
-                        <Grid
-                            x:Name="_passwordGrid"
-                            StyleClass="box-row"
-                            IsVisible="{Binding PinLock, Converter={StaticResource inverseBool}}"
-                            Padding="0, 10, 0, 0">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="*" />
-                            </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <Label
-                                Text="{u:I18n MasterPassword}"
-                                StyleClass="box-label"
-                                Grid.Row="0"
-                                Grid.Column="0" />
-                            <controls:MonoEntry
-                                x:Name="_masterPassword"
-                                Text="{Binding MasterPassword}"
-                                StyleClass="box-value"
-                                IsSpellCheckEnabled="False"
-                                IsTextPredictionEnabled="False"
-                                IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
-                                Grid.Row="1"
-                                Grid.Column="0"
-                                ReturnType="Go"
-                                ReturnCommand="{Binding SubmitCommand}"
-                                AutomationId="MasterPasswordEntry" />
-                            <controls:IconButton
-                                StyleClass="box-row-button, box-row-button-platform"
-                                Text="{Binding ShowPasswordIcon}"
-                                Command="{Binding TogglePasswordCommand}"
-                                Grid.Row="0"
-                                Grid.Column="1"
-                                Grid.RowSpan="2"
-                                AutomationProperties.IsInAccessibleTree="True"
-                                AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                                AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
-                                AutomationId="PasswordVisibilityToggle"
-                                />
-                        </Grid>
-                        <StackLayout
-                            StyleClass="box-row"
-                            Padding="0, 10, 0, 0">
-                            <Label
-                                Text="{Binding LockedVerifyText}"
-                                StyleClass="box-footer-label" />
-                            <Label
-                                Text="{Binding LoggedInAsText}"
-                                StyleClass="box-footer-label"
-                                Margin="0, 10, 0, 0" />
-                        </StackLayout>
-                    </StackLayout>
-                    <StackLayout Padding="10, 0">
-                        <Label
-                            Text="{u:I18n AccountBiometricInvalidated}"
-                            StyleClass="box-footer-label,text-danger,text-bold"
-                            IsVisible="{Binding BiometricIntegrityValid, Converter={StaticResource inverseBool}}" />
-                        <Button Text="{Binding BiometricButtonText}" Clicked="Biometric_Clicked"
-                                IsVisible="{Binding BiometricButtonVisible}">
-                        </Button>
-                        <Button
-                            x:Name="_unlockButton"
-                            Text="{u:I18n Unlock}"
-                            StyleClass="btn-primary"
-                            Clicked="Unlock_Clicked"
-                            AutomationId="UnlockVaultButton" />
-                    </StackLayout>
-                </StackLayout>
-            </ScrollView>
-        </ResourceDictionary>
-    </ContentPage.Resources>
-
-    <AbsoluteLayout
-        x:Name="_absLayout"
-        VerticalOptions="FillAndExpand"
-        HorizontalOptions="FillAndExpand">
-        <ContentView
-            x:Name="_mainContent"
-            AbsoluteLayout.LayoutFlags="All"
-            AbsoluteLayout.LayoutBounds="0, 0, 1, 1">
-        </ContentView>
-
-        <controls:AccountSwitchingOverlayView
-            x:Name="_accountListOverlay"
-            AbsoluteLayout.LayoutBounds="0, 0, 1, 1"
-            AbsoluteLayout.LayoutFlags="All"
-            MainPage="{Binding Source={x:Reference _page}}"
-            BindingContext="{Binding AccountSwitchingOverlayViewModel}"/>
-        
-    </AbsoluteLayout>
-
-</pages:BaseContentPage>

src/App/Pages/Accounts/LockPage.xaml.cs

@@ -1,206 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Bit.App.Models;
-using Bit.App.Resources;
-using Bit.App.Utilities;
-using Bit.Core;
-using Bit.Core.Abstractions;
-using Bit.Core.Utilities;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
-
-namespace Bit.App.Pages
-{
-    public partial class LockPage : BaseContentPage
-    {
-        private readonly IBroadcasterService _broadcasterService;
-        private readonly AppOptions _appOptions;
-        private readonly bool _autoPromptBiometric;
-        private readonly LockPageViewModel _vm;
-
-        private bool _promptedAfterResume;
-        private bool _appeared;
-
-        public LockPage(AppOptions appOptions = null, bool autoPromptBiometric = true)
-        {
-            _appOptions = appOptions;
-            _autoPromptBiometric = autoPromptBiometric;
-            InitializeComponent();
-            _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>();
-            _vm = BindingContext as LockPageViewModel;
-            _vm.Page = this;
-            _vm.UnlockedAction = () => Device.BeginInvokeOnMainThread(async () => await UnlockedAsync());
-
-            // 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)
-            {
-                ToolbarItems.Add(_moreItem);
-            }
-            else
-            {
-                ToolbarItems.Add(_logOut);
-            }
-        }
-
-        public Entry SecretEntry
-        {
-            get
-            {
-                if (_vm?.PinLock ?? false)
-                {
-                    return _pin;
-                }
-                return _masterPassword;
-            }
-        }
-
-        public async Task PromptBiometricAfterResumeAsync()
-        {
-            if (_vm.BiometricLock)
-            {
-                await Task.Delay(500);
-                if (!_promptedAfterResume)
-                {
-                    _promptedAfterResume = true;
-                    await _vm?.PromptBiometricAsync();
-                }
-            }
-        }
-
-        protected override async void OnAppearing()
-        {
-            base.OnAppearing();
-            _broadcasterService.Subscribe(nameof(LockPage), message =>
-            {
-                if (message.Command == Constants.ClearSensitiveFields)
-                {
-                    Device.BeginInvokeOnMainThread(_vm.ResetPinPasswordFields);
-                }
-            });
-            if (_appeared)
-            {
-                return;
-            }
-
-            _appeared = true;
-            _mainContent.Content = _mainLayout;
-
-            _accountAvatar?.OnAppearing();
-
-            _vm.AvatarImageSource = await GetAvatarImageSourceAsync();
-
-            await _vm.InitAsync();
-
-            _vm.FocusSecretEntry += PerformFocusSecretEntry;
-
-            if (!_vm.BiometricLock)
-            {
-                RequestFocus(SecretEntry);
-            }
-            else
-            {
-                if (_vm.UsingKeyConnector && !_vm.PinLock)
-                {
-                    _passwordGrid.IsVisible = false;
-                    _unlockButton.IsVisible = false;
-                }
-                if (_autoPromptBiometric)
-                {
-                    var tasks = Task.Run(async () =>
-                    {
-                        await Task.Delay(500);
-                        Device.BeginInvokeOnMainThread(async () => await _vm.PromptBiometricAsync());
-                    });
-                }
-            }
-        }
-
-        private void PerformFocusSecretEntry(int? cursorPosition)
-        {
-            Device.BeginInvokeOnMainThread(() =>
-            {
-                SecretEntry.Focus();
-                if (cursorPosition.HasValue)
-                {
-                    SecretEntry.CursorPosition = cursorPosition.Value;
-                }
-            });
-        }
-
-        protected override bool OnBackButtonPressed()
-        {
-            if (_accountListOverlay.IsVisible)
-            {
-                _accountListOverlay.HideAsync().FireAndForget();
-                return true;
-            }
-            return false;
-        }
-
-        protected override void OnDisappearing()
-        {
-            base.OnDisappearing();
-
-            _accountAvatar?.OnDisappearing();
-            _broadcasterService.Unsubscribe(nameof(LockPage));
-        }
-
-        private void Unlock_Clicked(object sender, EventArgs e)
-        {
-            if (DoOnce())
-            {
-                var tasks = Task.Run(async () =>
-                {
-                    await Task.Delay(50);
-                    Device.BeginInvokeOnMainThread(async () => await _vm.SubmitAsync());
-                });
-            }
-        }
-
-        private async void LogOut_Clicked(object sender, EventArgs e)
-        {
-            await _accountListOverlay.HideAsync();
-            if (DoOnce())
-            {
-                await _vm.LogOutAsync();
-            }
-        }
-
-        private async void Biometric_Clicked(object sender, EventArgs e)
-        {
-            if (DoOnce())
-            {
-                await _vm.PromptBiometricAsync();
-            }
-        }
-
-        private async void More_Clicked(object sender, System.EventArgs e)
-        {
-            await _accountListOverlay.HideAsync();
-
-            if (!DoOnce())
-            {
-                return;
-            }
-
-            var selection = await DisplayActionSheet(AppResources.Options,
-                AppResources.Cancel, null, AppResources.LogOut);
-
-            if (selection == AppResources.LogOut)
-            {
-                await _vm.LogOutAsync();
-            }
-        }
-
-        private async Task UnlockedAsync()
-        {
-            if (AppHelpers.SetAlternateMainPage(_appOptions))
-            {
-                return;
-            }
-            var previousPage = await AppHelpers.ClearPreviousPage();
-
-            Application.Current.MainPage = new TabsPage(_appOptions, previousPage);
-        }
-    }
-}

src/App/Pages/Accounts/LockPageViewModel.cs

@@ -1,470 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Bit.App.Abstractions;
-using Bit.App.Controls;
-using Bit.App.Resources;
-using Bit.App.Utilities;
-using Bit.Core;
-using Bit.Core.Abstractions;
-using Bit.Core.Enums;
-using Bit.Core.Models.Domain;
-using Bit.Core.Models.Request;
-using Bit.Core.Services;
-using Bit.Core.Utilities;
-using CommunityToolkit.Maui.Converters;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
-
-namespace Bit.App.Pages
-{
-    public class LockPageViewModel : BaseViewModel
-    {
-        private readonly IApiService _apiService;
-        private readonly IPlatformUtilsService _platformUtilsService;
-        private readonly IDeviceActionService _deviceActionService;
-        private readonly IVaultTimeoutService _vaultTimeoutService;
-        private readonly ICryptoService _cryptoService;
-        private readonly IMessagingService _messagingService;
-        private readonly IEnvironmentService _environmentService;
-        private readonly IStateService _stateService;
-        private readonly IBiometricService _biometricService;
-        private readonly IKeyConnectorService _keyConnectorService;
-        private readonly ILogger _logger;
-        private readonly IWatchDeviceService _watchDeviceService;
-        private readonly WeakEventManager<int?> _secretEntryFocusWeakEventManager = new WeakEventManager<int?>();
-        private readonly IPolicyService _policyService;
-        private readonly IPasswordGenerationService _passwordGenerationService;
-
-        private string _email;
-        private string _masterPassword;
-        private string _pin;
-        private bool _showPassword;
-        private bool _pinLock;
-        private bool _biometricLock;
-        private bool _biometricIntegrityValid = true;
-        private bool _biometricButtonVisible;
-        private bool _usingKeyConnector;
-        private string _biometricButtonText;
-        private string _loggedInAsText;
-        private string _lockedVerifyText;
-        private bool _isPinProtected;
-        private bool _isPinProtectedWithKey;
-
-        public LockPageViewModel()
-        {
-            _apiService = ServiceContainer.Resolve<IApiService>("apiService");
-            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
-            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
-            _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
-            _cryptoService = ServiceContainer.Resolve<ICryptoService>("cryptoService");
-            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
-            _environmentService = ServiceContainer.Resolve<IEnvironmentService>("environmentService");
-            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
-            _biometricService = ServiceContainer.Resolve<IBiometricService>("biometricService");
-            _keyConnectorService = ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService");
-            _logger = ServiceContainer.Resolve<ILogger>("logger");
-            _watchDeviceService = ServiceContainer.Resolve<IWatchDeviceService>();
-            _policyService = ServiceContainer.Resolve<IPolicyService>();
-            _passwordGenerationService = ServiceContainer.Resolve<IPasswordGenerationService>();
-
-            PageTitle = AppResources.VerifyMasterPassword;
-            TogglePasswordCommand = new Command(TogglePassword);
-            SubmitCommand = new Command(async () => await SubmitAsync());
-
-            AccountSwitchingOverlayViewModel = new AccountSwitchingOverlayViewModel(_stateService, _messagingService, _logger)
-            {
-                AllowAddAccountRow = true,
-                AllowActiveAccountSelection = true
-            };
-        }
-
-        public string MasterPassword
-        {
-            get => _masterPassword;
-            set => SetProperty(ref _masterPassword, value);
-        }
-
-        public string Pin
-        {
-            get => _pin;
-            set => SetProperty(ref _pin, value);
-        }
-
-        public bool ShowPassword
-        {
-            get => _showPassword;
-            set => SetProperty(ref _showPassword, value,
-                additionalPropertyNames: new string[]
-                {
-                    nameof(ShowPasswordIcon),
-                    nameof(PasswordVisibilityAccessibilityText),
-                });
-        }
-
-        public bool PinLock
-        {
-            get => _pinLock;
-            set => SetProperty(ref _pinLock, value);
-        }
-
-        public bool UsingKeyConnector
-        {
-            get => _usingKeyConnector;
-        }
-
-        public bool BiometricLock
-        {
-            get => _biometricLock;
-            set => SetProperty(ref _biometricLock, value);
-        }
-
-        public bool BiometricIntegrityValid
-        {
-            get => _biometricIntegrityValid;
-            set => SetProperty(ref _biometricIntegrityValid, value);
-        }
-
-        public bool BiometricButtonVisible
-        {
-            get => _biometricButtonVisible;
-            set => SetProperty(ref _biometricButtonVisible, value);
-        }
-
-        public string BiometricButtonText
-        {
-            get => _biometricButtonText;
-            set => SetProperty(ref _biometricButtonText, value);
-        }
-
-        public string LoggedInAsText
-        {
-            get => _loggedInAsText;
-            set => SetProperty(ref _loggedInAsText, value);
-        }
-
-        public string LockedVerifyText
-        {
-            get => _lockedVerifyText;
-            set => SetProperty(ref _lockedVerifyText, value);
-        }
-
-        public AccountSwitchingOverlayViewModel AccountSwitchingOverlayViewModel { get; }
-
-        public Command SubmitCommand { get; }
-        public Command TogglePasswordCommand { get; }
-        public string ShowPasswordIcon => ShowPassword ? BitwardenIcons.EyeSlash : BitwardenIcons.Eye;
-        public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow;
-        public Action UnlockedAction { get; set; }
-        public event Action<int?> FocusSecretEntry
-        {
-            add => _secretEntryFocusWeakEventManager.AddEventHandler(value);
-            remove => _secretEntryFocusWeakEventManager.RemoveEventHandler(value);
-        }
-
-        public async Task InitAsync()
-        {
-            (_isPinProtected, _isPinProtectedWithKey) = await _vaultTimeoutService.IsPinLockSetAsync();
-            PinLock = (_isPinProtected && await _stateService.GetPinProtectedKeyAsync() != null) ||
-                      _isPinProtectedWithKey;
-            BiometricLock = await _vaultTimeoutService.IsBiometricLockSetAsync() && await _cryptoService.HasKeyAsync();
-
-            // Users with key connector and without biometric or pin has no MP to unlock with
-            _usingKeyConnector = await _keyConnectorService.GetUsesKeyConnector();
-            if (_usingKeyConnector && !(BiometricLock || PinLock))
-            {
-                await _vaultTimeoutService.LogOutAsync();
-                return;
-            }
-            _email = await _stateService.GetEmailAsync();
-            if (string.IsNullOrWhiteSpace(_email))
-            {
-                await _vaultTimeoutService.LogOutAsync();
-                _logger.Exception(new NullReferenceException("Email not found in storage"));
-                return;
-            }
-            var webVault = _environmentService.GetWebVaultUrl(true);
-            if (string.IsNullOrWhiteSpace(webVault))
-            {
-                webVault = "https://bitwarden.com";
-            }
-            var webVaultHostname = CoreHelpers.GetHostname(webVault);
-            LoggedInAsText = string.Format(AppResources.LoggedInAsOn, _email, webVaultHostname);
-            if (PinLock)
-            {
-                PageTitle = AppResources.VerifyPIN;
-                LockedVerifyText = AppResources.VaultLockedPIN;
-            }
-            else
-            {
-                if (_usingKeyConnector)
-                {
-                    PageTitle = AppResources.UnlockVault;
-                    LockedVerifyText = AppResources.VaultLockedIdentity;
-                }
-                else
-                {
-                    PageTitle = AppResources.VerifyMasterPassword;
-                    LockedVerifyText = AppResources.VaultLockedMasterPassword;
-                }
-            }
-
-            if (BiometricLock)
-            {
-                BiometricIntegrityValid = await _platformUtilsService.IsBiometricIntegrityValidAsync();
-                if (!_biometricIntegrityValid)
-                {
-                    BiometricButtonVisible = false;
-                    return;
-                }
-                BiometricButtonVisible = true;
-                BiometricButtonText = AppResources.UseBiometricsToUnlock;
-                // 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)
-                {
-                    var supportsFace = await _deviceActionService.SupportsFaceBiometricAsync();
-                    BiometricButtonText = supportsFace ? AppResources.UseFaceIDToUnlock :
-                        AppResources.UseFingerprintToUnlock;
-                }
-
-            }
-        }
-
-        public async Task SubmitAsync()
-        {
-            if (PinLock && string.IsNullOrWhiteSpace(Pin))
-            {
-                await Page.DisplayAlert(AppResources.AnErrorHasOccurred,
-                    string.Format(AppResources.ValidationFieldRequired, AppResources.PIN),
-                    AppResources.Ok);
-                return;
-            }
-            if (!PinLock && string.IsNullOrWhiteSpace(MasterPassword))
-            {
-                await Page.DisplayAlert(AppResources.AnErrorHasOccurred,
-                    string.Format(AppResources.ValidationFieldRequired, AppResources.MasterPassword),
-                    AppResources.Ok);
-                return;
-            }
-
-            ShowPassword = false;
-            var kdfConfig = await _stateService.GetActiveUserCustomDataAsync(a => new KdfConfig(a?.Profile));
-
-            if (PinLock)
-            {
-                var failed = true;
-                try
-                {
-                    if (_isPinProtected)
-                    {
-                        var key = await _cryptoService.MakeKeyFromPinAsync(Pin, _email,
-                            kdfConfig,
-                            await _stateService.GetPinProtectedKeyAsync());
-                        var encKey = await _cryptoService.GetEncKeyAsync(key);
-                        var protectedPin = await _stateService.GetProtectedPinAsync();
-                        var decPin = await _cryptoService.DecryptToUtf8Async(new EncString(protectedPin), encKey);
-                        failed = decPin != Pin;
-                        if (!failed)
-                        {
-                            Pin = string.Empty;
-                            await AppHelpers.ResetInvalidUnlockAttemptsAsync();
-                            await SetKeyAndContinueAsync(key);
-                        }
-                    }
-                    else
-                    {
-                        var key = await _cryptoService.MakeKeyFromPinAsync(Pin, _email, kdfConfig);
-                        failed = false;
-                        Pin = string.Empty;
-                        await AppHelpers.ResetInvalidUnlockAttemptsAsync();
-                        await SetKeyAndContinueAsync(key);
-                    }
-                }
-                catch
-                {
-                    failed = true;
-                }
-                if (failed)
-                {
-                    var invalidUnlockAttempts = await AppHelpers.IncrementInvalidUnlockAttemptsAsync();
-                    if (invalidUnlockAttempts >= 5)
-                    {
-                        _messagingService.Send("logout");
-                        return;
-                    }
-                    await _platformUtilsService.ShowDialogAsync(AppResources.InvalidPIN,
-                        AppResources.AnErrorHasOccurred);
-                }
-            }
-            else
-            {
-                var key = await _cryptoService.MakeKeyAsync(MasterPassword, _email, kdfConfig);
-                var storedKeyHash = await _cryptoService.GetKeyHashAsync();
-                var passwordValid = false;
-                MasterPasswordPolicyOptions enforcedMasterPasswordOptions = null;
-
-                if (storedKeyHash != null)
-                {
-                    passwordValid = await _cryptoService.CompareAndUpdateKeyHashAsync(MasterPassword, key);
-                }
-                else
-                {
-                    await _deviceActionService.ShowLoadingAsync(AppResources.Loading);
-                    var keyHash = await _cryptoService.HashPasswordAsync(MasterPassword, key, HashPurpose.ServerAuthorization);
-                    var request = new PasswordVerificationRequest();
-                    request.MasterPasswordHash = keyHash;
-
-                    try
-                    {
-                        var response = await _apiService.PostAccountVerifyPasswordAsync(request);
-                        enforcedMasterPasswordOptions = response.MasterPasswordPolicy;
-                        passwordValid = true;
-                        var localKeyHash = await _cryptoService.HashPasswordAsync(MasterPassword, key, HashPurpose.LocalAuthorization);
-                        await _cryptoService.SetKeyHashAsync(localKeyHash);
-                    }
-                    catch (Exception e)
-                    {
-                        System.Diagnostics.Debug.WriteLine(">>> {0}: {1}", e.GetType(), e.StackTrace);
-                    }
-                    await _deviceActionService.HideLoadingAsync();
-                }
-                if (passwordValid)
-                {
-                    if (_isPinProtected)
-                    {
-                        var protectedPin = await _stateService.GetProtectedPinAsync();
-                        var encKey = await _cryptoService.GetEncKeyAsync(key);
-                        var decPin = await _cryptoService.DecryptToUtf8Async(new EncString(protectedPin), encKey);
-                        var pinKey = await _cryptoService.MakePinKeyAysnc(decPin, _email, kdfConfig);
-                        await _stateService.SetPinProtectedKeyAsync(await _cryptoService.EncryptAsync(key.Key, pinKey));
-                    }
-
-                    if (await RequirePasswordChangeAsync(enforcedMasterPasswordOptions))
-                    {
-                        // Save the ForcePasswordResetReason to force a password reset after unlock
-                        await _stateService.SetForcePasswordResetReasonAsync(
-                            ForcePasswordResetReason.WeakMasterPasswordOnLogin);
-                    }
-
-                    MasterPassword = string.Empty;
-                    await AppHelpers.ResetInvalidUnlockAttemptsAsync();
-                    await SetKeyAndContinueAsync(key);
-
-                    // Re-enable biometrics
-                    if (BiometricLock & !BiometricIntegrityValid)
-                    {
-                        await _biometricService.SetupBiometricAsync();
-                    }
-                }
-                else
-                {
-                    var invalidUnlockAttempts = await AppHelpers.IncrementInvalidUnlockAttemptsAsync();
-                    if (invalidUnlockAttempts >= 5)
-                    {
-                        _messagingService.Send("logout");
-                        return;
-                    }
-                    await _platformUtilsService.ShowDialogAsync(AppResources.InvalidMasterPassword,
-                        AppResources.AnErrorHasOccurred);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Checks if the master password requires updating to meet the enforced policy requirements
-        /// </summary>
-        /// <param name="options"></param>
-        private async Task<bool> RequirePasswordChangeAsync(MasterPasswordPolicyOptions options = null)
-        {
-            // If no policy options are provided, attempt to load them from the policy service
-            var enforcedOptions = options ?? await _policyService.GetMasterPasswordPolicyOptions();
-
-            // No policy to enforce on login/unlock
-            if (!(enforcedOptions is { EnforceOnLogin: true }))
-            {
-                return false;
-            }
-
-            var strength = _passwordGenerationService.PasswordStrength(
-                MasterPassword, _passwordGenerationService.GetPasswordStrengthUserInput(_email))?.Score;
-
-            if (!strength.HasValue)
-            {
-                _logger.Error("Unable to evaluate master password strength during unlock");
-                return false;
-            }
-
-            return !await _policyService.EvaluateMasterPassword(
-                strength.Value,
-                MasterPassword,
-                enforcedOptions
-            );
-        }
-
-        public async Task LogOutAsync()
-        {
-            var confirmed = await _platformUtilsService.ShowDialogAsync(AppResources.LogoutConfirmation,
-                AppResources.LogOut, AppResources.Yes, AppResources.Cancel);
-            if (confirmed)
-            {
-                _messagingService.Send("logout");
-            }
-        }
-
-        public void ResetPinPasswordFields()
-        {
-            try
-            {
-                MasterPassword = string.Empty;
-                Pin = string.Empty;
-                ShowPassword = false;
-            }
-            catch (Exception ex)
-            {
-                LoggerHelper.LogEvenIfCantBeResolved(ex);
-            }
-        }
-
-        public void TogglePassword()
-        {
-            ShowPassword = !ShowPassword;
-            var secret = PinLock ? Pin : MasterPassword;
-            _secretEntryFocusWeakEventManager.RaiseEvent(string.IsNullOrEmpty(secret) ? 0 : secret.Length, nameof(FocusSecretEntry));
-        }
-
-        public async Task PromptBiometricAsync()
-        {
-            BiometricIntegrityValid = await _platformUtilsService.IsBiometricIntegrityValidAsync();
-            BiometricButtonVisible = BiometricIntegrityValid;
-            if (!BiometricLock || !BiometricIntegrityValid)
-            {
-                return;
-            }
-            var success = await _platformUtilsService.AuthenticateBiometricAsync(null,
-                PinLock ? AppResources.PIN : AppResources.MasterPassword,
-                () => _secretEntryFocusWeakEventManager.RaiseEvent((int?)null, nameof(FocusSecretEntry)));
-            await _stateService.SetBiometricLockedAsync(!success);
-            if (success)
-            {
-                await DoContinueAsync();
-            }
-        }
-
-        private async Task SetKeyAndContinueAsync(SymmetricCryptoKey key)
-        {
-            var hasKey = await _cryptoService.HasKeyAsync();
-            if (!hasKey)
-            {
-                await _cryptoService.SetKeyAsync(key);
-            }
-            await DoContinueAsync();
-        }
-
-        private async Task DoContinueAsync()
-        {
-            await _stateService.SetBiometricLockedAsync(false);
-            _watchDeviceService.SyncDataToWatchAsync().FireAndForget();
-            _messagingService.Send("unlocked");
-            UnlockedAction?.Invoke();
-        }
-    }
-}