Bump version 2.0.18+218 (#352 )

New Translations (#351 )
New translations via [Crowdin GH Action](https://github.com/crowdin/github-action) Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2023-11-16 19:17:09 +05:30 · 2023-11-16 19:11:22 +05:30 · 2023-11-16 15:40:47 +05:30 · 2023-11-16 15:30:08 +05:30 · 2023-11-16 12:16:08 +05:30 · 2023-11-16 15:38:42 +09:00
35 changed files with 1084 additions and 99 deletions
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,7 +1,7 @@
 {
-    "workbench.colorCustomizations": {
-        "activityBar.background": "#44116A",
-        "titleBar.activeBackground": "#5F1895",
-        "titleBar.activeForeground": "#FDFBFE"
-    }
-}
+  "workbench.colorCustomizations": {
+    "activityBar.background": "#44116A",
+    "titleBar.activeBackground": "#5F1895",
+    "titleBar.activeForeground": "#FDFBFE"
+  }
+}
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -53,12 +53,14 @@
    </queries>
    <uses-permission android:name="android.permission.INTERNET"/>
    <uses-permission
-            android:name="android.permission.READ_EXTERNAL_STORAGE"
-            android:maxSdkVersion="32"/>
+        android:name="android.permission.READ_MEDIA_IMAGES" />
    <uses-permission
-            android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-            android:maxSdkVersion="29"
-            tools:ignore="ScopedStorage"/>
+        android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="29"
+        tools:ignore="ScopedStorage" />
    <uses-permission android:name="android.permission.USE_BIOMETRIC"/>

 </manifest>
--- a/assets/custom-icons/_data/custom-icons.json
+++ b/assets/custom-icons/_data/custom-icons.json
@@ -95,6 +95,12 @@
      "title": "La Poste",
 	    "slug": "laposte"
    },
+    {
+      "title": "Mastodon",
+      "altNames": ["mstdn", "fediscience", "mathstodon", "fosstodon"],
+      "slug": "mastodon",
+      "hex": "6364FF"
+    },
    {
      "title": "Microsoft"
    },
@@ -227,7 +233,9 @@
    {
      "title": "Skiff",
      "hex": "EF5A3C"
+    },
+    {
+      "title": "zzz_dev_test_icon"
    }
-    
  ]
 }
--- a/assets/custom-icons/icons/mastodon.svg
+++ b/assets/custom-icons/icons/mastodon.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Mastodon</title><path d="M23.268 5.313c-.35-2.578-2.617-4.61-5.304-5.004C17.51.242 15.792 0 11.813 0h-.03c-3.98 0-4.835.242-5.288.309C3.882.692 1.496 2.518.917 5.127.64 6.412.61 7.837.661 9.143c.074 1.874.088 3.745.26 5.611.118 1.24.325 2.47.62 3.68.55 2.237 2.777 4.098 4.96 4.857 2.336.792 4.849.923 7.256.38.265-.061.527-.132.786-.213.585-.184 1.27-.39 1.774-.753a.057.057 0 0 0 .023-.043v-1.809a.052.052 0 0 0-.02-.041.053.053 0 0 0-.046-.01 20.282 20.282 0 0 1-4.709.545c-2.73 0-3.463-1.284-3.674-1.818a5.593 5.593 0 0 1-.319-1.433.053.053 0 0 1 .066-.054c1.517.363 3.072.546 4.632.546.376 0 .75 0 1.125-.01 1.57-.044 3.224-.124 4.768-.422.038-.008.077-.015.11-.024 2.435-.464 4.753-1.92 4.989-5.604.008-.145.03-1.52.03-1.67.002-.512.167-3.63-.024-5.545zm-3.748 9.195h-2.561V8.29c0-1.309-.55-1.976-1.67-1.976-1.23 0-1.846.79-1.846 2.35v3.403h-2.546V8.663c0-1.56-.617-2.35-1.848-2.35-1.112 0-1.668.668-1.67 1.977v6.218H4.822V8.102c0-1.31.337-2.35 1.011-3.12.696-.77 1.608-1.164 2.74-1.164 1.311 0 2.302.5 2.962 1.498l.638 1.06.638-1.06c.66-.999 1.65-1.498 2.96-1.498 1.13 0 2.043.395 2.74 1.164.675.77 1.012 1.81 1.012 3.12z"/></svg>
--- a/assets/custom-icons/icons/zzz_dev_test_icon.svg
+++ b/assets/custom-icons/icons/zzz_dev_test_icon.svg
@@ -0,0 +1,5 @@
+<svg width="500" height="500" viewBox="0 0 500 500" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g style="mix-blend-mode:difference">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M250.207 5C111.849 5 0 117.52 0 256.723C0 367.996 71.6655 462.186 171.084 495.522C183.514 498.028 188.067 490.106 188.067 483.442C188.067 477.606 187.658 457.603 187.658 436.761C118.056 451.767 103.562 406.754 103.562 406.754C92.3769 377.581 75.8036 370.083 75.8036 370.083C53.0231 354.662 77.463 354.662 77.463 354.662C102.733 356.329 115.992 380.501 115.992 380.501C138.358 418.84 174.398 408.007 188.897 401.338C190.966 385.084 197.599 373.832 204.641 367.582C149.128 361.746 90.7226 340.075 90.7226 243.385C90.7226 215.879 100.658 193.374 116.402 175.872C113.918 169.622 105.217 143.779 118.891 109.189C118.891 109.189 140.017 102.519 187.653 135.028C208.047 129.517 229.079 126.714 250.207 126.691C271.333 126.691 292.869 129.611 312.756 135.028C360.396 102.519 381.523 109.189 381.523 109.189C395.197 143.779 386.491 169.622 384.007 175.872C400.165 193.374 409.691 215.879 409.691 243.385C409.691 340.075 351.285 361.326 295.358 367.582C304.474 375.499 312.341 390.5 312.341 414.257C312.341 448.013 311.931 475.105 311.931 483.437C311.931 490.106 316.49 498.028 328.914 495.527C428.333 462.18 499.999 367.996 499.999 256.723C500.409 117.52 388.15 5 250.207 5Z" fill="white"/>
+</g>
+</svg>
--- a/assets/scanner-icons/icons/cross.svg
+++ b/assets/scanner-icons/icons/cross.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 22C17.5 22 22 17.5 22 12C22 6.5 17.5 2 12 2C6.5 2 2 6.5 2 12C2 17.5 6.5 22 12 22Z" stroke="#292D32" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.16998 14.8299L14.83 9.16992" stroke="#292D32" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14.83 14.8299L9.16998 9.16992" stroke="#292D32" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
--- a/assets/scanner-icons/icons/flash_off.svg
+++ b/assets/scanner-icons/icons/flash_off.svg
@@ -0,0 +1,20 @@
+<svg width="62" height="62" viewBox="0 0 62 62" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_884_3193)">
+<rect x="15" y="14" width="32" height="32" rx="15" fill="white"/>
+</g>
+<path d="M40.7558 20.2363C40.4408 19.9212 39.9262 19.9212 39.6112 20.2363L20.2363 39.6217C19.9212 39.9367 19.9212 40.4513 20.2363 40.7663C20.3938 40.9133 20.5933 40.9973 20.8033 40.9973C21.0134 40.9973 21.2129 40.9133 21.3704 40.7558L40.7558 21.3704C41.0814 21.0554 41.0814 20.5513 40.7558 20.2363Z" fill="#292D32"/>
+<path d="M33.4575 21.5971V27.5408L27.5347 33.4636V31.8464H24.2898C22.8196 31.8464 22.4101 30.9433 23.3867 29.8407L30.4961 21.7546L31.3362 20.799C32.5018 19.4759 33.4575 19.8329 33.4575 21.5971Z" fill="#292D32"/>
+<path d="M37.6039 31.1619L30.4946 39.2479L29.6545 40.2035C28.4888 41.5267 27.5332 41.1696 27.5332 39.4054V36.6121L34.9891 29.1562H36.7008C38.171 29.1562 38.5806 30.0593 37.6039 31.1619Z" fill="#292D32"/>
+<defs>
+<filter id="filter0_d_884_3193" x="0" y="0" width="62" height="62" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feMorphology radius="5" operator="dilate" in="SourceAlpha" result="effect1_dropShadow_884_3193"/>
+<feOffset dy="1"/>
+<feGaussianBlur stdDeviation="5"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.17 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_884_3193"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_884_3193" result="shape"/>
+</filter>
+</defs>
+</svg>
--- a/assets/scanner-icons/icons/flash_on.svg
+++ b/assets/scanner-icons/icons/flash_on.svg
@@ -0,0 +1,18 @@
+<svg width="62" height="62" viewBox="0 0 62 62" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_5498_6943)">
+<rect x="15" y="14" width="32" height="32" rx="15" fill="white"/>
+</g>
+<path d="M36.844 29.1561H33.5997V21.5968C33.5997 19.8329 32.6443 19.476 31.4789 20.7988L30.639 21.7543L23.5311 29.8386C22.5547 30.941 22.9642 31.8439 24.4341 31.8439H27.6783V39.4032C27.6783 41.1671 28.6337 41.524 29.7991 40.2012L30.639 39.2457L37.7469 31.1615C38.7233 30.0591 38.3138 29.1561 36.844 29.1561Z" fill="#292D32"/>
+<defs>
+<filter id="filter0_d_5498_6943" x="0" y="0" width="62" height="62" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feMorphology radius="5" operator="dilate" in="SourceAlpha" result="effect1_dropShadow_5498_6943"/>
+<feOffset dy="1"/>
+<feGaussianBlur stdDeviation="5"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.17 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_5498_6943"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_5498_6943" result="shape"/>
+</filter>
+</defs>
+</svg>
--- a/assets/scanner-icons/icons/gallery.svg
+++ b/assets/scanner-icons/icons/gallery.svg
@@ -0,0 +1,18 @@
+<svg width="62" height="62" viewBox="0 0 62 62" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_884_3200)">
+<rect x="15" y="14" width="32" height="32" rx="15" fill="white"/>
+</g>
+<path d="M35.19 20H26.81C23.17 20 21 22.17 21 25.81V34.19C21 35.28 21.19 36.23 21.56 37.03C22.42 38.93 24.26 40 26.81 40H35.19C38.83 40 41 37.83 41 34.19V31.9V25.81C41 22.17 38.83 20 35.19 20ZM39.37 30.5C38.59 29.83 37.33 29.83 36.55 30.5L32.39 34.07C31.61 34.74 30.35 34.74 29.57 34.07L29.23 33.79C28.52 33.17 27.39 33.11 26.59 33.65L22.85 36.16C22.63 35.6 22.5 34.95 22.5 34.19V25.81C22.5 22.99 23.99 21.5 26.81 21.5H35.19C38.01 21.5 39.5 22.99 39.5 25.81V30.61L39.37 30.5Z" fill="#292D32"/>
+<defs>
+<filter id="filter0_d_884_3200" x="0" y="0" width="62" height="62" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feMorphology radius="5" operator="dilate" in="SourceAlpha" result="effect1_dropShadow_884_3200"/>
+<feOffset dy="1"/>
+<feGaussianBlur stdDeviation="5"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.17 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_884_3200"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_884_3200" result="shape"/>
+</filter>
+</defs>
+</svg>
--- a/assets/simple-icons
+++ b/assets/simple-icons
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -38,6 +38,8 @@ PODS:
  - file_picker (0.0.1):
    - DKImagePickerController/PhotoGallery
    - Flutter
+  - file_saver (0.0.1):
+    - Flutter
  - fk_user_agent (2.0.0):
    - Flutter
  - Flutter (1.0.0)
@@ -110,6 +112,7 @@ DEPENDENCIES:
  - connectivity (from `.symlinks/plugins/connectivity/ios`)
  - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
  - file_picker (from `.symlinks/plugins/file_picker/ios`)
+  - file_saver (from `.symlinks/plugins/file_saver/ios`)
  - fk_user_agent (from `.symlinks/plugins/fk_user_agent/ios`)
  - Flutter (from `Flutter`)
  - flutter_email_sender (from `.symlinks/plugins/flutter_email_sender/ios`)
@@ -153,6 +156,8 @@ EXTERNAL SOURCES:
    :path: ".symlinks/plugins/device_info_plus/ios"
  file_picker:
    :path: ".symlinks/plugins/file_picker/ios"
+  file_saver:
+    :path: ".symlinks/plugins/file_saver/ios"
  fk_user_agent:
    :path: ".symlinks/plugins/fk_user_agent/ios"
  Flutter:
@@ -202,6 +207,7 @@ SPEC CHECKSUMS:
  DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
  DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
  file_picker: ce3938a0df3cc1ef404671531facef740d03f920
+  file_saver: 503e386464dbe118f630e17b4c2e1190fa0cf808
  fk_user_agent: 1f47ec39291e8372b1d692b50084b0d54103c545
  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
  flutter_email_sender: 02d7443217d8c41483223627972bfdc09f74276b
@@ -225,7 +231,7 @@ SPEC CHECKSUMS:
  Sentry: e3203780941722a1fcfee99e351de14244c7f806
  sentry_flutter: 8f0ffd53088e6a4d50c095852c5cad9e4405025c
  SentryPrivate: 5e3683390f66611fc7c6215e27645873adb55d13
-  share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
+  share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5
  shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
  sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a
  SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
--- a/lib/l10n/arb/app_en.arb
+++ b/lib/l10n/arb/app_en.arb
@@ -1,5 +1,6 @@
 {
  "account": "Account",
+  "unlock": "Unlock",
  "recoveryKey": "Recovery key",
  "counterAppBarTitle": "Counter",
  "@counterAppBarTitle": {
@@ -85,6 +86,7 @@
  "importSelectJsonFile": "Select JSON file",
  "importEnteEncGuide": "Select the encrypted JSON file exported from ente",
  "importRaivoGuide": "Use the \"Export OTPs to Zip archive\" option in Raivo's Settings.\n\nExtract the zip file and import the JSON file.",
+  "importBitwardenGuide": "Use the \"Export vault\" option within Bitwarden Tools and import the unencrypted JSON file.",
  "importAegisGuide": "Use the \"Export the vault\" option in Aegis's Settings.\n\nIf your vault is encrypted, you will need to enter vault password to decrypt the vault.",
  "exportCodes": "Export codes",
  "importLabel": "Import",
@@ -97,6 +99,7 @@
  "authToViewYourRecoveryKey": "Please authenticate to view your recovery key",
  "authToChangeYourEmail": "Please authenticate to change your email",
  "authToChangeYourPassword": "Please authenticate to change your password",
+  "authToViewSecrets": "Please authenticate to view your secrets",
  "ok": "Ok",
  "cancel": "Cancel",
  "yes": "Yes",
@@ -336,5 +339,65 @@
  "deleteCodeAuthMessage": "Authenticate to delete code",
  "showQRAuthMessage": "Authenticate to show QR code",
  "confirmAccountDeleteTitle": "Confirm account deletion",
-  "confirmAccountDeleteMessage": "This account is linked to other ente apps, if you use any.\n\nYour uploaded data, across all ente apps, will be scheduled for deletion, and your account will be permanently deleted."
+  "confirmAccountDeleteMessage": "This account is linked to other ente apps, if you use any.\n\nYour uploaded data, across all ente apps, will be scheduled for deletion, and your account will be permanently deleted.",
+  "reminderText": "Reminder",
+  "reminderPopupBody": "Please delete the screenshot before resuming any photo cloud sync",
+  "invalidQrCodeText": "Invalid QR code",
+  "googleAuthImagePopupBody": "Please turn off all photo cloud sync from all apps, including iCloud, Google Photo, OneDrive, etc. \nAlso if you have a second smartphone, it is safer to import by scanning QR code.",
+  "importGoogleAuthImageButtonText": "Import from image",
+  "unableToRecognizeQrCodeText": "Unable to recognize a valid code from the uploaded image",
+  "qrCodeImageNotSelectedText": "Qr code image not selected",
+  "androidBiometricHint": "Verify identity",
+  "@androidBiometricHint": {
+    "description": "Hint message advising the user how to authenticate with biometrics. It is used on Android side. Maximum 60 characters."
+  },
+  "androidBiometricNotRecognized": "Not recognized. Try again.",
+  "@androidBiometricNotRecognized": {
+    "description": "Message to let the user know that authentication was failed. It is used on Android side. Maximum 60 characters."
+  },
+  "androidBiometricSuccess": "Success",
+  "@androidBiometricSuccess": {
+    "description": "Message to let the user know that authentication was successful. It is used on Android side. Maximum 60 characters."
+  },
+  "androidCancelButton": "Cancel",
+  "@androidCancelButton": {
+    "description": "Message showed on a button that the user can click to leave the current dialog. It is used on Android side. Maximum 30 characters."
+  },
+  "androidSignInTitle": "Authentication required",
+  "@androidSignInTitle": {
+    "description": "Message showed as a title in a dialog which indicates the user that they need to scan biometric to continue. It is used on Android side. Maximum 60 characters."
+  },
+  "androidBiometricRequiredTitle": "Biometric required",
+  "@androidBiometricRequiredTitle": {
+    "description": "Message showed as a title in a dialog which indicates the user has not set up biometric authentication on their device. It is used on Android side. Maximum 60 characters."
+  },
+  "androidDeviceCredentialsRequiredTitle": "Device credentials required",
+  "@androidDeviceCredentialsRequiredTitle": {
+    "description": "Message showed as a title in a dialog which indicates the user has not set up credentials authentication on their device. It is used on Android side. Maximum 60 characters."
+  },
+  "androidDeviceCredentialsSetupDescription": "Device credentials required",
+  "@androidDeviceCredentialsSetupDescription": {
+    "description": "Message advising the user to go to the settings and configure device credentials on their device. It shows in a dialog on Android side."
+  },
+  "goToSettings": "Go to settings",
+  "@goToSettings": {
+    "description": "Message showed on a button that the user can click to go to settings pages from the current dialog. It is used on both Android and iOS side. Maximum 30 characters."
+  },
+  "androidGoToSettingsDescription": "Biometric authentication is not set up on your device. Go to 'Settings > Security' to add biometric authentication.",
+  "@androidGoToSettingsDescription": {
+    "description": "Message advising the user to go to the settings and configure biometric on their device. It shows in a dialog on Android side."
+  },
+  "iOSLockOut": "Biometric authentication is disabled. Please lock and unlock your screen to enable it.",
+  "@iOSLockOut": {
+    "description": "Message advising the user to re-enable biometrics on their device. It shows in a dialog on iOS side."
+  },
+  "iOSGoToSettingsDescription": "Biometric authentication is not set up on your device. Please either enable Touch ID or Face ID on your phone.",
+  "@iOSGoToSettingsDescription": {
+    "description": "Message advising the user to go to the settings and configure Biometrics for their device. It shows in a dialog on iOS side."
+  },
+  "iOSOkButton": "OK",
+  "@iOSOkButton": {
+    "description": "Message showed on a button that the user can click to leave the current dialog. It is used on iOS side. Maximum 30 characters."
+  },
+  "parsingErrorText": "Error while parsing Google Auth QR code"
 }
--- a/lib/l10n/arb/app_es.arb
+++ b/lib/l10n/arb/app_es.arb
@@ -334,5 +334,7 @@
  "minimizeAppOnCopy": "Minimizar aplicación al copiar",
  "editCodeAuthMessage": "Autenticar para editar código",
  "deleteCodeAuthMessage": "Autenticar para borrar código",
-  "showQRAuthMessage": "Autenticar para mostrar código QR"
+  "showQRAuthMessage": "Autenticar para mostrar código QR",
+  "confirmAccountDeleteTitle": "Confirmar eliminación de la cuenta",
+  "confirmAccountDeleteMessage": "Esta cuenta está vinculada a otras aplicaciones de ente, si utiliza alguna.\n\nSe programará la eliminación de los datos que cargue en todas las aplicaciones de ente y su cuenta se eliminará permanentemente."
 }
--- a/lib/l10n/arb/app_fr.arb
+++ b/lib/l10n/arb/app_fr.arb
@@ -334,5 +334,7 @@
  "minimizeAppOnCopy": "Réduire l'application après la copie",
  "editCodeAuthMessage": "Authentification requise pour modifier le code",
  "deleteCodeAuthMessage": "Authentification requise pour supprimer le code",
-  "showQRAuthMessage": "Authentification requise pour afficher le code QR"
+  "showQRAuthMessage": "Authentification requise pour afficher le code QR",
+  "confirmAccountDeleteTitle": "Confirmer la suppression du compte",
+  "confirmAccountDeleteMessage": "Ce compte peut être lié à d'autres applications ente.\n\nVos données seront bientôt effacées de toutes les applications et votre compte sera définitivement supprimé."
 }
--- a/lib/l10n/arb/app_it.arb
+++ b/lib/l10n/arb/app_it.arb
@@ -334,5 +334,7 @@
  "minimizeAppOnCopy": "Riduci a icona l'app dopo la copia",
  "editCodeAuthMessage": "Autenticarsi per modificare il codice",
  "deleteCodeAuthMessage": "Autenticarsi per cancellare il codice",
-  "showQRAuthMessage": "Autenticarsi per mostrare il codice QR"
+  "showQRAuthMessage": "Autenticarsi per mostrare il codice QR",
+  "confirmAccountDeleteTitle": "Conferma l'eliminazione dell'account",
+  "confirmAccountDeleteMessage": "Questo account è collegato ad altre app di ente, se ne utilizzi.\n\nI tuoi dati caricati, su tutte le app di ente, saranno pianificati per la cancellazione e il tuo account verrà eliminato definitivamente."
 }
--- a/lib/l10n/arb/app_ja.arb
+++ b/lib/l10n/arb/app_ja.arb
@@ -1,32 +1,37 @@
 {
  "account": "アカウント",
  "recoveryKey": "回復キー",
-  "counterAppBarTitle": "カウンタ",
+  "counterAppBarTitle": "カウンター",
  "@counterAppBarTitle": {
    "description": "Text shown in the AppBar of the Counter Page"
  },
-  "onBoardingBody": "2要素認証コードの保護",
+  "onBoardingBody": "2要素認証コードを安全にバックアップ",
  "onBoardingGetStarted": "さあ、はじめよう",
  "setupFirstAccount": "最初のアカウントを設定しましょう",
-  "importScanQrCode": "QRコードをスキャン",
-  "importEnterSetupKey": "セットアップキーを入力",
+  "importScanQrCode": "QR コードを読み取り",
+  "qrCode": "QR コード",
+  "importEnterSetupKey": "手動で入力",
  "importAccountPageTitle": "アカウントの詳細を入力",
+  "secretCanNotBeEmpty": "秘密鍵は空欄にできません",
+  "bothIssuerAndAccountCanNotBeEmpty": "発行者とアカウントの両方を空欄にはできません",
+  "incorrectDetails": "不正な詳細",
+  "pleaseVerifyDetails": "詳細を確認し、もう一度お試しください",
  "codeIssuerHint": "発行者",
-  "codeSecretKeyHint": "シークレットキー",
+  "codeSecretKeyHint": "秘密鍵",
  "codeAccountHint": "アカウント (you@domain.com)",
-  "accountKeyType": "キーの種類",
-  "sessionExpired": "セッションの有効期間超過",
+  "accountKeyType": "鍵の種類",
+  "sessionExpired": "セッションが失効しました",
  "@sessionExpired": {
    "description": "Title of the dialog when the users current session is invalid/expired"
  },
  "pleaseLoginAgain": "再度ログインしてください",
  "loggingOut": "ログアウト中...",
  "timeBasedKeyType": "時間ベース (TOTP)",
-  "counterBasedKeyType": "カウンタベース (HOTP)",
+  "counterBasedKeyType": "カウンターベース (HOTP)",
  "saveAction": "保存",
  "nextTotpTitle": "次へ",
-  "deleteCodeTitle": "コードを削除しますか?",
-  "deleteCodeMessage": "このコードを削除してもよろしいですか? このアクションは元に戻せません。",
+  "deleteCodeTitle": "コードを削除しますか？",
+  "deleteCodeMessage": "本当にこのコードを削除してもよろしいですか？この決定は元に戻せません。",
  "viewLogsAction": "ログの表示",
  "sendLogsDescription": "問題のデバッグに役立つログが送信されます。機密情報が記録されないように予防措置を講じていますが、共有する前にこれらのログを確認することをお勧めします。",
  "preparingLogsTitle": "ログを準備中...",
@@ -40,7 +45,7 @@
    }
  },
  "copyEmailAction": "メールをコピー",
-  "exportLogsAction": "ログのエクスポート",
+  "exportLogsAction": "ログをエクスポート",
  "reportABug": "バグを報告",
  "crashAndErrorReporting": "クラッシュとエラーの報告",
  "reportBug": "バグを報告",
@@ -53,25 +58,41 @@
    }
  },
  "contactSupport": "サポートに問い合わせ",
+  "rateUsOnStore": "{storeName} で評価",
+  "blog": "ブログ",
+  "merchandise": "グッズ",
  "verifyPassword": "パスワードを確認",
  "pleaseWait": "お待ちください...",
-  "generatingEncryptionKeysTitle": "暗号化キーを生成中...",
-  "recreatePassword": "パスワードを再設定",
-  "recreatePasswordMessage": "現在のデバイスは、パスワードを確認するのに十分ではありません。全てのデバイスで利用できるように再生成する必要があります。\n\nリカバリーキーを使用してログインし、パスワードを再生成してください (ご希望の場合は再度同じパスワードを使用できます)",
+  "generatingEncryptionKeysTitle": "暗号化鍵を生成中...",
+  "recreatePassword": "パスワードを再作成",
+  "recreatePasswordMessage": "現在のデバイスは、パスワードを確認するのに十分ではありません。全てのデバイスで利用できるように再生成する必要があります。\n\n回復キーを使用してログインし、パスワードを再生成してください (ご希望の場合は再度同じパスワードを使用できます)",
  "useRecoveryKey": "回復キーを使用",
  "incorrectPasswordTitle": "パスワードが正しくありません",
-  "welcomeBack": "おかえりなさい!",
+  "welcomeBack": "おかえりなさい！",
  "madeWithLoveAtPrefix": "made with ❤️ at ",
  "supportDevs": "プロジェクト支援のために <bold-green>ente</bold-green> に登録",
-  "supportDiscount": "クーポンコード \"AUTH\" を使用すると、初年度が10%オフになります。",
+  "supportDiscount": "クーポンコード \"AUTH\" の使用で初年度が 10% オフに",
  "changeEmail": "メールアドレスを変更",
  "changePassword": "パスワードを変更",
  "data": "データ",
  "importCodes": "コードをインポート",
+  "importTypePlainText": "プレーンテキスト",
+  "importTypeEnteEncrypted": "ente 暗号化エクスポート",
+  "passwordForDecryptingExport": "復号化用パスワード",
+  "passwordEmptyError": "パスワードは空欄にできません",
+  "importFromApp": "{appName} からコードをインポート",
+  "importGoogleAuthGuide": "Google Authenticator の \"アカウントを転送\" オプションを使用してあなたのアカウントを QR コードにエクスポートしてください。その後、他のデバイスで QR コードを読み取ってください。\n\nヒント: ノートパソコンのウェブカメラを使用して QR コードを撮影することができます。",
+  "importSelectJsonFile": "JSON ファイルを選択",
+  "importEnteEncGuide": "ente からエクスポートされた暗号化 JSON ファイルを選択",
+  "importRaivoGuide": "Raivo の設定の \"OTP を zip アーカイブにエクスポート\" を使用してください。\n\nzip ファイルを解凍し JSON ファイルをインポートしてください。",
+  "importAegisGuide": "Aegis の設定の \"保管庫をエクスポート\" を使用してください。\n\n保管庫が暗号化されている場合、保管庫を復号するためにパスワードの入力が必要になります。",
  "exportCodes": "コードをエクスポート",
-  "importInstruction": "以下のフォーマットで、コードのリストを含むファイルを選択してください",
+  "importLabel": "インポート",
+  "importInstruction": "以下の形式のコードのリストを含むファイルを選択してください",
  "importCodeDelimiterInfo": "コードはカンマまたは改行で区切ることができます",
  "selectFile": "ファイルを選択",
+  "emailVerificationToggle": "メール認証",
+  "authToChangeEmailVerificationSetting": "メール認証を変更するためには認証が必要です",
  "authToViewYourRecoveryKey": "回復キーを表示するためには認証が必要です",
  "authToChangeYourEmail": "メールアドレスを変更するためには認証が必要です",
  "authToChangeYourPassword": "パスワードを変更するためには認証が必要です",
@@ -79,8 +100,9 @@
  "cancel": "キャンセル",
  "yes": "はい",
  "no": "いいえ",
-  "email": "Eメール",
+  "email": "E メール",
  "support": "サポート",
+  "general": "一般",
  "settings": "設定",
  "copied": "コピーしました",
  "pleaseTryAgain": "再度お試しください",
@@ -90,6 +112,12 @@
  "enterYourPasswordHint": "パスワードを入力してください",
  "forgotPassword": "パスワードを忘れた場合",
  "oops": "おっと",
+  "suggestFeatures": "機能を提案",
+  "faq": "FAQ",
+  "faq_q_1": "ente Auth はどのくらい安全ですか？",
+  "faq_a_1": "ente でバックアップされたすべてのコードはエンドツーエンドで暗号化されて保管されます。これはあなただけがコードにアクセスできることを意味します。私たちのアプリはオープンソースであり、私たちの暗号は外部有識者によって検証済みです。",
+  "faq_q_2": "パソコンから私のコードにアクセスできますか？",
+  "faq_a_2": "auth.ente.io で Web からコードにアクセス可能です。",
  "somethingWentWrongMessage": "問題が発生しました、再試行してください",
  "leaveFamily": "ファミリーから退会",
  "leaveFamilyMessage": "本当にファミリープランを退会しますか?",
--- a/lib/l10n/arb/app_ka.arb
+++ b/lib/l10n/arb/app_ka.arb
@@ -0,0 +1 @@
+{}
--- a/lib/l10n/arb/app_nl.arb
+++ b/lib/l10n/arb/app_nl.arb
@@ -92,6 +92,7 @@
  "importCodeDelimiterInfo": "De codes mogen gescheiden worden door een komma of een nieuwe regel",
  "selectFile": "Bestand selecteren",
  "emailVerificationToggle": "E-mailverificatie",
+  "emailVerificationEnableWarning": "Als u de 2FA van uw e-mail bij ons opslaat, kan de verificatie van die e-mail resulteren in een riskante impasse. Als u bent uitgesloten van een van beide diensten, kunt u zich mogelijk niet meer aanmelden bij de andere.",
  "authToChangeEmailVerificationSetting": "Gelieve te verifiëren om de e-mailverificatie te wijzigen",
  "authToViewYourRecoveryKey": "Graag verifiëren om uw herstelsleutel te bekijken",
  "authToChangeYourEmail": "Graag verifiëren om je e-mailadres te wijzigen",
@@ -327,8 +328,13 @@
  "sigInBackupReminder": "Exporteer de codes zodat je een back-up hebt waarvandaan je kan herstellen.",
  "offlineModeWarning": "Je hebt ervoor gekozen om verder te gaan zonder back-ups. Neem handmatige back-ups om ervoor te zorgen dat jouw codes veilig zijn.",
  "showLargeIcons": "Grote iconen",
+  "shouldHideCode": "Verberg codes",
  "focusOnSearchBar": "Focus zoekveld na starten app",
+  "confirmUpdatingkey": "Weet u zeker dat u de geheime sleutel wilt bijwerken?",
+  "minimizeAppOnCopy": "Na kopiëren app minimaliseren",
  "editCodeAuthMessage": "Authenticeren om code te bewerken",
  "deleteCodeAuthMessage": "Authenticeren om code te verwijderen",
-  "showQRAuthMessage": "Authenticeren om QR-code te tonen"
+  "showQRAuthMessage": "Authenticeren om QR-code te tonen",
+  "confirmAccountDeleteTitle": "Account verwijderen bevestigen",
+  "confirmAccountDeleteMessage": "Dit account is gekoppeld aan andere ente apps, als je er gebruik van maakt.\n\nJe geüploade gegevens worden in alle ente apps gepland voor verwijdering, en je account wordt permanent verwijderd voor alle ente diensten."
 }
--- a/lib/l10n/arb/app_pl.arb
+++ b/lib/l10n/arb/app_pl.arb
@@ -334,5 +334,7 @@
  "minimizeAppOnCopy": "Minimalizuj aplikację przy kopiowaniu",
  "editCodeAuthMessage": "Uwierzytelnij, aby edytować kod",
  "deleteCodeAuthMessage": "Uwierzytelnij, aby usunąć kod",
-  "showQRAuthMessage": "Uwierzytelnij, aby pokazać kod QR"
+  "showQRAuthMessage": "Uwierzytelnij, aby pokazać kod QR",
+  "confirmAccountDeleteTitle": "Potwierdź usunięcie konta",
+  "confirmAccountDeleteMessage": "To konto jest połączone z innymi aplikacjami ente, jeśli ich używasz.\n\nTwoje przesłane dane, we wszystkich aplikacjach ente, zostaną zaplanowane do usunięcia, a Twoje konto zostanie trwale usunięte."
 }
--- a/lib/l10n/arb/app_ru.arb
+++ b/lib/l10n/arb/app_ru.arb
@@ -92,6 +92,7 @@
  "importCodeDelimiterInfo": "Коды могут быть разделены запятой или новой строкой",
  "selectFile": "Выбрать файл",
  "emailVerificationToggle": "Подтверждение электронной почты",
+  "emailVerificationEnableWarning": "Если вы храните у нас двухфакторную аутентификацию в своей электронной почте, включение проверки электронной почты может привести к тупиковой ситуации. Если у вас заблокирован доступ к одной службе, возможно, вы не сможете войти в другую.",
  "authToChangeEmailVerificationSetting": "Авторизуйтесь, чтобы изменить подтверждение электронной почты",
  "authToViewYourRecoveryKey": "Пожалуйста, авторизуйтесь для просмотра вашего ключа восстановления",
  "authToChangeYourEmail": "Пожалуйста, авторизуйтесь, чтобы изменить адрес электронной почты",
@@ -102,6 +103,7 @@
  "no": "Нет",
  "email": "Электронная почта",
  "support": "Поддержка",
+  "general": "Общие",
  "settings": "Настройки",
  "copied": "Скопировано",
  "pleaseTryAgain": "Пожалуйста, попробуйте ещё раз",
@@ -181,6 +183,7 @@
  "enterDetailsManually": "Ввести детали вручную",
  "edit": "Редактировать",
  "copiedToClipboard": "Скопировано",
+  "copiedNextToClipboard": "Следующий код скопирован в буфер обмена",
  "error": "Ошибка",
  "recoveryKeyCopiedToClipboard": "Ключ восстановления скопирован в буфер обмена",
  "recoveryKeyOnForgotPassword": "Если вы забыли свой пароль, то восстановить данные можно только с помощью этого ключа.",
@@ -251,6 +254,10 @@
  "privacy": "Конфиденциальность",
  "terms": "Условия использования",
  "checkForUpdates": "Проверить наличие обновлений",
+  "downloadUpdate": "Скачать",
+  "criticalUpdateAvailable": "Доступно критическое обновление",
+  "updateAvailable": "Доступно обновление",
+  "update": "Обновить",
  "checking": "Проверка...",
  "youAreOnTheLatestVersion": "Вы используете последнюю версию",
  "warning": "Предупреждение",
@@ -315,7 +322,19 @@
  "plainText": "Обычный текст",
  "passwordToEncryptExport": "Пароль для шифрования экспорта",
  "export": "Экспорт",
+  "useOffline": "Использовать без резервных копий",
+  "signInToBackup": "Войдите в систему, чтобы создать резервную копию своих кодов",
+  "singIn": "Войти",
+  "sigInBackupReminder": "Экспортируйте свои коды, чтобы убедиться, что у вас есть резервная копия, из которой можно восстановить.",
+  "offlineModeWarning": "Вы решили продолжить без резервных копий. Пожалуйста, создайте резервные копии вручную, чтобы убедиться, что ваши коды в безопасности.",
+  "showLargeIcons": "Показать большие значки",
+  "shouldHideCode": "Скрыть коды",
+  "focusOnSearchBar": "Фокусировать поиск при запуске приложения",
+  "confirmUpdatingkey": "Вы уверены, что хотите обновить секретный ключ?",
+  "minimizeAppOnCopy": "Свернуть приложение при копировании",
  "editCodeAuthMessage": "Аутентификация для редактирования кода",
  "deleteCodeAuthMessage": "Аутентификация для удаления кода",
-  "showQRAuthMessage": "Аутентификация для отображения QR-кода"
+  "showQRAuthMessage": "Аутентификация для отображения QR-кода",
+  "confirmAccountDeleteTitle": "Подтвердить удаление аккаунта",
+  "confirmAccountDeleteMessage": "Эта учетная запись связана с другими приложениями ente, если вы ими пользуетесь.\n\nЗагруженные вами данные во всех приложениях ente будут запланированы к удалению, а ваша учетная запись будет удалена без возможности восстановления."
 }
--- a/lib/l10n/arb/app_zh.arb
+++ b/lib/l10n/arb/app_zh.arb
@@ -1,5 +1,6 @@
 {
  "account": "账户",
+  "unlock": "解锁",
  "recoveryKey": "恢复密钥",
  "counterAppBarTitle": "计数器",
  "@counterAppBarTitle": {
@@ -85,6 +86,7 @@
  "importSelectJsonFile": "选择 JSON 文件",
  "importEnteEncGuide": "选择从ente导出的加密JSON文件",
  "importRaivoGuide": "使用 Raivo 设置中的“将 OTP 导出到 Zip 存档”选项。\n\n解压 zip 文件并导入 JSON 文件。",
+  "importBitwardenGuide": "使用 Bitwarden 工具中的“导出保管库”选项并导入未加密的 JSON 文件。",
  "importAegisGuide": "在Aegis的设置中使用\"导出密码库\"选项。\n\n如果您的密码库已加密，您需要输入密码才能解密密码库。",
  "exportCodes": "导出代码",
  "importLabel": "导入",
@@ -97,6 +99,7 @@
  "authToViewYourRecoveryKey": "请验证以查看您的恢复密钥",
  "authToChangeYourEmail": "请验证以更改您的电子邮件",
  "authToChangeYourPassword": "请验证以更改密码",
+  "authToViewSecrets": "请进行身份验证以查看您的秘密",
  "ok": "好的",
  "cancel": "取消",
  "yes": "是",
@@ -334,5 +337,67 @@
  "minimizeAppOnCopy": "复制时最小化应用",
  "editCodeAuthMessage": "编辑代码需要身份验证",
  "deleteCodeAuthMessage": "删除代码需要身份验证",
-  "showQRAuthMessage": "显示QR码需要身份验证"
+  "showQRAuthMessage": "显示QR码需要身份验证",
+  "confirmAccountDeleteTitle": "确认删除账户",
+  "confirmAccountDeleteMessage": "该账户已链接到其他ente旗下的应用程序（如果您使用任何相关的应用程序）。\n\n您在所有ente旗下应用程序中上传的数据都将被安排删除，并且您的账户将被永久删除。",
+  "reminderText": "提醒",
+  "reminderPopupBody": "请先删除屏幕截图，然后再恢复任何照片的云同步",
+  "invalidQrCodeText": "二维码无效",
+  "googleAuthImagePopupBody": "请关闭所有应用程序中的所有照片云同步，包括 iCloud、Google Photo、OneDrive 等。 \n此外，如果您有第二部智能手机，通过扫描二维码导入会更安全。",
+  "importGoogleAuthImageButtonText": "从图像导入",
+  "unableToRecognizeQrCodeText": "无法从上传的图像中识别有效代码",
+  "qrCodeImageNotSelectedText": "未选择二维码图像",
+  "androidBiometricHint": "验证身份",
+  "@androidBiometricHint": {
+    "description": "Hint message advising the user how to authenticate with biometrics. It is used on Android side. Maximum 60 characters."
+  },
+  "androidBiometricNotRecognized": "未能识别。再试一次。",
+  "@androidBiometricNotRecognized": {
+    "description": "Message to let the user know that authentication was failed. It is used on Android side. Maximum 60 characters."
+  },
+  "androidBiometricSuccess": "成功",
+  "@androidBiometricSuccess": {
+    "description": "Message to let the user know that authentication was successful. It is used on Android side. Maximum 60 characters."
+  },
+  "androidCancelButton": "取消",
+  "@androidCancelButton": {
+    "description": "Message showed on a button that the user can click to leave the current dialog. It is used on Android side. Maximum 30 characters."
+  },
+  "androidSignInTitle": "需要进行身份验证",
+  "@androidSignInTitle": {
+    "description": "Message showed as a title in a dialog which indicates the user that they need to scan biometric to continue. It is used on Android side. Maximum 60 characters."
+  },
+  "androidBiometricRequiredTitle": "需要进行生物识别认证",
+  "@androidBiometricRequiredTitle": {
+    "description": "Message showed as a title in a dialog which indicates the user has not set up biometric authentication on their device. It is used on Android side. Maximum 60 characters."
+  },
+  "androidDeviceCredentialsRequiredTitle": "需要设备凭据",
+  "@androidDeviceCredentialsRequiredTitle": {
+    "description": "Message showed as a title in a dialog which indicates the user has not set up credentials authentication on their device. It is used on Android side. Maximum 60 characters."
+  },
+  "androidDeviceCredentialsSetupDescription": "需要设备凭据",
+  "@androidDeviceCredentialsSetupDescription": {
+    "description": "Message advising the user to go to the settings and configure device credentials on their device. It shows in a dialog on Android side."
+  },
+  "goToSettings": "前往设置",
+  "@goToSettings": {
+    "description": "Message showed on a button that the user can click to go to settings pages from the current dialog. It is used on both Android and iOS side. Maximum 30 characters."
+  },
+  "androidGoToSettingsDescription": "您的设备上未设置生物识别身份验证。转到“设置 > 安全”以添加生物识别身份验证。",
+  "@androidGoToSettingsDescription": {
+    "description": "Message advising the user to go to the settings and configure biometric on their device. It shows in a dialog on Android side."
+  },
+  "iOSLockOut": "生物识别身份验证已禁用。请锁定再解锁您的屏幕以启用它。",
+  "@iOSLockOut": {
+    "description": "Message advising the user to re-enable biometrics on their device. It shows in a dialog on iOS side."
+  },
+  "iOSGoToSettingsDescription": "您的设备上未设置生物识别身份验证。请在您的手机上启用 触控 ID 或 面容 ID。",
+  "@iOSGoToSettingsDescription": {
+    "description": "Message advising the user to go to the settings and configure Biometrics for their device. It shows in a dialog on iOS side."
+  },
+  "iOSOkButton": "好的",
+  "@iOSOkButton": {
+    "description": "Message showed on a button that the user can click to leave the current dialog. It is used on iOS side. Maximum 30 characters."
+  },
+  "parsingErrorText": "解析谷歌验证器的二维码时出错"
 }
--- a/lib/services/local_authentication_service.dart
+++ b/lib/services/local_authentication_service.dart
@@ -1,5 +1,3 @@
-
-
 import 'package:ente_auth/core/configuration.dart';
 import 'package:ente_auth/ui/tools/app_lock.dart';
 import 'package:ente_auth/utils/auth_util.dart';
@@ -19,7 +17,7 @@ class LocalAuthenticationService {
  ) async {
    if (await _isLocalAuthSupportedOnDevice()) {
      AppLock.of(context)!.setEnabled(false);
-      final result = await requestAuthentication(infoMessage);
+      final result = await requestAuthentication(context, infoMessage);
      AppLock.of(context)!.setEnabled(
        Configuration.instance.shouldShowLockScreen(),
      );
@@ -43,6 +41,7 @@ class LocalAuthenticationService {
    if (await LocalAuthentication().isDeviceSupported()) {
      AppLock.of(context)!.disable();
      final result = await requestAuthentication(
+        context,
        infoMessage,
      );
      if (result) {
--- a/lib/services/update_service.dart
+++ b/lib/services/update_service.dart
@@ -1,5 +1,3 @@
-
-
 import 'dart:io';

 import 'package:ente_auth/core/constants.dart';
@@ -94,7 +92,7 @@ class UpdateService {
    // Note: in auth, currently we don't have a way to identify if the
    // app was installed from play store, f-droid or github based on pkg name
    if (Platform.isAndroid) {
-      if(flavor == "playstore") {
+      if (flavor == "playstore") {
        return const Tuple2(
          "Play Store",
          "market://details??id=io.ente.auth",
@@ -120,8 +118,7 @@ class UpdateService {
      // Fall back if we fail to open play-store market app on android
      if (Platform.isAndroid && url.startsWith("market://")) {
        launchUrlString(
-          "https://play.google.com/store/apps/details?id=io"
-              ".ente.auth",
+          "https://play.google.com/store/apps/details?id=io.ente.auth",
          mode: LaunchMode.externalApplication,
        ).ignore();
      }
@@ -129,7 +126,8 @@ class UpdateService {
  }

  bool isIndependent() {
-    return flavor == "independent" || _packageInfo.packageName.endsWith("independent");
+    return flavor == "independent" ||
+        _packageInfo.packageName.endsWith("independent");
  }
 }

--- a/lib/ui/settings/data/import/analyze_qr_code.dart
+++ b/lib/ui/settings/data/import/analyze_qr_code.dart
@@ -0,0 +1,268 @@
+import 'dart:io';
+
+import 'package:ente_auth/l10n/l10n.dart';
+import 'package:ente_auth/models/code.dart';
+import 'package:ente_auth/ui/components/buttons/button_widget.dart';
+import 'package:ente_auth/ui/components/dialog_widget.dart';
+import 'package:ente_auth/ui/components/models/button_type.dart';
+import 'package:ente_auth/ui/settings/data/import/google_auth_import.dart';
+import 'package:ente_auth/ui/settings/data/import/qr_scanner_overlay.dart';
+import 'package:ente_auth/utils/toast_util.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_svg/svg.dart';
+import 'package:logging/logging.dart';
+import 'package:mobile_scanner/mobile_scanner.dart';
+import 'package:wechat_assets_picker/wechat_assets_picker.dart';
+
+class QrScanner extends StatefulWidget {
+  const QrScanner({super.key});
+
+  @override
+  State<QrScanner> createState() => _QrScannerState();
+}
+
+class _QrScannerState extends State<QrScanner> {
+  bool isNavigationPerformed = false;
+  bool isScannedByImage = false;
+
+  MobileScannerController scannerController = MobileScannerController(
+    detectionSpeed: DetectionSpeed.normal,
+    facing: CameraFacing.back,
+  );
+
+  @override
+  void dispose() {
+    scannerController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = context.l10n;
+    return SafeArea(
+      child: Scaffold(
+        backgroundColor: Colors.black,
+        body: Stack(
+          alignment: Alignment.topLeft,
+          children: [
+            Stack(
+              children: [
+                MobileScanner(
+                  controller: scannerController,
+                  onDetect: (capture) async {
+                    if (!isNavigationPerformed) {
+                      isNavigationPerformed = true;
+                      if (capture.barcodes[0].rawValue!
+                          .startsWith(kGoogleAuthExportPrefix)) {
+                        if (isScannedByImage) {
+                          final result = await showDialogWidget(
+                            context: context,
+                            title: l10n.reminderText,
+                            body: l10n.reminderPopupBody,
+                            buttons: [
+                              ButtonWidget(
+                                buttonType: ButtonType.primary,
+                                labelText: l10n.ok,
+                                isInAlert: true,
+                                buttonSize: ButtonSize.large,
+                                buttonAction: ButtonAction.first,
+                              ),
+                            ],
+                          );
+                          if (result?.action != null &&
+                              result!.action == ButtonAction.first) {
+                            isScannedByImage = false;
+                          }
+                        }
+                        HapticFeedback.vibrate();
+                        try {
+                          List<Code> codes =
+                              parseGoogleAuth(capture.barcodes[0].rawValue!);
+                          scannerController.dispose();
+                          Navigator.of(context).pop(codes);
+                        } catch (e) {
+                          showToast(context, l10n.parsingErrorText);
+                          Logger("Code parsing error").severe(
+                            "Error while parsing Google Auth QR code",
+                            e,
+                          );
+                          throw Exception(
+                            'Failed to parse Google Auth QR code \n ${e.toString()}',
+                          );
+                        }
+                      } else {
+                        showToast(context, l10n.invalidQrCodeText);
+                        isNavigationPerformed = false;
+                      }
+                    }
+                  },
+                ),
+                const QRScannerOverlay(),
+                Positioned(
+                  top: 150,
+                  left: 0,
+                  right: 0,
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: [
+                      // Torch button
+                      IconButton(
+                        icon: ValueListenableBuilder(
+                          valueListenable: scannerController.torchState,
+                          builder: (context, state, child) {
+                            switch (state) {
+                              case TorchState.on:
+                                return SvgPicture.asset(
+                                  'assets/scanner-icons/icons/flash_on.svg',
+                                );
+                              case TorchState.off:
+                                return SvgPicture.asset(
+                                  'assets/scanner-icons/icons/flash_off.svg',
+                                );
+                            }
+                          },
+                        ),
+                        iconSize: 60,
+                        onPressed: () => scannerController.toggleTorch(),
+                      ),
+                      IconButton(
+                        icon: SvgPicture.asset(
+                          'assets/scanner-icons/icons/gallery.svg',
+                        ),
+                        iconSize: 60,
+                        onPressed: () async {
+                          final result = await showDialogWidget(
+                            context: context,
+                            title: l10n.importFromApp(
+                              "Google Authenticator (saved image)",
+                            ),
+                            body: l10n.googleAuthImagePopupBody,
+                            buttons: [
+                              ButtonWidget(
+                                buttonType: ButtonType.primary,
+                                labelText: l10n.importGoogleAuthImageButtonText,
+                                isInAlert: true,
+                                buttonSize: ButtonSize.large,
+                                buttonAction: ButtonAction.first,
+                              ),
+                              ButtonWidget(
+                                buttonType: ButtonType.secondary,
+                                labelText: l10n.cancel,
+                                buttonSize: ButtonSize.large,
+                                isInAlert: true,
+                                buttonAction: ButtonAction.second,
+                              ),
+                            ],
+                          );
+                          if (result?.action != null &&
+                              result!.action != ButtonAction.cancel) {
+                            if (result.action == ButtonAction.first) {
+                              List<AssetEntity>? assets =
+                                  await AssetPicker.pickAssets(
+                                context,
+                                pickerConfig: const AssetPickerConfig(
+                                  maxAssets: 1,
+                                  requestType: RequestType.image,
+                                ),
+                              );
+
+                              if (assets != null && assets.isNotEmpty) {
+                                AssetEntity asset = assets.first;
+                                File? file = await asset.file;
+                                String path = file!.path;
+
+                                if (await scannerController
+                                    .analyzeImage(path)) {
+                                  isScannedByImage = true;
+                                  if (!mounted) return;
+                                } else {
+                                  if (!mounted) return;
+                                  isScannedByImage = false;
+                                  showToast(
+                                    context,
+                                    l10n.unableToRecognizeQrCodeText,
+                                  );
+                                }
+                              } else {
+                                if (!mounted) return;
+                                showToast(
+                                  context,
+                                  l10n.qrCodeImageNotSelectedText,
+                                );
+                              }
+                            }
+                          }
+                        },
+                      ),
+                    ],
+                  ),
+                ),
+                Positioned(
+                  bottom: 0,
+                  left: 0,
+                  right: 0,
+                  child: Container(
+                    decoration: const BoxDecoration(
+                      borderRadius: BorderRadius.only(
+                        topLeft: Radius.circular(30),
+                        topRight: Radius.circular(30),
+                      ),
+                      color: Colors.white,
+                    ),
+                    child: Padding(
+                      padding: const EdgeInsets.fromLTRB(
+                        40,
+                        15,
+                        40,
+                        18,
+                      ),
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.center,
+                        children: [
+                          Container(
+                            height: 5,
+                            width: 40,
+                            decoration: BoxDecoration(
+                              color: Colors.black,
+                              borderRadius: BorderRadius.circular(50),
+                            ),
+                          ),
+                          const SizedBox(
+                            height: 25,
+                          ),
+                          Text(
+                            l10n.scanACode,
+                            textAlign: TextAlign.center,
+                            style: const TextStyle(
+                              color: Colors.black,
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                  ),
+                ),
+              ],
+            ),
+            Positioned(
+              left: 25,
+              top: 25,
+              child: GestureDetector(
+                onTap: () {
+                  Navigator.pop(context);
+                },
+                child: SvgPicture.asset(
+                  'assets/scanner-icons/icons/cross.svg',
+                  colorFilter:
+                      const ColorFilter.mode(Colors.white, BlendMode.srcATop),
+                  height: 30,
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
--- a/lib/ui/settings/data/import/bitwarden_import.dart
+++ b/lib/ui/settings/data/import/bitwarden_import.dart
@@ -0,0 +1,103 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:ente_auth/l10n/l10n.dart';
+import 'package:ente_auth/models/code.dart';
+import 'package:ente_auth/services/authenticator_service.dart';
+import 'package:ente_auth/store/code_store.dart';
+import 'package:ente_auth/ui/components/buttons/button_widget.dart';
+import 'package:ente_auth/ui/components/dialog_widget.dart';
+import 'package:ente_auth/ui/components/models/button_type.dart';
+import 'package:ente_auth/ui/settings/data/import/import_success.dart';
+import 'package:ente_auth/utils/dialog_util.dart';
+import 'package:file_picker/file_picker.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+
+Future<void> showBitwardenImportInstruction(BuildContext context) async {
+  final l10n = context.l10n;
+  final result = await showDialogWidget(
+    context: context,
+    title: l10n.importFromApp("Bitwarden"),
+    body: l10n.importBitwardenGuide,
+    buttons: [
+      ButtonWidget(
+        buttonType: ButtonType.primary,
+        labelText: l10n.importSelectJsonFile,
+        isInAlert: true,
+        buttonSize: ButtonSize.large,
+        buttonAction: ButtonAction.first,
+      ),
+      ButtonWidget(
+        buttonType: ButtonType.secondary,
+        labelText: context.l10n.cancel,
+        buttonSize: ButtonSize.large,
+        isInAlert: true,
+        buttonAction: ButtonAction.second,
+      ),
+    ],
+  );
+  if (result?.action != null && result!.action != ButtonAction.cancel) {
+    if (result.action == ButtonAction.first) {
+      await _pickBitwardenJsonFile(context);
+    }
+  }
+}
+
+Future<void> _pickBitwardenJsonFile(BuildContext context) async {
+  final l10n = context.l10n;
+  FilePickerResult? result = await FilePicker.platform.pickFiles();
+  if (result == null) {
+    return;
+  }
+  final progressDialog = createProgressDialog(context, l10n.pleaseWait);
+  await progressDialog.show();
+  try {
+    String path = result.files.single.path!;
+    int? count = await _processBitwardenExportFile(context, path);
+    await progressDialog.hide();
+    if (count != null) {
+      await importSuccessDialog(context, count);
+    }
+  } catch (e) {
+    await progressDialog.hide();
+    await showErrorDialog(
+      context,
+      context.l10n.sorry,
+      context.l10n.importFailureDesc,
+    );
+  }
+}
+
+Future<int?> _processBitwardenExportFile(
+  BuildContext context,
+  String path,
+) async {
+  File file = File(path);
+  final jsonString = await file.readAsString();
+  final data = jsonDecode(jsonString);
+  List<dynamic> jsonArray = data['items'];
+  final parsedCodes = [];
+  for (var item in jsonArray) {
+    if (item['login']['totp'] != null) {
+      var issuer = item['name'];
+      var account = item['login']['username'];
+      var secret = item['login']['totp'];
+
+      parsedCodes.add(
+        Code.fromAccountAndSecret(
+          account,
+          issuer,
+          secret,
+        ),
+      );
+    }
+  }
+
+  for (final code in parsedCodes) {
+    await CodeStore.instance.addCode(code, shouldSync: false);
+  }
+  unawaited(AuthenticatorService.instance.onlineSync());
+  return parsedCodes.length;
+}
--- a/lib/ui/settings/data/import/google_auth_import.dart
+++ b/lib/ui/settings/data/import/google_auth_import.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:typed_data';
+
 import 'package:base32/base32.dart';
 import 'package:ente_auth/l10n/l10n.dart';
 import 'package:ente_auth/models/code.dart';
@@ -10,7 +11,7 @@ import 'package:ente_auth/store/code_store.dart';
 import 'package:ente_auth/ui/components/buttons/button_widget.dart';
 import 'package:ente_auth/ui/components/dialog_widget.dart';
 import 'package:ente_auth/ui/components/models/button_type.dart';
-import 'package:ente_auth/ui/scanner_gauth_page.dart';
+import 'package:ente_auth/ui/settings/data/import/analyze_qr_code.dart';
 import 'package:ente_auth/ui/settings/data/import/import_success.dart';
 import 'package:flutter/material.dart';
 import 'package:logging/logging.dart';
@@ -45,7 +46,7 @@ Future<void> showGoogleAuthInstruction(BuildContext context) async {
      final List<Code>? codes = await Navigator.of(context).push(
        MaterialPageRoute(
          builder: (BuildContext context) {
-            return const ScannerGoogleAuthPage();
+            return const QrScanner();
          },
        ),
      );
--- a/lib/ui/settings/data/import/import_service.dart
+++ b/lib/ui/settings/data/import/import_service.dart
@@ -1,10 +1,11 @@
 import 'package:ente_auth/ui/settings/data/import/aegis_import.dart';
+import 'package:ente_auth/ui/settings/data/import/bitwarden_import.dart';
 import 'package:ente_auth/ui/settings/data/import/encrypted_ente_import.dart';
 import 'package:ente_auth/ui/settings/data/import/google_auth_import.dart';
 import 'package:ente_auth/ui/settings/data/import/plain_text_import.dart';
 import 'package:ente_auth/ui/settings/data/import/raivo_plain_text_import.dart';
 import 'package:ente_auth/ui/settings/data/import_page.dart';
-import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';

 class ImportService {
  static final ImportService _instance = ImportService._internal();
@@ -31,6 +32,9 @@ class ImportService {
      case ImportType.aegis:
        showAegisImportInstruction(context);
        break;
+      case ImportType.bitwarden:
+        showBitwardenImportInstruction(context);
+        break;
    }
  }
 }
--- a/lib/ui/settings/data/import/qr_scanner_overlay.dart
+++ b/lib/ui/settings/data/import/qr_scanner_overlay.dart
@@ -0,0 +1,152 @@
+import 'package:flutter/material.dart';
+
+class QRScannerOverlay extends StatelessWidget {
+  const QRScannerOverlay({
+    Key? key,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    double scanArea = (MediaQuery.of(context).size.width < 400 ||
+            MediaQuery.of(context).size.height < 400)
+        ? 200.0
+        : 330.0;
+    return Stack(
+      children: [
+        ColorFiltered(
+          colorFilter:
+              ColorFilter.mode(Colors.black.withOpacity(0.9), BlendMode.srcOut),
+          child: Stack(
+            children: [
+              Container(
+                decoration: const BoxDecoration(
+                  color: Colors.red,
+                  backgroundBlendMode: BlendMode.dstOut,
+                ),
+              ),
+              Align(
+                alignment: Alignment.center,
+                child: Container(
+                  height: scanArea,
+                  width: scanArea,
+                  decoration: BoxDecoration(
+                    color: Colors.red,
+                    borderRadius: BorderRadius.circular(20),
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ),
+        Align(
+          alignment: Alignment.center,
+          child: CustomPaint(
+            foregroundPainter: BorderPainter(),
+            child: SizedBox(
+              width: scanArea + 25,
+              height: scanArea + 25,
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+// Creates the white borders
+class BorderPainter extends CustomPainter {
+  @override
+  void paint(Canvas canvas, Size size) {
+    const width = 4.0;
+    const radius = 20.0;
+    const tRadius = 3 * radius;
+    final rect = Rect.fromLTWH(
+      width,
+      width,
+      size.width - 2 * width,
+      size.height - 2 * width,
+    );
+    final rrect = RRect.fromRectAndRadius(rect, const Radius.circular(radius));
+    const clippingRect0 = Rect.fromLTWH(
+      0,
+      0,
+      tRadius,
+      tRadius,
+    );
+    final clippingRect1 = Rect.fromLTWH(
+      size.width - tRadius,
+      0,
+      tRadius,
+      tRadius,
+    );
+    final clippingRect2 = Rect.fromLTWH(
+      0,
+      size.height - tRadius,
+      tRadius,
+      tRadius,
+    );
+    final clippingRect3 = Rect.fromLTWH(
+      size.width - tRadius,
+      size.height - tRadius,
+      tRadius,
+      tRadius,
+    );
+
+    final path = Path()
+      ..addRect(clippingRect0)
+      ..addRect(clippingRect1)
+      ..addRect(clippingRect2)
+      ..addRect(clippingRect3);
+
+    canvas.clipPath(path);
+    canvas.drawRRect(
+      rrect,
+      Paint()
+        ..color = Colors.blueAccent
+        ..style = PaintingStyle.stroke
+        ..strokeWidth = width,
+    );
+  }
+
+  @override
+  bool shouldRepaint(CustomPainter oldDelegate) {
+    return false;
+  }
+}
+
+class BarReaderSize {
+  static double width = 200;
+  static double height = 200;
+}
+
+class OverlayWithHolePainter extends CustomPainter {
+  @override
+  void paint(Canvas canvas, Size size) {
+    final paint = Paint()..color = Colors.black54;
+    canvas.drawPath(
+      Path.combine(
+        PathOperation.difference,
+        Path()..addRect(Rect.fromLTWH(0, 0, size.width, size.height)),
+        Path()
+          ..addOval(
+            Rect.fromCircle(
+              center: Offset(size.width - 44, size.height - 44),
+              radius: 40,
+            ),
+          )
+          ..close(),
+      ),
+      paint,
+    );
+  }
+
+  @override
+  bool shouldRepaint(CustomPainter oldDelegate) {
+    return false;
+  }
+}
+
+@override
+bool shouldRepaint(CustomPainter oldDelegate) {
+  return false;
+}
--- a/lib/ui/settings/data/import_page.dart
+++ b/lib/ui/settings/data/import_page.dart
@@ -15,6 +15,7 @@ enum ImportType {
  ravio,
  googleAuthenticator,
  aegis,
+  bitwarden,
 }

 class ImportCodePage extends StatelessWidget {
@@ -24,6 +25,7 @@ class ImportCodePage extends StatelessWidget {
    ImportType.ravio,
    ImportType.aegis,
    ImportType.googleAuthenticator,
+    ImportType.bitwarden,
  ];

  ImportCodePage({super.key});
@@ -32,6 +34,7 @@ class ImportCodePage extends StatelessWidget {
    switch (type) {
      case ImportType.plainText:
        return context.l10n.importTypePlainText;
+
      case ImportType.encrypted:
        return context.l10n.importTypeEnteEncrypted;
      case ImportType.ravio:
@@ -40,6 +43,8 @@ class ImportCodePage extends StatelessWidget {
        return 'Google Authenticator';
      case ImportType.aegis:
        return 'Aegis Authenticator';
+      case ImportType.bitwarden:
+        return 'Bitwarden';
    }
  }

@@ -62,7 +67,7 @@ class ImportCodePage extends StatelessWidget {
                  iconButtonType: IconButtonType.secondary,
                  onTap: () {
                    Navigator.pop(context);
-                    if(Navigator.canPop(context)) {
+                    if (Navigator.canPop(context)) {
                      Navigator.pop(context);
                    }
                  },
--- a/lib/ui/tools/lock_screen.dart
+++ b/lib/ui/tools/lock_screen.dart
@@ -1,5 +1,4 @@
-
-
+import 'package:ente_auth/l10n/l10n.dart';
 import 'package:ente_auth/ui/common/gradient_button.dart';
 import 'package:ente_auth/ui/tools/app_lock.dart';
 import 'package:ente_auth/utils/auth_util.dart';
@@ -13,13 +12,19 @@ class LockScreen extends StatefulWidget {
  State<LockScreen> createState() => _LockScreenState();
 }

-class _LockScreenState extends State<LockScreen> {
+class _LockScreenState extends State<LockScreen> with WidgetsBindingObserver {
  final _logger = Logger("LockScreen");
+  bool _isShowingLockScreen = false;
+  bool _hasPlacedAppInBackground = false;
+  bool _hasAuthenticationFailed = false;
+  int? lastAuthenticatingTime;

  @override
  void initState() {
-    _showLockScreen();
+    _logger.info("initState");
    super.initState();
+    _showLockScreen(source: "initState");
+    WidgetsBinding.instance.addObserver(this);
  }

  @override
@@ -34,16 +39,16 @@ class _LockScreenState extends State<LockScreen> {
              alignment: Alignment.center,
              children: [
                Opacity(
-                  opacity: 0.3,
+                  opacity: 0.2,
                  child: Image.asset('assets/loading_photos_background.png'),
                ),
                SizedBox(
-                  width: 142,
+                  width: 180,
                  child: GradientButton(
-                    text: "Unlock",
+                    text: context.l10n.unlock,
                    iconData: Icons.lock_open_outlined,
                    onTap: () async {
-                      _showLockScreen();
+                      _showLockScreen(source: "tapUnlock");
                    },
                  ),
                ),
@@ -55,16 +60,67 @@ class _LockScreenState extends State<LockScreen> {
    );
  }

-  Future<void> _showLockScreen() async {
-    _logger.info("Showing lockscreen");
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    _logger.info(state.toString());
+    if (state == AppLifecycleState.resumed && !_isShowingLockScreen) {
+      // This is triggered either when the lock screen is dismissed or when
+      // the app is brought to foreground
+      _hasPlacedAppInBackground = false;
+      final bool didAuthInLast5Seconds = lastAuthenticatingTime != null &&
+          DateTime.now().millisecondsSinceEpoch - lastAuthenticatingTime! <
+              5000;
+      if (!_hasAuthenticationFailed && !didAuthInLast5Seconds) {
+        // Show the lock screen again only if the app is resuming from the
+        // background, and not when the lock screen was explicitly dismissed
+        Future.delayed(
+          Duration.zero,
+          () => _showLockScreen(source: "lifeCycle"),
+        );
+      } else {
+        _hasAuthenticationFailed = false; // Reset failure state
+      }
+    } else if (state == AppLifecycleState.paused ||
+        state == AppLifecycleState.inactive) {
+      // This is triggered either when the lock screen pops up or when
+      // the app is pushed to background
+      if (!_isShowingLockScreen) {
+        _hasPlacedAppInBackground = true;
+        _hasAuthenticationFailed = false; // reset failure state
+      }
+    }
+  }
+
+  @override
+  void dispose() {
+    WidgetsBinding.instance.removeObserver(this);
+    super.dispose();
+  }
+
+  Future<void> _showLockScreen({String source = ''}) async {
+    final int id = DateTime.now().millisecondsSinceEpoch;
+    _logger.info("Showing lock screen $source $id");
    try {
+      _isShowingLockScreen = true;
      final result = await requestAuthentication(
-        "Please authenticate to view your secrets",
+        context,
+        context.l10n.authToViewSecrets,
      );
+      _logger.finest("LockScreen Result $result $id");
+      _isShowingLockScreen = false;
      if (result) {
+        lastAuthenticatingTime = DateTime.now().millisecondsSinceEpoch;
        AppLock.of(context)!.didUnlock();
+      } else {
+        if (!_hasPlacedAppInBackground) {
+          // Treat this as a failure only if user did not explicitly
+          // put the app in background
+          _hasAuthenticationFailed = true;
+          _logger.info("Authentication failed");
+        }
      }
    } catch (e, s) {
+      _isShowingLockScreen = false;
      _logger.severe(e, s);
    }
  }
--- a/lib/ui/utils/icon_utils.dart
+++ b/lib/ui/utils/icon_utils.dart
@@ -4,6 +4,7 @@ import 'package:ente_auth/theme/ente_theme.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_svg/svg.dart';
+import 'package:logging/logging.dart';

 class IconUtils {
  IconUtils._privateConstructor();
@@ -77,20 +78,32 @@ class IconUtils {
  }

  Future<void> _loadJson() async {
-    final simpleIconData = await rootBundle
-        .loadString('assets/simple-icons/_data/simple-icons.json');
-    final simpleIcons = json.decode(simpleIconData);
-    for (final icon in simpleIcons["icons"]) {
-      _simpleIcons[icon["title"].toString().toLowerCase()] = icon["hex"];
-    }
-    final customIconData = await rootBundle
-        .loadString('assets/custom-icons/_data/custom-icons.json');
-    final customIcons = json.decode(customIconData);
-    for (final icon in customIcons["icons"]) {
-      _customIcons[icon["title"].toString().toLowerCase()] = CustomIconData(
-        icon["slug"],
-        icon["hex"],
-      );
+    try {
+      final simpleIconData = await rootBundle
+          .loadString('assets/simple-icons/_data/simple-icons.json');
+      final simpleIcons = json.decode(simpleIconData);
+      for (final icon in simpleIcons["icons"]) {
+        _simpleIcons[icon["title"].toString().toLowerCase()] = icon["hex"];
+      }
+      final customIconData = await rootBundle
+          .loadString('assets/custom-icons/_data/custom-icons.json');
+      final customIcons = json.decode(customIconData);
+      for (final icon in customIcons["icons"]) {
+        _customIcons[icon["title"].toString().toLowerCase()] = CustomIconData(
+          icon["slug"],
+          icon["hex"],
+        );
+        if (icon["altNames"] != null) {
+          for (final name in icon["altNames"]) {
+            _customIcons[name] = CustomIconData(
+              icon["slug"],
+              icon["hex"],
+            );
+          }
+        }
+      }
+    } catch (e) {
+      Logger("IconUtils").severe("Error loading icons", e);
    }
  }

--- a/lib/utils/auth_util.dart
+++ b/lib/utils/auth_util.dart
@@ -1,25 +1,37 @@
+import 'package:ente_auth/l10n/l10n.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:local_auth/local_auth.dart';
 import 'package:local_auth_android/local_auth_android.dart';
+import 'package:local_auth_ios/types/auth_messages_ios.dart';
 import 'package:logging/logging.dart';

-Future<bool> requestAuthentication(String reason) async {
+Future<bool> requestAuthentication(BuildContext context, String reason) async {
  Logger("AuthUtil").info("Requesting authentication");
  await LocalAuthentication().stopAuthentication();
+  final l10n = context.l10n;
  return await LocalAuthentication().authenticate(
    localizedReason: reason,
    authMessages: [
-      const AndroidAuthMessages(
-        biometricHint: "Verify identity",
-        biometricNotRecognized: "Not recognized, try again",
-        biometricRequiredTitle: "Biometric required",
-        biometricSuccess: "Successfully verified",
-        cancelButton: "Cancel",
-        deviceCredentialsRequiredTitle: "Device credentials required",
-        deviceCredentialsSetupDescription: "Device credentials required",
-        goToSettingsButton: "Go to settings",
-        goToSettingsDescription:
-            "Authentication is not setup on your device, go to Settings > Security to set it up",
-        signInTitle: "Authentication required",
+      AndroidAuthMessages(
+        biometricHint: l10n.androidBiometricHint,
+        biometricNotRecognized: l10n.androidBiometricNotRecognized,
+        biometricRequiredTitle: l10n.androidBiometricRequiredTitle,
+        biometricSuccess: l10n.androidBiometricSuccess,
+        cancelButton: l10n.androidCancelButton,
+        deviceCredentialsRequiredTitle:
+            l10n.androidDeviceCredentialsRequiredTitle,
+        deviceCredentialsSetupDescription:
+            l10n.androidDeviceCredentialsSetupDescription,
+        goToSettingsButton: l10n.goToSettings,
+        goToSettingsDescription: l10n.androidGoToSettingsDescription,
+        signInTitle: l10n.androidSignInTitle,
+      ),
+      IOSAuthMessages(
+        goToSettingsButton: l10n.goToSettings,
+        goToSettingsDescription: l10n.goToSettings,
+        lockOut: l10n.iOSLockOut,
+        // cancelButton default value is "Ok"
+        cancelButton: l10n.iOSOkButton,
      ),
    ],
  );
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -10,13 +10,16 @@ import device_info_plus
 import file_saver
 import flutter_local_notifications
 import flutter_secure_storage_macos
+import mobile_scanner
 import package_info_plus
 import path_provider_foundation
+import photo_manager
 import sentry_flutter
 import share_plus
 import shared_preferences_foundation
 import sqflite
 import url_launcher_macos
+import video_player_avfoundation

 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
  ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin"))
@@ -24,11 +27,14 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
  FileSaverPlugin.register(with: registry.registrar(forPlugin: "FileSaverPlugin"))
  FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin"))
  FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin"))
+  MobileScannerPlugin.register(with: registry.registrar(forPlugin: "MobileScannerPlugin"))
  FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin"))
  PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
+  PhotoManagerPlugin.register(with: registry.registrar(forPlugin: "PhotoManagerPlugin"))
  SentryFlutterPlugin.register(with: registry.registrar(forPlugin: "SentryFlutterPlugin"))
  SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
  SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
  SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))
  UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
+  FVPVideoPlayerPlugin.register(with: registry.registrar(forPlugin: "FVPVideoPlayerPlugin"))
 }
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -386,6 +386,22 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "3.0.0"
+  extended_image:
+    dependency: transitive
+    description:
+      name: extended_image
+      sha256: b4d72a27851751cfadaf048936d42939db7cd66c08fdcfe651eeaa1179714ee6
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.1.1"
+  extended_image_library:
+    dependency: transitive
+    description:
+      name: extended_image_library
+      sha256: "8bf87c0b14dcb59200c923a9a3952304e4732a0901e40811428834ef39018ee1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.6.0"
  fake_async:
    dependency: transitive
    description:
@@ -422,10 +438,10 @@ packages:
    dependency: "direct main"
    description:
      name: file_saver
-      sha256: "8ffd91ae9f543c5ebbfec71a814ee5aa9e21176d31335133308abf63f4c42e8a"
+      sha256: "591d25e750e3a4b654f7b0293abc2ed857242f82ca7334051b2a8ceeb369dac8"
      url: "https://pub.dev"
    source: hosted
-    version: "0.2.9"
+    version: "0.2.8"
  fixnum:
    dependency: transitive
    description:
@@ -687,6 +703,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.1.0"
+  http_client_helper:
+    dependency: transitive
+    description:
+      name: http_client_helper
+      sha256: "8a9127650734da86b5c73760de2b404494c968a3fd55602045ffec789dac3cb1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.0"
  http_multi_server:
    dependency: transitive
    description:
@@ -768,7 +792,7 @@ packages:
    source: hosted
    version: "2.1.7"
  local_auth_android:
-    dependency: transitive
+    dependency: "direct main"
    description:
      name: local_auth_android
      sha256: "523dd636ce061ddb296cbc3db410cb8f21efb7d8798f7b9532c8038ce2f8bad5"
@@ -776,7 +800,7 @@ packages:
    source: hosted
    version: "1.0.31"
  local_auth_ios:
-    dependency: transitive
+    dependency: "direct main"
    description:
      name: local_auth_ios
      sha256: edc2977c5145492f3451db9507a2f2f284ee4f408950b3e16670838726761940
@@ -839,6 +863,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.0.4"
+  mobile_scanner:
+    dependency: "direct main"
+    description:
+      name: mobile_scanner
+      sha256: cf978740676ba5b0c17399baf117984b31190bb7a6eaa43e51229ed46abc42ee
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.5.2"
  mocktail:
    dependency: "direct dev"
    description:
@@ -1007,6 +1039,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "5.1.0"
+  photo_manager:
+    dependency: transitive
+    description:
+      name: photo_manager
+      sha256: c1f21882f22c97cc85a8a67b08d7b979a03c9b7f18f940c10c6860b3a49581d3
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.8.0"
  pinput:
    dependency: "direct main"
    description:
@@ -1548,6 +1588,46 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.1.4"
+  video_player:
+    dependency: transitive
+    description:
+      name: video_player
+      sha256: e16f0a83601a78d165dabc17e4dac50997604eb9e4cc76e10fa219046b70cef3
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.8.1"
+  video_player_android:
+    dependency: transitive
+    description:
+      name: video_player_android
+      sha256: "3fe89ab07fdbce786e7eb25b58532d6eaf189ceddc091cb66cba712f8d9e8e55"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.10"
+  video_player_avfoundation:
+    dependency: transitive
+    description:
+      name: video_player_avfoundation
+      sha256: fe73d636f82286a3739f5e644f95f09442cacdc436ebbe5436521dc915f3ecac
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.5.1"
+  video_player_platform_interface:
+    dependency: transitive
+    description:
+      name: video_player_platform_interface
+      sha256: be72301bf2c0150ab35a8c34d66e5a99de525f6de1e8d27c0672b836fe48f73a
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.2.1"
+  video_player_web:
+    dependency: transitive
+    description:
+      name: video_player_web
+      sha256: ab7a462b07d9ca80bed579e30fb3bce372468f1b78642e0911b10600f2c5cb5b
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.2"
  vm_service:
    dependency: transitive
    description:
@@ -1588,6 +1668,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.2.0"
+  wechat_assets_picker:
+    dependency: "direct main"
+    description:
+      name: wechat_assets_picker
+      sha256: "00c93a04421013040b555cdcccdb8e90f142a171d6c0d968c2b5042a76013601"
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.7.1"
  win32:
    dependency: transitive
    description:
@@ -1629,5 +1717,5 @@ packages:
    source: hosted
    version: "3.1.2"
 sdks:
-  dart: ">=3.1.0-185.0.dev <4.0.0"
-  flutter: ">=3.10.0"
+  dart: ">=3.1.0 <4.0.0"
+  flutter: ">=3.13.0"
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: ente_auth
 description: ente two-factor authenticator
-version: 2.0.13+213
+version: 2.0.18+218
 publish_to: none

 environment:
@@ -27,7 +27,8 @@ dependencies:
  expandable: ^5.0.1
  expansion_tile_card: ^3.0.0
  file_picker: ^5.2.4
-  file_saver: ^0.2.9
+  # https://github.com/incrediblezayed/file_saver/issues/86
+  file_saver: 0.2.8
  fk_user_agent: ^2.1.0
  flutter:
    sdk: flutter
@@ -53,7 +54,11 @@ dependencies:
  intl: ^0.18.0
  json_annotation: ^4.5.0
  local_auth: ^2.1.7
+
+  local_auth_android: ^1.0.31
+  local_auth_ios: ^1.1.3
  logging: ^1.0.1
+  mobile_scanner: ^3.5.2
  modal_bottom_sheet: ^3.0.0-pre
  move_to_background: ^1.0.2
  open_filex: ^4.3.2
@@ -77,6 +82,7 @@ dependencies:
  uni_links: ^0.5.1
  url_launcher: ^6.1.5
  uuid: ^3.0.4
+  wechat_assets_picker: ^8.6.3

 dev_dependencies:
  bloc_test: ^9.0.3
@@ -99,6 +105,7 @@ flutter:
    - assets/simple-icons/_data/
    - assets/custom-icons/icons/
    - assets/custom-icons/_data/
+    - assets/scanner-icons/icons/

  fonts:
    - family: Inter
Author	SHA1	Message	Date
Neeraj Gupta	b203b373b9	Bump version 2.0.18+218 (#352 )	2023-11-16 19:17:09 +05:30
github-actions[bot]	a4e12a1e0c	New Translations (#351 ) New translations via [Crowdin GH Action](https://github.com/crowdin/github-action) Co-authored-by: Crowdin Bot <support+bot@crowdin.com>	2023-11-16 19:11:22 +05:30
Neeraj Gupta	233858ad09	Analyze qr code image (#336 )	2023-11-16 15:40:47 +05:30
Neeraj Gupta	863d602a70	Merge branch 'main' into analyzeQrCodeImage	2023-11-16 15:30:08 +05:30
Neeraj Gupta	f97bf015f1	New Translations (#350 )	2023-11-16 12:16:08 +05:30
Muhammed Ayimen	9d73a39b9d	Updated: Parsing error catched and logged	2023-11-16 15:38:42 +09:00
Muhammed Ayimen	3455e7f7c3	Removed: Unwanted comments in analyze qr code screen	2023-11-16 15:34:44 +09:00
Muhammed Ayimen	e9861e5311	Uncommented: Gradle file contents	2023-11-16 13:21:02 +09:00
Muhammed Ayimen	f902c8ca4c	Added: Error handling while parcing qr code data	2023-11-16 13:19:51 +09:00
Muhammed Ayimen	4180621bd9	Bug fixed: Old scanner package using in other places	2023-11-16 13:17:43 +09:00
Muhammed Ayimen	ab2eb77722	Added and removed: Disposal of scanner controller and removal of old scanning package	2023-11-16 13:17:07 +09:00
Muhammed Ayimen	09e6511d64	Removed: Old google auth import scanner	2023-11-16 13:12:03 +09:00
Crowdin Bot	5c4ec23b1a	New Crowdin translations by GitHub Action	2023-11-16 00:01:16 +00:00
Muhammed Ayimen	c7a78a70c9	Bug fixed: Google auth image option click function	2023-11-15 08:19:07 +09:00
Muhammed Ayimen	a4df578665	Merge conflict: Resolved-2	2023-11-15 08:12:09 +09:00
Muhammed Ayimen	4cfbe91ad4	Merge conflict: Resolved	2023-11-15 08:08:38 +09:00
Vishnu Mohandas	ae6e910e84	New Translations (#346 )	2023-11-14 21:14:36 +05:30
Crowdin Bot	533e0c413a	New Crowdin translations by GitHub Action	2023-11-14 14:57:08 +00:00
Vishnu Mohandas	4ec71f6151	Bitwarden import (#348 )	2023-11-14 20:26:18 +05:30
Muhammed Ayimen	adc157fe56	Fixes: Based on the review	2023-11-14 23:42:53 +09:00
Muhammed Ayimen	3b8219020a	Updated: en arb file content for bitwarden data	2023-11-14 23:40:40 +09:00
Muhammed Ayimen	9b759a02a5	Completed: Import from bitwarden functionality	2023-11-14 23:06:02 +09:00
Muhammed Ayimen	bed3bd9612	Bug fixed: Using the map values from wrong jsonArray	2023-11-14 23:05:43 +09:00
Muhammed Ayimen	27c8111e63	Created: Bitward import functionality with json file selecting and extracting the data to a particular format	2023-11-14 23:05:02 +09:00
Muhammed Ayimen	4b66689e07	Created: Popup for bitwarden import option	2023-11-14 23:04:21 +09:00
Muhammed Ayimen	f22b0cde8d	Added: Bitwarden option in import screen	2023-11-14 23:04:05 +09:00
Muhammed Ayimen	1705229ad9	Merge conflict: Resolved	2023-11-14 17:47:22 +09:00
Muhammed Ayimen	baa941c9dd	Merge branch 'main' of https://github.com/i-aiymen/auth into analyzeQrCodeImage	2023-11-14 17:45:10 +09:00
Neeraj Gupta	55e9a7049e	Lock screen fixes (#345 )	2023-11-14 10:39:52 +05:30
Neeraj Gupta	6b4b69f0bb	Bump version 2.0.17	2023-11-14 10:35:19 +05:30
Neeraj Gupta	572417d3aa	Fix bug in setting showingLockScreen flag	2023-11-14 10:35:00 +05:30
Neeraj Gupta	90193eaed9	Fix import	2023-11-14 10:30:19 +05:30
Neeraj Gupta	d80f783013	Remove commented out code	2023-11-14 10:29:59 +05:30
Neeraj Gupta	16c36a088f	bump version	2023-11-14 10:28:35 +05:30
Neeraj Gupta	c0444680c6	Extract strings for local auth	2023-11-14 10:25:02 +05:30
Neeraj Gupta	03b1accfda	Add lockscreen fixes from photos	2023-11-14 10:21:03 +05:30
Muhammed Ayimen	8e379a8e43	Uncommmented: Gradle file contents	2023-11-13 20:42:30 +09:00
Muhammed Ayimen	e05bd71fe1	Extracted: All the string added in the Qr code scanning and analyzing image to en arb files	2023-11-13 20:38:49 +09:00
Muhammed Ayimen	5cc4d8cfb3	Updated: allowing only images to be selected for analyzing the Qr code	2023-11-13 20:26:30 +09:00
Vishnu Mohandas	c359775ebc	Support multiple names for the same service (#344 )	2023-11-13 16:42:08 +05:30
Vishnu Mohandas	80148f95af	Merge branch 'main' into support_multiple_names	2023-11-13 16:33:16 +05:30
vishnukvmd	16bb23d977	Support multiple names for the same service	2023-11-13 16:32:08 +05:30
Vishnu Mohandas	0e59f80999	Update icons (#341 )	2023-11-12 12:19:16 +05:30
vishnukvmd	a13d2a065e	Update icon for mstdn.*	2023-11-12 10:31:28 +05:30
vishnukvmd	993bf81e43	Update simple icons	2023-11-12 10:04:50 +05:30
Muhammed Ayimen	71f3ce4120	Changed: Settings.json file	2023-11-12 13:03:16 +09:00
Muhammed Ayimen	694662d851	Uncommmented: Gradle file contents	2023-11-12 12:57:30 +09:00
Muhammed Ayimen	492748f854	Added: Reminder Popup after analyzing a Qr Code image from gallery	2023-11-12 12:56:26 +09:00
Muhammed Ayimen	c6811ffadc	Updated: Different toast, based different condition	2023-11-12 12:23:24 +09:00
Muhammed Ayimen	d432f08dc6	Added: Vibration effect, when google auth Qr code scanning is successfull	2023-11-12 12:16:03 +09:00
Muhammed Ayimen	2930f22208	Added: Functionality to capture the QR codes by scanning it and checking if the QR code is associated with google auth and reject all the QR ccodes	2023-11-12 12:15:25 +09:00
Muhammed Ayimen	b52de5d9e6	Added: Popup while selecting google auth saved image option similar to normal google auth option	2023-11-12 12:05:27 +09:00
Muhammed Ayimen	fd6b030dff	Removed: Unwanted permissions from manifest file	2023-11-10 07:58:28 +09:00
Muhammed Ayimen	ae07e435ae	Merge branch 'analyzeQrCodeImage' of https://github.com/i-aiymen/auth into analyzeQrCodeImage	2023-11-09 08:03:47 +09:00
Muhammed Ayimen	abab8df412	Updated: Build gradle and settings.json file to initial values	2023-11-08 22:30:37 +09:00
Muhammed Ayimen	c0cc5f29e1	Re-Updated: Location of icons used in qr-code-scanner screen and added the location to the pubspec	2023-11-08 22:27:14 +09:00
Muhammed Ayimen	cd817f6df9	Re-Updated: Location of icons used in qr-code-scanner screen	2023-11-08 22:21:10 +09:00
Muhammed Ayimen	2d56c656cc	Updated: Location of icons used in qr-code-scanner screen	2023-11-08 22:12:07 +09:00
Muhammed Ayimen	b33ec5e347	Removed: Unwanted permisions from manifest file	2023-11-08 22:08:53 +09:00
Muhammed Ayimen	3bdfebfcea	Added: Comments for different widgets used	2023-11-08 21:47:59 +09:00
Vishnu Mohandas	02d2db92c2	New Translations (#335 )	2023-11-08 18:14:12 +05:30
Muhammed Ayimen	3db1c55ce3	Function added: Qr Code Image analyzing by uploading from gallery and scanning Qr code images directly	2023-11-08 21:25:01 +09:00
Crowdin Bot	8ed5bd84d2	New Crowdin translations by GitHub Action	2023-11-08 12:01:18 +00:00
Vishnu Mohandas	7855e3925a	New Translations (#328 )	2023-11-06 14:11:38 +05:30
Crowdin Bot	f5125b7981	New Crowdin translations by GitHub Action	2023-11-06 00:01:05 +00:00
Vishnu Mohandas	5b11569ea9	New Translations (#325 )	2023-11-05 20:33:41 +05:30
Crowdin Bot	c2dc0e6318	New Crowdin translations by GitHub Action	2023-11-05 12:01:21 +00:00
Neeraj Gupta	4ab4b51b56	Reformat code (#323 )	2023-10-31 11:41:41 +05:30
vishnukvmd	25c84d5b56	Reformat code	2023-10-31 10:56:04 +05:30
Neeraj Gupta	8f7cf104ed	New Translations (#322 )	2023-10-31 06:40:17 +05:30
Crowdin Bot	dfc21f60a8	New Crowdin translations by GitHub Action	2023-10-31 00:01:26 +00:00
Neeraj Gupta	ed3067d9d2	New Translations (#321 )	2023-10-27 11:43:24 +05:30
Crowdin Bot	459e501700	New Crowdin translations by GitHub Action	2023-10-27 00:01:16 +00:00
Neeraj Gupta	67c5452dee	Fix invalid json for custom icons + bump version (#320 )	2023-10-25 13:21:11 +05:30
Neeraj Gupta	b847880d41	bump version 2.0.15+215	2023-10-25 12:54:03 +05:30
Neeraj Gupta	257e4e1486	Swallow error in during icon json load	2023-10-25 12:52:49 +05:30
Neeraj Gupta	f8f13f9c8c	Fix json	2023-10-25 12:51:11 +05:30
Neeraj Gupta	4bfe69bc47	Downgrade file saver (#319 )	2023-10-25 10:01:44 +05:30
Neeraj Gupta	322eb273cd	Downgrade file saver	2023-10-25 09:57:27 +05:30
Neeraj Gupta	6bb7db7d54	Add dev_test_icon (#318 )	2023-10-25 09:57:01 +05:30
Neeraj Gupta	d077109bc8	New Translations (#317 )	2023-10-25 09:43:38 +05:30
Crowdin Bot	ed8aef8f80	New Crowdin translations by GitHub Action	2023-10-25 00:01:02 +00:00
Tanguy	bb1f730e32	Add dev_test_icon Test icon for verifying SVG behaviour in the release version	2023-10-24 19:47:35 +02:00
				`@@ -0,0 +1 @@`
				<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Mastodon</title><path d="M23.268 5.313c-.35-2.578-2.617-4.61-5.304-5.004C17.51.242 15.792 0 11.813 0h-.03c-3.98 0-4.835.242-5.288.309C3.882.692 1.496 2.518.917 5.127.64 6.412.61 7.837.661 9.143c.074 1.874.088 3.745.26 5.611.118 1.24.325 2.47.62 3.68.55 2.237 2.777 4.098 4.96 4.857 2.336.792 4.849.923 7.256.38.265-.061.527-.132.786-.213.585-.184 1.27-.39 1.774-.753a.057.057 0 0 0 .023-.043v-1.809a.052.052 0 0 0-.02-.041.053.053 0 0 0-.046-.01 20.282 20.282 0 0 1-4.709.545c-2.73 0-3.463-1.284-3.674-1.818a5.593 5.593 0 0 1-.319-1.433.053.053 0 0 1 .066-.054c1.517.363 3.072.546 4.632.546.376 0 .75 0 1.125-.01 1.57-.044 3.224-.124 4.768-.422.038-.008.077-.015.11-.024 2.435-.464 4.753-1.92 4.989-5.604.008-.145.03-1.52.03-1.67.002-.512.167-3.63-.024-5.545zm-3.748 9.195h-2.561V8.29c0-1.309-.55-1.976-1.67-1.976-1.23 0-1.846.79-1.846 2.35v3.403h-2.546V8.663c0-1.56-.617-2.35-1.848-2.35-1.112 0-1.668.668-1.67 1.977v6.218H4.822V8.102c0-1.31.337-2.35 1.011-3.12.696-.77 1.608-1.164 2.74-1.164 1.311 0 2.302.5 2.962 1.498l.638 1.06.638-1.06c.66-.999 1.65-1.498 2.96-1.498 1.13 0 2.043.395 2.74 1.164.675.77 1.012 1.81 1.012 3.12z"/></svg>