Bumped version to 2024.3.3 (#3113)

Co-authored-by: bitwarden-devops-bot <106330231+bitwarden-devops-bot@users.noreply.github.com>

.github/CODEOWNERS

@@ -0,0 +1,46 @@
+# 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
+
+# DevOps for Version Bumping
+src/App/Platforms/Android/AndroidManifest.xml
+src/iOS.Autofill/Info.plist
+src/iOS.Extension/Info.plist
+src/iOS.ShareExtension/Info.plist
+src/App/Platforms/iOS/Info.plist
+
+## 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/Core/Resources/Localization @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/Core/Resources/Localization/AppResources.Designer.cs
+src/Core/Resources/Localization/AppResources.resx
+src/watchOS/bitwarden/bitwarden\ WatchKit\ Extension/Localization/en.lproj
+store/apple/en
+store/google/en
+
+## Utils ##
+store/google/Publisher

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,8 @@
 blank_issues_enabled: false
 contact_links:
+  - name: Customer Support
+    url: https://bitwarden.com/contact/
+    about: Please contact our customer support for account issues and general customer support.
   - name: Report mobile autofill failure
     url: https://docs.google.com/forms/d/e/1FAIpQLScMopHyN7KGJs8hW562VTzbIGL4KcFnx0wJcsW0GYE1BnPiGA/viewform
     about: We are aware of some situations where the Bitwarden mobile app will not autofill information correctly. This is something the Bitwarden team is actively working on but need your help as a community and active Bitwarden users!
@@ -9,9 +12,6 @@ contact_links:
   - name: Bitwarden Community Forums
     url: https://community.bitwarden.com
     about: Please visit the community forums for general community discussion, support and the development roadmap.
-  - name: Customer Support
-    url: https://bitwarden.com/contact/
-    about: Please contact our customer support for account issues and general customer support.
   - name: Security Issues
     url: https://hackerone.com/bitwarden
     about: We use HackerOne to manage security disclosures.

.github/labeler.yml

@@ -0,0 +1,19 @@
+android:
+- src/App/*
+- src/Core/*
+- src/Android/*
+
+iOS:
+- src/App/*
+- src/Core/*
+- lib/ios/*
+- src/iOS/*
+- 'src/iOS.Autofill/*'
+- 'src/iOS.Core/*'
+- 'src/iOS.Extension/*'
+- 'src/iOS.ShareExtension/*'
+- 'src/iOS.Widget/*'
+- src/watchOS/*
+
+watchOS:
+- src/watchOS/*

.github/renovate.json

@@ -1,22 +1,36 @@
 {
-    "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-    "extends": [
-      "config:base",
-      "schedule:monthly",
-      ":maintainLockFilesMonthly",
-      ":preserveSemverRanges",
-      ":rebaseStalePrs",
-      ":disableDependencyDashboard"
-    ],
-    "enabledManagers": [
-      "nuget"
-    ],
-    "packageRules": [
-      {
-        "matchManagers": ["nuget"],
-        "groupName": "Nuget updates",
-        "groupSlug": "nuget",
-        "separateMajorMinor": false
-      }
-    ]
-  }
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base",
+    "github>bitwarden/renovate-config:pin-actions",
+    ":combinePatchMinorReleases",
+    ":dependencyDashboard",
+    ":maintainLockFilesWeekly",
+    ":pinAllExceptPeerDependencies",
+    ":prConcurrentLimit10",
+    ":rebaseStalePrs",
+    ":separateMajorReleases",
+    "group:monorepos",
+    "schedule:weekends"
+  ],
+  "enabledManagers": ["github-actions", "npm", "nuget"],
+  "commitMessagePrefix": "[deps]:",
+  "commitMessageTopic": "{{depName}}",
+  "packageRules": [
+    {
+      "groupName": "gh minor",
+      "matchManagers": ["github-actions"],
+      "matchUpdateTypes": ["minor", "patch"]
+    },
+    {
+      "groupName": "npm minor",
+      "matchManagers": ["npm"],
+      "matchUpdateTypes": ["minor", "patch"]
+    },
+    {
+      "groupName": "nuget minor",
+      "matchManagers": ["nuget"],
+      "matchUpdateTypes": ["minor", "patch"]
+    }
+  ]
+}

.github/secrets/google-services.json.gpg

@@ -1,3 +0,0 @@
-<EFBFBD>
-	K<>Y#<23>(<28><><EFBFBD><EFBFBD>
EI֐߄T?)l<><6C><EFBFBD><18><><10>"=<3D>|<7C>'e<><0E>m<EFBFBD>/~<7E><>'F<><46>><3E><><EFBFBD><EFBFBD>l<EFBFBD>b<EFBFBD>[<5B>+R<><52>iL<69><4C>"<22><><EFBFBD>~V:<3A><>p<EFBFBD>a<17>ڵel%8t<38><74>튖<EFBFBD>y<<3C>n<EFBFBD><6E><EFBFBD>aU<61>w<16>JD<4A><44><1F><>We<57>9<EFBFBD><39><EFBFBD><EFBFBD><x8d<38>O<EFBFBD>j\<14>ד<EFBFBD><D793><EFBFBD>Vq<56><71>֋
-Ǻ<EFBFBD>-<2D>#<23><><11><>]$<24>(<28>l,<2C>Br<42><02><>d<><64><EFBFBD>•a-<2D><><EFBFBD>:<3A><>:<3A><04>9b,!Em<02><19><>Qf<>D<EFBFBD>g<EFBFBD><06><0E>x(P<>ȡ~<7E>͹<EFBFBD><CDB9>	<09><>[<06><>!:<3A>;f<><66>

.github/workflows/automatic-issue-responses.yml

@@ -14,7 +14,7 @@ jobs:
       # Feature request
       - if: github.event.label.name == 'feature-request'
         name: Feature request
-        uses: peter-evans/close-issue@849549ba7c3a595a064c4b2c56f206ee78f93515  # v2.0.0
+        uses: peter-evans/close-issue@276d7966e389d888f011539a86c8920025ea0626  # v3.0.1
         with:
           comment: |
             We use GitHub issues as a place to track bugs and other development related issues. The [Bitwarden Community Forums](https://community.bitwarden.com/) has a [Feature Requests](https://community.bitwarden.com/c/feature-requests) section for submitting, voting for, and discussing requests like this one.
@@ -25,7 +25,7 @@ jobs:
       # Intended behavior
       - if: github.event.label.name == 'intended-behavior'
         name: Intended behaviour
-        uses: peter-evans/close-issue@849549ba7c3a595a064c4b2c56f206ee78f93515  # v2.0.0
+        uses: peter-evans/close-issue@276d7966e389d888f011539a86c8920025ea0626  # v3.0.1
         with:
           comment: |
             Your issue appears to be describing the intended behavior of the software. If you want this to be changed, it would be a feature request.
@@ -38,7 +38,7 @@ jobs:
       # Customer support request
       - if: github.event.label.name == 'customer-support'
         name: Customer Support request
-        uses: peter-evans/close-issue@849549ba7c3a595a064c4b2c56f206ee78f93515  # v2.0.0
+        uses: peter-evans/close-issue@276d7966e389d888f011539a86c8920025ea0626  # v3.0.1
         with:
           comment: |
             We use GitHub issues as a place to track bugs and other development related issues. Your issue appears to be a support request, or would otherwise be better handled by our dedicated Customer Success team.
@@ -49,14 +49,14 @@ jobs:
       # Resolved
       - if: github.event.label.name == 'resolved'
         name: Resolved
-        uses: peter-evans/close-issue@849549ba7c3a595a064c4b2c56f206ee78f93515  # v2.0.0
+        uses: peter-evans/close-issue@276d7966e389d888f011539a86c8920025ea0626  # v3.0.1
         with:
           comment: |
             We’ve closed this issue, as it appears the original problem has been resolved. If this happens again or continues to be an problem, please respond to this issue with any additional detail to assist with reproduction and root cause analysis.
       # Stale
       - if: github.event.label.name == 'stale'
         name: Stale
-        uses: peter-evans/close-issue@849549ba7c3a595a064c4b2c56f206ee78f93515  # v2.0.0
+        uses: peter-evans/close-issue@276d7966e389d888f011539a86c8920025ea0626  # v3.0.1
         with:
           comment: |
             As we haven’t heard from you about this problem in some time, this issue will now be closed.

.github/workflows/build-beta.yml

@@ -0,0 +1,5 @@
+---
+name: Build Beta
+
+on:
+  workflow_dispatch:

.github/workflows/cleanup-rc-branch.yml

@@ -0,0 +1,53 @@
+---
+name: Cleanup RC Branch
+
+on:
+  push:
+    tags:
+      - v**
+
+jobs:
+  delete-rc:
+    name: Delete RC Branch
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Login to Azure - CI Subscription
+        uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0
+        with:
+          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
+
+      - name: Retrieve bot secrets
+        id: retrieve-bot-secrets
+        uses: bitwarden/gh-actions/get-keyvault-secrets@main
+        with:
+          keyvault: bitwarden-ci
+          secrets: "github-pat-bitwarden-devops-bot-repo-scope"
+
+      - name: Checkout main
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        with:
+          ref: main
+          token: ${{ steps.retrieve-bot-secrets.outputs.github-pat-bitwarden-devops-bot-repo-scope }}
+
+      - name: Check if a RC branch exists
+        id: branch-check
+        run: |
+          hotfix_rc_branch_check=$(git ls-remote --heads origin hotfix-rc | wc -l)
+          rc_branch_check=$(git ls-remote --heads origin rc | wc -l)
+
+          if [[ "${hotfix_rc_branch_check}" -gt 0 ]]; then
+            echo "hotfix-rc branch exists." | tee -a $GITHUB_STEP_SUMMARY
+            echo "name=hotfix-rc" >> $GITHUB_OUTPUT
+          elif [[ "${rc_branch_check}" -gt 0 ]]; then
+            echo "rc branch exists." | tee -a $GITHUB_STEP_SUMMARY
+            echo "name=rc" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Delete RC branch
+        env:
+          BRANCH_NAME: ${{ steps.branch-check.outputs.name }}
+        run: |
+          if ! [[ -z "$BRANCH_NAME" ]]; then
+            git push --quiet origin --delete $BRANCH_NAME
+            echo "Deleted $BRANCH_NAME branch." | tee -a $GITHUB_STEP_SUMMARY
+          fi

.github/workflows/crowdin-pull.yml

@@ -15,28 +15,28 @@ jobs:
       _CROWDIN_PROJECT_ID: "269690"
     steps:
       - name: Checkout repo
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
 
       - name: Login to Azure - CI Subscription
-        uses: Azure/login@77f1b2e3fb80c0e8645114159d17008b8a2e475a
+        uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0
         with:
           creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
 
       - name: Retrieve secrets
         id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@c3b3285993151c5af47cefcb3b9134c28ab479af
+        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"
 
       - name: Download translations
-        uses: crowdin/github-action@12143a68c213f3c6d9913c9e5023224f7231face
+        uses: crowdin/github-action@c953b17499daa6be3e5afbf7a63616fb02d8b18d # v1.19.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
         with:
           config: crowdin.yml
-          crowdin_branch_name: master
+          crowdin_branch_name: main
           upload_sources: false
           upload_translations: false
           download_translations: true

.github/workflows/enforce-labels.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Enforce Label
-        uses: yogevbd/enforce-label-action@8d1e1709b1011e6d90400a0e6cf7c0b77aa5efeb
+        uses: yogevbd/enforce-label-action@a3c219da6b8fa73f6ba62b68ff09c469b3a1c024 # 2.2.2
         with:
           BANNED_LABELS: "hold,needs-qa"
           BANNED_LABELS_DESCRIPTION: "PRs with the hold or needs-qa labels cannot be merged"

.github/workflows/pr-labeler.yml

@@ -0,0 +1,17 @@
+---
+name: "Pull Request Labeler"
+
+on:
+  pull_request_target: {}
+
+jobs:
+  labeler:
+    name: "Pull Request Labeler"
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/labeler@ac9175f8a1f3625fd0d4fb234536d26811351594  # v4.3.0
+        with:
+          sync-labels: true

.github/workflows/release.yml

@@ -28,7 +28,7 @@ jobs:
       branch-name: ${{ steps.branch.outputs.branch-name }}
     steps:
       - name: Branch check
-        if: github.event.inputs.release_type != 'Dry Run'
+        if: inputs.release_type != 'Dry Run'
         run: |
           if [[ "$GITHUB_REF" != "refs/heads/rc" ]] && [[ "$GITHUB_REF" != "refs/heads/hotfix-rc" ]]; then
             echo "==================================="
@@ -38,15 +38,15 @@ jobs:
           fi
 
       - name: Checkout repo
-        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579  # v2.4.0
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
 
       - name: Check Release Version
         id: version
-        uses: bitwarden/gh-actions/release-version-check@8f055ef543c7433c967a1b9b04a0f230923233bb
+        uses: bitwarden/gh-actions/release-version-check@main
         with:
-          release-type: ${{ github.event.inputs.release_type }}
+          release-type: ${{ inputs.release_type }}
           project-type: xamarin
-          file: src/Android/Properties/AndroidManifest.xml
+          file: src/App/Platforms/Android/AndroidManifest.xml
 
       - name: Get branch name
         id: branch
@@ -55,8 +55,8 @@ jobs:
           echo "branch-name=$BRANCH_NAME" >> $GITHUB_OUTPUT
 
       - name: Create GitHub deployment
-        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        uses: chrnorm/deployment-action@1b599fe41a0ef1f95191e7f2eec4743f2d7dfc48
+        if: ${{ inputs.release_type != 'Dry Run' }}
+        uses: chrnorm/deployment-action@55729fcebec3d284f60f5bcabbd8376437d696b1 # v2.0.7
         id: deployment
         with:
           token: '${{ secrets.GITHUB_TOKEN }}'
@@ -67,27 +67,27 @@ jobs:
 
 
       - name: Download all artifacts
-        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        uses: dawidd6/action-download-artifact@575b1e4167df67acf7e692af784566618b23c71e  # v2.17.10
+        if: ${{ inputs.release_type != 'Dry Run' }}
+        uses: dawidd6/action-download-artifact@71072fbb1229e1317f1a8de6b04206afb461bd67 # v3.1.2
         with:
           workflow: build.yml
           workflow_conclusion: success
           branch: ${{ steps.branch.outputs.branch-name }}
 
       - name: Dry Run - Download all artifacts
-        if: ${{ github.event.inputs.release_type == 'Dry Run' }}
-        uses: dawidd6/action-download-artifact@575b1e4167df67acf7e692af784566618b23c71e  # v2.17.10
+        if: ${{ inputs.release_type == 'Dry Run' }}
+        uses: dawidd6/action-download-artifact@71072fbb1229e1317f1a8de6b04206afb461bd67 # v3.1.2
         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
+        if: ${{ inputs.release_type != 'Dry Run' }}
+        uses: ncipollo/release-action@2c591bcc8ecdcd2db72b97d6147f871fcd833ba5 # v1.14.0
         with:
           artifacts: "./com.x8bit.bitwarden.aab/com.x8bit.bitwarden.aab,
                       ./com.x8bit.bitwarden.apk/com.x8bit.bitwarden.apk,
@@ -103,16 +103,16 @@ jobs:
           draft: true
 
       - name: Update deployment status to Success
-        if: ${{ github.event.inputs.release_type != 'Dry Run' && success() }}
-        uses: chrnorm/deployment-status@07b3930847f65e71c9c6802ff5a402f6dfb46b86
+        if: ${{ inputs.release_type != 'Dry Run' && success() }}
+        uses: chrnorm/deployment-status@9a72af4586197112e0491ea843682b5dc280d806 # v2.0.3
         with:
           token: '${{ secrets.GITHUB_TOKEN }}'
           state: 'success'
           deployment-id: ${{ steps.deployment.outputs.deployment_id }}
 
       - name: Update deployment status to Failure
-        if: ${{ github.event.inputs.release_type != 'Dry Run' && failure() }}
-        uses: chrnorm/deployment-status@07b3930847f65e71c9c6802ff5a402f6dfb46b86
+        if: ${{ inputs.release_type != 'Dry Run' && failure() }}
+        uses: chrnorm/deployment-status@9a72af4586197112e0491ea843682b5dc280d806 # v2.0.3
         with:
           token: '${{ secrets.GITHUB_TOKEN }}'
           state: 'failure'
@@ -126,11 +126,11 @@ jobs:
     if: inputs.fdroid_publish
     steps:
       - name: Checkout repo
-        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579  # v2.4.0
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
 
       - name: Download F-Droid .apk artifact
-        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        uses: dawidd6/action-download-artifact@575b1e4167df67acf7e692af784566618b23c71e  # v2.17.10
+        if: ${{ inputs.release_type != 'Dry Run' }}
+        uses: dawidd6/action-download-artifact@71072fbb1229e1317f1a8de6b04206afb461bd67 # v3.1.2
         with:
           workflow: build.yml
           workflow_conclusion: success
@@ -138,18 +138,18 @@ jobs:
           name: com.x8bit.bitwarden-fdroid.apk
 
       - name: Dry Run - Download F-Droid .apk artifact
-        if: ${{ github.event.inputs.release_type == 'Dry Run' }}
-        uses: dawidd6/action-download-artifact@575b1e4167df67acf7e692af784566618b23c71e  # v2.17.10
+        if: ${{ inputs.release_type == 'Dry Run' }}
+        uses: dawidd6/action-download-artifact@71072fbb1229e1317f1a8de6b04206afb461bd67 # v3.1.2
         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@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
         with:
-          node-version: '10.x'
+          node-version: '16.x'
 
       - name: Set up F-Droid server
         run: |
@@ -176,13 +176,19 @@ jobs:
       - name: Install Node dependencies
         run: npm install
 
-      - name: Decrypt secrets
+      - name: Login to Azure - CI Subscription
+        uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0
+        with:
+          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
+
+      - name: Download secrets
         env:
-          DECRYPT_FILE_PASSWORD: ${{ secrets.DECRYPT_FILE_PASSWORD }}
+          ACCOUNT_NAME: bitwardenci
+          CONTAINER_NAME: mobile
         run: |
-          mkdir -p ~/secrets
-          gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
-            --output ./store/fdroid/keystore.jks ./.github/secrets/store_fdroid-keystore.jks.gpg
+          mkdir -p $HOME/secrets
+          az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME \
+          --name store_fdroid-keystore.jks --file ./store/fdroid/keystore.jks --output none
 
       - name: Compile for F-Droid Store
         env:
@@ -211,5 +217,5 @@ jobs:
           cd $GITHUB_WORKSPACE
 
       - name: Deploy to gh-pages
-        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
+        if: ${{ inputs.release_type != 'Dry Run' }}
         run: npm run deploy

.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@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9.0.0
         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.

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

@@ -1,5 +1,5 @@
 ---
-name: Version Auto Bump
+name: Auto Bump Mobile Version
 
 on:
   push:
@@ -7,39 +7,25 @@ on:
       - v**
 
 jobs:
-  setup:
-    name: "Setup"
+  bump-version:
+    name: Bump Mobile Version
     runs-on: ubuntu-22.04
-    outputs:
-      version_number: ${{ steps.version.outputs.new-version }}
     steps:
-      - name: Checkout Branch
-        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
-
-      - name: Calculate bumped version
-        id: version
-        env:
-          RELEASE_TAG: ${{ github.ref }}
-        run: |
-          CURR_MAJOR=$(echo $RELEASE_TAG | sed -r 's/refs\/tags\/v([0-9]{4}\.[0-9]{1,2})\.([0-9]{1,2})/\1/')
-          CURR_PATCH=$(echo $RELEASE_TAG | sed -r 's/refs\/tags\/v([0-9]{4}\.[0-9]{1,2})\.([0-9]{1,2})/\2/')
-          echo "Current Major: $CURR_MAJOR"
-          echo "Current Patch: $CURR_PATCH"
-
-          NEW_PATCH=$((CURR_PATCH+1))
-          NEW_VER=$CURR_MAJOR.$NEW_PATCH
-          echo "New Version: $NEW_VER"
-          echo "new-version=$NEW_VER" >> $GITHUB_OUTPUT
-
-  trigger_version_bump:
-    name: "Version bump"
-    runs-on: ubuntu-22.04
-    needs:
-      - setup
-    steps:
-      - name: Bump version to ${{ needs.setup.outputs.version_number }}
-        uses: ./.github/workflows/version-bump.yml
-        secrets:
-          AZURE_PROD_KV_CREDENTIALS: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
+      - name: Login to Azure - CI Subscription
+        uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0
         with:
-          version_number: ${{ needs.setup.outputs.version_number }}
+          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
+
+      - name: Retrieve bot secrets
+        id: retrieve-bot-secrets
+        uses: bitwarden/gh-actions/get-keyvault-secrets@main
+        with:
+          keyvault: bitwarden-ci
+          secrets: "github-pat-bitwarden-devops-bot-repo-scope"
+
+      - name: Trigger Version Bump workflow
+        env:
+          GH_TOKEN: ${{ steps.retrieve-bot-secrets.outputs.github-pat-bitwarden-devops-bot-repo-scope }}
+        run: |
+          echo '{"cut_rc_branch": "false"}' | \
+          gh workflow run version-bump.yml --json --repo bitwarden/mobile

.github/workflows/version-bump.yml

@@ -4,84 +4,200 @@ name: Version Bump
 on:
   workflow_dispatch:
     inputs:
-      version_number:
-        description: "New Version"
-        required: true
-  workflow_call:
-    inputs:
-      version_number:
-        required: true
+      version_number_override:
+        description: "New version override (leave blank for automatic calculation, example: '2024.1.0')"
+        required: false
         type: string
-    secrets:
-      AZURE_PROD_KV_CREDENTIALS:
-        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
+    runs-on: ubuntu-22.04
+    outputs:
+      version: ${{ steps.set-final-version-output.outputs.version }}
     steps:
+      - name: Validate version input
+        if: ${{ inputs.version_number_override != '' }}
+        uses: bitwarden/gh-actions/version-check@main
+        with:
+          version: ${{ inputs.version_number_override }}
+
       - name: Checkout Branch
-        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        with:
+          ref: main
+
+      - name: Check if RC branch exists
+        if: ${{ inputs.cut_rc_branch == true }}
+        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: Login to Azure - CI Subscription
-        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf
+        uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0
         with:
-         creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
+          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
 
       - name: Retrieve secrets
         id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@c3b3285993151c5af47cefcb3b9134c28ab479af
+        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: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@c8bb57c57e8df1be8c73ff3d59deab1dbc00e0d1
+        uses: crazy-max/ghaction-import-gpg@01dd5d3ca463c7f10f7f4f7b4f177225ac661ee4 # v6.1.0
         with:
           gpg_private_key: ${{ steps.retrieve-secrets.outputs.github-gpg-private-key }}
           passphrase: ${{ steps.retrieve-secrets.outputs.github-gpg-private-key-passphrase }}
           git_user_signingkey: true
           git_commit_gpgsign: true
 
-      - name: Create Version Branch
-        run: git switch -c version_bump_${{ github.event.inputs.version_number }}
-
-      - name: Bump Version - Android XML
-        uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945
-        with:
-          version: ${{ github.event.inputs.version_number }}
-          file_path: "./src/Android/Properties/AndroidManifest.xml"
-
-      - name: Bump Version - iOS.Autofill
-        uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945
-        with:
-          version: ${{ github.event.inputs.version_number }}
-          file_path: "./src/iOS.Autofill/Info.plist"
-
-      - name: Bump Version - iOS.Extension
-        uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945
-        with:
-          version: ${{ github.event.inputs.version_number }}
-          file_path: "./src/iOS.Extension/Info.plist"
-
-      - name: Bump Version - iOS.ShareExtension
-        uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945
-        with:
-          version: ${{ github.event.inputs.version_number }}
-          file_path: "./src/iOS.ShareExtension/Info.plist"
-
-      - name: Bump Version - iOS
-        uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945
-        with:
-          version: ${{ github.event.inputs.version_number }}
-          file_path: "./src/iOS/Info.plist"
-
       - name: Setup git
         run: |
           git config --local user.email "106330231+bitwarden-devops-bot@users.noreply.github.com"
           git config --local user.name "bitwarden-devops-bot"
 
+      - name: Create Version Branch
+        id: create-branch
+        run: |
+          NAME=version_bump_${{ github.ref_name }}_$(date +"%Y-%m-%d")
+          git switch -c $NAME
+          echo "name=$NAME" >> $GITHUB_OUTPUT
+
+      - name: Install xmllint
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libxml2-utils
+
+      - name: Get current version
+        id: current-version
+        run: |
+          CURRENT_VERSION=$(xmllint --xpath '
+            string(/manifest/@*[local-name()="versionName"
+              and namespace-uri()="http://schemas.android.com/apk/res/android"])
+            ' src/App/Platforms/Android/AndroidManifest.xml)
+          echo "version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
+
+      - name: Verify input version
+        if: ${{ inputs.version_number_override != '' }}
+        env:
+          CURRENT_VERSION: ${{ steps.current-version.outputs.version }}
+          NEW_VERSION: ${{ inputs.version_number_override }}
+        run: |
+          # 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: Calculate next release version
+        if: ${{ inputs.version_number_override == '' }}
+        id: calculate-next-version
+        uses: bitwarden/gh-actions/version-next@main
+        with:
+          version: ${{ steps.current-version.outputs.version }}
+
+      - name: Bump Version - Android XML - Version Override
+        if: ${{ inputs.version_number_override != '' }}
+        id: bump-version-override
+        uses: bitwarden/gh-actions/version-bump@main
+        with:
+          file_path: "src/App/Platforms/Android/AndroidManifest.xml"
+          version: ${{ inputs.version_number_override }}
+
+      - name: Bump Version - Android XML - Automatic Calculation
+        if: ${{ inputs.version_number_override == '' }}
+        id: bump-version-automatic
+        uses: bitwarden/gh-actions/version-bump@main
+        with:
+          file_path: "src/App/Platforms/Android/AndroidManifest.xml"
+          version: ${{ steps.calculate-next-version.outputs.version }}
+
+      - name: Bump Version - iOS.Autofill - Version Override
+        if: ${{ inputs.version_number_override != '' }}
+        uses: bitwarden/gh-actions/version-bump@main
+        with:
+          file_path: "src/iOS.Autofill/Info.plist"
+          version: ${{ inputs.version_number_override }}
+
+      - name: Bump Version - iOS.Autofill - Automatic Calculation
+        if: ${{ inputs.version_number_override == '' }}
+        uses: bitwarden/gh-actions/version-bump@main
+        with:
+          file_path: "src/iOS.Autofill/Info.plist"
+          version: ${{ steps.calculate-next-version.outputs.version }}
+
+      - name: Bump Version - iOS.Extension - Version Override
+        if: ${{ inputs.version_number_override != '' }}
+        uses: bitwarden/gh-actions/version-bump@main
+        with:
+          file_path: "src/iOS.Extension/Info.plist"
+          version: ${{ inputs.version_number_override }}
+
+      - name: Bump Version - iOS.Extension - Automatic Calculation
+        if: ${{ inputs.version_number_override == '' }}
+        uses: bitwarden/gh-actions/version-bump@main
+        with:
+          file_path: "src/iOS.Extension/Info.plist"
+          version: ${{ steps.calculate-next-version.outputs.version }}
+
+      - name: Bump Version - iOS.ShareExtension - Version Override
+        if: ${{ inputs.version_number_override != '' }}
+        uses: bitwarden/gh-actions/version-bump@main
+        with:
+          file_path: "src/iOS.ShareExtension/Info.plist"
+          version: ${{ inputs.version_number_override }}
+
+      - name: Bump Version - iOS.ShareExtension - Automatic Calculation
+        if: ${{ inputs.version_number_override == '' }}
+        uses: bitwarden/gh-actions/version-bump@main
+        with:
+          file_path: "src/iOS.ShareExtension/Info.plist"
+          version: ${{ steps.calculate-next-version.outputs.version }}
+
+      - name: Bump Version - iOS - Version Override
+        if: ${{ inputs.version_number_override != '' }}
+        uses: bitwarden/gh-actions/version-bump@main
+        with:
+          file_path: "src/App/Platforms/iOS/Info.plist"
+          version: ${{ inputs.version_number_override }}
+
+      - name: Bump Version - iOS - Automatic Calculation
+        if: ${{ inputs.version_number_override == '' }}
+        uses: bitwarden/gh-actions/version-bump@main
+        with:
+          file_path: "src/App/Platforms/iOS/Info.plist"
+          version: ${{ steps.calculate-next-version.outputs.version }}
+
+      - name: Set Job output
+        id: set-final-version-output
+        run: |
+          if [[ "${{ steps.bump-version-override.outcome }}" == "success" ]]; then
+            echo "version=${{ inputs.version_number_override }}" >> $GITHUB_OUTPUT
+          elif [[ "${{ steps.bump-version-automatic.outcome }}" == "success" ]]; then
+            echo "version=${{ steps.calculate-next-version.outputs.version }}" >> $GITHUB_OUTPUT
+          fi
+
       - name: Check if version changed
         id: version-changed
         run: |
@@ -94,22 +210,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 ${{ steps.set-final-version-output.outputs.version }}" -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 ${{ steps.set-final-version-output.outputs.version }}"
         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 +240,58 @@ jobs:
               - [X] Other
 
               ## Objective
-              Automated version bump to ${{ github.event.inputs.version_number }}"
+              Automated version bump to ${{ steps.set-final-version-output.outputs.version }}")
+          echo "pr_number=${PR_URL##*/}" >> $GITHUB_OUTPUT
+
+      - name: Approve PR
+        if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }}
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          PR_NUMBER: ${{ steps.create-pr.outputs.pr_number }}
+        run: gh pr review $PR_NUMBER --approve
+
+      - name: Merge PR
+        if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }}
+        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
+    if: ${{ inputs.cut_rc_branch == true }}
+    needs: bump_version
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout Branch
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        with:
+          ref: main
+
+      - name: Install xmllint
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libxml2-utils
+
+      - name: Verify version has been updated
+        env:
+          NEW_VERSION: ${{ needs.bump_version.outputs.version }}
+        run: |
+          # Wait for version to change.
+          while : ; do
+            echo "Waiting for version to be updated..."
+            git pull --force
+            CURRENT_VERSION=$(xmllint --xpath '
+            string(/manifest/@*[local-name()="versionName"
+              and namespace-uri()="http://schemas.android.com/apk/res/android"])
+            ' src/App/Platforms/Android/AndroidManifest.xml)
+
+            # If the versions don't match we continue the loop, otherwise we break out of the loop.
+            [[ "$NEW_VERSION" != "$CURRENT_VERSION" ]] || break
+            sleep 10
+          done
+
+      - name: Cut RC branch
+        run: |
+          git switch --quiet --create rc
+          git push --quiet --set-upstream origin rc

.github/workflows/workflow-linter.yml

@@ -1,11 +0,0 @@
----
-name: Workflow Linter
-
-on:
-  pull_request:
-    paths:
-      - .github/workflows/**
-
-jobs:
-  call-workflow:
-    uses: bitwarden/gh-actions/.github/workflows/workflow-linter.yml@master

.gitignore

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

Directory.Build.props

@@ -0,0 +1,16 @@
+<Project>
+ <PropertyGroup>
+   <MauiVersion>8.0.7</MauiVersion>
+   <ReleaseCodesignProvision>Automatic:AppStore</ReleaseCodesignProvision>
+   <ReleaseCodesignKey>iPhone Distribution</ReleaseCodesignKey>
+   <IncludeBitwardeniOSExtensions>True</IncludeBitwardeniOSExtensions>
+   <IncludeBitwardenWatchOSApp>True</IncludeBitwardenWatchOSApp>
+   <Argon2IdLoadMtouchExtraArgs>-gcc_flags "-L$(ProjectDir)../../lib/ios -largon2 -force_load $(ProjectDir)../../lib/ios/libargon2.a"</Argon2IdLoadMtouchExtraArgs>
+   
+   <!-- Uncomment this when Unit Testing-->
+   <!-- <CustomConstants>UT</CustomConstants> -->
+
+   <!-- Uncomment this when building FDROID-->
+   <!-- <CustomConstants>FDROID</CustomConstants> -->
+ </PropertyGroup>
+</Project>

README.md

@@ -1,12 +1,12 @@
-[![Github Workflow build on master](https://github.com/bitwarden/mobile/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/bitwarden/mobile/actions/workflows/build.yml?query=branch:master)
+[![Github Workflow build on main](https://github.com/bitwarden/mobile/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/bitwarden/mobile/actions/workflows/build.yml?query=branch:main)
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/bitwarden-mobile/localized.svg)](https://crowdin.com/project/bitwarden-mobile)
 [![Join the chat at https://gitter.im/bitwarden/Lobby](https://badges.gitter.im/bitwarden/Lobby.svg)](https://gitter.im/bitwarden/Lobby)
 
 # Bitwarden Mobile Application
 
-<a href="https://play.google.com/store/apps/details?id=com.x8bit.bitwarden" target="_blank"><img alt="Get it on Google Play" src="https://imgur.com/YQzmZi9.png" width="153" height="46"></a> <a href="https://mobileapp.bitwarden.com/fdroid/" target="_blank"><img alt="Get it on Google Play" src="https://i.imgur.com/HDicnzz.png" width="154" height="46"></a> <a href="https://itunes.apple.com/us/app/bitwarden-free-password-manager/id1137397744?mt=8" target="_blank"><img src="https://imgur.com/GdGqPMY.png" width="135" height="40"></a>
+<a href="https://play.google.com/store/apps/details?id=com.x8bit.bitwarden" target="_blank"><img alt="Get it on Google Play" src="https://imgur.com/YQzmZi9.png" width="153" height="46"></a> <a href="https://mobileapp.bitwarden.com/fdroid/" target="_blank"><img alt="Get it on F-Droid" src="https://i.imgur.com/HDicnzz.png" width="154" height="46"></a> <a href="https://itunes.apple.com/us/app/bitwarden-free-password-manager/id1137397744?mt=8" target="_blank"><img src="https://imgur.com/GdGqPMY.png" width="135" height="40"></a>
 
-The Bitwarden mobile application is written in C# with Xamarin Android, Xamarin iOS, and Xamarin Forms.
+The Bitwarden mobile application is written in C# using .NET MAUI.
 
 <img src="https://raw.githubusercontent.com/bitwarden/brand/master/screenshots/mobile-android-myvault.png" alt="" width="325" height="650" /> <img src="https://raw.githubusercontent.com/bitwarden/brand/master/screenshots/mobile-ios-myvault.png" alt="" width="300" height="650" />
 
@@ -20,6 +20,6 @@ Interested in contributing in a big way? Consider joining our team! We're hiring
 
 # Contribute
 
-Code contributions are welcome! Please commit any pull requests against the `master` branch. Learn more about how to contribute by reading the [Contributing Guidelines](https://contributing.bitwarden.com/contributing/). Check out the [Contributing Documentation](https://contributing.bitwarden.com/) for how to get started with your first contribution.
+Code contributions are welcome! Please commit any pull requests against the `main` branch. Learn more about how to contribute by reading the [Contributing Guidelines](https://contributing.bitwarden.com/contributing/). Check out the [Contributing Documentation](https://contributing.bitwarden.com/) for how to get started with your first contribution.
 
 Security audits and feedback are welcome. Please open an issue or email us privately if the report is sensitive in nature. You can read our security policy in the [`SECURITY.md`](SECURITY.md) file.

bitwarden-mobile.sln

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

build.cake

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

crowdin.yml

@@ -2,9 +2,9 @@ project_id_env: _CROWDIN_PROJECT_ID
 api_token_env: CROWDIN_API_TOKEN
 preserve_hierarchy: true
 files:
-  - source: /src/App/Resources/AppResources.resx
-    dest: /src/App/Resources/%original_file_name%
-    translation: /src/App/Resources/AppResources.%two_letters_code%.resx
+  - source: /src/Core/Resources/Localization/AppResources.resx
+    dest: /src/Core/Resources/Localization/%original_file_name%
+    translation: /src/Core/Resources/Localization/AppResources.%two_letters_code%.resx
     update_option: update_as_unapproved
     languages_mapping:
       two_letters_code:
@@ -38,3 +38,15 @@ files:
         pt-PT: pt-PT
         en-GB: en-GB
         en-IN: en-IN
+  - source: "/src/watchOS/bitwarden/bitwarden WatchKit Extension/Localization/en.lproj/Localizable.strings"
+    dest: "/src/watchOS/bitwarden/bitwarden WatchKit Extension/Localization/en.lproj/%original_file_name%"
+    translation: "/src/watchOS/bitwarden/bitwarden WatchKit Extension/Localization//%two_letters_code%.lproj/%original_file_name%"
+    update_option: update_as_unapproved
+    languages_mapping:
+      two_letters_code:
+        zh-CN: zh-Hans
+        zh-TW: zh-Hant
+        pt-BR: pt-BR
+        pt-PT: pt-PT
+        en-GB: en-GB
+        en-IN: en-IN

nuget.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <packageSources>
+        <add key="MAUI Nightly builds" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/maui-nightly/nuget/v3/index.json" />
+    </packageSources>
+</configuration>

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": {

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"
   }
 }

src/Android/Android.csproj

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

src/Android/Constants.cs

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

src/Android/Effects/FabShadowEffect.cs

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

src/Android/Effects/FixedSizeEffect.cs

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

src/Android/Effects/RemoveFontPaddingEffect.cs

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

src/Android/Effects/TabBarEffect.cs

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

src/Android/Properties/AssemblyInfo.cs

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

src/Android/Renderers/CustomEditorRenderer.cs

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

src/Android/Renderers/CustomEntryRenderer.cs

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

src/Android/Renderers/CustomPageRenderer.cs

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

src/Android/Renderers/CustomPickerRenderer.cs

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

src/Android/Renderers/CustomSearchBarRenderer.cs

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

src/Android/Renderers/CustomSwitchRenderer.cs

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

src/Android/Renderers/CustomTabbedRenderer.cs

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

src/Android/Renderers/ExtendedDatePickerRenderer.cs

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

src/Android/Renderers/ExtendedGridRenderer.cs

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

src/Android/Renderers/ExtendedSliderRenderer.cs

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

src/Android/Renderers/ExtendedStackLayoutRenderer.cs

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

src/Android/Renderers/ExtendedStepperRenderer.cs

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

src/Android/Renderers/ExtendedTimePickerRenderer.cs

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

src/Android/Renderers/HybridWebViewRenderer.cs

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

src/Android/Renderers/SelectableLabelRenderer.cs

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

src/App/App.csproj

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

src/App/App.xaml.cs

@@ -1,530 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.App.Abstractions;
-using Bit.App.Models;
-using Bit.App.Pages;
-using Bit.App.Resources;
-using Bit.App.Services;
-using Bit.App.Utilities;
-using Bit.App.Utilities.AccountManagement;
-using Bit.Core;
-using Bit.Core.Abstractions;
-using Bit.Core.Enums;
-using Bit.Core.Models.Data;
-using Bit.Core.Models.Response;
-using Bit.Core.Services;
-using Bit.Core.Utilities;
-using Xamarin.Forms;
-using Xamarin.Forms.Xaml;
-
-[assembly: XamlCompilation(XamlCompilationOptions.Compile)]
-namespace Bit.App
-{
-    public partial class App : Application, IAccountsManagerHost
-    {
-        public const string POP_ALL_AND_GO_TO_TAB_GENERATOR_MESSAGE = "popAllAndGoToTabGenerator";
-        public const string POP_ALL_AND_GO_TO_TAB_MYVAULT_MESSAGE = "popAllAndGoToTabMyVault";
-        public const string POP_ALL_AND_GO_TO_TAB_SEND_MESSAGE = "popAllAndGoToTabSend";
-        public const string POP_ALL_AND_GO_TO_AUTOFILL_CIPHERS_MESSAGE = "popAllAndGoToAutofillCiphers";
-
-        private readonly IBroadcasterService _broadcasterService;
-        private readonly IMessagingService _messagingService;
-        private readonly IStateService _stateService;
-        private readonly IVaultTimeoutService _vaultTimeoutService;
-        private readonly ISyncService _syncService;
-        private readonly IAuthService _authService;
-        private readonly IDeviceActionService _deviceActionService;
-        private readonly IFileService _fileService;
-        private readonly IAccountsManager _accountsManager;
-        private readonly IPushNotificationService _pushNotificationService;
-        private static bool _isResumed;
-        // these variables are static because the app is launching new activities on notification click, creating new instances of App. 
-        private static bool _pendingCheckPasswordlessLoginRequests;
-        private static object _processingLoginRequestLock = new object();
-
-        public App(AppOptions appOptions)
-        {
-            Options = appOptions ?? new AppOptions();
-            if (Options.IosExtension)
-            {
-                Current = this;
-                return;
-            }
-            _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
-            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
-            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
-            _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
-            _syncService = ServiceContainer.Resolve<ISyncService>("syncService");
-            _authService = ServiceContainer.Resolve<IAuthService>("authService");
-            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
-            _fileService = ServiceContainer.Resolve<IFileService>();
-            _accountsManager = ServiceContainer.Resolve<IAccountsManager>("accountsManager");
-            _pushNotificationService = ServiceContainer.Resolve<IPushNotificationService>();
-
-            _accountsManager.Init(() => Options, this);
-
-            Bootstrap();
-            _broadcasterService.Subscribe(nameof(App), async (message) =>
-            {
-                try
-                {
-                    if (message.Command == "showDialog")
-                    {
-                        var details = message.Data as DialogDetails;
-                        var confirmed = true;
-                        var confirmText = string.IsNullOrWhiteSpace(details.ConfirmText) ?
-                            AppResources.Ok : details.ConfirmText;
-                        Device.BeginInvokeOnMainThread(async () =>
-                        {
-                            if (!string.IsNullOrWhiteSpace(details.CancelText))
-                            {
-                                confirmed = await Current.MainPage.DisplayAlert(details.Title, details.Text, confirmText,
-                                    details.CancelText);
-                            }
-                            else
-                            {
-                                await Current.MainPage.DisplayAlert(details.Title, details.Text, confirmText);
-                            }
-                            _messagingService.Send("showDialogResolve", new Tuple<int, bool>(details.DialogId, confirmed));
-                        });
-                    }
-                    else if (message.Command == "resumed")
-                    {
-                        if (Device.RuntimePlatform == Device.iOS)
-                        {
-                            ResumedAsync().FireAndForget();
-                        }
-                    }
-                    else if (message.Command == "slept")
-                    {
-                        if (Device.RuntimePlatform == Device.iOS)
-                        {
-                            await SleptAsync();
-                        }
-                    }
-                    else if (message.Command == "migrated")
-                    {
-                        await Task.Delay(1000);
-                        await _accountsManager.NavigateOnAccountChangeAsync();
-                    }
-                    else if (message.Command == POP_ALL_AND_GO_TO_TAB_GENERATOR_MESSAGE ||
-                        message.Command == POP_ALL_AND_GO_TO_TAB_MYVAULT_MESSAGE ||
-                        message.Command == POP_ALL_AND_GO_TO_TAB_SEND_MESSAGE ||
-                        message.Command == POP_ALL_AND_GO_TO_AUTOFILL_CIPHERS_MESSAGE ||
-                        message.Command == DeepLinkContext.NEW_OTP_MESSAGE)
-                    {
-                        if (message.Command == DeepLinkContext.NEW_OTP_MESSAGE)
-                        {
-                            Options.OtpData = new OtpData((string)message.Data);
-                        }
-
-                        await Device.InvokeOnMainThreadAsync(async () =>
-                        {
-                            if (Current.MainPage is TabsPage tabsPage)
-                            {
-                                while (tabsPage.Navigation.ModalStack.Count > 0)
-                                {
-                                    await tabsPage.Navigation.PopModalAsync(false);
-                                }
-                                if (message.Command == POP_ALL_AND_GO_TO_AUTOFILL_CIPHERS_MESSAGE)
-                                {
-                                    Current.MainPage = new NavigationPage(new CipherSelectionPage(Options));
-                                }
-                                else if (message.Command == POP_ALL_AND_GO_TO_TAB_MYVAULT_MESSAGE)
-                                {
-                                    Options.MyVaultTile = false;
-                                    tabsPage.ResetToVaultPage();
-                                }
-                                else if (message.Command == POP_ALL_AND_GO_TO_TAB_GENERATOR_MESSAGE)
-                                {
-                                    Options.GeneratorTile = false;
-                                    tabsPage.ResetToGeneratorPage();
-                                }
-                                else if (message.Command == POP_ALL_AND_GO_TO_TAB_SEND_MESSAGE)
-                                {
-                                    tabsPage.ResetToSendPage();
-                                }
-                                else if (message.Command == DeepLinkContext.NEW_OTP_MESSAGE)
-                                {
-                                    tabsPage.ResetToVaultPage();
-                                    await tabsPage.Navigation.PushModalAsync(new NavigationPage(new CipherSelectionPage(Options)));
-                                }
-                            }
-                        });
-                    }
-                    else if (message.Command == "convertAccountToKeyConnector")
-                    {
-                        Device.BeginInvokeOnMainThread(async () =>
-                        {
-                            await Application.Current.MainPage.Navigation.PushModalAsync(
-                                new NavigationPage(new RemoveMasterPasswordPage()));
-                        });
-                    }
-                    else if (message.Command == Constants.ForceUpdatePassword)
-                    {
-                        Device.BeginInvokeOnMainThread(async () =>
-                        {
-                            await Application.Current.MainPage.Navigation.PushModalAsync(
-                                new NavigationPage(new UpdateTempPasswordPage()));
-                        });
-                    }
-                    else if (message.Command == Constants.PasswordlessLoginRequestKey
-                        || message.Command == "unlocked"
-                        || message.Command == AccountsManagerMessageCommands.ACCOUNT_SWITCH_COMPLETED)
-                    {
-                        lock (_processingLoginRequestLock)
-                        {
-                            // lock doesn't allow for async execution
-                            CheckPasswordlessLoginRequestsAsync().Wait();
-                        }
-                    }
-                }
-                catch (Exception ex)
-                {
-                    LoggerHelper.LogEvenIfCantBeResolved(ex);
-                }
-            });
-        }
-
-        private async Task CheckPasswordlessLoginRequestsAsync()
-        {
-            if (!_isResumed)
-            {
-                _pendingCheckPasswordlessLoginRequests = true;
-                return;
-            }
-            _pendingCheckPasswordlessLoginRequests = false;
-            if (await _vaultTimeoutService.IsLockedAsync())
-            {
-                return;
-            }
-
-            var notification = await _stateService.GetPasswordlessLoginNotificationAsync();
-            if (notification == null)
-            {
-                return;
-            }
-
-            if (await CheckShouldSwitchActiveUserAsync(notification))
-            {
-                return;
-            }
-
-            // Delay to wait for the vault page to appear
-            await Task.Delay(2000);
-            // if there is a request modal opened ignore all incoming requests
-            if (App.Current.MainPage.Navigation.ModalStack.Any(p => p is NavigationPage navPage && navPage.CurrentPage is LoginPasswordlessPage))
-            {
-                return;
-            }
-            var loginRequestData = await _authService.GetPasswordlessLoginRequestByIdAsync(notification.Id);
-            var page = new LoginPasswordlessPage(new LoginPasswordlessDetails()
-            {
-                PubKey = loginRequestData.PublicKey,
-                Id = loginRequestData.Id,
-                IpAddress = loginRequestData.RequestIpAddress,
-                Email = await _stateService.GetEmailAsync(),
-                FingerprintPhrase = loginRequestData.FingerprintPhrase,
-                RequestDate = loginRequestData.CreationDate,
-                DeviceType = loginRequestData.RequestDeviceType,
-                Origin = loginRequestData.Origin
-            });
-            await _stateService.SetPasswordlessLoginNotificationAsync(null);
-            _pushNotificationService.DismissLocalNotification(Constants.PasswordlessNotificationId);
-            if (!loginRequestData.IsExpired)
-            {
-                await Device.InvokeOnMainThreadAsync(() => Application.Current.MainPage.Navigation.PushModalAsync(new NavigationPage(page)));
-            }
-        }
-
-        private async Task<bool> CheckShouldSwitchActiveUserAsync(PasswordlessRequestNotification notification)
-        {
-            var activeUserId = await _stateService.GetActiveUserIdAsync();
-            if (notification.UserId == activeUserId)
-            {
-                return false;
-            }
-
-            var notificationUserEmail = await _stateService.GetEmailAsync(notification.UserId);
-            Device.BeginInvokeOnMainThread(async () =>
-            {
-                try
-                {
-                    var result = await _deviceActionService.DisplayAlertAsync(AppResources.LogInRequested, string.Format(AppResources.LoginAttemptFromXDoYouWantToSwitchToThisAccount, notificationUserEmail), AppResources.Cancel, AppResources.Ok);
-                    if (result == AppResources.Ok)
-                    {
-                        await _stateService.SetActiveUserAsync(notification.UserId);
-                        _messagingService.Send(AccountsManagerMessageCommands.SWITCHED_ACCOUNT);
-                    }
-                }
-                catch (Exception ex)
-                {
-                    LoggerHelper.LogEvenIfCantBeResolved(ex);
-                }
-            });
-            return true;
-        }
-
-        public AppOptions Options { get; private set; }
-
-        protected async override void OnStart()
-        {
-            System.Diagnostics.Debug.WriteLine("XF App: OnStart");
-            _isResumed = true;
-            await ClearCacheIfNeededAsync();
-            Prime();
-            if (string.IsNullOrWhiteSpace(Options.Uri))
-            {
-                var updated = await AppHelpers.PerformUpdateTasksAsync(_syncService, _deviceActionService,
-                    _stateService);
-                if (!updated)
-                {
-                    SyncIfNeeded();
-                }
-            }
-            if (_pendingCheckPasswordlessLoginRequests)
-            {
-                _messagingService.Send(Constants.PasswordlessLoginRequestKey);
-            }
-            if (Device.RuntimePlatform == Device.Android)
-            {
-                await _vaultTimeoutService.CheckVaultTimeoutAsync();
-                // Reset delay on every start
-                _vaultTimeoutService.DelayLockAndLogoutMs = null;
-            }
-            _messagingService.Send("startEventTimer");
-        }
-
-        protected async override void OnSleep()
-        {
-            System.Diagnostics.Debug.WriteLine("XF App: OnSleep");
-            _isResumed = false;
-            if (Device.RuntimePlatform == Device.Android)
-            {
-                var isLocked = await _vaultTimeoutService.IsLockedAsync();
-                if (!isLocked)
-                {
-                    await _stateService.SetLastActiveTimeAsync(_deviceActionService.GetActiveTime());
-                }
-                if (!SetTabsPageFromAutofill(isLocked))
-                {
-                    ClearAutofillUri();
-                }
-                await SleptAsync();
-            }
-        }
-
-        protected override void OnResume()
-        {
-            System.Diagnostics.Debug.WriteLine("XF App: OnResume");
-            _isResumed = true;
-            if (_pendingCheckPasswordlessLoginRequests)
-            {
-                _messagingService.Send(Constants.PasswordlessLoginRequestKey);
-            }
-            if (Device.RuntimePlatform == Device.Android)
-            {
-                ResumedAsync().FireAndForget();
-            }
-        }
-
-        private async Task SleptAsync()
-        {
-            await _vaultTimeoutService.CheckVaultTimeoutAsync();
-            await ClearSensitiveFieldsAsync();
-            _messagingService.Send("stopEventTimer");
-        }
-
-        private async Task ResumedAsync()
-        {
-            await _stateService.CheckExtensionActiveUserAndSwitchIfNeededAsync();
-            await _vaultTimeoutService.CheckVaultTimeoutAsync();
-            await ClearSensitiveFieldsAsync();
-            _messagingService.Send("startEventTimer");
-            await UpdateThemeAsync();
-            await ClearCacheIfNeededAsync();
-            Prime();
-            SyncIfNeeded();
-            if (Current.MainPage is NavigationPage navPage && navPage.CurrentPage is LockPage lockPage)
-            {
-                await lockPage.PromptBiometricAfterResumeAsync();
-            }
-        }
-
-        public async Task UpdateThemeAsync()
-        {
-            await Device.InvokeOnMainThreadAsync(() =>
-            {
-                ThemeManager.SetTheme(Current.Resources);
-                _messagingService.Send("updatedTheme");
-            });
-        }
-
-        private async Task ClearSensitiveFieldsAsync()
-        {
-            await Device.InvokeOnMainThreadAsync(() =>
-            {
-                _messagingService.Send(Constants.ClearSensitiveFields);
-            });
-        }
-
-        private void SetCulture()
-        {
-            // Calendars are removed by linker. ref https://bugzilla.xamarin.com/show_bug.cgi?id=59077
-            new System.Globalization.ThaiBuddhistCalendar();
-            new System.Globalization.HijriCalendar();
-            new System.Globalization.UmAlQuraCalendar();
-        }
-
-        private async Task ClearCacheIfNeededAsync()
-        {
-            var lastClear = await _stateService.GetLastFileCacheClearAsync();
-            if ((DateTime.UtcNow - lastClear.GetValueOrDefault(DateTime.MinValue)).TotalDays >= 1)
-            {
-                var task = Task.Run(() => _fileService.ClearCacheAsync());
-            }
-        }
-
-        private void ClearAutofillUri()
-        {
-            if (Device.RuntimePlatform == Device.Android && !string.IsNullOrWhiteSpace(Options.Uri))
-            {
-                Options.Uri = null;
-            }
-        }
-
-        private bool SetTabsPageFromAutofill(bool isLocked)
-        {
-            if (Device.RuntimePlatform == Device.Android && !string.IsNullOrWhiteSpace(Options.Uri) &&
-                !Options.FromAutofillFramework)
-            {
-                Task.Run(() =>
-                {
-                    Device.BeginInvokeOnMainThread(() =>
-                    {
-                        Options.Uri = null;
-                        if (isLocked)
-                        {
-                            Current.MainPage = new NavigationPage(new LockPage());
-                        }
-                        else
-                        {
-                            Current.MainPage = new TabsPage();
-                        }
-                    });
-                });
-                return true;
-            }
-            return false;
-        }
-
-        private void Prime()
-        {
-            Task.Run(() =>
-            {
-                var word = EEFLongWordList.Instance.List[1];
-                var parsedDomain = DomainName.TryParse("https://bitwarden.com", out var domainName);
-            });
-        }
-
-        private void Bootstrap()
-        {
-            InitializeComponent();
-            SetCulture();
-            ThemeManager.SetTheme(Current.Resources);
-            Current.RequestedThemeChanged += (s, a) =>
-            {
-                UpdateThemeAsync();
-            };
-            Current.MainPage = new NavigationPage(new HomePage(Options));
-            _accountsManager.NavigateOnAccountChangeAsync().FireAndForget();
-            ServiceContainer.Resolve<MobilePlatformUtilsService>("platformUtilsService").Init();
-        }
-
-        private void SyncIfNeeded()
-        {
-            if (Xamarin.Essentials.Connectivity.NetworkAccess == Xamarin.Essentials.NetworkAccess.None)
-            {
-                return;
-            }
-            Task.Run(async () =>
-            {
-                var lastSync = await _syncService.GetLastSyncAsync();
-                if (lastSync == null || ((DateTime.UtcNow - lastSync) > TimeSpan.FromMinutes(30)))
-                {
-                    await Task.Delay(1000);
-                    await _syncService.FullSyncAsync(false);
-                }
-            });
-        }
-
-        public async Task SetPreviousPageInfoAsync()
-        {
-            PreviousPageInfo lastPageBeforeLock = null;
-            if (Current.MainPage is TabbedPage tabbedPage && tabbedPage.Navigation.ModalStack.Count > 0)
-            {
-                var topPage = tabbedPage.Navigation.ModalStack[tabbedPage.Navigation.ModalStack.Count - 1];
-                if (topPage is NavigationPage navPage)
-                {
-                    if (navPage.CurrentPage is CipherDetailsPage cipherDetailsPage)
-                    {
-                        lastPageBeforeLock = new PreviousPageInfo
-                        {
-                            Page = "view",
-                            CipherId = cipherDetailsPage.ViewModel.CipherId
-                        };
-                    }
-                    else if (navPage.CurrentPage is CipherAddEditPage cipherAddEditPage && cipherAddEditPage.ViewModel.EditMode)
-                    {
-                        lastPageBeforeLock = new PreviousPageInfo
-                        {
-                            Page = "edit",
-                            CipherId = cipherAddEditPage.ViewModel.CipherId
-                        };
-                    }
-                }
-            }
-            await _stateService.SetPreviousPageInfoAsync(lastPageBeforeLock);
-        }
-
-        public void Navigate(NavigationTarget navTarget, INavigationParams navParams)
-        {
-            switch (navTarget)
-            {
-                case NavigationTarget.HomeLogin:
-                    Current.MainPage = new NavigationPage(new HomePage(Options));
-                    break;
-                case NavigationTarget.Login:
-                    if (navParams is LoginNavigationParams loginParams)
-                    {
-                        Current.MainPage = new NavigationPage(new LoginPage(loginParams.Email, Options));
-                    }
-                    break;
-                case NavigationTarget.Lock:
-                    if (navParams is LockNavigationParams lockParams)
-                    {
-                        Current.MainPage = new NavigationPage(new LockPage(Options, lockParams.AutoPromptBiometric));
-                    }
-                    else
-                    {
-                        Current.MainPage = new NavigationPage(new LockPage(Options));
-                    }
-                    break;
-                case NavigationTarget.Home:
-                    Current.MainPage = new TabsPage(Options);
-                    break;
-                case NavigationTarget.AddEditCipher:
-                    Current.MainPage = new NavigationPage(new CipherAddEditPage(appOptions: Options));
-                    break;
-                case NavigationTarget.AutofillCiphers:
-                case NavigationTarget.OtpCipherSelection:
-                    Current.MainPage = new NavigationPage(new CipherSelectionPage(Options));
-                    break;
-                case NavigationTarget.SendAddEdit:
-                    Current.MainPage = new NavigationPage(new SendAddEditPage(Options));
-                    break;
-            }
-        }
-    }
-}

src/App/Controls/AuthenticatorViewCell/AuthenticatorViewCell.xaml.cs

@@ -1,67 +0,0 @@
-using System;
-using Bit.App.Pages;
-using Bit.App.Utilities;
-using Bit.Core.Models.View;
-using Bit.Core.Utilities;
-using Xamarin.Forms;
-
-namespace Bit.App.Controls
-{
-    public partial class AuthenticatorViewCell : ExtendedGrid
-    {
-        public static readonly BindableProperty CipherProperty = BindableProperty.Create(
-            nameof(Cipher), typeof(CipherView), typeof(AuthenticatorViewCell), default(CipherView), BindingMode.TwoWay);
-
-        public static readonly BindableProperty WebsiteIconsEnabledProperty = BindableProperty.Create(
-            nameof(WebsiteIconsEnabled), typeof(bool?), typeof(AuthenticatorViewCell));
-
-        public static readonly BindableProperty TotpSecProperty = BindableProperty.Create(
-            nameof(TotpSec), typeof(long), typeof(AuthenticatorViewCell));
-
-        public AuthenticatorViewCell()
-        {
-            InitializeComponent();
-        }
-
-        public Command CopyCommand { get; set; }
-
-        public CipherView Cipher
-        {
-            get => GetValue(CipherProperty) as CipherView;
-            set => SetValue(CipherProperty, value);
-        }
-
-        public bool? WebsiteIconsEnabled
-        {
-            get => (bool)GetValue(WebsiteIconsEnabledProperty);
-            set => SetValue(WebsiteIconsEnabledProperty, value);
-        }
-
-        public long TotpSec
-        {
-            get => (long)GetValue(TotpSecProperty);
-            set => SetValue(TotpSecProperty, value);
-        }
-
-        public bool ShowIconImage
-        {
-            get => WebsiteIconsEnabled ?? false
-                && !string.IsNullOrWhiteSpace(Cipher.Login?.Uri)
-                && IconImageSource != null;
-        }
-
-        private string _iconImageSource = string.Empty;
-        public string IconImageSource
-        {
-            get
-            {
-                if (_iconImageSource == string.Empty) // default value since icon source can return null
-                {
-                    _iconImageSource = IconImageHelper.GetLoginIconImage(Cipher);
-                }
-                return _iconImageSource;
-            }
-
-        }
-    }
-}

src/App/Controls/AvatarImageSource.cs

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

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

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

src/App/Controls/CipherViewCell/CipherViewCellViewModel.cs

@@ -1,51 +0,0 @@
-using Bit.App.Utilities;
-using Bit.Core.Models.View;
-using Bit.Core.Utilities;
-
-namespace Bit.App.Controls
-{
-    public class CipherViewCellViewModel : ExtendedViewModel
-    {
-        private CipherView _cipher;
-        private bool _websiteIconsEnabled;
-        private string _iconImageSource = string.Empty;
-
-        public CipherViewCellViewModel(CipherView cipherView, bool websiteIconsEnabled)
-        {
-            Cipher = cipherView;
-            WebsiteIconsEnabled = websiteIconsEnabled;
-        }
-
-        public CipherView Cipher
-        {
-            get => _cipher;
-            set => SetProperty(ref _cipher, value);
-        }
-
-        public bool WebsiteIconsEnabled
-        {
-            get => _websiteIconsEnabled;
-            set => SetProperty(ref _websiteIconsEnabled, value);
-        }
-
-        public bool ShowIconImage
-        {
-            get => WebsiteIconsEnabled
-                && !string.IsNullOrWhiteSpace(Cipher.Login?.Uri)
-                && IconImageSource != null;
-        }
-
-        public string IconImageSource
-        {
-            get
-            {
-                if (_iconImageSource == string.Empty) // default value since icon source can return null
-                {
-                    _iconImageSource = IconImageHelper.GetLoginIconImage(Cipher);
-                }
-                return _iconImageSource;
-            }
-
-        }
-    }
-}

src/App/Controls/ExtendedCollectionView.cs

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

src/App/Controls/ExtendedGrid.cs

@@ -1,8 +0,0 @@
-using Xamarin.Forms;
-
-namespace Bit.App.Controls
-{
-    public class ExtendedGrid : Grid
-    {
-    }
-}

src/App/Controls/ExtendedSearchBar.cs

@@ -1,19 +0,0 @@
-using Bit.App.Utilities;
-using Xamarin.Forms;
-
-namespace Bit.App.Controls
-{
-    public class ExtendedSearchBar : SearchBar
-    {
-        public ExtendedSearchBar()
-        {
-            if (Device.RuntimePlatform == Device.iOS)
-            {
-                if (ThemeManager.UsingLightTheme)
-                {
-                    TextColor = Color.Black;
-                }
-            }
-        }
-    }
-}

src/App/Controls/ExtendedStackLayout.cs

@@ -1,8 +0,0 @@
-using Xamarin.Forms;
-
-namespace Bit.App.Controls
-{
-    public class ExtendedStackLayout : StackLayout
-    {
-    }
-}

src/App/Controls/IconLabelButton/IconLabelButton.xaml

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

src/App/Controls/MonoEntry.cs

@@ -1,20 +0,0 @@
-using Xamarin.Forms;
-
-namespace Bit.App.Controls
-{
-    public class MonoEntry : Entry
-    {
-        public MonoEntry()
-        {
-            switch (Device.RuntimePlatform)
-            {
-                case Device.iOS:
-                    FontFamily = "Menlo-Regular";
-                    break;
-                case Device.Android:
-                    FontFamily = "RobotoMono_Regular.ttf#Roboto Mono";
-                    break;
-            }
-        }
-    }
-}

src/App/Controls/MonoLabel.cs

@@ -1,20 +0,0 @@
-using Xamarin.Forms;
-
-namespace Bit.App.Controls
-{
-    public class MonoLabel : Label
-    {
-        public MonoLabel()
-        {
-            switch (Device.RuntimePlatform)
-            {
-                case Device.iOS:
-                    FontFamily = "Menlo-Regular";
-                    break;
-                case Device.Android:
-                    FontFamily = "RobotoMono_Regular.ttf#Roboto Mono";
-                    break;
-            }
-        }
-    }
-}

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

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

src/App/Effects/FabShadowEffect.cs

@@ -1,11 +0,0 @@
-using Xamarin.Forms;
-
-namespace Bit.App.Effects
-{
-    public class FabShadowEffect : RoutingEffect
-    {
-        public FabShadowEffect()
-            : base("Bitwarden.FabShadowEffect")
-        { }
-    }
-}

src/App/Effects/FixedSizeEffect.cs

@@ -1,11 +0,0 @@
-using Xamarin.Forms;
-
-namespace Bit.App.Effects
-{
-    public class FixedSizeEffect : RoutingEffect
-    {
-        public FixedSizeEffect()
-            : base("Bitwarden.FixedSizeEffect")
-        { }
-    }
-}

src/App/Effects/NoEmojiKeyboardEffect.cs

@@ -1,12 +0,0 @@
-using System;
-using Xamarin.Forms;
-
-namespace Bit.App.Effects
-{
-    public class NoEmojiKeyboardEffect : RoutingEffect
-    {
-        public NoEmojiKeyboardEffect()
-            : base("Bitwarden.NoEmojiKeyboardEffect")
-        { }
-    }
-}

src/App/Effects/RemoveFontPaddingEffect.cs

@@ -1,13 +0,0 @@
-using System;
-using Xamarin.Forms;
-
-namespace Bit.App.Effects
-{
-    public class RemoveFontPaddingEffect : RoutingEffect
-    {
-        public RemoveFontPaddingEffect()
-            : base("Bitwarden.RemoveFontPaddingEffect")
-        { }
-    }
-}
-

src/App/Effects/ScrollViewContentInsetAdjustmentBehaviorEffect.cs

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

src/App/Effects/TabBarEffect.cs

@@ -1,11 +0,0 @@
-using Xamarin.Forms;
-
-namespace Bit.App.Effects
-{
-    public class TabBarEffect : RoutingEffect
-    {
-        public TabBarEffect()
-            : base("Bitwarden.TabBarEffect")
-        { }
-    }
-}

src/App/MauiProgram.cs

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

src/App/Pages/Accounts/HomePage.xaml

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

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

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

src/App/Pages/Accounts/LockPageViewModel.cs

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

src/App/Pages/Accounts/LoginPasswordlessRequestPage.xaml

@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<pages:BaseContentPage
-    xmlns="http://xamarin.com/schemas/2014/forms"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    x:Class="Bit.App.Pages.LoginPasswordlessRequestPage"
-    xmlns:pages="clr-namespace:Bit.App.Pages"
-    xmlns:controls="clr-namespace:Bit.App.Controls"
-    xmlns:u="clr-namespace:Bit.App.Utilities"
-    x:DataType="pages:LoginPasswordlessRequestViewModel"
-    Title="{Binding PageTitle}">
-
-    <ContentPage.BindingContext>
-        <pages:LoginPasswordlessRequestViewModel />
-    </ContentPage.BindingContext>
-
-    <ContentPage.ToolbarItems>
-        <ToolbarItem Text="{u:I18n Close}" Command="{Binding CloseCommand}" Order="Primary" Priority="-1" x:Name="_closeItem"/>
-    </ContentPage.ToolbarItems>
-
-    <ScrollView>
-        <StackLayout
-            Padding="7, 0, 7, 20">
-            <Label
-                Text="{u:I18n LogInInitiated}"
-                FontSize="Title"
-                FontAttributes="Bold"
-                Margin="0,14,0,21"/>
-            <Label
-                Text="{u:I18n ANotificationHasBeenSentToYourDevice}"
-                FontSize="Small"
-                Margin="0,0,0,10"/>
-            <Label
-                Text="{u:I18n PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice}"
-                FontSize="Small"
-                Margin="0,0,0,24"/>
-            <Label
-                Text="{u:I18n FingerprintPhrase}"
-                FontSize="Small"
-                FontAttributes="Bold"/>
-            <controls:MonoLabel
-                FormattedText="{Binding FingerprintPhrase}"
-                FontSize="Medium"
-                TextColor="{DynamicResource FingerprintPhrase}"/>
-            <Label
-                Text="{u:I18n ResendNotification}"
-                StyleClass="text-md"
-                HorizontalOptions="Start"
-                Margin="0,40,0,0"
-                TextColor="{DynamicResource HyperlinkColor}">
-                <Label.GestureRecognizers>
-                    <TapGestureRecognizer Command="{Binding CreatePasswordlessLoginCommand}" />
-                </Label.GestureRecognizers>
-            </Label>
-            <StackLayout
-                Orientation="Horizontal"
-                Margin="0,30,0,0">
-                <Label
-                    Text="{u:I18n NeedAnotherOption}"
-                    FontSize="Small"
-                    VerticalTextAlignment="End"/>
-                <Label
-                    Text="{u:I18n ViewAllLoginOptions}"
-                    StyleClass="text-md"
-                    VerticalTextAlignment="End"
-                    VerticalOptions="CenterAndExpand"
-                    Margin="5, 0"
-                    TextColor="{DynamicResource HyperlinkColor}">
-                    <Label.GestureRecognizers>
-                        <TapGestureRecognizer Command="{Binding CloseCommand}" />
-                    </Label.GestureRecognizers>
-                </Label>
-            </StackLayout>
-               
-        </StackLayout>
-    </ScrollView>
-</pages:BaseContentPage>

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

@@ -1,65 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.App.Models;
-using Bit.App.Utilities;
-using Xamarin.Forms;
-
-namespace Bit.App.Pages
-{
-    public partial class LoginPasswordlessRequestPage : BaseContentPage
-    {
-        private LoginPasswordlessRequestViewModel _vm;
-        private readonly AppOptions _appOptions;
-
-        public LoginPasswordlessRequestPage(string email, AppOptions appOptions = null)
-        {
-            InitializeComponent();
-            _appOptions = appOptions;
-            _vm = BindingContext as LoginPasswordlessRequestViewModel;
-            _vm.Page = this;
-            _vm.Email = email;
-            _vm.StartTwoFactorAction = () => Device.BeginInvokeOnMainThread(async () => await StartTwoFactorAsync());
-            _vm.LogInSuccessAction = () => Device.BeginInvokeOnMainThread(async () => await LogInSuccessAsync());
-            _vm.UpdateTempPasswordAction = () => Device.BeginInvokeOnMainThread(async () => await UpdateTempPasswordAsync());
-            _vm.CloseAction = () => { Navigation.PopModalAsync(); };
-
-            _vm.CreatePasswordlessLoginCommand.Execute(null);
-        }
-
-        protected override void OnAppearing()
-        {
-            base.OnAppearing();
-            _vm.StartCheckLoginRequestStatus();
-        }
-
-        protected override void OnDisappearing()
-        {
-            base.OnDisappearing();
-            _vm.StopCheckLoginRequestStatus();
-        }
-
-        private async Task StartTwoFactorAsync()
-        {
-            var page = new TwoFactorPage(false, _appOptions);
-            await Navigation.PushModalAsync(new NavigationPage(page));
-        }
-
-        private async Task LogInSuccessAsync()
-        {
-            if (AppHelpers.SetAlternateMainPage(_appOptions))
-            {
-                return;
-            }
-            var previousPage = await AppHelpers.ClearPreviousPage();
-            Application.Current.MainPage = new TabsPage(_appOptions, previousPage);
-        }
-
-        private async Task UpdateTempPasswordAsync()
-        {
-            var page = new UpdateTempPasswordPage();
-            await Navigation.PushModalAsync(new NavigationPage(page));
-        }
-    }
-}
-

src/App/Pages/Accounts/LoginPasswordlessRequestViewModel.cs

@@ -1,194 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Bit.App.Abstractions;
-using Bit.App.Resources;
-using Bit.App.Utilities;
-using Bit.Core;
-using Bit.Core.Abstractions;
-using Bit.Core.Enums;
-using Bit.Core.Models.Domain;
-using Bit.Core.Services;
-using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
-using Xamarin.Essentials;
-using Xamarin.Forms;
-
-namespace Bit.App.Pages
-{
-    public class LoginPasswordlessRequestViewModel : CaptchaProtectedViewModel
-    {
-        private const int REQUEST_TIME_UPDATE_PERIOD_IN_SECONDS = 4;
-
-        private IDeviceActionService _deviceActionService;
-        private IAuthService _authService;
-        private ISyncService _syncService;
-        private II18nService _i18nService;
-        private IStateService _stateService;
-        private IPlatformUtilsService _platformUtilsService;
-        private IEnvironmentService _environmentService;
-        private ILogger _logger;
-
-        protected override II18nService i18nService => _i18nService;
-        protected override IEnvironmentService environmentService => _environmentService;
-        protected override IDeviceActionService deviceActionService => _deviceActionService;
-        protected override IPlatformUtilsService platformUtilsService => _platformUtilsService;
-
-        private CancellationTokenSource _checkLoginRequestStatusCts;
-        private Task _checkLoginRequestStatusTask;
-        private string _fingerprintPhrase;
-        private string _email;
-        private string _requestId;
-        private string _requestAccessCode;
-        // Item1 publicKey, Item2 privateKey
-        private Tuple<byte[], byte[]> _requestKeyPair;
-
-        public LoginPasswordlessRequestViewModel()
-        {
-            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>();
-            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>();
-            _environmentService = ServiceContainer.Resolve<IEnvironmentService>();
-            _authService = ServiceContainer.Resolve<IAuthService>();
-            _syncService = ServiceContainer.Resolve<ISyncService>();
-            _i18nService = ServiceContainer.Resolve<II18nService>();
-            _stateService = ServiceContainer.Resolve<IStateService>();
-            _logger = ServiceContainer.Resolve<ILogger>();
-
-            PageTitle = AppResources.LogInWithAnotherDevice;
-
-            CreatePasswordlessLoginCommand = new AsyncCommand(CreatePasswordlessLoginAsync,
-                onException: ex => HandleException(ex),
-                allowsMultipleExecutions: false);
-
-            CloseCommand = new AsyncCommand(() => Device.InvokeOnMainThreadAsync(CloseAction),
-                onException: _logger.Exception,
-                allowsMultipleExecutions: false);
-        }
-
-        public Action StartTwoFactorAction { get; set; }
-        public Action LogInSuccessAction { get; set; }
-        public Action UpdateTempPasswordAction { get; set; }
-        public Action CloseAction { get; set; }
-
-        public ICommand CreatePasswordlessLoginCommand { get; }
-        public ICommand CloseCommand { get; }
-
-        public string FingerprintPhrase
-        {
-            get => _fingerprintPhrase;
-            set => SetProperty(ref _fingerprintPhrase, value);
-        }
-
-        public string Email
-        {
-            get => _email;
-            set => SetProperty(ref _email, value);
-        }
-
-        public void StartCheckLoginRequestStatus()
-        {
-            try
-            {
-                _checkLoginRequestStatusCts?.Cancel();
-                _checkLoginRequestStatusCts = new CancellationTokenSource();
-                _checkLoginRequestStatusTask = new TimerTask(_logger, CheckLoginRequestStatus, _checkLoginRequestStatusCts).RunPeriodic(TimeSpan.FromSeconds(REQUEST_TIME_UPDATE_PERIOD_IN_SECONDS));
-            }
-            catch (Exception ex)
-            {
-                _logger.Exception(ex);
-            }
-        }
-
-        public void StopCheckLoginRequestStatus()
-        {
-            try
-            {
-                _checkLoginRequestStatusCts?.Cancel();
-                _checkLoginRequestStatusCts?.Dispose();
-                _checkLoginRequestStatusCts = null;
-            }
-            catch (Exception ex)
-            {
-                _logger.Exception(ex);
-            }
-        }
-
-        private async Task CheckLoginRequestStatus()
-        {
-            if (string.IsNullOrEmpty(_requestId) || string.IsNullOrEmpty(_requestAccessCode))
-            {
-                return;
-            }
-
-            try
-            {
-                var response = await _authService.GetPasswordlessLoginResponseAsync(_requestId, _requestAccessCode);
-
-                if (response.RequestApproved == null || !response.RequestApproved.Value)
-                {
-                    return;
-                }
-
-                StopCheckLoginRequestStatus();
-
-                var authResult = await _authService.LogInPasswordlessAsync(Email, _requestAccessCode, _requestId, _requestKeyPair.Item2, response.Key, response.MasterPasswordHash);
-                await AppHelpers.ResetInvalidUnlockAttemptsAsync();
-
-                if (await HandleCaptchaAsync(authResult.CaptchaSiteKey, authResult.CaptchaNeeded, CheckLoginRequestStatus))
-                {
-                    return;
-                }
-
-                if (authResult.TwoFactor)
-                {
-                    StartTwoFactorAction?.Invoke();
-                }
-                else if (authResult.ForcePasswordReset)
-                {
-                    UpdateTempPasswordAction?.Invoke();
-                }
-                else
-                {
-                    _syncService.FullSyncAsync(true).FireAndForget();
-                    LogInSuccessAction?.Invoke();
-                }
-            }
-            catch (Exception ex)
-            {
-                StartCheckLoginRequestStatus();
-                HandleException(ex);
-            }
-        }
-
-        private async Task CreatePasswordlessLoginAsync()
-        {
-            await Device.InvokeOnMainThreadAsync(() => _deviceActionService.ShowLoadingAsync(AppResources.Loading));
-
-            var response = await _authService.PasswordlessCreateLoginRequestAsync(_email);
-            if (response != null)
-            {
-                FingerprintPhrase = response.FingerprintPhrase;
-                _requestId = response.Id;
-                _requestAccessCode = response.RequestAccessCode;
-                _requestKeyPair = response.RequestKeyPair;
-            }
-
-            await _deviceActionService.HideLoadingAsync();
-        }
-
-        private void HandleException(Exception ex)
-        {
-            Xamarin.Essentials.MainThread.InvokeOnMainThreadAsync(async () =>
-            {
-                await _deviceActionService.HideLoadingAsync();
-                await _platformUtilsService.ShowDialogAsync(AppResources.GenericErrorMessage);
-            }).FireAndForget();
-            _logger.Exception(ex);
-        }
-    }
-}
-

src/App/Pages/BaseContentPage.cs

@@ -1,156 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Bit.App.Abstractions;
-using Bit.App.Controls;
-using Bit.App.Utilities;
-using Bit.Core.Abstractions;
-using Bit.Core.Utilities;
-using Xamarin.Forms;
-using Xamarin.Forms.PlatformConfiguration;
-using Xamarin.Forms.PlatformConfiguration.iOSSpecific;
-
-namespace Bit.App.Pages
-{
-    public class BaseContentPage : ContentPage
-    {
-        private IStateService _stateService;
-        private IDeviceActionService _deviceActionService;
-
-        protected int ShowModalAnimationDelay = 400;
-        protected int ShowPageAnimationDelay = 100;
-
-        public BaseContentPage()
-        {
-            if (Device.RuntimePlatform == Device.iOS)
-            {
-                On<iOS>().SetUseSafeArea(true);
-                On<iOS>().SetModalPresentationStyle(UIModalPresentationStyle.FullScreen);
-            }
-        }
-
-        public DateTime? LastPageAction { get; set; }
-
-        public bool IsThemeDirty { get; set; }
-
-        protected async override void OnAppearing()
-        {
-            base.OnAppearing();
-
-            if (IsThemeDirty)
-            {
-                UpdateOnThemeChanged();
-            }
-
-            await SaveActivityAsync();
-        }
-
-        public bool DoOnce(Action action = null, int milliseconds = 1000)
-        {
-            if (LastPageAction.HasValue && (DateTime.UtcNow - LastPageAction.Value).TotalMilliseconds < milliseconds)
-            {
-                // Last action occurred recently.
-                return false;
-            }
-            LastPageAction = DateTime.UtcNow;
-            action?.Invoke();
-            return true;
-        }
-
-        public virtual Task UpdateOnThemeChanged()
-        {
-            IsThemeDirty = false;
-            return Task.CompletedTask;
-        }
-
-        protected void SetActivityIndicator(ContentView targetView = null)
-        {
-            var indicator = new ActivityIndicator
-            {
-                IsRunning = true,
-                VerticalOptions = LayoutOptions.CenterAndExpand,
-                HorizontalOptions = LayoutOptions.Center,
-                Color = ThemeManager.GetResourceColor("PrimaryColor"),
-            };
-            if (targetView != null)
-            {
-                targetView.Content = indicator;
-            }
-            else
-            {
-                Content = indicator;
-            }
-        }
-
-        protected async Task LoadOnAppearedAsync(View sourceView, bool fromModal, Func<Task> workFunction,
-            ContentView targetView = null)
-        {
-            async Task DoWorkAsync()
-            {
-                await workFunction.Invoke();
-                if (sourceView != null)
-                {
-                    if (targetView != null)
-                    {
-                        targetView.Content = sourceView;
-                    }
-                    else
-                    {
-                        Content = sourceView;
-                    }
-                }
-            }
-            if (Device.RuntimePlatform == Device.iOS)
-            {
-                await DoWorkAsync();
-                return;
-            }
-            await Task.Run(async () =>
-            {
-                await Task.Delay(fromModal ? ShowModalAnimationDelay : ShowPageAnimationDelay);
-                Device.BeginInvokeOnMainThread(async () => await DoWorkAsync());
-            });
-        }
-
-        protected void RequestFocus(InputView input)
-        {
-            Task.Run(async () =>
-            {
-                await Task.Delay(ShowModalAnimationDelay);
-                Device.BeginInvokeOnMainThread(() => input.Focus());
-            });
-        }
-
-        protected async Task<bool> ShowAccountSwitcherAsync()
-        {
-            return await _stateService.GetActiveUserIdAsync() != null;
-        }
-
-        protected async Task<AvatarImageSource> GetAvatarImageSourceAsync(bool useCurrentActiveAccount = true)
-        {
-            if (useCurrentActiveAccount)
-            {
-                var user = await _stateService.GetActiveUserCustomDataAsync(a => (a?.Profile?.UserId, a?.Profile?.Name, a?.Profile?.Email, a?.Profile?.AvatarColor));
-                return new AvatarImageSource(user.UserId, user.Name, user.Email, user.AvatarColor);
-            }
-            return new AvatarImageSource();
-        }
-
-        private void SetServices()
-        {
-            if (_stateService == null)
-            {
-                _stateService = ServiceContainer.Resolve<IStateService>("stateService");
-            }
-            if (_deviceActionService == null)
-            {
-                _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
-            }
-        }
-
-        private async Task SaveActivityAsync()
-        {
-            SetServices();
-            await _stateService.SetLastActiveTimeAsync(_deviceActionService.GetActiveTime());
-        }
-    }
-}

src/App/Pages/BaseViewModel.cs

@@ -1,51 +0,0 @@
-using System;
-using Bit.App.Abstractions;
-using Bit.App.Controls;
-using Bit.App.Resources;
-using Bit.Core.Abstractions;
-using Bit.Core.Exceptions;
-using Bit.Core.Services;
-using Bit.Core.Utilities;
-using Xamarin.Forms;
-
-namespace Bit.App.Pages
-{
-    public abstract class BaseViewModel : ExtendedViewModel
-    {
-        private string _pageTitle = string.Empty;
-        private AvatarImageSource _avatar;
-        private LazyResolve<IDeviceActionService> _deviceActionService = new LazyResolve<IDeviceActionService>();
-        private LazyResolve<IPlatformUtilsService> _platformUtilsService = new LazyResolve<IPlatformUtilsService>();
-        private LazyResolve<ILogger> _logger = new LazyResolve<ILogger>();
-
-        public string PageTitle
-        {
-            get => _pageTitle;
-            set => SetProperty(ref _pageTitle, value);
-        }
-
-        public AvatarImageSource AvatarImageSource
-        {
-            get => _avatar ?? new AvatarImageSource();
-            set => SetProperty(ref _avatar, value);
-        }
-
-        public ContentPage Page { get; set; }
-
-        protected void HandleException(Exception ex, string message = null)
-        {
-            if (ex is ApiException apiException && apiException.Error != null)
-            {
-                message = apiException.Error.GetSingleMessage();
-            }
-
-            Xamarin.Essentials.MainThread.InvokeOnMainThreadAsync(async () =>
-            {
-                await _deviceActionService.Value.HideLoadingAsync();
-                await _platformUtilsService.Value.ShowDialogAsync(message ?? AppResources.GenericErrorMessage);
-            }).FireAndForget();
-            _logger.Value.Exception(ex);
-        }
-
-    }
-}

src/App/Pages/Send/SendGroupingsPage/SendGroupingsPageListItem.cs

@@ -1,70 +0,0 @@
-using Bit.App.Resources;
-using Bit.Core;
-using Bit.Core.Enums;
-using Bit.Core.Models.View;
-
-namespace Bit.App.Pages
-{
-    public class SendGroupingsPageListItem : ISendGroupingsPageListItem
-    {
-        private string _icon;
-        private string _name;
-
-        public SendView Send { get; set; }
-        public SendType? Type { get; set; }
-        public string ItemCount { get; set; }
-        public bool ShowOptions { get; set; }
-
-        public string Name
-        {
-            get
-            {
-                if (_name != null)
-                {
-                    return _name;
-                }
-                if (Type != null)
-                {
-                    switch (Type.Value)
-                    {
-                        case SendType.Text:
-                            _name = AppResources.TypeText;
-                            break;
-                        case SendType.File:
-                            _name = AppResources.TypeFile;
-                            break;
-                        default:
-                            break;
-                    }
-                }
-                return _name;
-            }
-        }
-
-        public string Icon
-        {
-            get
-            {
-                if (_icon != null)
-                {
-                    return _icon;
-                }
-                if (Type != null)
-                {
-                    switch (Type.Value)
-                    {
-                        case SendType.Text:
-                            _icon = BitwardenIcons.FileText;
-                            break;
-                        case SendType.File:
-                            _icon = BitwardenIcons.File;
-                            break;
-                        default:
-                            break;
-                    }
-                }
-                return _icon;
-            }
-        }
-    }
-}

src/App/Pages/Settings/AutofillServicesPage.xaml

@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<pages:BaseContentPage 
-    xmlns="http://xamarin.com/schemas/2014/forms"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    x:Class="Bit.App.Pages.AutofillServicesPage"
-    xmlns:pages="clr-namespace:Bit.App.Pages"
-    xmlns:u="clr-namespace:Bit.App.Utilities"
-    x:DataType="pages:AutofillServicesPageViewModel"
-    Title="{Binding PageTitle}">
-    <ContentPage.BindingContext>
-        <pages:AutofillServicesPageViewModel />
-    </ContentPage.BindingContext>
-
-    <ScrollView>
-        <StackLayout Padding="0" Spacing="20">
-            <StackLayout 
-                StyleClass="box"
-                IsVisible="{Binding AutofillServiceVisible}">
-                <StackLayout StyleClass="box-row, box-row-switch">
-                    <Label
-                        Text="{u:I18n AutofillService}"
-                        StyleClass="box-label-regular"
-                        HorizontalOptions="StartAndExpand" />
-                    <RelativeLayout HorizontalOptions="End">
-                        <Switch
-                            x:Name="AutofillServiceSwitch"
-                            IsToggled="{Binding AutofillServiceToggled}"
-                            StyleClass="box-value"
-                            HorizontalOptions="End" />
-                        <Button
-                            Clicked="ToggleAutofillService"
-                            StyleClass="box-overlay"
-                            RelativeLayout.XConstraint="0"
-                            RelativeLayout.YConstraint="0"
-                            RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=AutofillServiceSwitch, Property=Width}"
-                            RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=AutofillServiceSwitch, Property=Height}" />
-                    </RelativeLayout>
-                </StackLayout>
-                <Label
-                    Text="{u:I18n AutofillServiceDescription}"
-                    StyleClass="box-footer-label, box-footer-label-switch" />
-            </StackLayout>
-            <StackLayout 
-                StyleClass="box"
-                IsVisible="{Binding InlineAutofillVisible}">
-                <StackLayout StyleClass="box-row, box-row-switch">
-                    <Label
-                        Text="{u:I18n InlineAutofill}"
-                        StyleClass="box-label-regular"
-                        IsEnabled="{Binding InlineAutofillEnabled}"
-                        HorizontalOptions="StartAndExpand" />
-                    <RelativeLayout HorizontalOptions="End">
-                        <Switch
-                            x:Name="InlineAutofillSwitch"
-                            IsEnabled="{Binding InlineAutofillEnabled}"
-                            IsToggled="{Binding InlineAutofillToggled}"
-                            StyleClass="box-value"
-                            HorizontalOptions="End" />
-                        <Button
-                            Clicked="ToggleInlineAutofill"
-                            StyleClass="box-overlay"
-                            RelativeLayout.XConstraint="0"
-                            RelativeLayout.YConstraint="0"
-                            RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=InlineAutofillSwitch, Property=Width}"
-                            RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=InlineAutofillSwitch, Property=Height}" />
-                    </RelativeLayout>
-                </StackLayout>
-                <Label
-                    Text="{u:I18n InlineAutofillDescription}"
-                    StyleClass="box-footer-label, box-footer-label-switch"
-                    IsEnabled="{Binding InlineAutofillEnabled}"/>
-            </StackLayout>
-            <StackLayout StyleClass="box">
-                <StackLayout StyleClass="box-row, box-row-switch">
-                    <Label
-                        Text="{u:I18n Accessibility}"
-                        StyleClass="box-label-regular"
-                        HorizontalOptions="StartAndExpand" />
-                    <RelativeLayout HorizontalOptions="End">
-                        <Switch
-                            x:Name="AccessibilitySwitch"
-                            IsToggled="{Binding AccessibilityToggled}"
-                            StyleClass="box-value"
-                            HorizontalOptions="End" />
-                        <Button
-                            Command="{Binding ToggleAccessibilityCommand}"
-                            StyleClass="box-overlay"
-                            RelativeLayout.XConstraint="0"
-                            RelativeLayout.YConstraint="0"
-                            RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=AccessibilitySwitch, Property=Width}"
-                            RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=AccessibilitySwitch, Property=Height}" />
-                    </RelativeLayout>
-                </StackLayout>
-                <Label
-                    Text="{Binding AccessibilityDescriptionLabel}"
-                    StyleClass="box-footer-label, box-footer-label-switch" />
-            </StackLayout>
-            <StackLayout 
-                StyleClass="box"
-                IsVisible="{Binding DrawOverVisible}">
-                <StackLayout StyleClass="box-row, box-row-switch">
-                    <Label
-                        Text="{u:I18n DrawOver}"
-                        StyleClass="box-label-regular"
-                        IsEnabled="{Binding DrawOverEnabled}"
-                        HorizontalOptions="StartAndExpand" />
-                    <RelativeLayout HorizontalOptions="End">
-                        <Switch
-                            x:Name="DrawOverSwitch"
-                            IsEnabled="{Binding DrawOverEnabled}"
-                            IsToggled="{Binding DrawOverToggled}"
-                            StyleClass="box-value"
-                            HorizontalOptions="End" />
-                        <Button
-                            Clicked="ToggleDrawOver"
-                            StyleClass="box-overlay"
-                            RelativeLayout.XConstraint="0"
-                            RelativeLayout.YConstraint="0"
-                            RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=DrawOverSwitch, Property=Width}"
-                            RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=DrawOverSwitch, Property=Height}" />
-                    </RelativeLayout>
-                </StackLayout>
-                <Label
-                    Text="{Binding DrawOverDescriptionLabel}"
-                    StyleClass="box-footer-label, box-footer-label-switch"
-                    IsEnabled="{Binding InlineAutofillEnabled}"/>
-            </StackLayout>
-        </StackLayout>
-    </ScrollView>
-
-</pages:BaseContentPage>

src/App/Pages/Settings/AutofillServicesPage.xaml.cs

@@ -1,66 +0,0 @@
-using System;
-using Xamarin.Forms;
-
-namespace Bit.App.Pages
-{
-    public partial class AutofillServicesPage : BaseContentPage
-    {
-        private readonly AutofillServicesPageViewModel _vm;
-        private readonly SettingsPage _settingsPage;
-        private DateTime? _timerStarted = null;
-        private TimeSpan _timerMaxLength = TimeSpan.FromMinutes(5);
-
-        public AutofillServicesPage(SettingsPage settingsPage)
-        {
-            InitializeComponent();
-            _vm = BindingContext as AutofillServicesPageViewModel;
-            _vm.Page = this;
-            _settingsPage = settingsPage;
-        }
-
-        protected async override void OnAppearing()
-        {
-            await _vm.InitAsync();
-            _vm.UpdateEnabled();
-            _timerStarted = DateTime.UtcNow;
-            Device.StartTimer(new TimeSpan(0, 0, 0, 0, 500), () =>
-            {
-                if (_timerStarted == null || (DateTime.UtcNow - _timerStarted) > _timerMaxLength)
-                {
-                    return false;
-                }
-                _vm.UpdateEnabled();
-                return true;
-            });
-            base.OnAppearing();
-        }
-
-        protected override void OnDisappearing()
-        {
-            _timerStarted = null;
-            _settingsPage.BuildList();
-            base.OnDisappearing();
-        }
-
-        private void ToggleAutofillService(object sender, EventArgs e)
-        {
-            if (DoOnce())
-            {
-                _vm.ToggleAutofillService();
-            }
-        }
-
-        private void ToggleInlineAutofill(object sender, EventArgs e)
-        {
-            _vm.ToggleInlineAutofill();
-        }
-
-        private void ToggleDrawOver(object sender, EventArgs e)
-        {
-            if (DoOnce())
-            {
-                _vm.ToggleDrawOver();
-            }
-        }
-    }
-}

src/App/Pages/Settings/AutofillServicesPageViewModel.cs

@@ -1,231 +0,0 @@
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Bit.App.Abstractions;
-using Bit.App.Resources;
-using Bit.App.Services;
-using Bit.Core.Abstractions;
-using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
-
-namespace Bit.App.Pages
-{
-    public class AutofillServicesPageViewModel : BaseViewModel
-    {
-        private readonly IDeviceActionService _deviceActionService;
-        private readonly IAutofillHandler _autofillHandler;
-        private readonly IStateService _stateService;
-        private readonly MobileI18nService _i18nService;
-        private readonly IPlatformUtilsService _platformUtilsService;
-        readonly LazyResolve<ILogger> _logger = new LazyResolve<ILogger>("logger");
-
-        private bool _autofillServiceToggled;
-        private bool _inlineAutofillToggled;
-        private bool _accessibilityToggled;
-        private bool _drawOverToggled;
-        private bool _inited;
-
-        public AutofillServicesPageViewModel()
-        {
-            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
-            _autofillHandler = ServiceContainer.Resolve<IAutofillHandler>();
-            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
-            _i18nService = ServiceContainer.Resolve<II18nService>("i18nService") as MobileI18nService;
-            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
-            PageTitle = AppResources.AutofillServices;
-            ToggleAccessibilityCommand = new AsyncCommand(ToggleAccessibilityAsync,
-                onException: ex => _logger.Value.Exception(ex),
-                allowsMultipleExecutions: false);
-        }
-
-        #region Autofill Service
-
-        public bool AutofillServiceVisible
-        {
-            get => _deviceActionService.SystemMajorVersion() >= 26;
-        }
-
-        public bool AutofillServiceToggled
-        {
-            get => _autofillServiceToggled;
-            set => SetProperty(ref _autofillServiceToggled, value,
-                additionalPropertyNames: new string[]
-                {
-                    nameof(InlineAutofillEnabled)
-                });
-        }
-
-        #endregion
-
-        #region Inline Autofill
-
-        public bool InlineAutofillVisible
-        {
-            get => _deviceActionService.SystemMajorVersion() >= 30;
-        }
-
-        public bool InlineAutofillEnabled
-        {
-            get => AutofillServiceToggled;
-        }
-
-        public bool InlineAutofillToggled
-        {
-            get => _inlineAutofillToggled;
-            set
-            {
-                if (SetProperty(ref _inlineAutofillToggled, value))
-                {
-                    var task = UpdateInlineAutofillToggledAsync();
-                }
-            }
-        }
-
-        #endregion
-
-        #region Accessibility
-
-        public ICommand ToggleAccessibilityCommand { get; }
-
-        public string AccessibilityDescriptionLabel
-        {
-            get
-            {
-                if (_deviceActionService.SystemMajorVersion() <= 22)
-                {
-                    // Android 5
-                    return _i18nService.T("AccessibilityDescription");
-                }
-                if (_deviceActionService.SystemMajorVersion() == 23)
-                {
-                    // Android 6
-                    return _i18nService.T("AccessibilityDescription2");
-                }
-                if (_deviceActionService.SystemMajorVersion() == 24 || _deviceActionService.SystemMajorVersion() == 25)
-                {
-                    // Android 7
-                    return _i18nService.T("AccessibilityDescription3");
-                }
-                // Android 8+
-                return _i18nService.T("AccessibilityDescription4");
-            }
-        }
-
-        public bool AccessibilityToggled
-        {
-            get => _accessibilityToggled;
-            set => SetProperty(ref _accessibilityToggled, value,
-                additionalPropertyNames: new string[]
-                {
-                    nameof(DrawOverEnabled)
-                });
-        }
-
-        #endregion
-
-        #region Draw-Over
-
-        public bool DrawOverVisible
-        {
-            get => _deviceActionService.SystemMajorVersion() >= 23;
-        }
-
-        public string DrawOverDescriptionLabel
-        {
-            get
-            {
-                if (_deviceActionService.SystemMajorVersion() <= 23)
-                {
-                    // Android 6
-                    return _i18nService.T("DrawOverDescription");
-                }
-                if (_deviceActionService.SystemMajorVersion() == 24 || _deviceActionService.SystemMajorVersion() == 25)
-                {
-                    // Android 7
-                    return _i18nService.T("DrawOverDescription2");
-                }
-                // Android 8+
-                return _i18nService.T("DrawOverDescription3");
-            }
-        }
-
-        public bool DrawOverEnabled
-        {
-            get => AccessibilityToggled;
-        }
-
-        public bool DrawOverToggled
-        {
-            get => _drawOverToggled;
-            set => SetProperty(ref _drawOverToggled, value);
-        }
-
-        #endregion
-
-        public async Task InitAsync()
-        {
-            InlineAutofillToggled = await _stateService.GetInlineAutofillEnabledAsync() ?? true;
-            _inited = true;
-        }
-
-        public void ToggleAutofillService()
-        {
-            if (!AutofillServiceToggled)
-            {
-                _deviceActionService.OpenAutofillSettings();
-            }
-            else
-            {
-                _autofillHandler.DisableAutofillService();
-            }
-        }
-
-        public void ToggleInlineAutofill()
-        {
-            if (!InlineAutofillEnabled)
-            {
-                return;
-            }
-            InlineAutofillToggled = !InlineAutofillToggled;
-        }
-
-        public async Task ToggleAccessibilityAsync()
-        {
-            if (!_autofillHandler.AutofillAccessibilityServiceRunning())
-            {
-                var accept = await _platformUtilsService.ShowDialogAsync(AppResources.AccessibilityDisclosureText,
-                    AppResources.AccessibilityServiceDisclosure, AppResources.Accept,
-                    AppResources.Decline);
-                if (!accept)
-                {
-                    return;
-                }
-            }
-            _deviceActionService.OpenAccessibilitySettings();
-        }
-
-        public void ToggleDrawOver()
-        {
-            if (!DrawOverEnabled)
-            {
-                return;
-            }
-            _deviceActionService.OpenAccessibilityOverlayPermissionSettings();
-        }
-
-        public void UpdateEnabled()
-        {
-            AutofillServiceToggled =
-                _autofillHandler.SupportsAutofillService() && _autofillHandler.AutofillServiceEnabled();
-            AccessibilityToggled = _autofillHandler.AutofillAccessibilityServiceRunning();
-            DrawOverToggled = _autofillHandler.AutofillAccessibilityOverlayPermitted();
-        }
-
-        private async Task UpdateInlineAutofillToggledAsync()
-        {
-            if (_inited)
-            {
-                await _stateService.SetInlineAutofillEnabledAsync(InlineAutofillToggled);
-            }
-        }
-    }
-}

src/App/Pages/Settings/LoginPasswordlessRequestsListPage.xaml

@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<pages:BaseContentPage 
-    xmlns="http://xamarin.com/schemas/2014/forms"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
-    x:Class="Bit.App.Pages.LoginPasswordlessRequestsListPage"
-    xmlns:pages="clr-namespace:Bit.App.Pages"
-    x:DataType="pages:LoginPasswordlessRequestsListViewModel"
-    xmlns:models="clr-namespace:Bit.Core.Models.Response;assembly=BitwardenCore"
-    xmlns:core="clr-namespace:Bit.Core;assembly=BitwardenCore"
-    xmlns:controls="clr-namespace:Bit.App.Controls"
-    xmlns:u="clr-namespace:Bit.App.Utilities"
-    Title="{Binding PageTitle}">
-    
-    <ContentPage.BindingContext>
-        <pages:LoginPasswordlessRequestsListViewModel />
-    </ContentPage.BindingContext>
-
-     <ContentPage.ToolbarItems>
-            <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
-    </ContentPage.ToolbarItems>
-
-    <ContentPage.Resources>
-        <ResourceDictionary>
-            <u:DateTimeConverter x:Key="dateTime" />
-            <xct:ItemSelectedEventArgsConverter x:Key="ItemSelectedEventArgsConverter" />
-            <controls:SelectionChangedEventArgsConverter x:Key="SelectionChangedEventArgsConverter" />
-            <DataTemplate
-                x:Key="loginRequestTemplate"
-                x:DataType="models:PasswordlessLoginResponse">
-                    <Grid
-                        Padding="10, 0"
-                        RowSpacing="0"
-                        RowDefinitions="*, Auto, *, 10"
-                        ColumnDefinitions="*, *">
-                        <Label
-                            Text="{u:I18n FingerprintPhrase}"
-                            FontSize="Small"
-                            Padding="0, 10, 0 ,0"
-                            FontAttributes="Bold"/>
-                        <controls:MonoLabel
-                            FormattedText="{Binding FingerprintPhrase}"
-                            Grid.Row="1"
-                            Grid.ColumnSpan="2"
-                            FontSize="Small"
-                            Padding="0, 5, 0, 10"
-                            VerticalTextAlignment="Center"
-                            TextColor="{DynamicResource FingerprintPhrase}"/>
-                        <Label
-                            Grid.Row="2"
-                            HorizontalOptions="Start"
-                            HorizontalTextAlignment="Start"
-                            Text="{Binding RequestDeviceType}"
-                            StyleClass="list-header-sub" />
-                        <Label
-                            Grid.Row="2"
-                            Grid.Column="1"
-                            HorizontalOptions="End"
-                            HorizontalTextAlignment="End"
-                            Text="{Binding CreationDate, Converter={StaticResource dateTime}}"
-                            StyleClass="list-header-sub" />
-                        <BoxView
-                            StyleClass="list-section-separator-top, list-section-separator-top-platform"
-                            VerticalOptions="End"
-                            Grid.Row="3"
-                            Grid.ColumnSpan="2"/>
-                    </Grid>
-	        </DataTemplate>
-
-            <StackLayout
-                x:Key="mainLayout"
-                x:Name="_mainLayout"
-                Padding="0, 10">
-                <RefreshView
-                    IsRefreshing="{Binding IsRefreshing}"
-                    Command="{Binding RefreshCommand}"
-                    VerticalOptions="FillAndExpand"
-                    BackgroundColor="{DynamicResource BackgroundColor}">
-                    <controls:ExtendedCollectionView
-                        ItemsSource="{Binding LoginRequests}"
-                        ItemTemplate="{StaticResource loginRequestTemplate}"
-                        SelectionMode="Single"
-                        ExtraDataForLogging="Login requests page" >
-                        <controls:ExtendedCollectionView.Behaviors>
-                            <xct:EventToCommandBehavior
-                                EventName="SelectionChanged"
-                                Command="{Binding AnswerRequestCommand}"
-                                EventArgsConverter="{StaticResource SelectionChangedEventArgsConverter}" />
-                        </controls:ExtendedCollectionView.Behaviors>
-                    </controls:ExtendedCollectionView>
-                </RefreshView>
-                <controls:IconLabelButton
-                        VerticalOptions="End"
-                        Margin="10,0"
-                        Icon="{Binding Source={x:Static core:BitwardenIcons.Trash}}"
-                        Label="{u:I18n DeclineAllRequests}"
-                        ButtonCommand="{Binding DeclineAllRequestsCommand}"/>
-            </StackLayout>
-        </ResourceDictionary>
-    </ContentPage.Resources>
-
-    <ContentView 
-        x:Name="_mainContent">
-    </ContentView>
-
-</pages:BaseContentPage>
-

src/App/Pages/Settings/LoginPasswordlessRequestsListPage.xaml.cs

@@ -1,38 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Abstractions;
-using Bit.Core.Models.Response;
-using Bit.Core.Utilities;
-using Xamarin.Forms;
-
-namespace Bit.App.Pages
-{
-    public partial class LoginPasswordlessRequestsListPage : BaseContentPage
-    {
-        private LoginPasswordlessRequestsListViewModel _vm;
-
-        public LoginPasswordlessRequestsListPage()
-        {
-            InitializeComponent();
-            SetActivityIndicator(_mainContent);
-            _vm = BindingContext as LoginPasswordlessRequestsListViewModel;
-            _vm.Page = this;
-        }
-
-        protected override async void OnAppearing()
-        {
-            base.OnAppearing();
-            await LoadOnAppearedAsync(_mainLayout, false, _vm.RefreshAsync, _mainContent);
-        }
-
-        private async void Close_Clicked(object sender, System.EventArgs e)
-        {
-            if (DoOnce())
-            {
-                await Navigation.PopModalAsync();
-            }
-        }
-    }
-}
-