Bump async from 2.6.3 to 2.6.4

Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4. - [Release notes](https://github.com/caolan/async/releases) - [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md) - [Commits](https://github.com/caolan/async/compare/v2.6.3...v2.6.4) --- updated-dependencies: - dependency-name: async dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
[deps]: Update actions/setup-dotnet action to v4 (#2947 )
2025-12-05 23:53:33 +00:00 · 2024-01-23 16:25:15 +00:00 · 2024-01-22 10:31:17 -05:00 · 2024-01-19 17:31:32 -05:00 · 2024-01-19 17:05:36 -05:00 · 2024-01-19 17:04:54 -05:00
1449 changed files with 226302 additions and 272349 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -0,0 +1,39 @@
+# Please sort into logical groups with comment headers. Sort groups in order of specificity.
+# For example, default owners should always be the first group.
+# Sort lines alphabetically within these groups to avoid accidentally adding duplicates.
+#
+# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
+
+# Default file owners
+* @bitwarden/dept-development-mobile
+
+# DevOps for Actions and other workflow changes
+.github/workflows @bitwarden/dept-devops
+
+## 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
+
+## Utils ##
+store/google/Publisher
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -8,16 +8,14 @@
    ":pinAllExceptPeerDependencies",
    ":prConcurrentLimit10",
    ":rebaseStalePrs",
-    "schedule:weekends",
-    ":separateMajorReleases"
+    ":separateMajorReleases",
+    "group:monorepos",
+    "schedule:weekends"
  ],
-  "enabledManagers": ["cargo", "github-actions", "npm", "nuget"],
+  "enabledManagers": ["github-actions", "npm", "nuget"],
+  "commitMessagePrefix": "[deps]:",
+  "commitMessageTopic": "{{depName}}",
  "packageRules": [
-    {
-      "groupName": "cargo minor",
-      "matchManagers": ["cargo"],
-      "matchUpdateTypes": ["minor", "patch"]
-    },
    {
      "groupName": "gh minor",
      "matchManagers": ["github-actions"],
@@ -32,6 +30,6 @@
      "groupName": "nuget minor",
      "matchManagers": ["nuget"],
      "matchUpdateTypes": ["minor", "patch"]
-    },
+    }
  ]
 }
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,15 +9,14 @@ on:
    paths-ignore:
      - ".github/workflows/**"
  workflow_dispatch:
-    inputs: {}

 jobs:
  cloc:
    name: CLOC
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    steps:
      - name: Checkout repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

      - name: Set up CLOC
        run: |
@@ -30,13 +29,13 @@ jobs:

  setup:
    name: Setup
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    outputs:
      rc_branch_exists: ${{ steps.branch-check.outputs.rc_branch_exists }}
      hotfix_branch_exists: ${{ steps.branch-check.outputs.hotfix_branch_exists }}
    steps:
      - name: Checkout repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
        with:
          submodules: 'true'

@@ -54,7 +53,6 @@ jobs:
          else
            echo "hotfix_branch_exists=0" >> $GITHUB_OUTPUT
          fi
-        shell: bash


  android:
@@ -72,7 +70,7 @@ jobs:
          nuget-version: 5.9.0

      - name: Set up .NET
-        uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0
+        uses: actions/setup-dotnet@4d6c8fcf3c8f7a60068d26b594648e99df24cee3 # v4.0.0
        with:
          dotnet-version: '3.1.x'

@@ -82,25 +80,12 @@ jobs:
      - name: Setup Windows builder
        run: choco install checksum --no-progress

-      - name: Work Around for broken Windows 2022 Runner Image
+      - name: Install Microsoft OpenJDK 11
        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
-          }
+          choco install microsoft-openjdk11 --no-progress
+          Write-Output "JAVA_HOME=$(Get-ChildItem -Path 'C:\Program Files\Microsoft\jdk*' | Select -First 1 -ExpandProperty FullName)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          Write-Output "Java Home: $env:JAVA_HOME"
+
      - name: Print environment
        run: |
          nuget help | grep Version
@@ -110,9 +95,10 @@ jobs:
          echo "GitHub event: $GITHUB_EVENT"

      - name: Checkout repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
        with:
          fetch-depth: 0
+
      - name: Decrypt secrets
        env:
          DECRYPT_FILE_PASSWORD: ${{ secrets.DECRYPT_FILE_PASSWORD }}
@@ -126,6 +112,7 @@ jobs:
          gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
            --output $HOME/secrets/play_creds.json ./.github/secrets/play_creds.json.gpg
        shell: bash
+
      - name: Decrypt secrets - Google Services
        if: ${{ matrix.variant == 'prod' }}
        env:
@@ -134,6 +121,7 @@ jobs:
          gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
            --output ./src/Android/google-services.json ./.github/secrets/google-services.json.gpg
        shell: bash
+
      - name: Increment version
        run: |
          BUILD_NUMBER=$((3000 + $GITHUB_RUN_NUMBER))
@@ -151,15 +139,12 @@ jobs:

      - name: Restore tools
        run: dotnet tool restore
-        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: Report test results
        uses: dorny/test-reporter@c9b3d0e2bd2a4e96aaf424dbaa31c46b42318226 # v1.6.0
@@ -186,8 +171,6 @@ jobs:
          Write-Output "########################################"
          msbuild "$($env:GITHUB_WORKSPACE + "/src/Android/Android.csproj")" "/p:Configuration=$configuration"

-        shell: pwsh
-
      - name: Sign Android Build
        env:
          PLAY_KEYSTORE_PASSWORD: ${{ secrets.PLAY_KEYSTORE_PASSWORD }}
@@ -234,10 +217,10 @@ jobs:
          $signedApkDestPath = $($env:GITHUB_WORKSPACE + "/$($packageName).apk");

          Copy-Item $signedApkPath $signedApkDestPath
-        shell: pwsh
+
      - name: Upload Prod .aab artifact
        if: ${{ matrix.variant == 'prod' }}
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
        with:
          name: com.x8bit.bitwarden.aab
          path: ./com.x8bit.bitwarden.aab
@@ -245,7 +228,7 @@ jobs:

      - name: Upload Prod .apk artifact
        if: ${{ matrix.variant == 'prod' }}
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
        with:
          name: com.x8bit.bitwarden.apk
          path: ./com.x8bit.bitwarden.apk
@@ -253,7 +236,7 @@ jobs:

      - name: Upload Other .apk artifact
        if: ${{ matrix.variant != 'prod' }}
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
        with:
          name: com.x8bit.bitwarden.${{ matrix.variant }}.apk
          path: ./com.x8bit.bitwarden.${{ matrix.variant }}.apk
@@ -273,7 +256,7 @@ jobs:

      - name: Upload .apk sha file for prod
        if: ${{ matrix.variant == 'prod' }}
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
        with:
          name: bw-android-apk-sha256.txt
          path: ./bw-android-apk-sha256.txt
@@ -281,14 +264,14 @@ jobs:

      - name: Upload .apk sha file for other
        if: ${{ matrix.variant != 'prod' }}
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
        with:
          name: bw-android-${{ matrix.variant }}-apk-sha256.txt
          path: ./bw-android-${{ matrix.variant }}-apk-sha256.txt
          if-no-files-found: error

      - name: Deploy to Play Store
-        if: ${{ matrix.variant == 'prod' && (( github.ref == 'refs/heads/master'
+        if: ${{ matrix.variant == 'prod' && (( github.ref == 'refs/heads/main'
          && needs.setup.outputs.rc_branch_exists == 0
          && needs.setup.outputs.hotfix_branch_exists == 0)
          || (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0)
@@ -318,25 +301,11 @@ jobs:
      - name: Setup Windows builder
        run: choco install checksum --no-progress

-      - name: Work Around for broken Windows 2022 Runner Image
+      - name: Install Microsoft OpenJDK 11
        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
-          }
+          choco install microsoft-openjdk11 --no-progress
+          Write-Output "JAVA_HOME=$(Get-ChildItem -Path 'C:\Program Files\Microsoft\jdk*' | Select -First 1 -ExpandProperty FullName)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          Write-Output "Java Home: $env:JAVA_HOME"

      - name: Print environment
        run: |
@@ -347,7 +316,7 @@ jobs:
          echo "GitHub event: $GITHUB_EVENT"

      - name: Checkout repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

      - name: Decrypt secrets
        env:
@@ -441,7 +410,6 @@ jobs:
          $appCenterNode.ParentNode.RemoveChild($appCenterNode);

          $xml.Save($corePath);
-        shell: pwsh

      - name: Restore packages
        run: nuget restore
@@ -455,7 +423,6 @@ jobs:
          Write-Output "########################################"

          msbuild "$($env:GITHUB_WORKSPACE + "/src/Android/Android.csproj")" "/p:Configuration=$configuration"
-        shell: pwsh

      - name: Sign for F-Droid
        env:
@@ -479,10 +446,9 @@ jobs:
          $signedApkDestPath = $($env:GITHUB_WORKSPACE + "/com.x8bit.bitwarden-fdroid.apk");

          Copy-Item $signedApkPath $signedApkDestPath
-        shell: pwsh

      - name: Upload F-Droid .apk artifact
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
        with:
          name: com.x8bit.bitwarden-fdroid.apk
          path: ./com.x8bit.bitwarden-fdroid.apk
@@ -494,7 +460,7 @@ jobs:
            -t sha256 | Out-File -Encoding ASCII ./bw-fdroid-apk-sha256.txt

      - name: Upload F-Droid sha file
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
        with:
          name: bw-fdroid-apk-sha256.txt
          path: ./bw-fdroid-apk-sha256.txt
@@ -520,28 +486,21 @@ jobs:
          echo "GitHub event: $GITHUB_EVENT"

      - name: Checkout repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
        with:
          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 }}

      - name: Retrieve secrets
        id: retrieve-secrets
-        env:
-          KEYVAULT: bitwarden-ci
-          SECRETS: |
-            appcenter-ios-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
+        uses: bitwarden/gh-actions/get-keyvault-secrets@main
+        with:
+          keyvault: "bitwarden-ci"
+          secrets: "appcenter-ios-token"

      - name: Decrypt secrets
        env:
@@ -570,7 +529,6 @@ jobs:
            ./.github/secrets/dist_watch_app_extension.mobileprovision.gpg
          gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
            --output ./src/watchOS/bitwarden/GoogleService-Info.plist ./.github/secrets/GoogleService-Info.plist.gpg
-        shell: bash

      - name: Increment version
        run: |
@@ -586,8 +544,6 @@ jobs:
          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
          cd src/watchOS/bitwarden
          agvtool new-version -all  $BUILD_NUMBER
-          cd ../../..
-        shell: bash

      - name: Update Entitlements
        run: |
@@ -596,7 +552,6 @@ jobs:
          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
-        shell: bash

      - name: Set up Keychain
        env:
@@ -613,7 +568,6 @@ jobs:
          security import ~/secrets/iphone-distribution-cert.p12 -k build.keychain -P $DIST_CERT_PASSWORD \
            -T /usr/bin/codesign -T /usr/bin/security
          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $KEYCHAIN_PASSWORD build.keychain
-        shell: bash

      - name: Set up provisioning profiles
        run: |
@@ -644,7 +598,6 @@ jobs:

          WATCH_APP_EXTENSION_UUID=$(grep UUID -A1 -a $WATCH_APP_EXTENSION_PROFILE_PATH | grep -io "[-A-F0-9]\{36\}")
          cp $WATCH_APP_EXTENSION_PROFILE_PATH "$PROFILES_DIR_PATH/$WATCH_APP_EXTENSION_UUID.mobileprovision"
-        shell: bash

      - name: Bulid WatchApp
        run: |
@@ -657,7 +610,6 @@ jobs:
          echo "########################################"
          echo "##### Done"
          echo "########################################"
-        shell: bash

      - name: Restore packages
        run: nuget restore
@@ -667,6 +619,22 @@ jobs:
          $configuration = "AppStore";
          $platform = "iPhone";

+          Write-Output "########################################"
+          Write-Output "##### Archive $configuration Configuration for $platform Platform"
+          Write-Output "########################################"
+          msbuild "$($env:GITHUB_WORKSPACE + "/src/iOS/iOS.csproj")" "/p:Platform=$platform" `
+            "/p:Configuration=$configuration" "/p:ArchiveOnBuild=true" "/t:`"Build`""
+
+          Write-Output "########################################"
+          Write-Output "##### Done"
+          Write-Output "########################################"
+        shell: pwsh
+
+      - name: Archive Build for Mobile Automation
+        run: |
+          $configuration = "Release";
+          $platform = "iPhoneSimulator";
+
          Write-Output "########################################"
          Write-Output "##### Archive $configuration Configuration for $platform Platform"
          Write-Output "########################################"
@@ -687,7 +655,14 @@ jobs:

          xcodebuild -exportArchive -archivePath $ARCHIVE_PATH -exportPath $EXPORT_PATH \
            -exportOptionsPlist $EXPORT_OPTIONS_PATH
-        shell: bash
+
+      - name: Export .app for Automation CI
+        run: |
+          ARCHIVE_PATH="./src/iOS/bin/iPhoneSimulator/Release/BitwardeniOS.app"
+          EXPORT_PATH="./bitwarden-export"
+
+          zip -r -q BitwardeniOS.app.zip $ARCHIVE_PATH
+          mv BitwardeniOS.app.zip $EXPORT_PATH

      - name: Copy all dSYMs files to upload
        run: |
@@ -700,10 +675,9 @@ jobs:
          cp -r -v $ARCHIVE_DSYMS_PATH $EXPORT_PATH
          mkdir $WATCH_DSYMS_EXPORT_PATH
          cp -r -v $WATCH_ARCHIVE_DSYMS_PATH $WATCH_DSYMS_EXPORT_PATH
-        shell: bash

      - name: Upload App Store .ipa & dSYMs artifacts
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
        with:
          name: Bitwarden iOS
          path: |
@@ -711,9 +685,16 @@ jobs:
            ./bitwarden-export/dSYMs/*.*
          if-no-files-found: error

+      - name: Upload .app file for Automation CI
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+        with:
+          name: BitwardeniOS.app.zip
+          path: ./bitwarden-export/BitwardeniOS.app.zip
+          if-no-files-found: error
+
      - name: Install AppCenter CLI
        if: |
-          (github.ref == 'refs/heads/master'
+          (github.ref == 'refs/heads/main'
            && needs.setup.outputs.rc_branch_exists == 0
            && needs.setup.outputs.hotfix_branch_exists == 0)
          || (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0)
@@ -722,7 +703,7 @@ jobs:

      - name: Upload dSYMs to App Center
        if: |
-          (github.ref == 'refs/heads/master'
+          (github.ref == 'refs/heads/main'
            && needs.setup.outputs.rc_branch_exists == 0
            && needs.setup.outputs.hotfix_branch_exists == 0)
          || (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0)
@@ -730,27 +711,24 @@ jobs:
        env:
          APPCENTER_IOS_TOKEN: ${{ steps.retrieve-secrets.outputs.appcenter-ios-token }}
        run: appcenter crashes upload-symbols -a bitwarden/bitwarden -s "./bitwarden-export/dSYMs" --token $APPCENTER_IOS_TOKEN
-        shell: bash

      - name: Upload Watch dSYMs to Firebase Crashlytics
        if: |
-          (github.ref == 'refs/heads/master'
+          (github.ref == 'refs/heads/main'
            && needs.setup.outputs.rc_branch_exists == 0
            && needs.setup.outputs.hotfix_branch_exists == 0)
          || (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0)
          || github.ref == 'refs/heads/hotfix-rc'
        run: |
-
          echo "########################################"
          echo "##### Uploading Watch dSYMs to Firebase"
          echo "########################################"

          find "$HOME/Library/Developer/XCode/DerivedData" -name "upload-symbols" -exec chmod +x {} \; -exec {} -gsp "./src/watchOS/bitwarden/GoogleService-Info.plist" -p ios "./bitwarden-export/Watch_dSYMs" \;
-        shell: bash

      - name: Deploy to App Store
        if: |
-          (github.ref == 'refs/heads/master'
+          (github.ref == 'refs/heads/main'
            && needs.setup.outputs.rc_branch_exists == 0
            && needs.setup.outputs.hotfix_branch_exists == 0)
          || (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0)
@@ -761,41 +739,33 @@ jobs:
        run: |
          xcrun altool --upload-app --type ios --file "./bitwarden-export/Bitwarden.ipa" \
              --username "$APPLE_ID_USERNAME" --password "$APPLE_ID_PASSWORD"
-        shell: bash


  crowdin-push:
    name: Crowdin Push
-    if: github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main'
    needs:
      - android
      - f-droid
      - ios
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    env:
      _CROWDIN_PROJECT_ID: "269690"
    steps:
      - name: Checkout repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

      - 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
-        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
+        uses: bitwarden/gh-actions/get-keyvault-secrets@main
+        with:
+          keyvault: "bitwarden-ci"
+          secrets: "crowdin-api-token"

      - name: Upload Sources
        uses: crowdin/github-action@965d501f160af7b1f88aed4c29154b0caf1e94b9 # v1.9.0
@@ -804,7 +774,7 @@ jobs:
          CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
        with:
          config: crowdin.yml
-          crowdin_branch_name: master
+          crowdin_branch_name: main 
          upload_sources: true
          upload_translations: false

@@ -812,7 +782,7 @@ jobs:
  check-failures:
    name: Check for failures
    if: always()
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    needs:
      - cloc
      - android
@@ -822,7 +792,7 @@ jobs:
    steps:
      - name: Check if any job failed
        if: |
-          (github.ref == 'refs/heads/master')
+          (github.ref == 'refs/heads/main')
          || (github.ref == 'refs/heads/rc')
          || (github.ref == 'refs/heads/hotfix-rc')
        env:
@@ -845,25 +815,18 @@ jobs:
          fi

      - name: Login to Azure - CI Subscription
-        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf # v1.4.3
+        uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.6
        if: failure()
        with:
          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}

      - name: Retrieve secrets
        id: retrieve-secrets
+        uses: bitwarden/gh-actions/get-keyvault-secrets@main
        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
+        with:
+          keyvault: "bitwarden-ci"
+          secrets: "devops-alerts-slack-webhook-url"

      - name: Notify Slack on failure
        uses: act10ns/slack@ed1309ab9862e57e9e583e51c7889486b9a00b0f # v2.0.0
--- a/.github/workflows/crowdin-pull.yml
+++ b/.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"
@@ -36,7 +36,7 @@ jobs:
          CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
        with:
          config: crowdin.yml
-          crowdin_branch_name: master
+          crowdin_branch_name: main
          upload_sources: false
          upload_translations: false
          download_translations: true
--- a/.github/workflows/pr-labeler.yml
+++ b/.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
--- a/.github/workflows/release.yml
+++ b/.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
@@ -80,14 +80,14 @@ jobs:
        with:
          workflow: build.yml
          workflow_conclusion: success
-          branch: master
+          branch: main

      - name: Prep Bitwarden iOS release asset
        run: zip -r Bitwarden\ iOS.zip Bitwarden\ iOS

      - 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' }}
@@ -143,13 +143,13 @@ jobs:
        with:
          workflow: build.yml
          workflow_conclusion: success
-          branch: master
+          branch: main
          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: |
--- a/.github/workflows/stale-bot.yml
+++ b/.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'
@@ -27,4 +27,4 @@ jobs:

            If you’re still working on this, please respond here after you’ve made the changes we’ve requested and our team will re-open it for further review.

-            Please make sure to resolve any conflicts with the master branch before requesting another review.
+            Please make sure to resolve any conflicts with the main branch before requesting another review.
--- a/.github/workflows/version-auto-bump.yml
+++ b/.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,6 @@ 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 }}
+    secrets: inherit
--- a/.github/workflows/version-bump.yml
+++ b/.github/workflows/version-bump.yml
@@ -1,43 +1,45 @@
 ---
 name: Version Bump
+run-name: Version Bump - v${{ inputs.version_number }}

 on:
  workflow_dispatch:
    inputs:
      version_number:
-        description: "New Version"
-        required: true
-  workflow_call:
-    inputs:
-      version_number:
-        required: true
-        type: string
-    secrets:
-      AZURE_PROD_KV_CREDENTIALS:
+        description: "New version (example: '2024.1.0')"
        required: true
+      cut_rc_branch:
+        description: "Cut RC branch?"
+        default: true
+        type: boolean

 jobs:
  bump_version:
-    name: "Create version_bump_${{ github.event.inputs.version_number }} branch"
-    runs-on: ubuntu-20.04
+    name: "Bump Version to v${{ inputs.version_number }}"
+    runs-on: ubuntu-22.04
    steps:
-      - name: Checkout Branch
-        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.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"
+          secrets: "github-gpg-private-key,
+            github-gpg-private-key-passphrase,
+            github-pat-bitwarden-devops-bot-repo-scope"
+
+      - name: Checkout Branch
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        with:
+          ref: main
+          repository: bitwarden/mobile

      - 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 }}
@@ -45,37 +47,68 @@ jobs:
          git_commit_gpgsign: true

      - name: Create Version Branch
-        run: git switch -c version_bump_${{ github.event.inputs.version_number }}
+        id: create-branch
+        run: |
+          NAME=version_bump_${{ github.ref_name }}_${{ inputs.version_number }}
+          git switch -c $NAME
+          echo "name=$NAME" >> $GITHUB_OUTPUT
+
+      - name: Install xmllint
+        run: sudo apt install -y libxml2-utils
+
+      - name: Verify input version
+        env:
+          NEW_VERSION: ${{ inputs.version_number }}
+        run: |
+          CURRENT_VERSION=$(xmllint --xpath '
+            string(/manifest/@*[local-name()="versionName" 
+              and namespace-uri()="http://schemas.android.com/apk/res/android"])
+            ' src/Android/Properties/AndroidManifest.xml)
+
+          # Error if version has not changed.
+          if [[ "$NEW_VERSION" == "$CURRENT_VERSION" ]]; then
+            echo "Version has not changed."
+            exit 1
+          fi
+
+          # Check if version is newer.
+          printf '%s\n' "${CURRENT_VERSION}" "${NEW_VERSION}" | sort -C -V
+          if [ $? -eq 0 ]; then
+            echo "Version check successful."
+          else
+            echo "Version check failed."
+            exit 1
+          fi

      - 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"
+          version: ${{ 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"
+          version: ${{ 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"
+          version: ${{ 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"
+          version: ${{ 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"
+          version: ${{ inputs.version_number }}
+          file_path: "src/iOS/Info.plist"

      - name: Setup git
        run: |
@@ -94,22 +127,24 @@ jobs:

      - name: Commit files
        if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }}
-        run: git commit -m "Bumped version to ${{ github.event.inputs.version_number }}" -a
+        run: git commit -m "Bumped version to ${{ inputs.version_number }}" -a

      - name: Push changes
        if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }}
-        run: git push -u origin version_bump_${{ github.event.inputs.version_number }}
+        env:
+          PR_BRANCH: ${{ steps.create-branch.outputs.name }}
+        run: git push -u origin $PR_BRANCH

      - name: Create Version PR
        if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }}
+        id: create-pr
        env:
-          PR_BRANCH: "version_bump_${{ github.event.inputs.version_number }}"
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-          BASE_BRANCH: master
-          TITLE: "Bump version to ${{ github.event.inputs.version_number }}"
+          GH_TOKEN: ${{ steps.retrieve-secrets.outputs.github-pat-bitwarden-devops-bot-repo-scope }}
+          PR_BRANCH: ${{ steps.create-branch.outputs.name }}
+          TITLE: "Bump version to ${{ inputs.version_number }}"
        run: |
-          gh pr create --title "$TITLE" \
-            --base "$BASE" \
+          PR_URL=$(gh pr create --title "$TITLE" \
+            --base "main" \
            --head "$PR_BRANCH" \
            --label "version update" \
            --label "automated pr" \
@@ -122,4 +157,42 @@ jobs:
              - [X] Other

              ## Objective
-              Automated version bump to ${{ github.event.inputs.version_number }}"
+              Automated version bump to ${{ inputs.version_number }}")
+          echo "pr_number=${PR_URL##*/}" >> $GITHUB_OUTPUT
+
+      - name: Approve PR
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          PR_NUMBER: ${{ steps.create-pr.outputs.pr_number }}
+        run: gh pr review $PR_NUMBER --approve
+
+      - name: Merge PR
+        env:
+          GH_TOKEN: ${{ steps.retrieve-secrets.outputs.github-pat-bitwarden-devops-bot-repo-scope }}
+          PR_NUMBER: ${{ steps.create-pr.outputs.pr_number }}
+        run: gh pr merge $PR_NUMBER --squash --auto --delete-branch
+
+  cut_rc:
+    name: Cut RC branch
+    needs: bump_version
+    if: ${{ inputs.cut_rc_branch == true }}
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout Branch
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        with:
+          ref: main
+
+      - name: Check if RC branch exists
+        run: |
+          remote_rc_branch_check=$(git ls-remote --heads origin rc | wc -l)
+          if [[ "${remote_rc_branch_check}" -gt 0 ]]; then
+            echo "Remote RC branch exists."
+            echo "Please delete current RC branch before running again."
+            exit 1
+          fi
+
+      - name: Cut RC branch
+        run: |
+          git switch --quiet --create rc
+          git push --quiet --set-upstream origin rc
--- a/.github/workflows/workflow-linter.yml
+++ b/.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
--- a/global.json
+++ b/global.json
@@ -1,5 +1,7 @@
 {
  "sdk": {
-    "version": "7.0.306"
+    "version": "7.0.400",
+    "rollForward": "latestPatch",
+    "allowPrerelease": false
  }
-}
+}
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,7 +8,7 @@
      "name": "bitwarden-mobile",
      "version": "0.0.0",
      "devDependencies": {
-        "gh-pages": "^3.2.3"
+        "gh-pages": "3.2.3"
      }
    },
    "node_modules/array-union": {
@@ -33,9 +33,9 @@
      }
    },
    "node_modules/async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
      "dev": true,
      "dependencies": {
        "lodash": "^4.17.14"
@@ -480,9 +480,9 @@
      "dev": true
    },
    "async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
      "dev": true,
      "requires": {
        "lodash": "^4.17.14"
--- a/package.json
+++ b/package.json
@@ -6,6 +6,6 @@
    "clean:l10n": "git push origin --delete l10n_master"
  },
  "devDependencies": {
-    "gh-pages": "^3.2.3"
+    "gh-pages": "3.2.3"
  }
 }
--- a/src/Android/Accessibility/AccessibilityHelpers.cs
+++ b/src/Android/Accessibility/AccessibilityHelpers.cs
@@ -107,6 +107,7 @@ namespace Bit.Droid.Accessibility
            new Browser("org.bromite.chromium", "url_bar"),
            new Browser("org.chromium.chrome", "url_bar"),
            new Browser("org.codeaurora.swe.browser", "url_bar"),
+            new Browser("org.cromite.cromite", "url_bar"),
            new Browser("org.gnu.icecat", "url_bar_title,mozac_browser_toolbar_url_view"), // 2nd = Anticipation
            new Browser("org.mozilla.fenix", "mozac_browser_toolbar_url_view"),
            new Browser("org.mozilla.fenix.nightly", "mozac_browser_toolbar_url_view"), // [DEPRECATED ENTRY]
--- a/src/Android/Android.csproj
+++ b/src/Android/Android.csproj
@@ -77,21 +77,21 @@
    <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.AndroidX.AppCompat" Version="1.6.1.3" />
+    <PackageReference Include="Xamarin.AndroidX.AutoFill" Version="1.1.0.18" />
+    <PackageReference Include="Xamarin.AndroidX.CardView" Version="1.0.0.21" />
+    <PackageReference Include="Xamarin.AndroidX.Core" Version="1.10.1.2" />
+    <PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="1.4.0.2" />
    <PackageReference Include="Xamarin.Essentials">
-      <Version>1.7.5</Version>
+      <Version>1.8.0</Version>
    </PackageReference>
    <PackageReference Include="Xamarin.Firebase.Messaging">
-      <Version>123.1.1.1</Version>
+      <Version>123.1.2.2</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.Google.Android.Material" Version="1.9.0.2" />
+    <PackageReference Include="Xamarin.Google.Dagger" Version="2.46.1.2" />
    <PackageReference Include="Xamarin.GooglePlayServices.SafetyNet">
-      <Version>118.0.1.3</Version>
+      <Version>118.0.1.5</Version>
    </PackageReference>
  </ItemGroup>
  <ItemGroup>
@@ -245,6 +245,14 @@
      <SubType></SubType>
      <Generator></Generator>
    </AndroidResource>
+    <AndroidResource Include="Resources\drawable\empty_login_requests.xml">
+      <SubType></SubType>
+      <Generator></Generator>
+    </AndroidResource>
+    <AndroidResource Include="Resources\drawable\empty_login_requests_dark.xml">
+      <SubType></SubType>
+      <Generator></Generator>
+    </AndroidResource>
  </ItemGroup>
  <ItemGroup>
    <AndroidResource Include="Resources\drawable\splash_screen.xml" />
--- a/src/Android/Autofill/AutofillHelpers.cs
+++ b/src/Android/Autofill/AutofillHelpers.cs
@@ -20,6 +20,7 @@ using AndroidX.AutoFill.Inline.V1;
 using Bit.Core.Abstractions;
 using SaveFlags = Android.Service.Autofill.SaveFlags;
 using Bit.Droid.Utilities;
+using Bit.Core.Services;

 namespace Bit.Droid.Autofill
 {
@@ -127,6 +128,7 @@ namespace Bit.Droid.Autofill
            "org.bromite.chromium",
            "org.chromium.chrome",
            "org.codeaurora.swe.browser",
+            "org.cromite.cromite",
            "org.gnu.icecat",
            "org.mozilla.fenix",
            "org.mozilla.fenix.nightly",
@@ -152,8 +154,9 @@ namespace Bit.Droid.Autofill
            "androidapp://com.oneplus.applocker",
        };

-        public static async Task<List<FilledItem>> GetFillItemsAsync(Parser parser, ICipherService cipherService)
+        public static async Task<List<FilledItem>> GetFillItemsAsync(Parser parser, ICipherService cipherService, IUserVerificationService userVerificationService)
        {
+            var userHasMasterPassword = await userVerificationService.HasMasterPasswordAsync();
            if (parser.FieldCollection.FillableForLogin)
            {
                var ciphers = await cipherService.GetAllDecryptedByUrlAsync(parser.Uri);
@@ -161,14 +164,14 @@ namespace Bit.Droid.Autofill
                {
                    var allCiphers = ciphers.Item1.ToList();
                    allCiphers.AddRange(ciphers.Item2.ToList());
-                    var nonPromptCiphers = allCiphers.Where(cipher => cipher.Reprompt == CipherRepromptType.None);
+                    var nonPromptCiphers = allCiphers.Where(cipher => !userHasMasterPassword || 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 ciphers.Where(c => c.Type == CipherType.Card && (!userHasMasterPassword || c.Reprompt == CipherRepromptType.None)).Select(c => new FilledItem(c)).ToList();
            }
            return new List<FilledItem>();
        }
--- a/src/Android/Autofill/AutofillService.cs
+++ b/src/Android/Autofill/AutofillService.cs
@@ -11,6 +11,7 @@ using Android.Widget;
 using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
+using Bit.Core.Services;
 using Bit.Core.Utilities;

 namespace Bit.Droid.Autofill
@@ -26,6 +27,7 @@ namespace Bit.Droid.Autofill
        private IPolicyService _policyService;
        private IStateService _stateService;
        private LazyResolve<ILogger> _logger = new LazyResolve<ILogger>("logger");
+        private IUserVerificationService _userVerificationService;

        public async override void OnFillRequest(FillRequest request, CancellationSignal cancellationSignal,
            FillCallback callback)
@@ -64,11 +66,9 @@ namespace Bit.Droid.Autofill
                var locked = await _vaultTimeoutService.IsLockedAsync();
                if (!locked)
                {
-                    if (_cipherService == null)
-                    {
-                        _cipherService = ServiceContainer.Resolve<ICipherService>("cipherService");
-                    }
-                    items = await AutofillHelpers.GetFillItemsAsync(parser, _cipherService);
+                    _cipherService ??= ServiceContainer.Resolve<ICipherService>();
+                    _userVerificationService ??=  ServiceContainer.Resolve<IUserVerificationService>();
+                    items = await AutofillHelpers.GetFillItemsAsync(parser, _cipherService, _userVerificationService);
                }

                // build response
--- a/src/Android/Constants.cs
+++ b/src/Android/Constants.cs
@@ -3,5 +3,11 @@
    public static class Constants
    {
        public const string PACKAGE_NAME = "com.x8bit.bitwarden";
+        public const string TEMP_CAMERA_IMAGE_NAME = "temp_camera_image.jpg";
+        
+        /// <summary>
+        /// This directory must also be declared in filepaths.xml
+        /// </summary>
+        public const string TEMP_CAMERA_IMAGE_DIR = "camera_temp";
    }
 }
--- a/src/Android/MainActivity.cs
+++ b/src/Android/MainActivity.cs
@@ -116,7 +116,7 @@ namespace Bit.Droid
                {
                    ListenYubiKey((bool)message.Data);
                }
-                else if (message.Command == "updatedTheme")
+                else if (message.Command is ThemeManager.UPDATED_THEME_MESSAGE_KEY)
                {
                    Xamarin.Forms.Device.BeginInvokeOnMainThread(() => AppearanceAdjustments());
                }
@@ -239,18 +239,22 @@ namespace Bit.Droid
                string fileName = null;
                if (data != null && data.Data != null)
                {
-                    uri = data.Data;
-                    fileName = AndroidHelpers.GetFileName(ApplicationContext, uri);
+                    if (data.Data.ToString()?.Contains(Constants.PACKAGE_NAME) != true)
+                    {
+                        uri = data.Data;
+                        fileName = AndroidHelpers.GetFileName(ApplicationContext, uri);
+                    }
                }
                else
                {
                    // camera
-                    var file = new Java.IO.File(FilesDir, "temp_camera_photo.jpg");
+                    var tmpDir = new Java.IO.File(FilesDir, Constants.TEMP_CAMERA_IMAGE_DIR);
+                    var file = new Java.IO.File(tmpDir, Constants.TEMP_CAMERA_IMAGE_NAME);
                    uri = FileProvider.GetUriForFile(this, "com.x8bit.bitwarden.fileprovider", file);
                    fileName = $"photo_{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}.jpg";
                }

-                if (uri == null)
+                if (uri == null || fileName == null)
                {
                    return;
                }
--- a/src/Android/MainApplication.cs
+++ b/src/Android/MainApplication.cs
@@ -68,9 +68,9 @@ namespace Bit.Droid
                ServiceContainer.Register<IDeleteAccountActionFlowExecutioner>("deleteAccountActionFlowExecutioner", deleteAccountActionFlowExecutioner);

                var verificationActionsFlowHelper = new VerificationActionsFlowHelper(
-                    ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService"),
                    ServiceContainer.Resolve<IPasswordRepromptService>("passwordRepromptService"),
-                    ServiceContainer.Resolve<ICryptoService>("cryptoService"));
+                    ServiceContainer.Resolve<ICryptoService>("cryptoService"),
+                    ServiceContainer.Resolve<IUserVerificationService>());
                ServiceContainer.Register<IVerificationActionsFlowHelper>("verificationActionsFlowHelper", verificationActionsFlowHelper);

                var accountsManager = new AccountsManager(
@@ -156,10 +156,11 @@ namespace Bit.Droid
                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);
+            var biometricService = new BiometricService(stateService, cryptoService);
+            var userPinService = new UserPinService(stateService, cryptoService);
+            var passwordRepromptService = new MobilePasswordRepromptService(platformUtilsService, cryptoService, stateService);

            ServiceContainer.Register<ISynchronousStorageService>(preferencesStorage);
            ServiceContainer.Register<IBroadcasterService>("broadcasterService", broadcasterService);
@@ -182,6 +183,7 @@ namespace Bit.Droid
            ServiceContainer.Register<ICryptoService>("cryptoService", cryptoService);
            ServiceContainer.Register<IPasswordRepromptService>("passwordRepromptService", passwordRepromptService);
            ServiceContainer.Register<IAvatarImageSourcePool>("avatarImageSourcePool", new AvatarImageSourcePool());
+            ServiceContainer.Register<IUserPinService>(userPinService);

            // Push
 #if FDROID
--- a/src/Android/Properties/AndroidManifest.xml
+++ b/src/Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2023.7.1" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2024.1.1" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
 	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.NFC" />
--- a/src/Android/Resources/drawable/empty_login_requests.xml
+++ b/src/Android/Resources/drawable/empty_login_requests.xml
@@ -0,0 +1,41 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="200"
+    android:viewportHeight="143"
+    android:width="200dp"
+    android:height="143dp">
+    <path
+        android:pathData="M34 43H10C6.68629 43 4 45.6863 4 49V109C4 112.314 6.68629 115 10 115H34C37.3137 115 40 112.314 40 109V49C40 45.6863 37.3137 43 34 43ZM10 39C4.47715 39 0 43.4772 0 49V109C0 114.523 4.47715 119 10 119H34C39.5228 119 44 114.523 44 109V49C44 43.4772 39.5228 39 34 39H10Z"
+        android:fillType="evenOdd"
+        android:fillColor="#89929F" />
+    <path
+        android:pathData="M20.3701 47.809C20.3701 47.2567 20.8178 46.809 21.3701 46.809H22.6122C23.1645 46.809 23.6122 47.2567 23.6122 47.809C23.6122 48.3612 23.1645 48.809 22.6122 48.809H21.3701C20.8178 48.809 20.3701 48.3612 20.3701 47.809Z"
+        android:fillType="evenOdd"
+        android:fillColor="#89929F" />
+    <path
+        android:pathData="M68 120C68 119.448 68.4477 119 69 119H127C127.552 119 128 119.448 128 120C128 120.552 127.552 121 127 121H69C68.4477 121 68 120.552 68 120Z"
+        android:fillType="evenOdd"
+        android:fillColor="#89929F" />
+    <path
+        android:pathData="M87.7402 120V102.236H89.7402V120H87.7402Z"
+        android:fillType="evenOdd"
+        android:fillColor="#89929F" />
+    <path
+        android:pathData="M107.71 120V102.236H109.71V120H107.71Z"
+        android:fillType="evenOdd"
+        android:fillColor="#89929F" />
+    <path
+        android:pathData="M27 25C27 17.268 33.268 11 41 11H157C164.732 11 171 17.268 171 25V31H167V25C167 19.4772 162.523 15 157 15H41C35.4772 15 31 19.4772 31 25V41H27V25ZM42 99H127V103H42V99Z"
+        android:fillType="evenOdd"
+        android:fillColor="#89929F" />
+    <path
+        android:pathData="M35 26C35 22.134 38.134 19 42 19H156C159.866 19 163 22.134 163 26V31H161V26C161 23.2386 158.761 21 156 21H42C39.2386 21 37 23.2386 37 26V41H35V26ZM42 93H127V95H42V93Z"
+        android:fillType="evenOdd"
+        android:fillColor="#89929F" />
+    <path
+        android:pathData="M125 39C125 33.4771 129.477 29 135 29H188C193.523 29 198 33.4772 198 39V119C198 124.523 193.523 129 188 129H135C129.477 129 125 124.523 125 119V39ZM135 33C131.686 33 129 35.6863 129 39V119C129 122.314 131.686 125 135 125H188C191.314 125 194 122.314 194 119V39C194 35.6863 191.314 33 188 33H135Z"
+        android:fillType="evenOdd"
+        android:fillColor="#89929F" />
+    <path
+        android:pathData="M164 120C164 121.105 163.105 122 162 122C160.895 122 160 121.105 160 120C160 118.895 160.895 118 162 118C163.105 118 164 118.895 164 120Z"
+        android:fillColor="#89929F" />
+</vector>
--- a/src/Android/Resources/drawable/empty_login_requests_dark.xml
+++ b/src/Android/Resources/drawable/empty_login_requests_dark.xml
@@ -0,0 +1,41 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="200"
+    android:viewportHeight="143"
+    android:width="200dp"
+    android:height="143dp">
+    <path
+        android:pathData="M34 43H10C6.68629 43 4 45.6863 4 49V109C4 112.314 6.68629 115 10 115H34C37.3137 115 40 112.314 40 109V49C40 45.6863 37.3137 43 34 43ZM10 39C4.47715 39 0 43.4772 0 49V109C0 114.523 4.47715 119 10 119H34C39.5228 119 44 114.523 44 109V49C44 43.4772 39.5228 39 34 39H10Z"
+        android:fillType="evenOdd"
+        android:fillColor="#A3A3A3" />
+    <path
+        android:pathData="M20.3701 47.809C20.3701 47.2567 20.8178 46.809 21.3701 46.809H22.6122C23.1645 46.809 23.6122 47.2567 23.6122 47.809C23.6122 48.3612 23.1645 48.809 22.6122 48.809H21.3701C20.8178 48.809 20.3701 48.3612 20.3701 47.809Z"
+        android:fillType="evenOdd"
+        android:fillColor="#A3A3A3" />
+    <path
+        android:pathData="M68 120C68 119.448 68.4477 119 69 119H127C127.552 119 128 119.448 128 120C128 120.552 127.552 121 127 121H69C68.4477 121 68 120.552 68 120Z"
+        android:fillType="evenOdd"
+        android:fillColor="#A3A3A3" />
+    <path
+        android:pathData="M87.7402 120V102.236H89.7402V120H87.7402Z"
+        android:fillType="evenOdd"
+        android:fillColor="#A3A3A3" />
+    <path
+        android:pathData="M107.71 120V102.236H109.71V120H107.71Z"
+        android:fillType="evenOdd"
+        android:fillColor="#A3A3A3" />
+    <path
+        android:pathData="M27 25C27 17.268 33.268 11 41 11H157C164.732 11 171 17.268 171 25V31H167V25C167 19.4772 162.523 15 157 15H41C35.4772 15 31 19.4772 31 25V41H27V25ZM42 99H127V103H42V99Z"
+        android:fillType="evenOdd"
+        android:fillColor="#A3A3A3" />
+    <path
+        android:pathData="M35 26C35 22.134 38.134 19 42 19H156C159.866 19 163 22.134 163 26V31H161V26C161 23.2386 158.761 21 156 21H42C39.2386 21 37 23.2386 37 26V41H35V26ZM42 93H127V95H42V93Z"
+        android:fillType="evenOdd"
+        android:fillColor="#A3A3A3" />
+    <path
+        android:pathData="M125 39C125 33.4771 129.477 29 135 29H188C193.523 29 198 33.4772 198 39V119C198 124.523 193.523 129 188 129H135C129.477 129 125 124.523 125 119V39ZM135 33C131.686 33 129 35.6863 129 39V119C129 122.314 131.686 125 135 125H188C191.314 125 194 122.314 194 119V39C194 35.6863 191.314 33 188 33H135Z"
+        android:fillType="evenOdd"
+        android:fillColor="#A3A3A3" />
+    <path
+        android:pathData="M164 120C164 121.105 163.105 122 162 122C160.895 122 160 121.105 160 120C160 118.895 160.895 118 162 118C163.105 118 164 118.895 164 120Z"
+        android:fillColor="#A3A3A3" />
+</vector>
--- a/src/Android/Resources/xml/autofillservice.xml
+++ b/src/Android/Resources/xml/autofillservice.xml
@@ -236,6 +236,9 @@
  <compatibility-package
    android:name="org.codeaurora.swe.browser"
    android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="org.cromite.cromite"
+    android:maxLongVersionCode="10000000000"/>
  <compatibility-package
    android:name="org.gnu.icecat"
    android:maxLongVersionCode="10000000000"/>
--- a/src/Android/Resources/xml/filepaths.xml
+++ b/src/Android/Resources/xml/filepaths.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <paths xmlns:android="http://schemas.android.com/apk/res/android">
  <cache-path name="cache" path="." />
-  <files-path name="internal" path="." />
+  <files-path name="temp_camera_images" path="camera_temp/" />
 </paths>
--- a/src/Android/Services/BiometricService.cs
+++ b/src/Android/Services/BiometricService.cs
@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using Android.OS;
 using Android.Security.Keystore;
+using Bit.App.Services;
 using Bit.Core.Abstractions;
 using Bit.Core.Services;
 using Java.Security;
@@ -9,10 +10,8 @@ using Javax.Crypto;

 namespace Bit.Droid.Services
 {
-    public class BiometricService : IBiometricService
+    public class BiometricService : BaseBiometricService
    {
-        private readonly IStateService _stateService;
-
        private const string KeyName = "com.8bit.bitwarden.biometric_integrity";

        private const string KeyStoreName = "AndroidKeyStore";
@@ -24,14 +23,14 @@ namespace Bit.Droid.Services

        private readonly KeyStore _keystore;

-        public BiometricService(IStateService stateService)
+        public BiometricService(IStateService stateService, ICryptoService cryptoService)
+            : base(stateService, cryptoService)
        {
-            _stateService = stateService;
            _keystore = KeyStore.GetInstance(KeyStoreName);
            _keystore.Load(null);
        }

-        public async Task<bool> SetupBiometricAsync(string bioIntegritySrcKey = null)
+        public override async Task<bool> SetupBiometricAsync(string bioIntegritySrcKey = null)
        {
            if (Build.VERSION.SdkInt >= BuildVersionCodes.M)
            {
@@ -41,7 +40,7 @@ namespace Bit.Droid.Services
            return true;
        }

-        public async Task<bool> IsSystemBiometricIntegrityValidAsync(string bioIntegritySrcKey = null)
+        public override async Task<bool> IsSystemBiometricIntegrityValidAsync(string bioIntegritySrcKey = null)
        {
            if (Build.VERSION.SdkInt < BuildVersionCodes.M)
            {
--- a/src/Android/Services/DeviceActionService.cs
+++ b/src/Android/Services/DeviceActionService.cs
@@ -547,6 +547,12 @@ namespace Bit.Droid.Services
            return true;
        }

+        public bool SupportsAutofillServices() => Build.VERSION.SdkInt >= BuildVersionCodes.O;
+
+        public bool SupportsInlineAutofill() => Build.VERSION.SdkInt >= BuildVersionCodes.R;
+
+        public bool SupportsDrawOver() => Build.VERSION.SdkInt >= BuildVersionCodes.M;
+
        private Intent RateIntentForUrl(string url, Activity activity)
        {
            var intent = new Intent(Intent.ActionView, Android.Net.Uri.Parse($"{url}?id={activity.PackageName}"));
@@ -601,6 +607,38 @@ namespace Bit.Droid.Services
            throw new NotImplementedException();
        }

+        public string GetAutofillAccessibilityDescription()
+        {
+            if (Build.VERSION.SdkInt <= BuildVersionCodes.LollipopMr1)
+            {
+                return AppResources.AccessibilityDescription;
+            }
+            if (Build.VERSION.SdkInt <= BuildVersionCodes.M)
+            {
+                return AppResources.AccessibilityDescription2;
+            }
+            if (Build.VERSION.SdkInt <= BuildVersionCodes.NMr1)
+            {
+                return AppResources.AccessibilityDescription3;
+            }
+
+            return AppResources.AccessibilityDescription4;
+        }
+
+        public string GetAutofillDrawOverDescription()
+        {
+            if (Build.VERSION.SdkInt <= BuildVersionCodes.M)
+            {
+                return AppResources.DrawOverDescription;
+            }
+            if (Build.VERSION.SdkInt <= BuildVersionCodes.NMr1)
+            {
+                return AppResources.DrawOverDescription2;
+            }
+
+            return AppResources.DrawOverDescription3;
+        }
+
        private void SetNumericKeyboardTo(EditText editText)
        {
            editText.InputType = InputTypes.ClassNumber | InputTypes.NumberFlagDecimal | InputTypes.NumberFlagSigned;
--- a/src/Android/Services/FileService.cs
+++ b/src/Android/Services/FileService.cs
@@ -190,7 +190,8 @@ namespace Bit.Droid.Services
                {
                    try
                    {
-                        var file = new Java.IO.File(activity.FilesDir, "temp_camera_photo.jpg");
+                        var tmpDir = new Java.IO.File(activity.FilesDir, Constants.TEMP_CAMERA_IMAGE_DIR);
+                        var file = new Java.IO.File(tmpDir, Constants.TEMP_CAMERA_IMAGE_NAME);
                        if (!file.Exists())
                        {
                            file.ParentFile.Mkdirs();
--- a/src/App/Abstractions/IDeviceActionService.cs
+++ b/src/App/Abstractions/IDeviceActionService.cs
@@ -28,6 +28,9 @@ namespace Bit.App.Abstractions
        bool SupportsNfc();
        bool SupportsCamera();
        bool SupportsFido2();
+        bool SupportsAutofillServices();
+        bool SupportsInlineAutofill();
+        bool SupportsDrawOver();

        bool LaunchApp(string appName);
        void RateApp();
@@ -41,5 +44,7 @@ namespace Bit.App.Abstractions
        Task SetScreenCaptureAllowedAsync();
        void OpenAppSettings();
        void CloseExtensionPopUp();
+        string GetAutofillAccessibilityDescription();
+        string GetAutofillDrawOverDescription();
    }
 }
--- a/src/App/Abstractions/IPasswordRepromptService.cs
+++ b/src/App/Abstractions/IPasswordRepromptService.cs
@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using Bit.Core.Enums;

 namespace Bit.App.Abstractions
 {
@@ -6,10 +7,8 @@ namespace Bit.App.Abstractions
    {
        string[] ProtectedFields { get; }

-        Task<bool> ShowPasswordPromptAsync();
+        Task<bool> PromptAndCheckPasswordIfNeededAsync(CipherRepromptType repromptType = CipherRepromptType.Password);

        Task<(string password, bool valid)> ShowPasswordPromptAndGetItAsync();
-
-        Task<bool> Enabled();
    }
 }
--- a/src/App/App.csproj
+++ b/src/App/App.csproj
@@ -1,28 +1,33 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
    <RootNamespace>Bit.App</RootNamespace>
    <AssemblyName>BitwardenApp</AssemblyName>
    <Configurations>Debug;Release;FDroid</Configurations>
-    <TargetFrameworks>net7.0-android;net7.0-ios</TargetFrameworks>
-    <UseMaui>True</UseMaui>
-    <OutputType>Library</OutputType>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <SingleProject>true</SingleProject>
  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DebugType>pdbonly</DebugType>
+    <DebugSymbols>true</DebugSymbols>
+  </PropertyGroup>
+
  <ItemGroup>
    <PackageReference Include="Plugin.Fingerprint" Version="2.1.5" />
+    <PackageReference Include="SkiaSharp.Views.Forms" Version="2.88.3" />
+    <PackageReference Include="Xamarin.CommunityToolkit" Version="2.0.6" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
    <PackageReference Include="Xamarin.FFImageLoading.Forms" Version="2.4.11.982" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2612" />
    <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>
@@ -54,9 +59,6 @@
    <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>
@@ -66,12 +68,6 @@
    <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>
@@ -125,6 +121,7 @@
      <DependentUpon>LoginPasswordlessRequestPage.xaml</DependentUpon>
    </Compile>
  </ItemGroup>
+
  <ItemGroup>
    <Folder Include="Resources\" />
    <Folder Include="Behaviors\" />
@@ -141,10 +138,13 @@
    <Folder Include="Controls\PasswordStrengthProgressBar\" />
    <Folder Include="Utilities\Automation\" />
    <Folder Include="Utilities\Prompts\" />
+    <Folder Include="Controls\Settings\" />
  </ItemGroup>
+
  <ItemGroup>
    <EmbeddedResource Remove="Pages\Accounts\AccountsPopupPage.xaml" />
  </ItemGroup>
+
  <ItemGroup>
    <Compile Update="Styles\Black.xaml.cs">
      <DependentUpon>Black.xaml</DependentUpon>
@@ -168,6 +168,7 @@
      <DependentUpon>Android.xaml</DependentUpon>
    </Compile>
  </ItemGroup>
+
  <ItemGroup>
    <Compile Update="Resources\AppResources.cs.Designer.cs">
      <DependentUpon>AppResources.cs.resx</DependentUpon>
@@ -305,6 +306,7 @@
      <AutoGen>True</AutoGen>
    </Compile>
  </ItemGroup>
+
  <ItemGroup>
    <EmbeddedResource Update="Resources\AppResources.cs.resx">
      <LastGenOutput>AppResources.cs.Designer.cs</LastGenOutput>
@@ -415,6 +417,7 @@
      <Generator>ResXFileCodeGenerator</Generator>
    </EmbeddedResource>
  </ItemGroup>
+
  <ItemGroup>
    <None Remove="Behaviors\" />
    <None Remove="Xamarin.CommunityToolkit" />
@@ -433,5 +436,6 @@
    <None Remove="Controls\PasswordStrengthProgressBar\" />
    <None Remove="Utilities\Automation\" />
    <None Remove="Utilities\Prompts\" />
+    <None Remove="Controls\Settings\" />
  </ItemGroup>
-</Project>
+</Project>
--- a/src/App/App.xaml
+++ b/src/App/App.xaml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Application xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+<?xml version="1.0" encoding="utf-8" ?>
+<Application xmlns="http://xamarin.com/schemas/2014/forms"
             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
             x:Class="Bit.App.App">
    <Application.Resources>
--- a/src/App/App.xaml.cs
+++ b/src/App/App.xaml.cs
@@ -15,9 +15,8 @@ using Bit.Core.Models.Data;
 using Bit.Core.Models.Response;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
-using Microsoft.Maui.Controls.Xaml;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;

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

-                        Device.InvokeOnMainThreadAsync(async () =>
+                        await Device.InvokeOnMainThreadAsync(async () =>
                        {
                            if (Current.MainPage is TabsPage tabsPage)
                            {
@@ -174,6 +171,11 @@ namespace Bit.App
                                new NavigationPage(new UpdateTempPasswordPage()));
                        });
                    }
+                    else if (message.Command == Constants.ForceSetPassword)
+                    {
+                        await Device.InvokeOnMainThreadAsync(() => Application.Current.MainPage.Navigation.PushModalAsync(
+                                new NavigationPage(new SetPasswordPage(orgIdentifier: (string)message.Data))));
+                    }
                    else if (message.Command == "syncCompleted")
                    {
                        await _configService.GetAsync(true);
@@ -296,7 +298,6 @@ namespace Bit.App
            {
                _messagingService.Send(Constants.PasswordlessLoginRequestKey);
            }
-            // TODO Xamarin.Forms.Device.RuntimePlatform is no longer supported. Use Microsoft.Maui.Devices.DeviceInfo.Platform instead. For more details see https://learn.microsoft.com/en-us/dotnet/maui/migration/forms-projects#device-changes
            if (Device.RuntimePlatform == Device.Android)
            {
                await _vaultTimeoutService.CheckVaultTimeoutAsync();
@@ -312,7 +313,6 @@ namespace Bit.App
        {
            System.Diagnostics.Debug.WriteLine("XF App: OnSleep");
            _isResumed = false;
-            // TODO Xamarin.Forms.Device.RuntimePlatform is no longer supported. Use Microsoft.Maui.Devices.DeviceInfo.Platform instead. For more details see https://learn.microsoft.com/en-us/dotnet/maui/migration/forms-projects#device-changes
            if (Device.RuntimePlatform == Device.Android)
            {
                var isLocked = await _vaultTimeoutService.IsLockedAsync();
@@ -336,7 +336,6 @@ namespace Bit.App
            {
                _messagingService.Send(Constants.PasswordlessLoginRequestKey);
            }
-            // TODO Xamarin.Forms.Device.RuntimePlatform is no longer supported. Use Microsoft.Maui.Devices.DeviceInfo.Platform instead. For more details see https://learn.microsoft.com/en-us/dotnet/maui/migration/forms-projects#device-changes
            if (Device.RuntimePlatform == Device.Android)
            {
                ResumedAsync().FireAndForget();
@@ -371,7 +370,7 @@ namespace Bit.App
            await Device.InvokeOnMainThreadAsync(() =>
            {
                ThemeManager.SetTheme(Current.Resources);
-                _messagingService.Send("updatedTheme");
+                _messagingService.Send(ThemeManager.UPDATED_THEME_MESSAGE_KEY);
            });
        }

@@ -402,7 +401,6 @@ namespace Bit.App

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

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

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

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

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

        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 int AccountListRowHeight => Device.RuntimePlatform == Device.Android ? 74 : 70;

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

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

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

 namespace Bit.App.Controls
 {
--- a/src/App/Controls/AccountViewCell/AccountViewCellViewModel.cs
+++ b/src/App/Controls/AccountViewCell/AccountViewCellViewModel.cs
@@ -36,7 +36,7 @@ namespace Bit.App.Controls

        public bool ShowHostname
        {
-            get => !string.IsNullOrWhiteSpace(AccountView.Hostname) && AccountView.Hostname != "vault.bitwarden.com";
+            get => !string.IsNullOrWhiteSpace(AccountView.Hostname);
        }

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

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

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

 namespace Bit.App.Controls
 {
--- a/src/App/Controls/CircularProgressbarView.cs
+++ b/src/App/Controls/CircularProgressbarView.cs
@@ -1,11 +1,9 @@
 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;
+using SkiaSharp.Views.Forms;
+using Xamarin.Essentials;
+using Xamarin.Forms;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 namespace Bit.App.Controls
 {
--- a/src/App/Controls/ExternalLinkItemView.xaml
+++ b/src/App/Controls/ExternalLinkItemView.xaml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentView
+    xmlns="http://xamarin.com/schemas/2014/forms"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:controls="clr-namespace:Bit.App.Controls"
+    x:Class="Bit.App.Controls.ExternalLinkItemView"
+    xmlns:core="clr-namespace:Bit.Core;assembly=BitwardenCore"
+    x:Name="_contentView">
+    <ContentView.GestureRecognizers>
+        <TapGestureRecognizer Command="{Binding GoToLinkCommand, Mode=OneWay, Source={x:Reference _contentView}}" />
+    </ContentView.GestureRecognizers>
+    <StackLayout
+        Orientation="Horizontal">
+        <controls:CustomLabel
+            Text="{Binding Title, Mode=OneWay, Source={x:Reference _contentView}}"
+            HorizontalOptions="StartAndExpand"
+            LineBreakMode="TailTruncation" />
+
+        <controls:IconLabel
+            Text="{Binding Source={x:Static core:BitwardenIcons.ShareSquare}}"
+            TextColor="{DynamicResource TextColor}"
+            HorizontalOptions="End"
+            VerticalOptions="Center"
+            AutomationProperties.IsInAccessibleTree="True"
+            AutomationProperties.Name="{Binding Title, Mode=OneWay, Source={x:Reference _contentView}}" />
+
+    </StackLayout>
+</ContentView>
+
--- a/src/App/Controls/ExternalLinkItemView.xaml.cs
+++ b/src/App/Controls/ExternalLinkItemView.xaml.cs
@@ -0,0 +1,31 @@
+using System.Windows.Input;
+using Xamarin.Forms;
+
+namespace Bit.App.Controls
+{
+    public partial class ExternalLinkItemView : ContentView
+    {
+        public static readonly BindableProperty TitleProperty = BindableProperty.Create(
+            nameof(Title), typeof(string), typeof(ExternalLinkItemView), null, BindingMode.OneWay);
+
+        public static readonly BindableProperty GoToLinkCommandProperty = BindableProperty.Create(
+            nameof(GoToLinkCommand), typeof(ICommand), typeof(ExternalLinkItemView));
+
+        public ExternalLinkItemView()
+        {
+            InitializeComponent();
+        }
+
+        public string Title
+        {
+            get { return (string)GetValue(TitleProperty); }
+            set { SetValue(TitleProperty, value); }
+        }
+
+        public ICommand GoToLinkCommand
+        {
+            get => GetValue(GoToLinkCommandProperty) as ICommand;
+            set => SetValue(GoToLinkCommandProperty, value);
+        }
+    }
+}
--- a/src/App/Controls/HybridWebView.cs
+++ b/src/App/Controls/HybridWebView.cs
@@ -1,6 +1,5 @@
 using System;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 namespace Bit.App.Controls
 {
--- a/src/App/Controls/Settings/BaseSettingControlView.cs
+++ b/src/App/Controls/Settings/BaseSettingControlView.cs
@@ -0,0 +1,27 @@
+using System.Runtime.CompilerServices;
+using Bit.App.Utilities;
+using Xamarin.Forms;
+
+namespace Bit.App.Controls
+{
+    public class BaseSettingItemView : ContentView
+    {
+        public static readonly BindableProperty TitleProperty = BindableProperty.Create(
+            nameof(Title), typeof(string), typeof(SwitchItemView), null);
+
+        public static readonly BindableProperty SubtitleProperty = BindableProperty.Create(
+            nameof(Subtitle), typeof(string), typeof(SwitchItemView), null);
+
+        public string Title
+        {
+            get { return (string)GetValue(TitleProperty); }
+            set { SetValue(TitleProperty, value); }
+        }
+
+        public string Subtitle
+        {
+            get { return (string)GetValue(SubtitleProperty); }
+            set { SetValue(SubtitleProperty, value); }
+        }
+    }
+}
--- a/src/App/Controls/Settings/SettingChooserItemView.xaml
+++ b/src/App/Controls/Settings/SettingChooserItemView.xaml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<controls:BaseSettingItemView
+    xmlns="http://xamarin.com/schemas/2014/forms"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:controls="clr-namespace:Bit.App.Controls"
+    x:Class="Bit.App.Controls.SettingChooserItemView"
+    x:Name="_contentView"
+    ControlTemplate="{StaticResource SettingControlTemplate}">
+    <controls:BaseSettingItemView.GestureRecognizers>
+        <TapGestureRecognizer Command="{Binding ChooseCommand, Mode=OneWay, Source={x:Reference _contentView}}" />
+    </controls:BaseSettingItemView.GestureRecognizers>
+
+    <controls:CustomLabel
+        Text="{Binding DisplayValue, Source={x:Reference _contentView}}"
+        HorizontalTextAlignment="End"
+        TextColor="{DynamicResource MutedColor}"
+        StyleClass="list-sub" />
+
+</controls:BaseSettingItemView>
--- a/src/App/Controls/Settings/SettingChooserItemView.xaml.cs
+++ b/src/App/Controls/Settings/SettingChooserItemView.xaml.cs
@@ -0,0 +1,31 @@
+using System.Windows.Input;
+using Xamarin.Forms;
+
+namespace Bit.App.Controls
+{
+    public partial class SettingChooserItemView : BaseSettingItemView
+    {
+        public static readonly BindableProperty DisplayValueProperty = BindableProperty.Create(
+            nameof(DisplayValue), typeof(string), typeof(SettingChooserItemView), null);
+
+        public static readonly BindableProperty ChooseCommandProperty = BindableProperty.Create(
+            nameof(ChooseCommand), typeof(ICommand), typeof(ExternalLinkItemView));
+
+        public string DisplayValue
+        {
+            get { return (string)GetValue(DisplayValueProperty); }
+            set { SetValue(DisplayValueProperty, value); }
+        }
+
+        public SettingChooserItemView()
+        {
+            InitializeComponent();
+        }
+
+        public ICommand ChooseCommand
+        {
+            get => GetValue(ChooseCommandProperty) as ICommand;
+            set => SetValue(ChooseCommandProperty, value);
+        }
+    }
+}
--- a/src/App/Controls/Settings/SwitchItemView.xaml
+++ b/src/App/Controls/Settings/SwitchItemView.xaml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<controls:BaseSettingItemView
+    xmlns="http://xamarin.com/schemas/2014/forms"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:controls="clr-namespace:Bit.App.Controls"
+    x:Class="Bit.App.Controls.SwitchItemView"
+    x:Name="_contentView"
+    ControlTemplate="{StaticResource SettingControlTemplate}">
+    <controls:BaseSettingItemView.GestureRecognizers>
+        <TapGestureRecognizer Tapped="ContentView_Tapped" />
+    </controls:BaseSettingItemView.GestureRecognizers>
+
+    <Switch
+        x:Name="_switch"
+        HeightRequest="20"
+        Scale="{OnPlatform iOS=0.8, Android=1}"
+        IsToggled="{Binding IsToggled, Mode=TwoWay, Source={x:Reference _contentView}}"
+        AutomationId="{Binding SwitchAutomationId, Mode=OneWay, Source={x:Reference _contentView}}"/>
+</controls:BaseSettingItemView>
--- a/src/App/Controls/Settings/SwitchItemView.xaml.cs
+++ b/src/App/Controls/Settings/SwitchItemView.xaml.cs
@@ -0,0 +1,45 @@
+using System.Windows.Input;
+using Xamarin.Forms;
+
+namespace Bit.App.Controls
+{
+    public partial class SwitchItemView : BaseSettingItemView
+    {
+        public static readonly BindableProperty IsToggledProperty = BindableProperty.Create(
+            nameof(IsToggled), typeof(bool), typeof(SwitchItemView), null, BindingMode.TwoWay);
+
+        public static readonly BindableProperty SwitchAutomationIdProperty = BindableProperty.Create(
+            nameof(SwitchAutomationId), typeof(string), typeof(SwitchItemView), null, BindingMode.OneWay);
+
+        public static readonly BindableProperty ToggleSwitchCommandProperty = BindableProperty.Create(
+            nameof(ToggleSwitchCommand), typeof(ICommand), typeof(ExternalLinkItemView));
+
+        public SwitchItemView()
+        {
+            InitializeComponent();
+        }
+
+        public bool IsToggled
+        {
+            get { return (bool)GetValue(IsToggledProperty); }
+            set { SetValue(IsToggledProperty, value); }
+        }
+
+        public string SwitchAutomationId
+        {
+            get { return (string)GetValue(SwitchAutomationIdProperty); }
+            set { SetValue(SwitchAutomationIdProperty, value); }
+        }
+
+        public ICommand ToggleSwitchCommand
+        {
+            get => GetValue(ToggleSwitchCommandProperty) as ICommand;
+            set => SetValue(ToggleSwitchCommandProperty, value);
+        }
+
+        void ContentView_Tapped(System.Object sender, System.EventArgs e)
+        {
+            _switch.IsToggled = !_switch.IsToggled;
+        }
+    }
+}
--- a/src/App/Effects/FabShadowEffect.cs
+++ b/src/App/Effects/FabShadowEffect.cs
@@ -1,5 +1,4 @@
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 namespace Bit.App.Lists.ItemViewModels.CustomFields
 {
--- a/Show More
+++ b/Show More