v2.0.6

This reverts commit ff37e902ea.

.github/PULL_REQUEST_TEMPLATE.md

@@ -14,6 +14,7 @@
 
 <!--- Put an `x` in all the boxes that apply: -->
 
+- [ ] 🖼️ New icon
 - [ ] ✨ New feature (non-breaking change which adds functionality)
 - [ ] 🛠️ Bug fix (non-breaking change which fixes an issue)
 - [ ] ❌ Breaking change (fix or feature that would cause existing functionality to change)

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: Flutter CI
+name: release
 
 # This workflow is triggered on pushes to the repository.
 on:
@@ -25,7 +25,7 @@ jobs:
             - uses: subosito/flutter-action@v2
               with:
                   channel: "stable"
-                  flutter-version: "3.7.3"
+                  flutter-version: "3.13.4"
 
             # Fetch sub modules
             - run: git submodule update --init --recursive
@@ -41,7 +41,7 @@ jobs:
 
             # Build independent apk.
             - name: Build
-              run: flutter build apk --release --flavor independent && mv build/app/outputs/flutter-apk/app-independent-release.apk build/app/outputs/flutter-apk/ente-auth.apk
+              run: flutter build apk --release --flavor independent --dart-define=app.flavor=independent && mv build/app/outputs/flutter-apk/app-independent-release.apk build/app/outputs/flutter-apk/ente-auth.apk
               env:
                   SIGNING_KEY_PATH: "/home/runner/work/_temp/keystore/ente_auth_key.jks"
                   SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
@@ -50,7 +50,7 @@ jobs:
 
             # Build Play store aab.
             - name: Build
-              run: flutter build appbundle --release --flavor playstore
+              run: flutter build appbundle --release --flavor playstore --dart-define=app.flavor=playstore
               env:
                   SIGNING_KEY_PATH: "/home/runner/work/_temp/keystore/ente_auth_key.jks"
                   SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}

.gitmodules

@@ -6,3 +6,6 @@
 	path = flutter
 	url = https://github.com/flutter/flutter.git
 	branch = stable
+[submodule "assets/simple-icons"]
+	path = assets/simple-icons
+	url = https://github.com/simple-icons/simple-icons.git

CONTRIBUTING.md

@@ -0,0 +1,56 @@
+# Contributing
+
+Thank you for showing interest in contributing to ente Authenticator. There are a couple of ways to help
+out. This document contains some general guidelines for each type of
+contribution.
+
+
+## Translations
+[![Crowdin](https://badges.crowdin.net/ente-authenticator-app/localized.svg)](https://crowdin.com/project/ente-authenticator-app)
+
+We use [Crowdin](https://crowdin.com/project/ente-authenticator-app) to crowdsource
+translations of ente Authenticator. 
+If your language is not listed for translation, feel free to [create a GitHub issue](https://github.com/ente-io/auth/issues/new?title=Request+for+New+Language+Translation&body=Language+name%3A) to have it added.
+
+## Icons
+
+ente Auth supports the icon pack provided by
+[simple-icons](https://github.com/simple-icons/simple-icons).
+
+If you would like to add your own custom icon, please open a pull-request
+with the relevant SVG and color
+code ([example PR](https://github.com/ente-io/auth/pull/213/files)).
+
+
+## Development
+
+If you're planning on adding a new feature or making other changes, please
+discuss it with us by creating [an
+issue](https://github.com/ente-io/auth/issues/new)
+on GitHub. Discussing your idea with us first ensures that everyone is on the
+same page before you start working on your change.
+
+### 💻  Setup
+
+1. [Install Flutter v3.10.6](https://flutter.dev/docs/get-started/install)
+2. Clone this repository with `git clone git@github.com:ente-io/auth.git` 
+3. Pull in all submodules with `git submodule update --init --recursive`
+4. For Android, run 
+    ```bash
+    flutter run -t lib/main.dart --flavor independent
+    ```
+5. For iOS, run `flutter run` 
+
+
+#### Localization
+If the feature requires adding new strings, you can do that by following these steps:
+
+1. Add a new entry inside [app_en.arb](https://github.com/ente-io/auth/blob/main/lib/l10n/arb/app_en.arb) (Remember to save)
+2.  In your dart file, add follwing import
+    ```dart
+    import "package:ente_auth/l10n/l10n.dart";
+    ```
+3. Refer to the string using `context.l10n.<keyName>`. For example 
+    ```dart
+    context.l10n.account
+    ```

README.md

@@ -1,5 +1,9 @@
 # ente Authenticator
 
+![Build](https://github.com/ente-io/auth/actions/workflows/ci.yml/badge.svg?branch=)
+[![Crowdin](https://badges.crowdin.net/ente-authenticator-app/localized.svg)](https://crowdin.com/project/ente-authenticator-app) 
+ [![Matrix](https://img.shields.io/matrix/ente:matrix.org?color=blue)](https://matrix.to/#/#ente:matrix.org)
+
 ente's Authenticator app helps you generate and store 2 step verification (2FA)
 tokens on your mobile devices.
 
@@ -25,22 +29,23 @@ your devices. Every new device you sign into will have access to these tokens.
 ### Offline Mode
 
 ente generates 2FA tokens offline, so your network connectivity will not get in
-the way of your workflow.
+the way of your workflow. If you wish to use the app without an account for e2ee
+backups, you can do that as well.
 
 ### Import and Export Tokens
 
 You can add tokens to ente by one of the following methods:
 1. Scanning a QR code
 2. Manually entering (copy-pasting) a 2FA secret
-3. Bulk importing from a file that contains a list of codes in the following
-   format:
-```
-otpauth://totp/provider.com:you@email.com?secret=YOUR_SECRET
-```
-The codes maybe separated by new lines or commas.
+3. Bulk importing from other popular 2FA apps and from a file  that contains a list of codes in the following format:.
+    ```
+    otpauth://totp/provider.com:you@email.com?secret=YOUR_SECRET
+    ```
 
-You can also export the codes you have added to ente, to an **unencrypted** text
-file, that adheres to the above format.
+You can export the codes you have added to ente, to either an **encrypted** or
+plain text file. The encrypted backups can be accessed through the app, as well
+as a standalone CLI tool. [Read
+more](migration-guides/encrypted_export.md#how-to-use-the-exported-data).
 
 
 ## 📲 Download
@@ -71,16 +76,10 @@ src="https://ente.io/static/ed265c3abdcd3efa5e29f64b927bcb44/e230a/play-store-ba
 src="https://user-images.githubusercontent.com/1161789/154795157-c4468ff9-97fd-46f3-87fe-dca789d8733a.png">
 </a>
 
-### Web
+### Web / Desktop
 
 You can view your 2FA codes at [auth.ente.io](https://auth.ente.io). For adding or managing your secrets, please use our mobile app.
 
-### Desktop
-
-Support for desktop platforms (Linux, Windows and older Macs) is a [work in
-progress](https://github.com/ente-io/auth/tree/desktop).
-
-Please ⭐ this repo to be notified of updates.
 
 
 ## 🔩 Architecture
@@ -89,7 +88,7 @@ The architecture that powers end-to-end encrypted storage and sync of your
 tokens has been documented [here](architecture/README.md).
 
 
-## 🧑‍💻 Building from source
+## 🧑‍💻 Build from source
 
 1. [Install Flutter](https://flutter.dev/docs/get-started/install)
 2. Clone this repository with `git clone git@github.com:ente-io/auth.git` 
@@ -101,20 +100,27 @@ For maintainers, there is [additional documentation](RELEASES.md) on
 automatically publishing the main branch to App store, Play store and GitHub
 releases.
 
-## 🙋‍♂️ Support
+
+## 🧑‍🔧 Contribute
+
+Please refer to our [contribution guide](./CONTRIBUTING.md) if you wish to add
+an icon, assist with translation, or develop new features.
+
+You can also support us by giving this project a ⭐ star on GitHub or by leaving
+a review on
+[PlayStore](https://play.google.com/store/apps/details?id=io.ente.auth),
+[AppStore](https://apps.apple.com/us/app/ente-authenticator/id6444121398) or
+[AlternativeTo](https://alternativeto.net/software/ente-authenticator/).
+
+
+## 🙋‍♂️ Help
 
 If you need help, please reach out to support@ente.io, and a human will get in
 touch with you.
 
 If you have feature requests, please create a [GitHub issue](https://github.com/ente-io/auth/issues/).
 
-If you wish to support us, please ⭐
-[star](https://github.com/ente-io/auth/stargazers) this project.
 
-## 🙌 Translation
-[![Crowdin](https://badges.crowdin.net/ente-authenticator-app/localized.svg)](https://crowdin.com/project/ente-authenticator-app)
-
-If you're interested in helping out with translation, please visit our [Crowdin project](https://crowdin.com/project/ente-authenticator-app) to get started. Thank you for your support.
 
 ## 💜 Community
 

analysis_options.yaml

@@ -48,4 +48,5 @@ analyzer:
     avoid_renaming_method_parameters: ignore # incorrect warnings for `equals` overrides
 
   exclude:
-    - thirdparty/**
+    - thirdparty/**
+    - flutter/**

android/build.gradle

@@ -24,6 +24,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

assets/build/.last_build_id

@@ -0,0 +1 @@
+f23611a675a8c9bc71eb16e8a1108cf8

assets/custom-icons/_data/custom-icons.json

@@ -0,0 +1,175 @@
+{
+  "icons": [
+    {
+      "title": "3Commas"
+    },
+    {
+      "title": "Addy.io",
+      "slug": "addy_io"
+    },
+    {
+      "title": "Anycoin Direct",
+      "slug": "anycoindirect"
+    },
+    {
+      "title": "AscendEX"
+    },
+    {
+      "title": "BitMEX"
+    },
+    {
+      "title": "Bitfinex"
+    },
+    {
+      "title": "Bitvavo",
+      "hex": "0051FF"
+    },
+    {
+      "title": "Bybit"
+    },
+    {
+      "title": "Channel Island Hosting",
+      "slug": "cih",
+      "hex": "D14633"
+    },
+    {
+      "title": "Control D",
+      "hex": "5FD800"
+    },
+    {
+      "title": "ente",
+      "hex": "1DB954"
+    },
+    {
+      "title": "Filen",
+      "hex": "858585"
+    },
+    {
+      "title": "Github",
+      "hex": "858585"
+    },
+    {
+      "title": "Google"
+    },
+    {
+      "title": "ING"
+    },
+    {
+      "title": "Jagex",
+      "hex": "D3D800"
+    },
+    {
+      "title": "KPN",
+      "color": "00CC00"
+    },
+    {
+      "title": "Kick",
+      "hex": "53FC19"
+    },
+    {
+      "title": "Kraken",
+      "hex": "5848D5"
+    },
+    {
+      "title": "Kronos"
+    },
+    {
+      "title": "KuCoin",
+      "hex": "01BC8D"
+    },
+    {
+      "title": "ngrok",
+      "hex": "858585"
+    },
+    {
+      "title": "Njalla"
+    },
+    {
+      "title": "Odido"
+    },
+    {
+      "title": "Parsec"
+    },
+    {
+      "title": "Peerberry",
+      "hex": "03E5A5"
+    },
+    {
+      "title": "Plutus",
+      "hex": "DEC685"
+    },
+    {
+      "title": "Poloniex"
+    },
+    {
+      "title": "Porkbun",
+      "hex": "F27777"
+    },
+    {
+      "title": "PostNL",
+      "color": "EF8300"
+    },
+    {
+      "title": "Privacy Guides"
+    },
+    {
+      "title": "Privacy.com"
+    },
+    {
+      "title": "Revolt",
+      "hex": "858585"
+    },
+    {
+      "title": "SimpleLogin"
+    },
+    {
+      "title": "Standard Notes",
+      "hex": "2173E6"
+    },
+    {
+      "title": "Techlore"
+    },
+    {
+      "title": "Termius",
+      "hex": "858585"
+    },
+    {
+      "title": "Trading 212",
+      "hex": "4BA4DE"
+    },
+    {
+      "title": "TradingView"
+    },
+    {
+      "title": "TransIP"
+    },
+    {
+      "title": "Tresorit"
+    },
+    {
+      "title": "Tweakers"
+    },
+    {
+      "title": "Twingate",
+      "hex": "858585"
+    },
+    {
+      "title": "Ubisoft",
+      "hex": "4285f4"
+    },
+    {
+      "title": "Unity",
+      "hex": "858585"
+    },
+    {
+      "title": "WHMCS"
+    },
+    {
+      "title": "Windscribe",
+      "hex": "858585"
+    },
+    {
+      "title": "Wise"
+    }
+  ]
+}

assets/custom-icons/icons/anycoindirect.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" aria-label="Orcid" role="img" version="1.1" viewBox="0.79 51.26 510.85 401.95">
+ <g transform="matrix(1.8847 0 0 1.8847 -226.47 142.44)">
+  <path d="m210.18 163.64c-14.707-2.2926-31.751-9.0578-44.305-17.585-2.8482-1.9348-8.7317-6.9155-13.075-11.068-21.324-20.391-32.22-46.1-32.22-76.022 0-17.205 2.7096-29.835 9.5175-44.363 5.8047-12.387 10.213-18.754 20.167-29.132 13.999-14.594 31.147-24.495 51.284-29.609 11.441-2.9055 37.22-2.9624 48.711-0.1076 40.087 9.9595 70.882 41.824 79.154 81.902 1.9229 9.3165 2.1434 16.351 2.157 68.808l0.0151 58.431-36.249-0.63384-0.57539-10.345c-0.69065-12.418-1.4635-12.921-10.457-6.8047-8.8696 6.0316-21.846 11.745-32.623 14.363-10.811 2.6264-31.592 3.7112-41.501 2.1665zm37.596-39.57c11.397-3.9634 19.648-9.2846 27.823-17.943 23.762-25.167 25.535-62.553 4.2627-89.883-24.032-30.876-70.734-34.898-99.77-8.5916-9.161 8.2997-14.976 17.186-19.235 29.396-8.3593 23.965-2.0768 51.448 15.95 69.775 10.466 10.64 20.214 15.985 35.674 19.561 9.7042 2.2446 25.084 1.2359 35.294-2.3148z" fill="#0b0b0b" stroke-width="1.1508"></path>
+  <ellipse cx="368.88" cy="-25.341" rx="22.749" ry="23.037" fill="#4b72e6" stroke-width=".91944"></ellipse>
+ </g>
+</svg>

assets/custom-icons/icons/ascendex.svg

@@ -0,0 +1,5 @@
+<svg viewBox="0 0 260 175" fill="none" xmlns="http://www.w3.org/2000/svg">
+
+<path d="M247.29 1.26445C240.845 -1.34875 233.551 0.084293 228.633 4.9735L164.605 68.6175V103.179L233.212 35.0674V148.615H119.235L106.09 127.457L60.2109 173.061H240.76C250.173 173.061 257.805 165.474 257.805 156.118V17.0279C257.805 10.1156 253.65 3.96194 247.29 1.26445Z" fill="#2C2236"/>
+<path d="M59.448 148.615L135.009 73.5067V143.642H159.602V55.3829C159.602 48.4706 155.447 42.3169 149.086 39.7037C142.641 37.0905 135.348 38.5236 130.429 43.4128L0 173.061H53.0028L77.5961 148.615H59.448Z" fill="#2C2236"/>
+</svg>

assets/custom-icons/icons/bitfinex.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100.1"><path d="M3.7 85.5c4.6 4.9 29.9 28.2 69.7 1.2 28.7-22.3 28.1-70.9 25.3-85.6 0 0-.2 0-.5-.2C96.9 4 63.9 76.4 3.7 85.5zM98.1 1.1C93.3.4 58.8-2.5 24.8 19.5 2.2 34.1-.9 55.5.1 69.6c52.8-5.8 96.1-66 98-68.5z" fill="#a3bf00"/></svg>

assets/custom-icons/icons/bitmex.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 312.41 195.69" xmlns="http://www.w3.org/2000/svg"><path d="M107.52 0h118.16a7.78 7.78 0 01-1.55 4.32c-4 6.86-7.6 14-11.53 20.86-5.6 9.82-10.76 19.88-16.41 29.69-3.58 7.06-7.62 13.9-11.44 20.84h-68.88c-1.2 0-2.39.06-3.59.13-1 2.64-2.66 5-4 7.43-1.75 2.84-3.17 5.87-4.9 8.71-1.83 3.82-4.36 7.24-6.2 11-3.8 6.45-7.35 13-11.07 19.52q-5.82 10-11.38 20.28c-1.57 2.43-3 4.94-4.33 7.51-7.77 13.57-15.29 27.21-23.07 40.71a16.39 16.39 0 01-2.58 4c-13.3-.09-26.6 0-39.9 0a20.34 20.34 0 00-4.85.68c0-3.68 2.46-6.62 4.12-9.68 2-4.15 4.67-8 6.68-12.16 15.94-28.52 31.71-57.14 47.6-85.68 3.6-6.2 6.69-12.53 10.31-18.61 4.52-8 8.73-16.18 13.44-24.09 1.5-3.31 3.52-6.34 5.17-9.57 5.86-10.43 11.61-20.92 17.45-31.35A18.11 18.11 0 01107.52 0z" fill="#eb4a60"/><path d="M244.44 42c7.87-13.75 15.47-27.65 23.45-41.34h42.68a8.82 8.82 0 011.84.29c-1.42 2.15-2.61 4.43-3.86 6.67q-15.44 27.71-30.79 55.45c-4.3 7.53-8.3 15.23-12.66 22.72l-.43.15-.08.94q-30.1 54-60 108.08Q145.82 195 87 195c2.23-4.66 4.87-9.11 7.35-13.64 11.2-20.57 22.65-40.91 33.65-61.43q36.1-.06 72.22 0C215.09 94 229.64 67.93 244.4 42z" fill="#595fb5"/></svg>

assets/custom-icons/icons/bybit.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 3 87 29">
+<path d="M62.0083 25.3572V3H66.5022V25.3572H62.0083Z" fill="#F7A600"></path>
+<path d="M9.63407 31.9983H0V9.64111H9.24666C13.7406 9.64111 16.3591 12.0903 16.3591 15.9214C16.3591 18.4013 14.6774 20.0039 13.5134 20.5375C14.9028 21.1652 16.6813 22.5779 16.6813 25.5624C16.6813 29.7373 13.7406 31.9983 9.63407 31.9983ZM8.89096 13.5355H4.4939V18.6852H8.89096C10.7981 18.6852 11.8652 17.6488 11.8652 16.1095C11.8652 14.5719 10.7981 13.5355 8.89096 13.5355ZM9.18151 22.6104H4.4939V28.1056H9.18151C11.2189 28.1056 12.1874 26.8503 12.1874 25.3418C12.1874 23.835 11.2171 22.6104 9.18151 22.6104Z" fill="white"></path>
+<path d="M30.3882 22.8293V31.9983H25.926V22.8293L19.0073 9.64111H23.8886L28.1888 18.6527L32.4239 9.64111H37.3052L30.3882 22.8293Z" fill="white"></path>
+<path d="M50.0457 31.9983H40.4116V9.64111H49.6583C54.1522 9.64111 56.7707 12.0903 56.7707 15.9214C56.7707 18.4013 55.089 20.0039 53.925 20.5375C55.3144 21.1652 57.093 22.5779 57.093 25.5624C57.093 29.7373 54.1522 31.9983 50.0457 31.9983ZM49.3026 13.5355H44.9055V18.6852H49.3026C51.2097 18.6852 52.2768 17.6488 52.2768 16.1095C52.2768 14.5719 51.2097 13.5355 49.3026 13.5355ZM49.5931 22.6104H44.9055V28.1056H49.5931C51.6305 28.1056 52.599 26.8503 52.599 25.3418C52.599 23.835 51.6305 22.6104 49.5931 22.6104Z" fill="white"></path>
+<path d="M80.986 13.5355V32H76.4921V13.5355H70.4785V9.64111H86.9996V13.5355H80.986Z" fill="white"></path>
+</svg>

assets/custom-icons/icons/cih.svg

@@ -0,0 +1 @@
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid meet" viewBox="1 0 385.87 107"><g transform="translate(0.000000,107.000000) scale(0.100000,-0.100000)"><path d="M10 535 l0 -535 535 0 535 0 0 535 0 535 -535 0 -535 0 0 -535z m360 255 c58 -17 61 -21 48 -63 -9 -28 -16 -36 -27 -31 -9 3 -33 10 -55 15 -51 13 -104 -13 -128 -61 -23 -46 -24 -159 -2 -206 28 -58 97 -79 173 -53 37 13 37 14 45 -28 7 -28 4 -33 -23 -47 -37 -20 -140 -21 -184 -2 -122 51 -157 287 -62 413 48 62 132 87 215 63z m188 -242 l2 -238 -45 0 -45 0 0 233 c0 129 3 237 7 241 4 4 23 6 43 4 l35 -3 3 -237z m152 147 l0 -95 85 0 85 0 0 95 0 95 40 0 40 0 0 -240 0 -240 -40 0 -40 0 0 105 0 105 -85 0 -85 0 0 -105 0 -105 -40 0 -40 0 0 240 0 240 40 0 40 0 0 -95z" /></g></svg>

assets/custom-icons/icons/ente.svg

@@ -0,0 +1,3 @@
+<svg width="8" height="8" viewBox="0 0 8 8" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.06803 7.096C3.33203 7.096 2.68403 6.952 2.12403 6.664C1.57203 6.376 1.14403 5.984 0.840033 5.488C0.536033 4.984 0.384033 4.412 0.384033 3.772C0.384033 3.124 0.532033 2.552 0.828033 2.056C1.13203 1.552 1.54403 1.16 2.06403 0.879997C2.58403 0.591998 3.17203 0.447998 3.82803 0.447998C4.46003 0.447998 5.02803 0.583998 5.53203 0.855998C6.04403 1.12 6.44803 1.504 6.74403 2.008C7.04003 2.504 7.18803 3.1 7.18803 3.796C7.18803 3.868 7.18403 3.952 7.17603 4.048C7.16803 4.136 7.16003 4.22 7.15203 4.3H1.90803V3.208H6.16803L5.44803 3.532C5.44803 3.196 5.38003 2.904 5.24403 2.656C5.10803 2.408 4.92003 2.216 4.68003 2.08C4.44003 1.936 4.16003 1.864 3.84003 1.864C3.52003 1.864 3.23603 1.936 2.98803 2.08C2.74803 2.216 2.56003 2.412 2.42403 2.668C2.28803 2.916 2.22003 3.212 2.22003 3.556V3.844C2.22003 4.196 2.29603 4.508 2.44803 4.78C2.60803 5.044 2.82803 5.248 3.10803 5.392C3.39603 5.528 3.73203 5.596 4.11603 5.596C4.46003 5.596 4.76003 5.544 5.01603 5.44C5.28003 5.336 5.52003 5.18 5.73603 4.972L6.73203 6.052C6.43603 6.388 6.06403 6.648 5.61603 6.832C5.16803 7.008 4.65203 7.096 4.06803 7.096Z" fill="black" style="fill:black;fill:black;fill-opacity:1;"/>
+</svg>

assets/custom-icons/icons/filen.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Ebene_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 499.35 499.35"><defs><style>.cls-1{fill-rule:evenodd;}</style></defs><g id="Ebene_1-2"><path id="Ellipse-Copy-Difference-Union-2" class="cls-1" d="M249.67,0C111.79,0,0,111.79,0,249.67s111.79,249.67,249.67,249.67,249.67-111.79,249.67-249.67S387.56,0,249.67,0ZM116.67,77.19h155.67c5.37-8.57,14.92-14.27,25.82-14.27,16.81,0,30.48,13.61,30.48,30.48s-13.67,30.43-30.48,30.43c-11.07,0-20.77-5.91-26.09-14.75H99.86V406.87c0,.33,0,.54-.05,.87,15.35,14.54,32.76,26.85,51.75,36.45v-129.42c0-.27,.05-.49,.05-.76s.05-.49,.11-.76,.11-.49,.16-.76c.05-.27,.11-.49,.16-.76,.05-.27,.16-.49,.22-.76s.16-.49,.27-.76,.22-.49,.27-.71c.11-.27,.22-.49,.33-.71,.11-.22,.27-.43,.33-.71,.11-.27,.27-.43,.38-.65,.16-.22,.27-.43,.38-.65,.16-.22,.33-.38,.43-.65,.16-.22,.33-.38,.43-.6,.16-.22,.33-.38,.49-.6,.16-.22,.33-.38,.49-.54s.33-.33,.54-.54c.22-.16,.38-.33,.6-.49,.22-.16,.38-.33,.6-.49,.22-.16,.38-.33,.6-.43,.22-.16,.43-.33,.65-.38,.22-.16,.43-.27,.65-.38,.27-.11,.43-.27,.71-.33s.43-.22,.71-.33c.27-.11,.49-.22,.71-.33,.27-.11,.49-.16,.76-.27s.49-.16,.76-.22,.49-.16,.76-.22c.27-.05,.49-.11,.76-.16s.49-.11,.76-.11,.49-.05,.76-.11c.27,0,.49-.05,.76-.05h53.81c5.37-8.57,14.92-14.27,25.82-14.27,16.81,0,30.48,13.61,30.48,30.48s-13.61,30.48-30.48,30.48c-11.07,0-20.77-5.91-26.09-14.75h-37.26v123.56c0,.71-.05,1.41-.16,2.12,21.05,6.62,43.39,10.25,66.5,10.25,20.72,0,40.79-2.87,59.77-8.3v-165c-8.52-5.37-14.16-14.86-14.16-25.71,0-16.81,13.61-30.48,30.48-30.48s30.48,13.61,30.48,30.48c0,11.12-5.97,20.88-14.92,26.2v152.64c14.65-6.78,28.42-15.19,41.12-24.95v-154.43c0-.27,.05-.49,.05-.76s.05-.49,.11-.76c.05-.27,.11-.49,.16-.76s.11-.49,.16-.76,.16-.49,.22-.76c.11-.27,.16-.49,.27-.76s.16-.49,.27-.76,.22-.49,.33-.71c.11-.22,.27-.43,.33-.71,.11-.27,.27-.43,.38-.65s.27-.43,.38-.65c.16-.22,.33-.43,.43-.65s.33-.38,.43-.6c.16-.22,.33-.38,.49-.6,.16-.22,.33-.38,.54-.54s.33-.33,.54-.54c.22-.16,.38-.33,.6-.49,.22-.16,.38-.33,.6-.49,.22-.16,.38-.33,.65-.43,.22-.16,.43-.33,.65-.38,.22-.11,.43-.27,.65-.38,.22-.16,.43-.27,.71-.33,.27-.11,.43-.22,.71-.33s.49-.22,.71-.33c.27-.11,.49-.22,.76-.27,.27-.11,.49-.16,.76-.22s.49-.11,.76-.22c.27-.05,.49-.11,.76-.16,.27-.05,.49-.05,.76-.11s.49-.05,.76-.05,.49-.05,.76-.05h69.43v-3.04c0-54.51-20.02-104.36-53.16-142.55v68.56c0,.27-.05,.49-.05,.81s-.05,.49-.11,.76c-.05,.27-.11,.49-.16,.76s-.11,.49-.16,.76-.16,.49-.22,.76c-.11,.27-.16,.49-.27,.76s-.22,.49-.33,.76c-.11,.27-.22,.49-.33,.71-.11,.27-.27,.43-.33,.71s-.27,.43-.38,.71c-.16,.27-.27,.43-.38,.65-.16,.22-.33,.43-.43,.65-.16,.22-.33,.38-.49,.6-.16,.22-.33,.38-.49,.6-.16,.22-.33,.38-.54,.54s-.38,.33-.54,.54c-.22,.22-.38,.33-.6,.49-.22,.16-.38,.33-.6,.49-.22,.16-.38,.33-.65,.43-.22,.16-.43,.33-.65,.38-.27,.16-.43,.27-.71,.38s-.43,.27-.71,.33c-.27,.11-.49,.22-.71,.33-.27,.11-.49,.22-.76,.33s-.49,.16-.76,.27-.49,.16-.76,.22-.49,.11-.76,.16c-.27,.05-.49,.11-.76,.16-.27,.05-.49,.05-.81,.11s-.49,.05-.81,.05H183.44v32.38c8.9,5.32,14.81,15.02,14.81,26.14,0,16.81-13.61,30.48-30.48,30.48s-30.38-13.67-30.38-30.54c0-10.85,5.64-20.39,14.16-25.76v-49.47c0-.27,.05-.49,.05-.76s.05-.49,.11-.76,.11-.49,.16-.76,.11-.49,.16-.76,.16-.49,.22-.76,.16-.49,.27-.76,.22-.49,.27-.71c.11-.27,.22-.49,.33-.71s.27-.43,.33-.71c.11-.27,.27-.43,.38-.71,.16-.27,.27-.43,.38-.65,.16-.22,.33-.43,.43-.65,.16-.22,.33-.38,.43-.6,.16-.22,.33-.38,.49-.6s.33-.38,.49-.54l.54-.54c.22-.22,.38-.33,.6-.49s.38-.33,.6-.49,.38-.33,.6-.43c.22-.16,.43-.33,.65-.38,.22-.16,.43-.27,.65-.38,.27-.11,.43-.27,.71-.33s.43-.22,.71-.33,.49-.22,.71-.33c.27-.11,.49-.22,.76-.27s.49-.16,.76-.22,.49-.16,.76-.22,.49-.11,.76-.16c.27-.05,.49-.11,.76-.11s.49-.05,.76-.05,.49-.05,.76-.05h215.45V78.7c0-.49,0-.98,.05-1.46-36.78-28.53-82.83-45.4-132.89-45.4s-96.28,16.92-133.05,45.35h0ZM31.84,249.67c0-44.42,13.29-85.76,36.12-120.15v240.34c-22.84-34.44-36.12-75.78-36.12-120.2h0Zm432.85,34.88h-50.44v107.72c25.98-29.83,43.88-66.83,50.44-107.72Z"/></g></svg>

assets/custom-icons/icons/github.svg

@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>GitHub</title><path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12"/></svg>

assets/custom-icons/icons/google.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 32" width="64" height="64"><defs><path id="A" d="M44.5 20H24v8.5h11.8C34.7 33.9 30.1 37 24 37c-7.2 0-13-5.8-13-13s5.8-13 13-13c3.1 0 5.9 1.1 8.1 2.9l6.4-6.4C34.6 4.1 29.6 2 24 2 11.8 2 2 11.8 2 24s9.8 22 22 22c11 0 21-8 21-22 0-1.3-.2-2.7-.5-4z"/></defs><clipPath id="B"><use xlink:href="#A"/></clipPath><g transform="matrix(.727273 0 0 .727273 -.954545 -1.45455)"><path d="M0 37V11l17 13z" clip-path="url(#B)" fill="#fbbc05"/><path d="M0 11l17 13 7-6.1L48 14V0H0z" clip-path="url(#B)" fill="#ea4335"/><path d="M0 37l30-23 7.9 1L48 0v48H0z" clip-path="url(#B)" fill="#34a853"/><path d="M48 48L17 24l-4-3 35-10z" clip-path="url(#B)" fill="#4285f4"/></g></svg>

assets/custom-icons/icons/jagex.svg

@@ -0,0 +1 @@
+<svg class="c-banner__logo" viewBox="-1 -1 92 82" version="1.1" xmlns="http://www.w3.org/2000/svg"><polygon points="60.1999 0.5754 57.6142 5.7558 24.2762 72.1228 13.3222 72.1228 29.3572 40.1918 29.3432 40.1638 29.3522 40.1408 13.3462 8.2678 33.4892 8.2678 29.3882 0.0448 0.0002 0.0448 20.1542 40.1708 0.0002 80.2968 0.0232 80.2968 0.0002 80.3408 29.3882 80.3408 65.5952 8.2178 76.5512 8.2178 60.5132 40.1478 60.5282 40.1798 60.5182 40.2018 76.5302 72.0768 56.3842 72.0768 60.4872 80.2968 89.8752 80.2968 69.7202 40.1708 89.8752 0.0448 89.8542 0.0448 89.8752 -0.0002 60.4872 -0.0002"></polygon></svg>

assets/custom-icons/icons/kronos.svg

@@ -0,0 +1 @@
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" enable-background="new 0 183 500 127" xml:space="preserve" viewBox="4.4 197.87 81.3 99.27"> <g> 	 		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="35.9" y1="490.1" x2="35.9" y2="404" gradientTransform="matrix(0.5128 0 0 -0.5128 -1.525879e-005 449.2308)"> 		<stop offset="0" style="stop-color:#0099FF"/> 		<stop offset="1" style="stop-color:#0033FF"/> 	</linearGradient> 	<path fill="url(#SVGID_1_)" d="M19.1,242.1l13.3-5.6v-24.5c0-7.7-6.3-14-14-14l0,0c-7.7,0-14,6.3-14,14V235 &#9;&#9;c0.3,0.1,0.6,0.3,0.9,0.4L19.1,242.1z"/> 	 		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="35.9" y1="344.1" x2="35.9" y2="296.6666" gradientTransform="matrix(0.5128 0 0 -0.5128 -1.525879e-005 449.2308)"> 		<stop offset="0" style="stop-color:#0099FF"/> 		<stop offset="1" style="stop-color:#0033FF"/> 	</linearGradient> 	<path fill="url(#SVGID_2_)" d="M4.4,278.7v4.4c0,7.7,6.3,14,14,14l0,0c7.7,0,14-6.3,14-14v-3.6l-14-6.8L4.4,278.7z"/> 	 		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="63.2" y1="408.4827" x2="166.9691" y2="408.4827" gradientTransform="matrix(0.5128 0 0 -0.5128 -1.525879e-005 449.2308)"> 		<stop offset="0" style="stop-color:#0099FF"/> 		<stop offset="1" style="stop-color:#0033FF"/> 	</linearGradient> 	<path fill="url(#SVGID_3_)" d="M52.7,258.2l23-9.7c8-3.4,12-11.9,9-19l0,0c-3-7.1-11.9-10.2-19.9-6.7l-32.3,13.7v12.1L52.7,258.2z"/> 	 		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="37.3" y1="403.2" x2="63.1711" y2="403.2" gradientTransform="matrix(0.5128 0 0 -0.5128 -1.525879e-005 449.2308)"> 		<stop offset="0" style="stop-color:#0099FF"/> 		<stop offset="1" style="stop-color:#0033FF"/> 	</linearGradient> 	<polygon fill="url(#SVGID_4_)" points="32.4,248.5 32.4,236.5 19.1,242.1 &#9;"/> 	 		<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="8.6" y1="344.85" x2="35.8632" y2="344.85" gradientTransform="matrix(0.5128 0 0 -0.5128 -1.525879e-005 449.2308)"> 		<stop offset="0" style="stop-color:#0099FF"/> 		<stop offset="1" style="stop-color:#0033FF"/> 	</linearGradient> 	<polygon fill="url(#SVGID_5_)" points="4.4,266.1 4.4,278.7 18.4,272.8 &#9;"/> 	 		<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="63.2" y1="335.0948" x2="167.0464" y2="335.0948" gradientTransform="matrix(0.5128 0 0 -0.5128 -1.525879e-005 449.2308)"> 		<stop offset="0" style="stop-color:#0099FF"/> 		<stop offset="1" style="stop-color:#0033FF"/> 	</linearGradient> 	<path fill="url(#SVGID_6_)" d="M76.5,269.7l-23.8-11.5l-20.3,8.6v12.7l31.9,15.4c7.7,3.7,16.7,1.1,20.1-5.8l0,0 &#9;&#9;C87.7,282.1,84.2,273.4,76.5,269.7z"/> 	 		<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="35.9" y1="343.3" x2="63.2" y2="343.3" gradientTransform="matrix(0.5128 0 0 -0.5128 -1.525879e-005 449.2308)"> 		<stop offset="0" style="stop-color:#0099FF"/> 		<stop offset="1" style="stop-color:#0033FF"/> 	</linearGradient> 	<polygon fill="url(#SVGID_7_)" points="18.4,272.8 32.4,279.5 32.4,266.8 &#9;"/> 	 		<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="8.6" y1="404.75" x2="37.3" y2="404.75" gradientTransform="matrix(0.5128 0 0 -0.5128 -1.525879e-005 449.2308)"> 		<stop offset="0" style="stop-color:#0099FF"/> 		<stop offset="1" style="stop-color:#0033FF"/> 	</linearGradient> 	<path fill="url(#SVGID_8_)" d="M19.1,242.1l-13.8-6.7c-0.3-0.2-0.6-0.3-0.9-0.4v13.3L19.1,242.1z"/> 	 		<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="63.2" y1="373.6" x2="102.7" y2="373.6" gradientTransform="matrix(0.5128 0 0 -0.5128 -1.525879e-005 449.2308)"> 		<stop offset="0" style="stop-color:#0099FF"/> 		<stop offset="1" style="stop-color:#0033FF"/> 	</linearGradient> 	<polygon fill="url(#SVGID_9_)" points="32.4,266.8 52.7,258.2 32.4,248.5 &#9;"/> 	 		<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="35.9" y1="404" x2="35.9" y2="344.1" gradientTransform="matrix(0.5128 0 0 -0.5128 -1.525879e-005 449.2308)"> 		<stop offset="0" style="stop-color:#0099FF"/> 		<stop offset="1" style="stop-color:#0033FF"/> 	</linearGradient> 	<polygon fill="url(#SVGID_10_)" points="19.1,242.1 4.4,248.3 4.4,266.1 18.4,272.8 32.4,266.8 32.4,248.5 &#9;"/> 	 		<linearGradient id="SVGID_11_" gradientUnits="userSpaceOnUse" x1="35.9" y1="490.1" x2="35.9" y2="296.6" gradientTransform="matrix(0.5128 0 0 -0.5128 -1.525879e-005 449.2308)"> 		<stop offset="0" style="stop-color:#0099FF"/> 		<stop offset="1" style="stop-color:#0033FF"/> 	</linearGradient> 	<path opacity="0.8" fill="url(#SVGID_11_)" enable-background="new    " d="M4.4,211.9v71.2c0,7.7,6.3,14,14,14l0,0 &#9;&#9;c7.7,0,14-6.3,14-14v-71.2c0-7.7-6.3-14-14-14l0,0C10.7,197.9,4.4,204.2,4.4,211.9z"/> </g> </svg>

assets/custom-icons/icons/ngrok.svg

@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>ngrok</title><path d="M18.951 7.598v6.713h1.463v-1.69l1.61 1.69H24v-.08l-2.123-2.153 2.002-1.846v-.07H21.95l-1.537 1.496v-4.06zm-2.93 2.41a2.626 2.626 0 00-1.787.635 2.049 2.049 0 00-.703 1.556c-.002.75.311 1.287.7 1.643.526.478 1.221.626 1.767.623.666 0 1.34-.195 1.805-.62.521-.483.713-1.029.713-1.607 0-.73-.31-1.247-.71-1.603-.553-.475-1.202-.628-1.785-.627zm-9.062.039c-1.188-.005-2.1.977-2.104 2.25-.004 1.296.908 2.108 2.032 2.096.664.002.983-.244 1.308-.541v1.193h-1.37l-1.03 1.158v.2H9.66v-6.24H8.195v.435c-.381-.408-.772-.542-1.236-.551zm-4.805.11l-.691.786v-.771H0v4.15h1.463v-2.799c.547.002 1.023-.002 1.49-.003v2.802h1.465v-2.595c-.004-.547-.1-.819-.307-1.061a1.431 1.431 0 00-.914-.51zm8.114.005v4.15h1.468l.002-2.779h1.065l1.164-1.314v-.057h-1.598l-.635.715v-.715zm-2.946 1.115c.504 0 .96.444.948.948a.956.956 0 01-.948.945c-.523 0-.931-.403-.947-.945-.002-.52.443-.94.947-.948zm8.703.001c.525 0 .94.434.944.95-.027.544-.42.95-.944.95s-.934-.417-.95-.95a.955.955 0 01.95-.95z"/></svg>

assets/custom-icons/icons/njalla.svg

@@ -0,0 +1,4 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="5.77 -0.00 22.32 33.87">
+    <polygon transform="matrix(.95184 0 0 .95184 -135.49 -8.5051)" points="156.53 25.555 160.28 17.221 167.88 34.983 171.86 34.983 160.35 8.9354 148.41 34.983 152.33 34.983" fill="#19d6ac" fill-rule="evenodd"></polygon>
+    <path d="m15.203 24.793h3.4654v9.0737h-3.4654z" fill="#01051f" fill-rule="evenodd"></path>
+</svg>

assets/custom-icons/icons/parsec.svg

@@ -0,0 +1 @@
+<svg width="1251" height="1942" viewBox="0 0 1251 1942" xmlns="http://www.w3.org/2000/svg"><g fillRule="nonzero" fill="none"><path d="M235.91 1333.56c53.54 32.86 786.2 484.26 786.2 484.26s76.62 60 153.83 22.79c77.21-37.21 74.06-112.61 74.06-122.49v-997s2.85-59.82-22.79-113.94c-28.91-61-68.27-93.36-111.09-119.64-42.82-26.28-743.48-458.62-743.48-458.62s-62.29-49.27-136.73-17.09C161.47 44.01 159 115.52 159 134.32v1078.14c.52 16.25 2.43 37.81 8.55 49.89 10.68 21.09 14.82 38.35 68.36 71.21zM487 487.37l436 267.87v607l-436-265V487.37z" fill="#26ABFF"/><path d="M0 1299.37c.52 16.25 2.43 39.2 8.55 51.27 10.68 21.1 14.82 38.36 68.36 71.22s786.2 484.25 786.2 484.25 76.62 60.06 153.83 22.79c77.21-37.27 74.06-112.61 74.06-122.49v-997s2.85-59.82-22.79-113.95c-28.91-61-68.27-93.36-111.09-119.64-42.82-26.28-743.48-458.6-743.48-458.6S151.35 68 76.91 100.12 0 203.82 0 222.61v1076.76zm327-723.71l436 267.87v607l-436-265V575.66z" fill="#F50049"/></g></svg>

assets/custom-icons/icons/privacy.svg

@@ -0,0 +1,4 @@
+<svg data-v-08e34066="" viewBox="1 1 38 38" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path data-v-08e34066="" d="M29.4 1H10.6C7.23969 1 5.55953 1 4.27606 1.65396C3.14708 2.2292 2.2292 3.14708 1.65396 4.27606C1 5.55953 1 7.23969 1 10.6V29.4C1 32.7603 1 34.4405 1.65396 35.7239C2.2292 36.8529 3.14708 37.7708 4.27606 38.346C5.55953 39 7.23969 39 10.6 39H29.4C32.7603 39 34.4405 39 35.7239 38.346C36.8529 37.7708 37.7708 36.8529 38.346 35.7239C39 34.4405 39 32.7603 39 29.4V10.6C39 7.23969 39 5.55953 38.346 4.27606C37.7708 3.14708 36.8529 2.2292 35.7239 1.65396C34.4405 1 32.7603 1 29.4 1Z" fill="#232320"></path>
+  <path data-v-08e34066="" fill-rule="evenodd" clip-rule="evenodd" d="M19.5603 10.0009H12V30.0471H16.2956V23.4605H19.5603C25.3259 23.4605 28.2087 21.2172 28.2087 16.7307C28.2087 12.2442 25.3259 10.0009 19.5603 10.0009ZM19.7607 13.781C22.4717 13.781 23.8272 14.7643 23.8272 16.7307C23.8272 18.6971 22.4717 19.6803 19.7607 19.6803H16.2956V13.781H19.7607Z" fill="white"></path>
+</svg>

assets/custom-icons/icons/privacyguides.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100%" height="100%" version="1.1" viewBox="0 0 33 34" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2"><path d="M4.581,4.337c-0.113,0.379 -0.049,0.822 0.077,1.707l1.604,11.224c0.277,1.939 0.415,2.909 0.782,3.775c0.325,0.768 0.781,1.474 1.346,2.087c0.638,0.691 1.465,1.217 3.117,2.269l2.349,1.495c1.126,0.716 1.69,1.075 2.295,1.214c0.465,0.108 0.947,0.121 1.416,0.042c-0.388,-0.887 -0.603,-1.867 -0.603,-2.897c0,-3.996 3.24,-7.236 7.236,-7.236c1.166,0 2.268,0.276 3.243,0.766c0.069,-0.432 0.14,-0.929 0.223,-1.514l0,-0.001l1.604,-11.224c0.126,-0.885 0.19,-1.328 0.077,-1.707c-0.099,-0.334 -0.292,-0.632 -0.557,-0.859c-0.3,-0.257 -0.73,-0.38 -1.59,-0.626l-9.441,-2.697c-0.296,-0.085 -0.444,-0.127 -0.594,-0.144c-0.134,-0.015 -0.268,-0.015 -0.402,0c-0.15,0.017 -0.298,0.059 -0.594,0.144l-9.441,2.697c-0.86,0.246 -1.29,0.369 -1.59,0.626c-0.265,0.227 -0.458,0.525 -0.557,0.859Z" style="fill:#ffd06f"/><path d="M13.246,2.719c0.066,-0.007 0.134,-0.007 0.201,0c0.057,0.007 0.122,0.022 0.446,0.114l9.44,2.698c0.444,0.126 0.727,0.208 0.94,0.287c0.202,0.075 0.274,0.124 0.311,0.156c0.132,0.113 0.229,0.262 0.278,0.429c0.014,0.047 0.03,0.133 0.016,0.348c-0.015,0.226 -0.056,0.518 -0.122,0.974l-1.346,9.426c-4.125,0.397 -7.351,3.873 -7.351,8.102c0,0.835 0.126,1.641 0.36,2.4l-0.451,0.286c-1.183,0.753 -1.594,1.001 -2.012,1.097c-0.401,0.092 -0.818,0.092 -1.22,0c-0.417,-0.096 -0.829,-0.344 -2.012,-1.097l-2.349,-1.494c-1.693,-1.078 -2.398,-1.535 -2.938,-2.12c-0.495,-0.536 -0.894,-1.153 -1.178,-1.825c-0.31,-0.733 -0.436,-1.564 -0.72,-3.551l-1.603,-11.224c-0.066,-0.456 -0.107,-0.748 -0.121,-0.974c-0.015,-0.215 0.001,-0.301 0.015,-0.348c0.05,-0.167 0.146,-0.316 0.279,-0.429c0.036,-0.032 0.109,-0.081 0.31,-0.156c0.213,-0.079 0.496,-0.161 0.94,-0.287l9.44,-2.698c0.324,-0.092 0.389,-0.107 0.447,-0.114Zm13.306,5.231l-1.318,9.228c4.007,0.508 7.106,3.93 7.106,8.075c0,4.496 -3.644,8.141 -8.14,8.141c-3.01,0 -5.639,-1.634 -7.048,-4.064l-0.212,0.136l-0.135,0.085c-0.996,0.634 -1.683,1.072 -2.443,1.248c-0.668,0.154 -1.364,0.154 -2.032,0c-0.76,-0.176 -1.447,-0.614 -2.443,-1.248l-0.134,-0.085l-2.466,-1.57l0,0c-1.541,-0.98 -2.461,-1.565 -3.179,-2.344c-0.637,-0.689 -1.149,-1.483 -1.515,-2.347c-0.413,-0.976 -0.567,-2.054 -0.825,-3.863l-1.628,-11.392c-0.059,-0.416 -0.111,-0.778 -0.131,-1.081c-0.021,-0.323 -0.012,-0.648 0.087,-0.98c0.148,-0.501 0.439,-0.949 0.835,-1.289c0.264,-0.226 0.557,-0.366 0.86,-0.478c0.285,-0.106 0.636,-0.206 1.04,-0.322l0.031,-0.009l9.44,-2.697l0.05,-0.014c0.247,-0.071 0.465,-0.133 0.693,-0.159c0.2,-0.022 0.402,-0.022 0.603,0c0.227,0.026 0.445,0.088 0.692,0.159l0.05,0.014l9.471,2.706c0.404,0.116 0.755,0.216 1.04,0.322c0.304,0.112 0.596,0.252 0.86,0.478c0.397,0.34 0.687,0.788 0.835,1.289c0.099,0.332 0.108,0.657 0.087,0.98c-0.02,0.303 -0.072,0.665 -0.131,1.08l0,0.001Zm-2.352,10.972c-3.497,0 -6.332,2.835 -6.332,6.331c0,3.497 2.835,6.332 6.332,6.332c3.497,0 6.331,-2.835 6.331,-6.332c0,-3.496 -2.834,-6.331 -6.331,-6.331Zm4.313,4.197c0.319,-0.384 0.268,-0.954 -0.116,-1.274c-0.384,-0.32 -0.954,-0.268 -1.274,0.116l-3.888,4.666l-2.013,-2.013c-0.354,-0.353 -0.926,-0.353 -1.28,0c-0.353,0.353 -0.353,0.926 0,1.279l2.714,2.713c0.18,0.18 0.427,0.276 0.68,0.264c0.254,-0.011 0.492,-0.129 0.654,-0.324l4.523,-5.427Zm-19.689,-10.529c0,-2.497 2.024,-4.522 4.522,-4.522c2.498,0 4.522,2.025 4.522,4.522c0,1.48 -0.71,2.794 -1.809,3.619l0,3.617c0,1.499 -1.214,2.714 -2.713,2.714c-1.499,0 -2.713,-1.215 -2.713,-2.714l0,-3.617c-1.099,-0.825 -1.809,-2.139 -1.809,-3.619Zm5.426,4.523l-1.808,0l0,2.713c0,0.5 0.405,0.905 0.904,0.905c0.5,0 0.904,-0.405 0.904,-0.905l0,-2.713Zm-0.904,-1.809c1.499,0 2.713,-1.215 2.713,-2.714c0,-1.498 -1.214,-2.713 -2.713,-2.713c-1.499,0 -2.713,1.215 -2.713,2.713c0,1.499 1.214,2.714 2.713,2.714Z" style="fill:#28323f"/></svg>

assets/custom-icons/icons/revolt.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="193.733" height="37.438" viewBox="0 0 193.733 37.438"><path d="M23.393,1.382c0,2.787-1.52,4.46-4.764,4.46H13.258V-2.977H18.63C21.873-2.977,23.393-1.254,23.393,1.382Zm-24-11.555,5.2,7.213V25.4h8.666V11.973h2.078l7.4,13.43h9.781l-8.21-14.089A10.355,10.355,0,0,0,32.212,1.027c0-6.183-4.358-11.2-13.075-11.2Zm60.035,0H37.634V25.4H59.426V18.46H46.3v-7.8H57.906V3.966H46.3V-2.969H59.426Zm20.981,26.86-8.818-26.86H62.365L74.984,25.4H85.83L98.449-10.173H89.276Zm56.659-9.173c0-10.693-8.058-18.194-18.194-18.194-10.085,0-18.3,7.5-18.3,18.194a17.9,17.9,0,0,0,18.3,18.244A17.815,17.815,0,0,0,137.066,7.514Zm-27.62,0c0-6.335,3.649-10.338,9.426-10.338,5.676,0,9.376,4,9.376,10.338,0,6.233-3.7,10.338-9.376,10.338C113.095,17.852,109.446,13.747,109.446,7.514ZM141.88-10.173V25.4H161.9v-6.95H150.545V-10.173Zm22.248,7.2h9.426V25.4h8.666V-2.975h9.426v-7.2H164.128Z" transform="translate(1.586 11.18)" stroke-width="1"/></svg>

assets/custom-icons/icons/simplelogin.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="257.53 367.08 96.3 56.1"><path d="M320.99 367.09h31.23c1.65 1.51 1.51 3.5 1.51 5.47.03 16.44.06 32.88.1 49.32-.54 1.26-1.63 1.31-2.79 1.3-10.01-.05-20.03-.08-30.04-.12v-3.7h24.59c.07-.31.15-.62.22-.94l-17.42-15.56c1.03-.86 2.06-1.73 3.09-2.59 6.01 5.12 12.02 10.24 18.4 15.68v-41.87c-6.46 5.59-12.42 10.76-18.38 15.92-1.47-.47-2.05-1.63-2.33-3.02 5.58-4.96 11.17-9.92 17.53-15.58H321c-.01-1.43-.01-2.87-.01-4.31z" fill="#d63085"/><path d="M320.99 419.36v3.7c-12.96.04-25.93.08-38.89.11-.75 0-1.49-.02-2.05-.63l.81-2.34c.37-.02.77.04 1.11-.07 13.45-4.42 23.45-20.97 21.19-34.9-.27-1.64-1.13-2.22-2.54-2.69-6.15-2.06-11.75-5.11-16.62-9.42-.87-.77-1.74-1.92-3.12-.73l-.78-3.07c.49-.75.98-1.5 1.47-2.24h39.41v4.31h-33.81c4.99 4.71 9.96 7.07 15.29 8.63 2.08.61 3.47 1.46 3.29 3.62-.34 4.16 2.24 6.43 5.1 8.68 1.54 1.21 2.87 2.67 4.3 4.02-.6 1.17-.85 2.6-2.28 3.18-1.23-1-2.26-1.39-3.69 0-3.34 3.24-7.14 5.96-9.5 10.19-2.05 3.66-5.35 6.43-9.56 9.62 11.14-.15 21.01-.48 30.87.03z" fill="#e13282"/><path d="M331.49 390c-1.69 1.71-4.56 3.31-4.75 5.17-.21 2.06 3.39 3.06 4.73 5.1-1.03.86-2.06 1.73-3.09 2.59-.59-.43-1.3-.76-1.74-1.31-2.64-3.36-4.98-3.57-8.02-.15-2.65 2.99-4.03-.53-5.74-1.86 1.43-.58 1.68-2.01 2.28-3.18 1.58.86 2.72.14 3.92-.9 3.31-2.87 6.71-5.65 10.07-8.47.3 1.38.87 2.54 2.34 3.01z" fill="#db3485"/><path d="M280.89 372.41c-4.61 4.6-10.14 7.79-16.3 9.72-2.97.93-3.78 2.58-3.83 5.31-.25 13.99 5.63 24.51 17.9 31.47.74.42 1.47.87 2.21 1.3l-.81 2.34c-15.11-5.05-25.86-25.05-21.59-40.06.31-1.08.78-1.76 1.84-2.03 7.64-1.89 13.93-6.14 19.81-11.12.25 1.02.51 2.04.77 3.07z" fill="#ea3a84"/><path d="M264.89 390.1c-.35-2.49.61-4.72 4.4-5.83 4.16-1.22 7.73-3.85 10.92-6.78 1.37-1.25 2.27-1.35 3.65-.09 3.77 3.44 8.06 6.11 12.95 7.67 1.57.5 1.99 1.45 2.19 2.92 1.42 10.49-5.72 22.94-15.46 27.11-1.77.76-3.05.28-4.46-.55-9.01-5.29-13.69-13.15-14.19-24.45zm29.95 1.06c-.74-.77-1.4-1.48-2.08-2.16-.92-.91-1.55-.17-2.15.44a307.76 307.76 0 00-4.37 4.48c-5.12 5.35-5.11 5.36-10.55.22a3.19 3.19 0 01-.26-.26c-1-1.17-1.89-1.71-3.24-.24-1.12 1.22-1.47 2.03-.1 3.3 2.43 2.25 4.8 4.58 7.05 7.01 1.28 1.38 2.14 1.07 3.29-.1 3.62-3.68 7.31-7.28 10.96-10.92.49-.53.91-1.13 1.45-1.77z" fill="#e63280"/><path d="M294.84 391.16c-.53.64-.95 1.24-1.46 1.76-3.65 3.65-7.34 7.25-10.96 10.92-1.15 1.17-2.01 1.48-3.29.1-2.25-2.43-4.62-4.76-7.05-7.01-1.37-1.27-1.02-2.08.1-3.3 1.36-1.47 2.25-.92 3.24.24.08.09.17.18.26.26 5.44 5.14 5.44 5.14 10.55-.22 1.44-1.51 2.9-3 4.37-4.48.6-.61 1.23-1.35 2.15-.44.69.69 1.34 1.39 2.09 2.17z" fill="#fdf5f9"/></svg>

assets/custom-icons/icons/techlore.svg

@@ -0,0 +1,44 @@
+<svg viewBox="0 0 6048 6048" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g id="OriginalVar02" transform="matrix(2.14229,0,0,2.14229,-3453.84,-3453.84)">
+        <g transform="matrix(0.946278,0,0,0.946278,58.4097,253.617)">
+            <circle cx="3133.55" cy="2927.26" r="1491.53" style="fill:rgb(238,81,40);"/>
+            <clipPath id="_clip1">
+                <circle cx="3133.55" cy="2927.26" r="1491.53"/>
+            </clipPath>
+            <g clip-path="url(#_clip1)">
+                <g transform="matrix(0.707107,-0.707107,0.707107,0.707107,-1135.13,2924.48)">
+                    <rect x="651.828" y="3023.62" width="4729.24" height="1958.3" style="fill:rgb(250,179,20);"/>
+                </g>
+                <g transform="matrix(1,0,0,1,109.931,-96.3589)">
+                    <path d="M3023.62,1353.88L3023.62,2776.29L3028.21,3023.62L4304.79,1747.04L3577.71,1353.88L3023.62,1353.88Z" style="fill:rgb(124,187,65);"/>
+                </g>
+                <g transform="matrix(1,0,0,1,109.931,-96.3589)">
+                    <path d="M4920.41,3023.62L3028.21,3023.62L4391.69,1660.14L4920.41,3023.62Z" style="fill:rgb(39,154,213);"/>
+                </g>
+            </g>
+        </g>
+        <g transform="matrix(0.834404,0,0,0.834404,408.972,581.101)">
+            <circle cx="3133.55" cy="2927.26" r="1491.53"/>
+            <clipPath id="_clip2">
+                <circle cx="3133.55" cy="2927.26" r="1491.53"/>
+            </clipPath>
+            <g clip-path="url(#_clip2)">
+                <g transform="matrix(2.13311,0,0,2.13311,-3918.18,-3725.29)">
+                    <circle cx="3305.85" cy="4518.47" r="1209.3" style="fill:white;"/>
+                </g>
+                <g transform="matrix(0.769998,0,0,0.769998,805.369,599.08)">
+                    <path d="M3047.81,4345.68C3032.69,4353.73 3014.55,4353.73 2999.44,4345.68C2931.61,4308.11 2734.01,4185.69 2573.45,3956.88C2453.8,3786.35 2399.49,3593.47 2377.44,3491.3C2373.47,3472.7 2377.15,3453.29 2387.64,3437.43C2398.12,3421.57 2414.55,3410.59 2433.22,3406.95C2510.15,3391.86 2638,3360.86 2745.78,3306.34C2856.29,3250.44 2942.35,3175.89 2987.84,3131.96C3007.79,3112.67 3039.45,3112.67 3059.41,3131.96C3104.89,3175.89 3190.96,3250.44 3301.46,3306.34C3409.25,3360.86 3537.09,3391.86 3614.03,3406.95C3632.7,3410.59 3649.12,3421.57 3659.61,3437.43C3670.1,3453.29 3673.77,3472.7 3669.81,3491.3C3647.75,3593.47 3593.45,3786.35 3473.79,3956.88C3313.24,4185.69 3115.64,4308.11 3047.81,4345.68Z" style="fill:rgb(250,179,20);"/>
+                </g>
+                <g transform="matrix(1.19846,0,0,1.19846,-490.136,-696.426)">
+                    <path d="M2994.76,2354.51C3000.61,2364.97 3011.65,2371.44 3023.62,2371.44C3035.6,2371.44 3046.64,2364.97 3052.48,2354.51C3107.2,2256.62 3193.51,2183.01 3301.76,2154.01C3538.6,2090.55 3791.31,2264.5 3865.72,2542.23C3940.14,2819.95 3808.27,3096.95 3571.43,3160.41C3370.55,3214.24 3158.25,3097.27 3053.02,2891.07C3047.36,2880.06 3036.01,2873.14 3023.62,2873.14C3011.24,2873.14 2999.89,2880.06 2994.22,2891.07C2888.99,3097.27 2676.7,3214.24 2475.82,3160.41C2238.97,3096.95 2107.11,2819.95 2181.52,2542.23C2255.94,2264.5 2508.64,2090.55 2745.48,2154.01C2853.73,2183.01 2940.05,2256.62 2994.76,2354.51Z" style="fill:white;"/>
+                </g>
+                <g transform="matrix(1.52514,0,0,1.52514,-1330.46,-1816.92)">
+                    <circle cx="2728.54" cy="2896.83" r="108.215"/>
+                </g>
+                <g transform="matrix(1.52514,0,0,1.52514,-725.25,-1816.92)">
+                    <circle cx="2728.54" cy="2896.83" r="108.215"/>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

assets/custom-icons/icons/termius.svg

@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Termius</title><path d="M17.812 19.381A6.194 6.194 0 0 0 24 13.193c0-1.7-.723-3.352-1.958-4.515a6.01 6.01 0 0 0-6.005-5.955 5.98 5.98 0 0 0-2.731.656 5.985 5.985 0 0 0-4.12-1.635 6.011 6.011 0 0 0-6 5.743A6.224 6.224 0 0 0 0 12.917a6.225 6.225 0 0 0 6.706 6.2 6.426 6.426 0 0 0 5.508 3.14 6.395 6.395 0 0 0 5.347-2.881c.084.003.167.005.25.005zm-5.598 1.242A4.792 4.792 0 0 1 7.9 17.888l-.267-.562-.613.108a4.592 4.592 0 0 1-5.387-4.516A4.59 4.59 0 0 1 4.34 8.734l.506-.228-.026-.555a4.377 4.377 0 0 1 4.367-4.574c1.297 0 2.512.566 3.347 1.56l.47.56.609-.407a4.349 4.349 0 0 1 2.425-.734 4.378 4.378 0 0 1 4.364 4.632l-.025.416.322.265a4.612 4.612 0 0 1 1.669 3.524 4.561 4.561 0 0 1-5.14 4.518l-.554-.071-.267.49a4.764 4.764 0 0 1-4.192 2.493zm3.102-6.533.016-.007c.212-.091.288-.171.288-.393v-.278c0-.244-.14-.401-.37-.401h-.013l-.046.01a4.534 4.534 0 0 1-1.502.272c-.48 0-.954-.09-1.409-.27l-.013-.005-.052-.007c-.23 0-.37.157-.37.401v.278c0 .209.078.303.261.382l.02.009.02.008a3.91 3.91 0 0 0 1.544.32c.525 0 1.071-.107 1.626-.319zm-7.081-2.285c0-.224.116-.348.272-.38l1.501-.394-1.505-.395c-.156-.041-.268-.164-.268-.38v-.473c0-.207.124-.296.266-.296.046 0 .094.01.141.028l2.68.867c.203.068.315.231.315.455v.387c0 .224-.112.388-.316.456l-2.685.868a.437.437 0 0 1-.125.02c-.168 0-.276-.12-.276-.297v-.466z"/></svg>

assets/custom-icons/icons/trading212.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" id="Layer_1" x="0" y="0" xml:space="preserve" viewBox="416.27 4.60 176.09 146.40"><style>.st0{fill:#373944}</style><path id="logo--en__char--2" d="M504.3 64.4l35.7 79.3c1.8 5.5 5.5 7.3 10.1 7.3H584c7.3 0 10.1-4.6 7.3-11L533.6 11.9c-1.8-5.5-5.5-7.3-10.1-7.3h-38.4c-4.6 0-8.2 1.8-10.1 7.3L417.3 140c-2.7 6.4 0 11 7.3 11h33.9c4.6 0 8.2-1.8 10.1-7.3l35.7-79.3z" fill="#4ba4de"></path></svg>

assets/custom-icons/icons/tradingview.svg

@@ -0,0 +1,7 @@
+<svg viewBox="74.19999694824219 156.22198486328125 352.21697998046875 181.93902587890625" xmlns="http://www.w3.org/2000/svg">
+  <g>
+    <path style="stroke-width: 0px; stroke: rgb(41, 98, 255); stroke-miterlimit: 1; paint-order: stroke; fill: rgb(41, 98, 255);" d="M 74.268 158.688 L 216.747 158.711 L 217.506 338.161 L 145.466 337.657 L 145.445 229.983 L 74.2 229.871 L 74.268 158.688 Z"></path>
+    <circle style="fill: rgb(41, 98, 255);" cx="270.59" cy="192.178" r="35.956"></circle>
+    <polygon style="stroke: rgb(0, 0, 0); fill: rgb(41, 98, 255); stroke-width: 0px;" points="343.41 158.808 426.417 158.896 351.232 336.856 269.104 336.679 342.837 158.951"></polygon>
+  </g>
+</svg>

assets/custom-icons/icons/transip.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 120.1 21.4"><path d="M12.7 12.4c-.1 2.5-.3 2.8-3.2 2.897h-.8c-2.399-.1-3.1-.6-3.1-2.698V6.7h9V4.6h-9V1.8H2.9v2.9H0v2.1h2.9v6.6c0 1 .3 2.1 1.1 2.8.8.8 2.2 1.2 4.3 1.2h1.2c2.5 0 3.8-.5 4.6-1.301.7-.802.8-2 .8-3.199v-1.5h-2.3v1h.1zm17.9-6.9c-.9-.7-2.4-1-4.5-1H24c-1.4 0-3 .3-3.9 1.5V4.6h-2.5v12.5h2.7V9.3c0-1.5 1-2.7 3.3-2.7H25c4 .1 4.4.3 4.5 3.3v.7H32V8.9c-.1-1.5-.5-2.7-1.4-3.4zM48 13.7c0 .7-.3 1-1.2 1.3-.9.3-2.3.3-4.3.3h-3c-3.1-.1-3.4-.5-3.4-1.7v-.4c0-1.4.6-1.601 3.5-1.7h3.5c1.7 0 3 0 3.8.3s1.1.6 1.1 1.4v.5zm-4.6-9.2h-3.6c-2 0-3.5.2-4.4.8-1 .5-1.4 1.4-1.4 2.6v.8h2.7v-.8c0-.9.3-1.4 3.2-1.4h3.3c3.5 0 4.8.3 4.8 2.3v1.8c-.8-.9-2.1-1.1-4.6-1.1h-3.6c-2 0-3.5.1-4.601.5-1.1.4-1.7 1.3-1.7 2.8v.8c0 1.2.2 2.103.9 2.801.7.699 1.8 1 3.6 1h5.4c2.9 0 4-.198 4.6-1v.802h2.7V8.8C50.7 5 47.6 4.5 43.4 4.5zm25.7 1.2c-.9-.8-2.4-1.3-4.5-1.3h-3.4c-2.5 0-4.299.3-5.299 1.8V4.6h-2.5v12.5h2.7V10c0-2.7 1-3.5 6.3-3.5H63c4.4.1 4.699 1 4.699 2.7v7.9H70.4V8.8c-.099-1.2-.4-2.3-1.3-3.1zm19.3 4.7c-1.103-.5-2.5-.6-4.201-.6h-6c-2.398-.1-2.5-.5-2.5-1.4V8c0-.7.102-.9.602-1.1.5-.2 1.5-.3 3.1-.3h3.9c1.199 0 2.199 0 2.799.2.599.2.9.5.9 1.4v.3h2.5v-.8c0-.9-.199-1.8-1.1-2.3-.9-.6-2.4-.9-4.9-.9H80c-2.801 0-4.5.3-5.6.8-1 .5-1.4 1.4-1.4 2.4v.7c0 1.2.301 2.1 1.1 2.6.801.6 1.9.8 3.5.8h6.9c2.699.101 2.801.5 2.9 1.601v.102c0 .898-.201 1.2-.801 1.5-.599.197-1.699.297-3.4.297h-4.898c-2.301 0-2.9-.5-3-1.899V12.6h-2.5v.9c0 1.9.799 2.9 2.1 3.4 1.199.5 2.9.5 4.5.5H83.6c2.701 0 6.4-.103 6.4-3.7.1-1.8-.6-2.8-1.6-3.3z"/><path fill="#187dc1" d="M96.5 0h2.699v2.2H96.5zm0 4.6h2.699v12.5H96.5zm20.801 7.6c0 2.7-1.301 3.1-4 3.1h-4c-2.4 0-4.102-.399-4.201-3.2V9.8c0-2 1-3.3 3.9-3.3h4.5c3.1.1 3.801 1 3.801 3.3v2.4zM118 5.5c-1.199-.8-2.801-1-4.4-1h-4.299C107.5 4.5 105.9 5 105 6.1V4.6h-2.5v16.8h2.699v-5.3c.602.9 1.801 1.3 3.801 1.3h4.301c2.299 0 4-.301 5.199-1.2 1.1-.9 1.6-2.3 1.6-4.3V9.8c-.1-2.2-.901-3.5-2.1-4.3z"/></svg>

assets/custom-icons/icons/tresorit.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="#1f85e9" d="M256 0l-30 52.278h30l67.444 39.879L256 134.102l-30 52.993h30l111.124-69.111 64.944 38.401v199.23L256 459.722h-30L256 512l221.069-130.715v-250.57z"/><path fill="#0ab2db" d="M79.932 355.615v-59.018L256 187.095v-52.993L79.932 243.604v-87.219L256 52.278V0L34.931 130.715v250.57L256 512v-52.278z"/></svg>

assets/custom-icons/icons/twingate.svg

@@ -0,0 +1 @@
+<svg width="86" height="20" xmlns="http://www.w3.org/2000/svg" id="svg712272324_2169"><path fill-rule="evenodd" clip-rule="evenodd" d="M0 8.516V17.2s1.298-.89 2.75-1.91v-4.774c0-2.347.707-3.104 2.62-4.526l2.624-1.95V0S4.198 2.816 2.62 3.99C.707 5.412 0 6.17 0 8.516ZM4 20v-8.684c0-2.347.707-3.104 2.62-4.526 1.578-1.174 5.374-3.99 5.374-3.99v7.577c0 .218.001.425.003.624.018 2.099.027 3.218-2.12 4.841C8.105 17.184 4 20 4 20ZM26.8 5.617h-3.4v9.825h-2V5.617H18V3.72h8.802L26.8 5.617Zm5.336 3.947h.017l1.925 5.878h1.866l2.989-8.57h-2l-1.931 6.16-1.944-6.16h-1.814l-1.965 6.144-1.915-6.143h-2.032l2.995 8.57h1.865l1.944-5.88Zm8-2.691h2.47v8.57h-1.964v-6.82h-1.134l.627-1.75Zm.259-2.642a1.231 1.231 0 0 1 2.461 0c0 .71-.511 1.205-1.221 1.205-.71 0-1.242-.495-1.242-1.205h.002Zm8.451 2.444c-1.403 0-2.277.66-2.642 1.337l-.002-1.14h-1.814v8.576h1.965v-4.97c0-1.336.776-2.114 2.015-2.114 1.173 0 1.7.771 1.7 1.944v5.134h1.966V10.06c0-1.998-1.107-3.385-3.188-3.385Zm11.207.198h1.814v8.207c0 2.262-1.454 3.979-4.096 3.979-2.576 0-3.748-1.651-3.93-2.988h1.966c.181.66.759 1.303 1.998 1.303 1.354 0 2.096-.825 2.096-2.03v-1.337c-.48.742-1.388 1.32-2.708 1.32-2.444 0-3.947-1.964-3.947-4.326 0-2.362 1.503-4.326 3.947-4.326 1.32 0 2.295.528 2.857 1.425l.003-1.227ZM57.59 8.408c-1.425 0-2.378 1.09-2.378 2.591 0 1.502.958 2.592 2.378 2.592 1.452 0 2.394-1.107 2.394-2.591 0-1.485-.94-2.592-2.393-2.592h-.001ZM70 15.441h1.814V6.89h-1.817v1.227c-.546-.897-1.552-1.426-2.89-1.426-2.525 0-3.96 2.033-3.96 4.478s1.437 4.476 3.962 4.476c1.336 0 2.345-.534 2.89-1.426v1.222Zm-.068-4.276c0 1.537-.908 2.742-2.411 2.742-1.486 0-2.411-1.206-2.411-2.742 0-1.535.907-2.74 2.411-2.74s2.411 1.204 2.411 2.74Zm3.448-6.52h1.964v2.228h1.602v1.569h-1.602v4.326c0 .676.282 1.007.958 1.007a2.42 2.42 0 0 0 .611-.083v1.701a4.31 4.31 0 0 1-1.023.099c-1.75 0-2.51-.907-2.51-2.526V4.644Zm8.474 9.311c-1.371 0-2.246-.874-2.395-2.228h6.524s.017-.298.017-.612c0-2.51-1.668-4.441-4.211-4.441s-4.26 1.98-4.26 4.475c0 2.559 1.684 4.49 4.276 4.49 1.997 0 3.516-1.204 4.028-2.905h-1.981c-.314.759-1.091 1.221-1.998 1.221Zm2.196-3.682h-4.557c.198-1.173 1.024-1.998 2.295-1.998 1.27 0 2.097.81 2.262 1.998Z"></path></svg>

assets/custom-icons/icons/ubisoft.svg

@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Ubisoft</title><path d="M23.561 11.988C23.301-.304 6.954-4.89.656 6.634c.282.206.661.477.943.672a11.747 11.747 0 00-.976 3.067 11.885 11.885 0 00-.184 2.071C.439 18.818 5.621 24 12.005 24c6.385 0 11.556-5.17 11.556-11.556v-.455zm-20.27 2.06c-.152 1.246-.054 1.636-.054 1.788l-.282.098c-.108-.206-.37-.932-.488-1.908C2.163 10.308 4.7 6.96 8.57 6.33c3.544-.52 6.937 1.68 7.728 4.758l-.282.098c-.087-.087-.228-.336-.77-.878-4.281-4.281-11.002-2.32-11.956 3.74zm11.002 2.081a3.145 3.145 0 01-2.59 1.355 3.15 3.15 0 01-3.155-3.155 3.159 3.159 0 012.927-3.144c1.018-.043 1.972.51 2.416 1.398a2.58 2.58 0 01-.455 2.95c.293.205.575.4.856.595zm6.58.12c-1.669 3.782-5.106 5.766-8.77 5.712-7.034-.347-9.083-8.466-4.38-11.393l.207.206c-.076.108-.358.325-.791 1.182-.51 1.041-.672 2.081-.607 2.732.369 5.67 8.314 6.83 11.045 1.214C21.057 8.217 11.822.401 3.626 6.374l-.184-.184C5.599 2.808 9.816 1.3 13.837 2.309c6.147 1.55 9.453 7.956 7.035 13.94z"/></svg>

assets/custom-icons/icons/unity.svg

@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Unity</title><path d="m12.9288 4.2939 3.7997 2.1929c.1366.077.1415.2905 0 .3675l-4.515 2.6076a.4192.4192 0 0 1-.4246 0L7.274 6.8543c-.139-.0745-.1415-.293 0-.3675l3.7972-2.193V0L1.3758 5.5977V16.793l3.7177-2.1456v-4.3858c-.0025-.1565.1813-.2682.318-.1838l4.5148 2.6076a.4252.4252 0 0 1 .2136.3676v5.2127c.0025.1565-.1813.2682-.3179.1838l-3.7996-2.1929-3.7178 2.1457L12 24l9.6954-5.5977-3.7178-2.1457-3.7996 2.1929c-.1341.082-.3229-.0248-.3179-.1838V13.053c0-.1565.087-.2956.2136-.3676l4.5149-2.6076c.134-.082.3228.0224.3179.1838v4.3858l3.7177 2.1456V5.5977L12.9288 0Z"/></svg>

assets/custom-icons/icons/whmcs.svg

@@ -0,0 +1 @@
+<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="610.85 0 209.25 205.02"><defs><style>.cls-4,.cls-5{fill-rule:evenodd}.cls-4{fill:#c3c7cc}.cls-5{fill:#8abd56}</style></defs><g id="Layer_1-2" data-name="Layer 1"><path class="cls-5" d="M706.12 154.18c-24.88 0-45.04-20.12-45.04-44.92s20.17-44.91 45.04-44.91c18.75 0 34.83 11.44 41.61 27.69h29.99c-.58-2.36-1.22-4.71-2.01-6.98l17.24-15.67-8.47-15.1-23.03 6.45a77.812 77.812 0 0 0-6.48-6.49l7.07-21.88-14.88-8.89-17.6 16.1c-2.95-.99-5.99-1.79-9.1-2.4l-5.41-22.39-17.34-.33-5.97 22.73a73.37 73.37 0 0 0-9.5 2.55l-16.3-16.96-15.22 8.31 6.33 23.37a75.446 75.446 0 0 0-6.18 6.21l-23.03-6.39-9.07 14.75L636.22 86c-.97 2.87-1.75 5.83-2.35 8.85l-22.5 6.18-.5 17.29 23.19 6.31c.68 3.2 1.58 6.32 2.66 9.35l-17.77 15.43 8.18 15.25 23.99-6.48a78.86 78.86 0 0 0 5.93 5.92l-5.56 23.97 14.77 8.28 17.47-17.04c2.64.84 5.37 1.54 8.14 2.08l5.49 23.6h17.35l5.71-23.6c3.17-.62 6.28-1.45 9.29-2.46l16.07 17.23 15.05-8.59-6.36-22.81c2.42-2.1 4.69-4.35 6.8-6.74l22.37 6.72 8.77-14.92-14.02-13.77H742.3c-8.21 11.01-21.36 18.15-36.17 18.15z"/><path class="cls-4" d="M757.72 32.4c-16.16 0-29.26 13.06-29.26 29.18s13.1 29.18 29.26 29.18 29.26-13.06 29.26-29.18-13.1-29.18-29.26-29.18zm46.88 38.87c-.42 2.05-.98 4.06-1.66 6.01l10.84 10.62-5.7 9.7-14.52-4.36a46.849 46.849 0 0 1-4.43 4.37l4.14 14.82-9.78 5.58-10.46-11.2c-1.95.66-3.96 1.2-6.02 1.6l-3.72 15.34h-11.27l-3.57-15.34c-1.81-.35-3.57-.8-5.29-1.35l-11.35 11.08-9.6-5.38 3.62-15.58a48.105 48.105 0 0 1-3.85-3.84l-15.59 4.22-5.32-9.92 11.54-10.02c-.7-1.97-1.28-4-1.72-6.08l-15.07-4.09.32-11.23 14.62-4.01c.39-1.96.9-3.88 1.53-5.75l-11.33-11.02 5.89-9.58 14.96 4.15c1.25-1.42 2.6-2.77 4.02-4.03l-4.12-15.19 9.89-5.39 10.58 11.02a49.32 49.32 0 0 1 6.18-1.66L752.24 0l11.27.22 3.5 14.54c2.02.4 3.99.92 5.91 1.57l11.44-10.46 9.66 5.78-4.6 14.21c1.49 1.32 2.9 2.73 4.22 4.22l14.96-4.19 5.5 9.8-11.2 10.18c.77 2.24 1.39 4.54 1.85 6.92l15.34 3.85-.12 11.24-15.4 3.4z"/></g></svg>

assets/custom-icons/icons/windscribe.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<svg width="800px" height="800px" viewBox="0 0 192 192" xmlns="http://www.w3.org/2000/svg">
+
+<g fill="none">
+
+<path d="m97.156 22 49.672 21.975L170 96.111l-21.154 51.37L96.122 170l-50.775-20.6L22 97.096l22.34-53.421Z" style="fill:#000000;fill-opacity:0;stroke:#000000;stroke-width:12;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;paint-order:stroke fill markers"/>
+
+<path d="M128.273 70v51.57h-7.916L96.096 98.308 71.703 121.57h-7.666V70" style="fill:#000000;fill-opacity:0;stroke:#000000;stroke-width:12;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;paint-order:stroke fill markers"/>
+
+</g>
+
+</svg>

ios/Podfile.lock

@@ -81,20 +81,22 @@ PODS:
     - Flutter
     - MTBBarcodeScanner
   - Reachability (3.2)
-  - SDWebImage (5.15.0):
-    - SDWebImage/Core (= 5.15.0)
-  - SDWebImage/Core (5.15.0)
-  - Sentry/HybridSDK (7.31.5)
+  - SDWebImage (5.17.0):
+    - SDWebImage/Core (= 5.17.0)
+  - SDWebImage/Core (5.17.0)
+  - Sentry/HybridSDK (8.9.1):
+    - SentryPrivate (= 8.9.1)
   - sentry_flutter (0.0.1):
     - Flutter
     - FlutterMacOS
-    - Sentry/HybridSDK (= 7.31.5)
+    - Sentry/HybridSDK (= 8.9.1)
+  - SentryPrivate (8.9.1)
   - share_plus (0.0.1):
     - Flutter
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - sqflite (0.0.2):
+  - sqflite (0.0.3):
     - Flutter
     - FMDB (>= 2.7.5)
   - SwiftyGif (5.4.4)
@@ -121,11 +123,11 @@ DEPENDENCIES:
   - move_to_background (from `.symlinks/plugins/move_to_background/ios`)
   - open_filex (from `.symlinks/plugins/open_filex/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
-  - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/ios`)
+  - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`)
   - sentry_flutter (from `.symlinks/plugins/sentry_flutter/ios`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
-  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/ios`)
+  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
   - sqflite (from `.symlinks/plugins/sqflite/ios`)
   - uni_links (from `.symlinks/plugins/uni_links/ios`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
@@ -140,6 +142,7 @@ SPEC REPOS:
     - Reachability
     - SDWebImage
     - Sentry
+    - SentryPrivate
     - SwiftyGif
     - Toast
 
@@ -177,7 +180,7 @@ EXTERNAL SOURCES:
   package_info_plus:
     :path: ".symlinks/plugins/package_info_plus/ios"
   path_provider_foundation:
-    :path: ".symlinks/plugins/path_provider_foundation/ios"
+    :path: ".symlinks/plugins/path_provider_foundation/darwin"
   qr_code_scanner:
     :path: ".symlinks/plugins/qr_code_scanner/ios"
   sentry_flutter:
@@ -185,7 +188,7 @@ EXTERNAL SOURCES:
   share_plus:
     :path: ".symlinks/plugins/share_plus/ios"
   shared_preferences_foundation:
-    :path: ".symlinks/plugins/shared_preferences_foundation/ios"
+    :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
   sqflite:
     :path: ".symlinks/plugins/sqflite/ios"
   uni_links:
@@ -207,27 +210,28 @@ SPEC CHECKSUMS:
   flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef
   flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
   flutter_sodium: c84426b4de738514b5b66cfdeb8a06634e72fe0b
-  fluttertoast: eb263d302cc92e04176c053d2385237e9f43fad0
+  fluttertoast: fafc4fa4d01a6a9e4f772ecd190ffa525e9e2d9c
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
   local_auth_ios: c6cf091ded637a88f24f86a8875d8b0f526e2605
   move_to_background: 39a5b79b26d577b0372cbe8a8c55e7aa9fcd3a2d
   MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
   open_filex: 6e26e659846ec990262224a12ef1c528bb4edbe4
   OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
-  package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
-  path_provider_foundation: 37748e03f12783f9de2cb2c4eadfaa25fe6d4852
+  package_info_plus: fd030dabf36271f146f1f3beacd48f564b0f17f7
+  path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
   qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e
   Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
-  SDWebImage: 9bec4c5cdd9579e1f57104735ee0c37df274d593
-  Sentry: 4c9babff9034785067c896fd580b1f7de44da020
-  sentry_flutter: b10ae7a5ddcbc7f04648eeb2672b5747230172f1
+  SDWebImage: 750adf017a315a280c60fde706ab1e552a3ae4e9
+  Sentry: e3203780941722a1fcfee99e351de14244c7f806
+  sentry_flutter: 8f0ffd53088e6a4d50c095852c5cad9e4405025c
+  SentryPrivate: 5e3683390f66611fc7c6215e27645873adb55d13
   share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
-  shared_preferences_foundation: 297b3ebca31b34ec92be11acd7fb0ba932c822ca
-  sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
+  shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
+  sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a
   SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
   Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
   uni_links: d97da20c7701486ba192624d99bffaaffcfc298a
-  url_launcher_ios: ae1517e5e344f5544fb090b079e11f399dfbe4d2
+  url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
 
 PODFILE CHECKSUM: b4e3a7eabb03395b66e81fc061789f61526ee6bb
 

ios/Runner.xcodeproj/project.pbxproj

@@ -159,7 +159,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

lib/app/view/app.dart

@@ -1,4 +1,3 @@
-
 import 'dart:async';
 import 'dart:io';
 
@@ -12,6 +11,7 @@ import "package:ente_auth/l10n/l10n.dart";
 import 'package:ente_auth/locale.dart';
 import "package:ente_auth/onboarding/view/onboarding_page.dart";
 import 'package:ente_auth/services/update_service.dart';
+import 'package:ente_auth/services/user_service.dart';
 import 'package:ente_auth/ui/home_page.dart';
 import 'package:ente_auth/ui/settings/app_update_dialog.dart';
 import 'package:flutter/foundation.dart';
@@ -49,6 +49,7 @@ class _AppState extends State<App> {
       }
     });
     _signedInEvent = Bus.instance.on<SignedInEvent>().listen((event) {
+      UserService.instance.getUserDetailsV2().ignore();
       if (mounted) {
         setState(() {});
       }
@@ -127,7 +128,8 @@ class _AppState extends State<App> {
 
   Map<String, WidgetBuilder> get _getRoutes {
     return {
-      "/": (context) => Configuration.instance.hasConfiguredAccount()
+      "/": (context) => Configuration.instance.hasConfiguredAccount() ||
+              Configuration.instance.hasOptedForOfflineMode()
           ? const HomePage()
           : const OnboardingPage(),
     };

lib/app/view/app_theme_extension.dart

@@ -38,9 +38,7 @@ final darkTheme = ThemeData(
   fontFamily: "Inter",
   brightness: Brightness.dark,
   scaffoldBackgroundColor: Colors.black,
-  backgroundColor: Colors.black,
   appBarTheme: const AppBarTheme(color: Colors.orange),
-  colorScheme: const ColorScheme.dark(primary: Colors.white),
   textTheme: _buildTextTheme(Colors.white),
   outlinedButtonTheme: buildOutlinedButtonThemeData(
     bgDisabled: Colors.grey.shade500,
@@ -59,25 +57,25 @@ final darkTheme = ThemeData(
       borderSide: BorderSide.none,
       borderRadius: BorderRadius.circular(6),
     ),
-  ),
+  ), colorScheme: const ColorScheme.dark(primary: Colors.white).copyWith(background: Colors.black),
 );
 
 TextTheme _buildTextTheme(Color textColor) {
   return const TextTheme().copyWith(
-    headline4: TextStyle(
+    headlineMedium: TextStyle(
       color: textColor,
       fontSize: 32,
       fontWeight: FontWeight.w700,
       fontFamily: "Inter",
     ),
-    headline5: TextStyle(
+    headlineSmall: TextStyle(
       color: textColor,
       fontSize: 24,
       fontWeight: FontWeight.w600,
       fontFamily: "Inter",
     ),
     // AG: Body
-    headline6: TextStyle(
+    titleLarge: TextStyle(
       color: textColor,
       fontSize: 18,
       fontFamily: "Inter",
@@ -92,31 +90,31 @@ TextTheme _buildTextTheme(Color textColor) {
       height: 28,
     ),
 
-    subtitle1: TextStyle(
+    titleMedium: TextStyle(
       color: textColor,
       fontFamily: "Inter",
       fontSize: 16,
       fontWeight: FontWeight.w500,
     ),
-    subtitle2: TextStyle(
+    titleSmall: TextStyle(
       color: textColor,
       fontFamily: "Inter",
       fontSize: 14,
       fontWeight: FontWeight.w500,
     ),
-    bodyText1: TextStyle(
+    bodyLarge: TextStyle(
       fontFamily: "Inter",
       color: textColor,
       fontSize: 16,
       fontWeight: FontWeight.w500,
     ),
-    bodyText2: TextStyle(
+    bodyMedium: TextStyle(
       fontFamily: "Inter",
       color: textColor,
       fontSize: 14,
       fontWeight: FontWeight.w500,
     ),
-    caption: TextStyle(
+    bodySmall: TextStyle(
       color: textColor.withOpacity(0.6),
       fontSize: 14,
       fontWeight: FontWeight.w500,

lib/core/configuration.dart

@@ -1,10 +1,10 @@
+import 'dart:async';
 import 'dart:convert';
 import 'dart:io' as io;
 import 'dart:typed_data';
 
 import 'package:bip39/bip39.dart' as bip39;
 import 'package:ente_auth/core/constants.dart';
-import 'package:ente_auth/core/errors.dart';
 import 'package:ente_auth/core/event_bus.dart';
 import 'package:ente_auth/events/signed_in_event.dart';
 import 'package:ente_auth/events/signed_out_event.dart';
@@ -18,6 +18,7 @@ import 'package:flutter_sodium/flutter_sodium.dart';
 import 'package:logging/logging.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
+import 'package:tuple/tuple.dart';
 
 class Configuration {
   Configuration._privateConstructor();
@@ -29,15 +30,23 @@ class Configuration {
   );
   static const emailKey = "email";
   static const keyAttributesKey = "key_attributes";
-  static const keyKey = "key";
+
   static const keyShouldShowLockScreen = "should_show_lock_screen";
   static const lastTempFolderClearTimeKey = "last_temp_folder_clear_time";
+  static const keyKey = "key";
   static const secretKeyKey = "secret_key";
   static const authSecretKeyKey = "auth_secret_key";
+  static const offlineAuthSecretKey = "offline_auth_secret_key";
   static const tokenKey = "token";
   static const encryptedTokenKey = "encrypted_token";
   static const userIDKey = "user_id";
   static const hasMigratedSecureStorageKey = "has_migrated_secure_storage";
+  static const hasOptedForOfflineModeKey = "has_opted_for_offline_mode";
+  final List<String> onlineSecureKeys = [
+    keyKey,
+    secretKeyKey,
+    authSecretKeyKey
+  ];
 
   final kTempFolderDeletionTimeBuffer = const Duration(days: 1).inMicroseconds;
 
@@ -45,28 +54,20 @@ class Configuration {
 
   String? _cachedToken;
   late String _documentsDirectory;
-  String? _key;
   late SharedPreferences _preferences;
+  String? _key;
   String? _secretKey;
   String? _authSecretKey;
+  String? _offlineAuthKey;
   late FlutterSecureStorage _secureStorage;
   late String _tempDirectory;
-  late String _thumbnailCacheDirectory;
 
-  // 6th July 22: Remove this after 3 months. Hopefully, active users
-  // will migrate to newer version of the app, where shared media is stored
-  // on appSupport directory which OS won't clean up automatically
-  late String _sharedTempMediaDirectory;
-
-  late String _sharedDocumentsMediaDirectory;
   String? _volatilePassword;
 
   final _secureStorageOptionsIOS = const IOSOptions(
     accessibility: KeychainAccessibility.first_unlock_this_device,
   );
 
-  // const IOSOptions(accessibility: IOSAccessibility.first_unlock);
-
   Future<void> init() async {
     _preferences = await SharedPreferences.getInstance();
     _secureStorage = const FlutterSecureStorage();
@@ -88,15 +89,27 @@ class Configuration {
       _logger.warning(e);
     }
     tempDirectory.createSync(recursive: true);
-    final tempDirectoryPath = (await getTemporaryDirectory()).path;
-    _thumbnailCacheDirectory = tempDirectoryPath + "/thumbnail-cache";
-    io.Directory(_thumbnailCacheDirectory).createSync(recursive: true);
-    _sharedTempMediaDirectory = tempDirectoryPath + "/ente-shared-media";
-    io.Directory(_sharedTempMediaDirectory).createSync(recursive: true);
-    _sharedDocumentsMediaDirectory = _documentsDirectory + "/ente-shared-media";
-    io.Directory(_sharedDocumentsMediaDirectory).createSync(recursive: true);
+    await _initOnlineAccount();
+    await _initOfflineAccount();
+  }
+
+  Future<void> _initOfflineAccount() async {
+    _offlineAuthKey = await _secureStorage.read(
+      key: offlineAuthSecretKey,
+      iOptions: _secureStorageOptionsIOS,
+    );
+  }
+
+  Future<void> _initOnlineAccount() async {
     if (!_preferences.containsKey(tokenKey)) {
-      await _secureStorage.deleteAll(iOptions: _secureStorageOptionsIOS);
+      for (final key in onlineSecureKeys) {
+        unawaited(
+          _secureStorage.delete(
+            key: key,
+            iOptions: _secureStorageOptionsIOS,
+          ),
+        );
+      }
     } else {
       _key = await _secureStorage.read(
         key: keyKey,
@@ -113,13 +126,17 @@ class Configuration {
       if (_key == null) {
         await logout(autoLogout: true);
       }
-      await _migrateSecurityStorageToFirstUnlock();
     }
   }
 
   Future<void> logout({bool autoLogout = false}) async {
     await _preferences.clear();
-    await _secureStorage.deleteAll(iOptions: _secureStorageOptionsIOS);
+    for (String key in onlineSecureKeys) {
+      await _secureStorage.delete(
+        key: key,
+        iOptions: _secureStorageOptionsIOS,
+      );
+    }
     await AuthenticatorDB.instance.clearTable();
     _key = null;
     _cachedToken = null;
@@ -146,6 +163,7 @@ class Configuration {
       utf8.encode(password) as Uint8List,
       kekSalt,
     );
+    final loginKey = await CryptoUtil.deriveLoginKey(derivedKeyResult.key);
 
     // Encrypt the key with this derived key
     final encryptedKeyData =
@@ -175,10 +193,12 @@ class Configuration {
       Sodium.bin2hex(recoveryKey),
       Sodium.bin2base64(keyPair.sk),
     );
-    return KeyGenResult(attributes, privateAttributes);
+    return KeyGenResult(attributes, privateAttributes, loginKey);
   }
 
-  Future<KeyAttributes> updatePassword(String password) async {
+  Future<Tuple2<KeyAttributes, Uint8List>> getAttributesForNewPassword(
+    String password,
+  ) async {
     // Get master key
     final masterKey = getKey();
 
@@ -189,6 +209,7 @@ class Configuration {
       utf8.encode(password) as Uint8List,
       kekSalt,
     );
+    final loginKey = await CryptoUtil.deriveLoginKey(derivedKeyResult.key);
 
     // Encrypt the key with this derived key
     final encryptedKeyData =
@@ -196,42 +217,39 @@ class Configuration {
 
     final existingAttributes = getKeyAttributes();
 
-    return existingAttributes!.copyWith(
+    final updatedAttributes = existingAttributes!.copyWith(
       kekSalt: Sodium.bin2base64(kekSalt),
       encryptedKey: Sodium.bin2base64(encryptedKeyData.encryptedData!),
       keyDecryptionNonce: Sodium.bin2base64(encryptedKeyData.nonce!),
       memLimit: derivedKeyResult.memLimit,
       opsLimit: derivedKeyResult.opsLimit,
     );
+    return Tuple2(updatedAttributes, loginKey);
   }
 
-  Future<void> decryptAndSaveSecrets(
+  // decryptSecretsAndGetLoginKey decrypts the master key and recovery key
+  // with the given password and save them in local secure storage.
+  // This method also returns the keyEncKey that can be used for performing
+  // SRP setup for existing users.
+  Future<Uint8List> decryptSecretsAndGetKeyEncKey(
     String password,
-    KeyAttributes attributes,
-  ) async {
+    KeyAttributes attributes, {
+    Uint8List? keyEncryptionKey,
+  }) async {
     _logger.info('Start decryptAndSaveSecrets');
-    // validatePreVerificationStateCheck(
-    //   attributes,
-    //   password,
-    //   getEncryptedToken(),
-    // );
-    _logger.info('state validation done');
-    final kek = await CryptoUtil.deriveKey(
+    keyEncryptionKey ??= await CryptoUtil.deriveKey(
       utf8.encode(password) as Uint8List,
       Sodium.base642bin(attributes.kekSalt),
       attributes.memLimit,
       attributes.opsLimit,
-    ).onError((e, s) {
-      _logger.severe('deriveKey failed', e, s);
-      throw KeyDerivationError();
-    });
+    );
 
     _logger.info('user-key done');
     Uint8List key;
     try {
       key = CryptoUtil.decryptSync(
         Sodium.base642bin(attributes.encryptedKey),
-        kek,
+        keyEncryptionKey,
         Sodium.base642bin(attributes.keyDecryptionNonce),
       );
     } catch (e) {
@@ -256,6 +274,7 @@ class Configuration {
     await setToken(
       Sodium.bin2base64(token, variant: Sodium.base64VariantUrlsafe),
     );
+    return keyEncryptionKey;
   }
 
   Future<void> recover(String recoveryKey) async {
@@ -306,6 +325,10 @@ class Configuration {
     return _cachedToken;
   }
 
+  bool isLoggedIn() {
+    return getToken() != null;
+  }
+
   Future<void> setToken(String token) async {
     _cachedToken = token;
     await _preferences.setString(tokenKey, token);
@@ -349,52 +372,31 @@ class Configuration {
     }
   }
 
-  Future<void> setKey(String? key) async {
+  Future<void> setKey(String key) async {
     _key = key;
-    if (key == null) {
-      await _secureStorage.delete(
-        key: keyKey,
-        iOptions: _secureStorageOptionsIOS,
-      );
-    } else {
-      await _secureStorage.write(
-        key: keyKey,
-        value: key,
-        iOptions: _secureStorageOptionsIOS,
-      );
-    }
+    await _secureStorage.write(
+      key: keyKey,
+      value: key,
+      iOptions: _secureStorageOptionsIOS,
+    );
   }
 
   Future<void> setSecretKey(String? secretKey) async {
     _secretKey = secretKey;
-    if (secretKey == null) {
-      await _secureStorage.delete(
-        key: secretKeyKey,
-        iOptions: _secureStorageOptionsIOS,
-      );
-    } else {
-      await _secureStorage.write(
-        key: secretKeyKey,
-        value: secretKey,
-        iOptions: _secureStorageOptionsIOS,
-      );
-    }
+    await _secureStorage.write(
+      key: secretKeyKey,
+      value: secretKey,
+      iOptions: _secureStorageOptionsIOS,
+    );
   }
 
   Future<void> setAuthSecretKey(String? authSecretKey) async {
     _authSecretKey = authSecretKey;
-    if (authSecretKey == null) {
-      await _secureStorage.delete(
-        key: authSecretKeyKey,
-        iOptions: _secureStorageOptionsIOS,
-      );
-    } else {
-      await _secureStorage.write(
-        key: authSecretKeyKey,
-        value: authSecretKey,
-        iOptions: _secureStorageOptionsIOS,
-      );
-    }
+    await _secureStorage.write(
+      key: authSecretKeyKey,
+      value: authSecretKey,
+      iOptions: _secureStorageOptionsIOS,
+    );
   }
 
   Uint8List? getKey() {
@@ -409,11 +411,15 @@ class Configuration {
     return _authSecretKey == null ? null : Sodium.base642bin(_authSecretKey!);
   }
 
+  Uint8List? getOfflineSecretKey() {
+    return _offlineAuthKey == null ? null : Sodium.base642bin(_offlineAuthKey!);
+  }
+
   Uint8List getRecoveryKey() {
     final keyAttributes = getKeyAttributes()!;
     return CryptoUtil.decryptSync(
       Sodium.base642bin(keyAttributes.recoveryKeyEncryptedWithMasterKey),
-      getKey(),
+      getKey()!,
       Sodium.base642bin(keyAttributes.recoveryKeyDecryptionNonce),
     );
   }
@@ -423,22 +429,34 @@ class Configuration {
     return _tempDirectory;
   }
 
-  String getThumbnailCacheDirectory() {
-    return _thumbnailCacheDirectory;
-  }
-
-  String getOldSharedMediaCacheDirectory() {
-    return _sharedTempMediaDirectory;
-  }
-
-  String getSharedMediaDirectory() {
-    return _sharedDocumentsMediaDirectory;
-  }
-
   bool hasConfiguredAccount() {
     return getToken() != null && _key != null;
   }
 
+  bool hasOptedForOfflineMode() {
+    return _preferences.getBool(hasOptedForOfflineModeKey) ?? false;
+  }
+
+  Future<void> optForOfflineMode() async {
+    if ((await _secureStorage.containsKey(
+      key: offlineAuthSecretKey,
+      iOptions: _secureStorageOptionsIOS,
+    ))) {
+      _offlineAuthKey = await _secureStorage.read(
+        key: offlineAuthSecretKey,
+        iOptions: _secureStorageOptionsIOS,
+      );
+    } else {
+      _offlineAuthKey = Sodium.bin2base64(CryptoUtil.generateKey());
+      await _secureStorage.write(
+        key: offlineAuthSecretKey,
+        value: _offlineAuthKey,
+        iOptions: _secureStorageOptionsIOS,
+      );
+    }
+    await _preferences.setBool(hasOptedForOfflineModeKey, true);
+  }
+
   bool shouldShowLockScreen() {
     if (_preferences.containsKey(keyShouldShowLockScreen)) {
       return _preferences.getBool(keyShouldShowLockScreen)!;
@@ -458,27 +476,4 @@ class Configuration {
   String? getVolatilePassword() {
     return _volatilePassword;
   }
-
-  Future<void> _migrateSecurityStorageToFirstUnlock() async {
-    final hasMigratedSecureStorageToFirstUnlock =
-        _preferences.getBool(hasMigratedSecureStorageKey) ?? false;
-    if (!hasMigratedSecureStorageToFirstUnlock &&
-        _key != null &&
-        _secretKey != null) {
-      await _secureStorage.write(
-        key: keyKey,
-        value: _key,
-        iOptions: _secureStorageOptionsIOS,
-      );
-      await _secureStorage.write(
-        key: secretKeyKey,
-        value: _secretKey,
-        iOptions: _secureStorageOptionsIOS,
-      );
-      await _preferences.setBool(
-        hasMigratedSecureStorageKey,
-        true,
-      );
-    }
-  }
 }

lib/core/constants.dart

@@ -7,6 +7,7 @@ const String sentryDSN =
     "https://ed4ddd6309b847ba8849935e26e9b648@sentry.ente.io/9";
 const String sentryTunnel = "https://sentry-reporter.ente.io";
 const String roadmapURL = "https://roadmap.ente.io";
+const String githubIssuesUrl = "https://github.com/ente-io/auth/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc";
 const int microSecondsInDay = 86400000000;
 const int android11SDKINT = 30;
 const int galleryLoadStartTime = -8000000000000000; // Wednesday, March 6, 1748

lib/core/errors.dart

@@ -41,4 +41,6 @@ class InvalidStateError extends AssertionError {
 
 class KeyDerivationError extends Error {}
 
+class SrpSetupNotCompleteError extends Error {}
+
 class AuthenticatorKeyNotFound extends Error {}

lib/core/logging/super_logging.dart

@@ -204,7 +204,7 @@ class SuperLogging {
 
   static void setUserID(String userID) async {
     if (config.sentryDsn != null) {
-      Sentry.configureScope((scope) => scope.user = SentryUser(id: userID));
+      Sentry.configureScope((scope) => scope.setUser(SentryUser(id: userID)));
       $.info("setting sentry user ID to: $userID");
     }
   }
@@ -310,7 +310,7 @@ class SuperLogging {
     if (_preferences.containsKey(keyShouldReportErrors)) {
       return _preferences.getBool(keyShouldReportErrors)!;
     } else {
-      return false;
+      return kDebugMode;
     }
   }
 

lib/core/logging/tunneled_transport.dart

@@ -22,11 +22,11 @@ class TunneledTransport implements Transport {
       : _dsn = _options.dsn != null ? Dsn.parse(_options.dsn!) : null,
         _headers = _buildHeaders(
           _options.platformChecker.isWeb,
-          _options.sdk.identifier,
+          _options.sentryClientName,
         ) {
     _credentialBuilder = _CredentialBuilder(
       _dsn,
-      _options.sdk.identifier,
+      _options.sentryClientName,
       _options.clock,
     );
   }

lib/core/network.dart

@@ -1,18 +1,29 @@
 import 'dart:io';
 
 import 'package:dio/dio.dart';
+import 'package:ente_auth/core/configuration.dart';
+import 'package:ente_auth/core/constants.dart';
 import 'package:fk_user_agent/fk_user_agent.dart';
+import 'package:flutter/foundation.dart';
 import 'package:package_info_plus/package_info_plus.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 import 'package:uuid/uuid.dart';
 
 int kConnectTimeout = 15000;
 
 class Network {
+  // apiEndpoint points to the Ente server's API endpoint
+  static const apiEndpoint = String.fromEnvironment(
+    "endpoint",
+    defaultValue: kDefaultProductionEndpoint,
+  );
   late Dio _dio;
+  late Dio _enteDio;
 
   Future<void> init() async {
     await FkUserAgent.init();
     final packageInfo = await PackageInfo.fromPlatform();
+    final preferences = await SharedPreferences.getInstance();
     _dio = Dio(
       BaseOptions(
         connectTimeout: kConnectTimeout,
@@ -24,6 +35,18 @@ class Network {
       ),
     );
     _dio.interceptors.add(RequestIdInterceptor());
+    _enteDio = Dio(
+      BaseOptions(
+        baseUrl: apiEndpoint,
+        connectTimeout: kConnectTimeout,
+        headers: {
+          HttpHeaders.userAgentHeader: FkUserAgent.userAgent,
+          'X-Client-Version': packageInfo.version,
+          'X-Client-Package': packageInfo.packageName,
+        },
+      ),
+    );
+    _enteDio.interceptors.add(EnteRequestInterceptor(preferences, apiEndpoint));
   }
 
   Network._privateConstructor();
@@ -31,6 +54,7 @@ class Network {
   static Network instance = Network._privateConstructor();
 
   Dio getDio() => _dio;
+  Dio get enteDio => _enteDio;
 }
 
 class RequestIdInterceptor extends Interceptor {
@@ -41,3 +65,27 @@ class RequestIdInterceptor extends Interceptor {
     return super.onRequest(options, handler);
   }
 }
+
+class EnteRequestInterceptor extends Interceptor {
+  final SharedPreferences _preferences;
+  final String enteEndpoint;
+
+  EnteRequestInterceptor(this._preferences, this.enteEndpoint);
+
+  @override
+  void onRequest(RequestOptions options, RequestInterceptorHandler handler) {
+    if (kDebugMode) {
+      assert(
+      options.baseUrl == enteEndpoint,
+      "interceptor should only be used for API endpoint",
+      );
+    }
+    // ignore: prefer_const_constructors
+    options.headers.putIfAbsent("x-request-id", () => Uuid().v4().toString());
+    final String? tokenValue = _preferences.getString(Configuration.tokenKey);
+    if (tokenValue != null) {
+      options.headers.putIfAbsent("X-Auth-Token", () => tokenValue);
+    }
+    return super.onRequest(options, handler);
+  }
+}

lib/ente_theme_data.dart

@@ -11,11 +11,6 @@ final lightThemeData = ThemeData(
   iconTheme: const IconThemeData(color: Colors.black),
   primaryIconTheme:
       const IconThemeData(color: Colors.red, opacity: 1.0, size: 50.0),
-  colorScheme: const ColorScheme.light(
-    primary: Colors.black,
-    secondary: Color.fromARGB(255, 163, 163, 163),
-  ),
-  accentColor: const Color.fromRGBO(0, 0, 0, 0.6),
   outlinedButtonTheme: buildOutlinedButtonThemeData(
     bgDisabled: const Color.fromRGBO(158, 158, 158, 1),
     bgEnabled: const Color.fromRGBO(0, 0, 0, 1),
@@ -26,9 +21,7 @@ final lightThemeData = ThemeData(
     onPrimary: const Color.fromRGBO(255, 255, 255, 1),
     primary: const Color.fromRGBO(0, 0, 0, 1),
   ),
-  toggleableActiveColor: const Color.fromRGBO(102, 187, 106, 1),
   scaffoldBackgroundColor: const Color.fromRGBO(255, 255, 255, 1),
-  backgroundColor: const Color.fromRGBO(255, 255, 255, 1),
   appBarTheme: const AppBarTheme().copyWith(
     backgroundColor: Colors.white,
     foregroundColor: Colors.black,
@@ -38,8 +31,8 @@ final lightThemeData = ThemeData(
   //https://api.flutter.dev/flutter/material/TextTheme-class.html
   textTheme: _buildTextTheme(const Color.fromRGBO(0, 0, 0, 1)),
   primaryTextTheme: const TextTheme().copyWith(
-    bodyText2: const TextStyle(color: Colors.yellow),
-    bodyText1: const TextStyle(color: Colors.orange),
+    bodyMedium: const TextStyle(color: Colors.yellow),
+    bodyLarge: const TextStyle(color: Colors.orange),
   ),
   cardColor: const Color.fromRGBO(250, 250, 250, 1.0),
   dialogTheme: const DialogTheme().copyWith(
@@ -79,7 +72,27 @@ final lightThemeData = ThemeData(
           ? const Color.fromRGBO(255, 255, 255, 1)
           : const Color.fromRGBO(0, 0, 0, 1);
     }),
-  ),
+  ),  radioTheme: RadioThemeData(
+ fillColor: MaterialStateProperty.resolveWith<Color?>((Set<MaterialState> states) {
+ if (states.contains(MaterialState.disabled)) { return null; }
+ if (states.contains(MaterialState.selected)) { return const Color.fromRGBO(102, 187, 106, 1); }
+ return null;
+ }),
+ ), switchTheme: SwitchThemeData(
+ thumbColor: MaterialStateProperty.resolveWith<Color?>((Set<MaterialState> states) {
+ if (states.contains(MaterialState.disabled)) { return null; }
+ if (states.contains(MaterialState.selected)) { return const Color.fromRGBO(102, 187, 106, 1); }
+ return null;
+ }),
+ trackColor: MaterialStateProperty.resolveWith<Color?>((Set<MaterialState> states) {
+ if (states.contains(MaterialState.disabled)) { return null; }
+ if (states.contains(MaterialState.selected)) { return const Color.fromRGBO(102, 187, 106, 1); }
+ return null;
+ }),
+ ), colorScheme: const ColorScheme.light(
+    primary: Colors.black,
+    secondary: Color.fromARGB(255, 163, 163, 163),
+  ).copyWith(background: const Color.fromRGBO(255, 255, 255, 1)),
 );
 
 final darkThemeData = ThemeData(
@@ -90,13 +103,10 @@ final darkThemeData = ThemeData(
   primaryIconTheme:
       const IconThemeData(color: Colors.red, opacity: 1.0, size: 50.0),
   hintColor: const Color.fromRGBO(158, 158, 158, 1),
-  colorScheme: const ColorScheme.dark(primary: Colors.white),
-  accentColor: const Color.fromRGBO(45, 194, 98, 0.2),
   buttonTheme: const ButtonThemeData().copyWith(
     buttonColor: const Color.fromRGBO(45, 194, 98, 1.0),
   ),
   textTheme: _buildTextTheme(const Color.fromRGBO(255, 255, 255, 1)),
-  toggleableActiveColor: const Color.fromRGBO(102, 187, 106, 1),
   outlinedButtonTheme: buildOutlinedButtonThemeData(
     bgDisabled: const Color.fromRGBO(158, 158, 158, 1),
     bgEnabled: const Color.fromRGBO(255, 255, 255, 1),
@@ -108,7 +118,6 @@ final darkThemeData = ThemeData(
     primary: const Color.fromRGBO(255, 255, 255, 1),
   ),
   scaffoldBackgroundColor: const Color.fromRGBO(0, 0, 0, 1),
-  backgroundColor: const Color.fromRGBO(0, 0, 0, 1),
   appBarTheme: const AppBarTheme().copyWith(
     color: Colors.black,
     elevation: 0,
@@ -155,59 +164,76 @@ final darkThemeData = ThemeData(
         return const Color.fromRGBO(158, 158, 158, 1);
       }
     }),
-  ),
+  ), radioTheme: RadioThemeData(
+ fillColor: MaterialStateProperty.resolveWith<Color?>((Set<MaterialState> states) {
+ if (states.contains(MaterialState.disabled)) { return null; }
+ if (states.contains(MaterialState.selected)) { return const Color.fromRGBO(102, 187, 106, 1); }
+ return null;
+ }),
+ ), switchTheme: SwitchThemeData(
+ thumbColor: MaterialStateProperty.resolveWith<Color?>((Set<MaterialState> states) {
+ if (states.contains(MaterialState.disabled)) { return null; }
+ if (states.contains(MaterialState.selected)) { return const Color.fromRGBO(102, 187, 106, 1); }
+ return null;
+ }),
+ trackColor: MaterialStateProperty.resolveWith<Color?>((Set<MaterialState> states) {
+ if (states.contains(MaterialState.disabled)) { return null; }
+ if (states.contains(MaterialState.selected)) { return const Color.fromRGBO(102, 187, 106, 1); }
+ return null;
+ }),
+ ), colorScheme: const ColorScheme.dark(primary: Colors.white).copyWith(background: const Color.fromRGBO(0, 0, 0, 1)),
 );
 
 TextTheme _buildTextTheme(Color textColor) {
   return const TextTheme().copyWith(
-    headline4: TextStyle(
+    headlineMedium: TextStyle(
       color: textColor,
       fontSize: 32,
       fontWeight: FontWeight.w600,
       fontFamily: 'Inter',
     ),
-    headline5: TextStyle(
+    headlineSmall: TextStyle(
       color: textColor,
       fontSize: 24,
       fontWeight: FontWeight.w600,
       fontFamily: 'Inter',
     ),
-    headline6: TextStyle(
+    titleLarge: TextStyle(
       color: textColor,
       fontSize: 18,
       fontFamily: 'Inter',
       fontWeight: FontWeight.w600,
     ),
-    subtitle1: TextStyle(
+    titleMedium: TextStyle(
       color: textColor,
       fontFamily: 'Inter',
       fontSize: 16,
       fontWeight: FontWeight.w500,
     ),
-    subtitle2: TextStyle(
+    titleSmall: TextStyle(
       color: textColor,
       fontFamily: 'Inter',
       fontSize: 14,
       fontWeight: FontWeight.w500,
     ),
-    bodyText1: TextStyle(
+    bodyLarge: TextStyle(
       fontFamily: 'Inter',
       color: textColor,
       fontSize: 16,
       fontWeight: FontWeight.w500,
     ),
-    bodyText2: TextStyle(
+    bodyMedium: TextStyle(
       fontFamily: 'Inter',
       color: textColor,
       fontSize: 14,
       fontWeight: FontWeight.w500,
     ),
-    caption: TextStyle(
+    bodySmall: TextStyle(
       color: textColor.withOpacity(0.4),
       fontSize: 10,
       fontWeight: FontWeight.w500,
     ),
-    overline: TextStyle(
+    labelSmall: TextStyle(
       fontFamily: 'Inter',
       color: textColor,
       fontSize: 14,
@@ -344,7 +370,7 @@ extension CustomColorScheme on ColorScheme {
       ? const Color.fromRGBO(245, 245, 245, 1.0)
       : const Color.fromRGBO(30, 30, 30, 1.0);
 
-  Color get searchResultsCountTextColor => brightness == Brightness.light
+  Color get mutedTextColor => brightness == Brightness.light
       ? const Color.fromRGBO(80, 80, 80, 1)
       : const Color.fromRGBO(150, 150, 150, 1);
 
@@ -410,9 +436,7 @@ ElevatedButtonThemeData buildElevatedButtonThemeData({
 }) {
   return ElevatedButtonThemeData(
     style: ElevatedButton.styleFrom(
-      elevation: elevation,
-      onPrimary: onPrimary,
-      primary: primary,
+      foregroundColor: onPrimary, backgroundColor: primary, elevation: elevation,
       alignment: Alignment.center,
       textStyle: const TextStyle(
         fontWeight: FontWeight.w600,

lib/events/icons_changed_event.dart

@@ -0,0 +1,3 @@
+import 'package:ente_auth/events/event.dart';
+
+class IconsChangedEvent extends Event {}

lib/l10n/arb/app_de.arb

@@ -11,6 +11,10 @@
   "importScanQrCode": "Scannen eines QR-Codes",
   "importEnterSetupKey": "Einen Setup-Schlüssel eingeben",
   "importAccountPageTitle": "Kontodaten eingeben",
+  "secretCanNotBeEmpty": "Geheimnis darf nicht leer sein",
+  "bothIssuerAndAccountCanNotBeEmpty": "Sowohl Aussteller als auch Konto können nicht leer sein",
+  "incorrectDetails": "Falsche Angaben",
+  "pleaseVerifyDetails": "Überprüfe die Angaben und versuche es erneut",
   "codeIssuerHint": "Aussteller",
   "codeSecretKeyHint": "Geheimer Schlüssel",
   "codeAccountHint": "Konto (you@domain.com)",

lib/l10n/arb/app_en.arb

@@ -1,4 +1,3 @@
-
 {
   "account": "Account",
   "recoveryKey": "Recovery key",
@@ -6,18 +5,19 @@
   "@counterAppBarTitle": {
     "description": "Text shown in the AppBar of the Counter Page"
   },
-  "onBoardingBody": "Secure your 2FA codes",
+  "onBoardingBody": "Securely backup your 2FA codes",
   "onBoardingGetStarted": "Get Started",
   "setupFirstAccount": "Setup your first account",
   "importScanQrCode": "Scan a QR Code",
+  "qrCode": "QR Code",
   "importEnterSetupKey": "Enter a setup key",
   "importAccountPageTitle": "Enter account details",
   "secretCanNotBeEmpty": "Secret can not be empty",
   "bothIssuerAndAccountCanNotBeEmpty": "Both issuer and account can not be empty",
-  "incorrectDetails" :"Incorrect details",
+  "incorrectDetails": "Incorrect details",
   "pleaseVerifyDetails": "Please verify the details and try again",
   "codeIssuerHint": "Issuer",
-  "codeSecretKeyHint" : "Secret Key",
+  "codeSecretKeyHint": "Secret Key",
   "codeAccountHint": "Account (you@domain.com)",
   "accountKeyType": "Type of key",
   "sessionExpired": "Session expired",
@@ -25,7 +25,7 @@
     "description": "Title of the dialog when the users current session is invalid/expired"
   },
   "pleaseLoginAgain": "Please login again",
-  "loggingOut" : "Logging out...",
+  "loggingOut": "Logging out...",
   "timeBasedKeyType": "Time based (TOTP)",
   "counterBasedKeyType": "Counter based (HOTP)",
   "saveAction": "Save",
@@ -58,6 +58,9 @@
     }
   },
   "contactSupport": "Contact support",
+  "rateUsOnStore" : "Rate us on {storeName}",
+  "blog": "Blog",
+  "merchandise": "Merchandise",
   "verifyPassword": "Verify password",
   "pleaseWait": "Please wait...",
   "generatingEncryptionKeysTitle": "Generating encryption keys...",
@@ -67,16 +70,30 @@
   "incorrectPasswordTitle": "Incorrect password",
   "welcomeBack": "Welcome back!",
   "madeWithLoveAtPrefix": "made with ❤️ at ",
-  "supportDevs" : "Subscribe to <bold-green>ente</bold-green> to support this project.",
-  "supportDiscount" : "Use coupon code \"AUTH\" to get 10% off first year",
+  "supportDevs": "Subscribe to <bold-green>ente</bold-green> to support us",
+  "supportDiscount": "Use coupon code \"AUTH\" to get 10% off first year",
   "changeEmail": "Change email",
   "changePassword": "Change password",
-  "data" : "Data",
+  "data": "Data",
   "importCodes": "Import codes",
+  "importTypePlainText": "Plain text",
+  "importTypeEnteEncrypted": "ente Encrypted export",
+  "passwordForDecryptingExport": "Password to decrypt export",
+  "passwordEmptyError": "Password can not be empty",
+  "importFromApp": "Import codes from {appName}",
+  "importGoogleAuthGuide": "Export your accounts from Google Authenticator to a QR code using the \"Transfer Accounts\" option. Then using another device, scan the QR code.\n\nTip: You can use your laptop's webcam to take a picture of the QR code.",
+  "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.",
+  "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",
   "importInstruction": "Please select a file that contains a list of your codes in the following format",
   "importCodeDelimiterInfo": "The codes can be separated by a comma or a new line",
   "selectFile": "Select file",
+  "emailVerificationToggle": "Email verification",
+  "emailVerificationEnableWarning": "If you are storing the 2FA to your email with us, turning on email verification could result in a deadlock. If you are locked out of one service, you might not be able to log in to the other.",
+  "authToChangeEmailVerificationSetting": "Please authenticate to change email verification",
   "authToViewYourRecoveryKey": "Please authenticate to view your recovery key",
   "authToChangeYourEmail": "Please authenticate to change your email",
   "authToChangeYourPassword": "Please authenticate to change your password",
@@ -86,15 +103,28 @@
   "no": "No",
   "email": "Email",
   "support": "Support",
+  "general": "General",
   "settings": "Settings",
   "copied": "Copied",
   "pleaseTryAgain": "Please try again",
   "existingUser": "Existing User",
-  "newUser" : "New to ente",
+  "newUser": "New to ente",
   "delete": "Delete",
   "enterYourPasswordHint": "Enter your password",
   "forgotPassword": "Forgot password",
   "oops": "Oops",
+  "suggestFeatures": "Suggest features",
+  "faq": "FAQ",
+  "faq_q_1": "How secure is ente Auth?",
+  "faq_a_1": "All codes you backup via ente is stored end-to-end encrypted. This means only you can access your codes. Our apps are open source and our cryptography has been externally audited.",
+  "faq_q_2": "Can I access my codes on desktop?",
+  "faq_a_2": "You can access your codes on the web @ auth.ente.io.",
+  "faq_q_3": "How can I delete codes?",
+  "faq_a_3": "You can delete a code by swiping left on that item.",
+  "faq_q_4": "How can I support this project?",
+  "faq_a_4": "You can support the development of this project by subscribing to our Photos app @ ente.io.",
+  "faq_q_5": "How can I enable FaceID lock in ente Auth",
+  "faq_a_5": "You can enable FaceID lock under Settings → Security → Lockscreen.",
   "somethingWentWrongMessage": "Something went wrong, please try again",
   "leaveFamily": "Leave family",
   "leaveFamilyMessage": "Are you sure that you want to leave the family plan?",
@@ -110,7 +140,7 @@
   "recoverAccount": "Recover account",
   "enterRecoveryKeyHint": "Enter your recovery key",
   "recover": "Recover",
-  "contactSupportViaEmailMessage":"Please drop an email to {email} from your registered email address",
+  "contactSupportViaEmailMessage": "Please drop an email to {email} from your registered email address",
   "@contactSupportViaEmailMessage": {
     "placeholders": {
       "email": {
@@ -155,12 +185,14 @@
   "enterDetailsManually": "Enter details manually",
   "edit": "Edit",
   "copiedToClipboard": "Copied to clipboard",
+  "copiedNextToClipboard": "Copied next code to clipboard",
   "error": "Error",
   "recoveryKeyCopiedToClipboard": "Recovery key copied to clipboard",
   "recoveryKeyOnForgotPassword": "If you forget your password, the only way you can recover your data is with this key.",
   "recoveryKeySaveDescription": "We don't store this key, please save this 24 word key in a safe place.",
   "doThisLater": "Do this later",
   "saveKey": "Save key",
+  "back": "Back",
   "createAccount": "Create account",
   "passwordStrength": "Password strength: {passwordStrengthValue}",
   "@passwordStrength": {
@@ -175,7 +207,7 @@
     "message": "Password Strength: {passwordStrengthText}"
   },
   "password": "Password",
-  "signUpTerms" : "I agree to the <u-terms>terms of service</u-terms> and <u-policy>privacy policy</u-policy>",
+  "signUpTerms": "I agree to the <u-terms>terms of service</u-terms> and <u-policy>privacy policy</u-policy>",
   "privacyPolicyTitle": "Privacy Policy",
   "termsOfServicesTitle": "Terms",
   "encryption": "Encryption",
@@ -224,18 +256,22 @@
   "privacy": "Privacy",
   "terms": "Terms",
   "checkForUpdates": "Check for updates",
+  "downloadUpdate": "Download",
+  "criticalUpdateAvailable": "Critical update available",
+  "updateAvailable": "Update available",
+  "update": "Update",
   "checking": "Checking...",
   "youAreOnTheLatestVersion": "You are on the latest version",
   "warning": "Warning",
   "exportWarningDesc": "The exported file contains sensitive information. Please store this safely.",
-  "iUnderStand" : "I understand",
+  "iUnderStand": "I understand",
   "@iUnderStand": {
     "description": "Text for the button to confirm the user understands the warning"
   },
   "authToExportCodes": "Please authenticate to export your codes",
   "importSuccessTitle": "Yay!",
   "importSuccessDesc": "You have imported {count} codes!",
-  "@importSuccessDesc" : {
+  "@importSuccessDesc": {
     "placeholders": {
       "count": {
         "description": "The number of codes imported",
@@ -244,9 +280,9 @@
       }
     }
   },
-  "sorry" : "Sorry",
+  "sorry": "Sorry",
   "importFailureDesc": "Could not parse the selected file.\nPlease write to support@ente.io if you need help!",
-  "pendingSyncs" : "Warning",
+  "pendingSyncs": "Warning",
   "pendingSyncsWarningBody": "Some of your codes have not been backed up.\n\nPlease ensure that you have a backup for these codes before you logout.",
   "checkInboxAndSpamFolder": "Please check your inbox (and spam) to complete verification",
   "tapToEnterCode": "Tap to enter code",
@@ -268,5 +304,31 @@
   "thisWillLogYouOutOfTheFollowingDevice": "This will log you out of the following device:",
   "terminateSession": "Terminate session?",
   "terminate": "Terminate",
-  "thisDevice": "This device"
+  "thisDevice": "This device",
+  "toResetVerifyEmail": "To reset your password, please verify your email first.",
+  "thisEmailIsAlreadyInUse": "This email is already in use",
+  "verificationFailedPleaseTryAgain": "Verification failed, please try again",
+  "yourVerificationCodeHasExpired": "Your verification code has expired",
+  "incorrectCode": "Incorrect code",
+  "sorryTheCodeYouveEnteredIsIncorrect": "Sorry, the code you've entered is incorrect",
+  "emailChangedTo": "Email changed to {newEmail}",
+  "authenticationFailedPleaseTryAgain": "Authentication failed, please try again",
+  "authenticationSuccessful": "Authentication successful!",
+  "twofactorAuthenticationSuccessfullyReset": "Two-factor authentication successfully reset",
+  "incorrectRecoveryKey": "Incorrect recovery key",
+  "theRecoveryKeyYouEnteredIsIncorrect": "The recovery key you entered is incorrect",
+  "enterPassword": "Enter password",
+  "selectExportFormat": "Select export format",
+  "exportDialogDesc": "Encrypted exports will be protected by a password of your choice.",
+  "encrypted": "Encrypted",
+  "plainText": "Plain text",
+  "passwordToEncryptExport": "Password to encrypt export",
+  "export": "Export",
+  "useOffline": "Use without backups",
+  "signInToBackup": "Sign in to backup your codes",
+  "singIn": "Sign in",
+  "sigInBackupReminder": "Please export your codes to ensure that you have a backup you can restore from.",
+  "offlineModeWarning": "You have chosen to proceed without backups. Please take manual backups to make sure your codes are safe.",
+  "showLargeIcons": "Show large icons",
+  "focusOnSearchBar": "Focus search on app start"
 }

lib/l10n/arb/app_fr.arb

@@ -68,10 +68,14 @@
   "changePassword": "Modifier le mot de passe",
   "data": "Données",
   "importCodes": "Importer les codes",
+  "importSelectJsonFile": "Sélectionnez un fichier JSON",
+  "importEnteEncGuide": "Sélectionnez le fichier JSON chiffré exporté à partir de ente",
   "exportCodes": "Exporter les codes",
   "importInstruction": "Veuillez sélectionner un fichier qui contient une liste de vos codes dans le format suivant",
   "importCodeDelimiterInfo": "Les codes peuvent être séparés par une virgule ou un retour à la ligne",
   "selectFile": "Sélectionner le fichier",
+  "emailVerificationToggle": "Vérification de l'adresse e-mail",
+  "authToChangeEmailVerificationSetting": "Veuillez vous authentifier pour modifier votre adresse e-mail",
   "authToViewYourRecoveryKey": "Veuillez vous authentifier pour afficher votre clé de récupération",
   "authToChangeYourEmail": "Veuillez vous authentifier pour modifier votre adresse e-mail",
   "authToChangeYourPassword": "Veuillez vous authentifier pour modifier votre mot de passe",
@@ -90,6 +94,14 @@
   "enterYourPasswordHint": "Saisir votre mot de passe",
   "forgotPassword": "Mot de passe oublié",
   "oops": "Oups",
+  "suggestFeatures": "Suggérer des fonctionnalités",
+  "faq": "FAQ",
+  "faq_q_2": "Puis-je accéder à mes codes sur mon ordinateur ?",
+  "faq_a_2": "Vous pouvez accéder à vos codes sur le web via auth.ente.io.",
+  "faq_q_3": "Comment puis-je supprimer des codes ?",
+  "faq_a_3": "Vous pouvez supprimer un code en glissant vers la gauche.",
+  "faq_q_4": "Comment puis-je soutenir le projet?",
+  "faq_a_4": "Vous pouvez soutenir le développement de ce projet en vous abonnant à notre application Photos, ente.io.",
   "somethingWentWrongMessage": "Quelque chose s'est mal passé, veuillez recommencer",
   "leaveFamily": "Quitter le plan familial",
   "leaveFamilyMessage": "Êtes-vous certains de vouloir quitter le plan familial?",
@@ -156,6 +168,7 @@
   "recoveryKeySaveDescription": "Nous ne stockons pas cette clé, veuillez enregistrer cette clé de 24 mots dans un endroit sûr.",
   "doThisLater": "Plus tard",
   "saveKey": "Enregistrer la clé",
+  "back": "Retour",
   "createAccount": "Créer un compte",
   "passwordStrength": "Force du mot de passe : {passwordStrengthValue}",
   "@passwordStrength": {
@@ -186,6 +199,7 @@
   "continueLabel": "Continuer",
   "insecureDevice": "Appareil non sécurisé",
   "sorryWeCouldNotGenerateSecureKeysOnThisDevicennplease": "Désolé, nous n'avons pas pu générer de clés sécurisées sur cet appareil.\n\nVeuillez vous inscrire depuis un autre appareil.",
+  "howItWorks": "Comment ça fonctionne",
   "ackPasswordLostWarning": "Je comprends que si je perds mon mot de passe, je risque de perdre mes données puisque celles-ci sont <underline>chiffrées de bout en bout</underline>.",
   "loginTerms": "En cliquant sur \"Connexion\", j'accepte les <u-terms>conditions d'utilisation</u-terms> et la <u-policy>politique de confidentialité</u-policy>",
   "logInLabel": "Connexion",
@@ -262,5 +276,19 @@
   "thisWillLogYouOutOfTheFollowingDevice": "Cela vous déconnectera de l'appareil suivant :",
   "terminateSession": "Quitter la session ?",
   "terminate": "Quitter",
-  "thisDevice": "Cet appareil"
+  "thisDevice": "Cet appareil",
+  "toResetVerifyEmail": "Pour réinitialiser votre mot de passe, veuillez d'abord vérifier votre e-mail.",
+  "thisEmailIsAlreadyInUse": "Cette adresse mail est déjà utilisé",
+  "verificationFailedPleaseTryAgain": "La vérification a échouée, veuillez réessayer",
+  "yourVerificationCodeHasExpired": "Votre code de vérification a expiré",
+  "incorrectCode": "Code non valide",
+  "sorryTheCodeYouveEnteredIsIncorrect": "Le code que vous avez saisi est incorrect",
+  "emailChangedTo": "L'e-mail a été changé en {newEmail}",
+  "authenticationFailedPleaseTryAgain": "L'authentification a échouée, veuillez réessayer",
+  "authenticationSuccessful": "Authentification réussie!",
+  "twofactorAuthenticationSuccessfullyReset": "L'authentification à deux facteurs a été réinitialisée avec succès ",
+  "incorrectRecoveryKey": "Clé de récupération non valide",
+  "theRecoveryKeyYouEnteredIsIncorrect": "La clé de récupération que vous avez entrée est incorrecte",
+  "enterPassword": "Saisissez le mot de passe",
+  "export": "Exporter"
 }

lib/l10n/arb/app_it.arb

@@ -9,8 +9,13 @@
   "onBoardingGetStarted": "Per iniziare",
   "setupFirstAccount": "Configura il tuo primo account",
   "importScanQrCode": "Scansiona un codice QR",
+  "qrCode": "Codice QR",
   "importEnterSetupKey": "Inserisci il codice segreto",
   "importAccountPageTitle": "Inserisci i dettagli del tuo account",
+  "secretCanNotBeEmpty": "La chiave segreta è obbligatoria",
+  "bothIssuerAndAccountCanNotBeEmpty": "Sia l'emittente che l'account sono obbligatori",
+  "incorrectDetails": "Dettagli errati",
+  "pleaseVerifyDetails": "Verifica i dettagli e riprova",
   "codeIssuerHint": "Emittente",
   "codeSecretKeyHint": "Codice segreto",
   "codeAccountHint": "Account (username@dominio.it)",
@@ -53,6 +58,9 @@
     }
   },
   "contactSupport": "Contatta il supporto",
+  "rateUsOnStore": "Valutaci su {storeName}",
+  "blog": "Blog",
+  "merchandise": "Prodotti",
   "verifyPassword": "Verifica la password",
   "pleaseWait": "Attendere prego...",
   "generatingEncryptionKeysTitle": "Generazione delle chiavi di crittografia...",
@@ -64,14 +72,27 @@
   "madeWithLoveAtPrefix": "realizzato con ❤️ a ",
   "supportDevs": "Iscriviti a <bold-green>ente</bold-green> per supportare questo progetto.",
   "supportDiscount": "Utilizzare il codice coupon \"AUTH\" per ottenere il 10% di sconto al primo anno",
-  "changeEmail": "modifica email",
+  "changeEmail": "Modifica email",
   "changePassword": "Cambia password",
   "data": "Dati",
   "importCodes": "Importa codici",
+  "importTypePlainText": "Testo in chiaro",
+  "importTypeEnteEncrypted": "ente Esportazione criptata",
+  "passwordForDecryptingExport": "Password per decriptare il file esportato",
+  "passwordEmptyError": "La password è obbligatoria",
+  "importFromApp": "Importa codici da {appName}",
+  "importGoogleAuthGuide": "Esporta i tuoi account da Google Authenticator in un codice QR utilizzando l'opzione \"Trasferisci Account\". Quindi, usando un altro dispositivo, scansiona il codice QR.\n\nSuggerimento: Puoi usare la webcam del tuo computer portatile per scattare una foto del codice QR.",
+  "importSelectJsonFile": "Seleziona file JSON",
+  "importEnteEncGuide": "Seleziona il file JSON criptato esportato da ente",
+  "importRaivoGuide": "Utilizza l'opzione \"Esporta i codici OTP in archivio Zip\" nelle impostazioni di Raivo.\n\nEstrai il file zip e importa il file JSON.",
+  "importAegisGuide": "Usa l'opzione \"Esporta la cassaforte\" nelle impostazioni di Aegis.\n\nSe la tua cassaforte è criptata, dovrai inserire la password della cassaforte per decriptarla.",
   "exportCodes": "Esporta codici",
+  "importLabel": "Importa",
   "importInstruction": "Per favore seleziona un file contenente una lista dei tuoi codici nel seguente formato",
   "importCodeDelimiterInfo": "I codici possono essere separati da una virgola o da una nuova riga",
   "selectFile": "Seleziona file",
+  "emailVerificationToggle": "Verifica email",
+  "authToChangeEmailVerificationSetting": "Autenticati per cambiare la verifica email",
   "authToViewYourRecoveryKey": "Autenticati per visualizzare la tua chiave di recupero",
   "authToChangeYourEmail": "Autenticati per cambiare la tua email",
   "authToChangeYourPassword": "Autenticati per cambiare la tua password",
@@ -81,6 +102,7 @@
   "no": "No",
   "email": "Email",
   "support": "Supporto",
+  "general": "Generali",
   "settings": "Impostazioni",
   "copied": "Copiato",
   "pleaseTryAgain": "Per favore riprova",
@@ -90,6 +112,18 @@
   "enterYourPasswordHint": "Inserisci la tua password",
   "forgotPassword": "Password dimenticata",
   "oops": "Oops",
+  "suggestFeatures": "Suggerisci funzionalità",
+  "faq": "FAQ",
+  "faq_q_1": "Quanto è sicuro ente Auth?",
+  "faq_a_1": "Tutti i codici di cui fai il backup tramite ente sono memorizzati con crittografia end-to-end. Ciò significa che solo tu puoi accedere ai tuoi codici. Le nostre app sono open source e la nostra crittografia è stata verificata esternamente.",
+  "faq_q_2": "Posso accedere ai miei codici sul desktop?",
+  "faq_a_2": "Puoi accedere ai tuoi codici sul web @ auth.ente.io.",
+  "faq_q_3": "Come posso cancellare i codici?",
+  "faq_a_3": "Puoi eliminare un codice scorrendo il dito a sinistra sul codice in questione.",
+  "faq_q_4": "Come posso supportare questo progetto?",
+  "faq_a_4": "Puoi supportare lo sviluppo di questo progetto abbonandoti alla nostra app Photos @ ente.io.",
+  "faq_q_5": "Come posso abilitare il blocco FaceID in ente Auth",
+  "faq_a_5": "Puoi abilitare il blocco FaceID in Impostazioni → Sicurezza → Schermata di blocco.",
   "somethingWentWrongMessage": "Qualcosa è andato storto, per favore riprova",
   "leaveFamily": "Abbandona il piano famiglia",
   "leaveFamilyMessage": "Sei sicuro di voler uscire dal piano famiglia?",
@@ -105,7 +139,7 @@
   "recoverAccount": "Recupera account",
   "enterRecoveryKeyHint": "Inserisci la tua chiave di recupero",
   "recover": "Recupera",
-  "contactSupportViaEmailMessage": "Per favore invia un'email a {email} dal tuo indirizzo email registrato",
+  "contactSupportViaEmailMessage": "Per favore invia un'email a {email} dall'indirizzo email con cui sei registrato",
   "@contactSupportViaEmailMessage": {
     "placeholders": {
       "email": {
@@ -150,12 +184,14 @@
   "enterDetailsManually": "Inserisci i dettagli manualmente",
   "edit": "Modifica",
   "copiedToClipboard": "Copiato negli appunti",
+  "copiedNextToClipboard": "Copiato il codice successivo negli appunti",
   "error": "Errore",
   "recoveryKeyCopiedToClipboard": "Chiave di recupero copiata negli appunti",
   "recoveryKeyOnForgotPassword": "Se dimentichi la password, l'unico modo per recuperare i tuoi dati è con questa chiave.",
   "recoveryKeySaveDescription": "Non memorizziamo questa chiave, per favore salva questa chiave di 24 parole in un posto sicuro.",
   "doThisLater": "Fallo più tardi",
   "saveKey": "Salva chiave",
+  "back": "Indietro",
   "createAccount": "Crea account",
   "passwordStrength": "Forza password: {passwordStrengthValue}",
   "@passwordStrength": {
@@ -219,6 +255,10 @@
   "privacy": "Privacy",
   "terms": "Termini",
   "checkForUpdates": "Controlla aggiornamenti",
+  "downloadUpdate": "Scarica",
+  "criticalUpdateAvailable": "Un aggiornamento importante è disponibile",
+  "updateAvailable": "Aggiornamento disponibile",
+  "update": "Aggiorna",
   "checking": "Controllo...",
   "youAreOnTheLatestVersion": "Stai utilizzando l'ultima versione",
   "warning": "Attenzione",
@@ -263,5 +303,31 @@
   "thisWillLogYouOutOfTheFollowingDevice": "Questo ti disconnetterà dal seguente dispositivo:",
   "terminateSession": "Termina sessione?",
   "terminate": "Termina",
-  "thisDevice": "Questo dispositivo"
+  "thisDevice": "Questo dispositivo",
+  "toResetVerifyEmail": "Per reimpostare la tua password, prima verifica la tua email.",
+  "thisEmailIsAlreadyInUse": "Questa email é già in uso",
+  "verificationFailedPleaseTryAgain": "Verifica fallita, per favore riprova",
+  "yourVerificationCodeHasExpired": "Il tuo codice di verifica è scaduto",
+  "incorrectCode": "Codice errato",
+  "sorryTheCodeYouveEnteredIsIncorrect": "Spiacenti, il codice che hai inserito non è corretto",
+  "emailChangedTo": "Email modificata in {newEmail}",
+  "authenticationFailedPleaseTryAgain": "Autenticazione non riuscita, riprova",
+  "authenticationSuccessful": "Autenticazione riuscita!",
+  "twofactorAuthenticationSuccessfullyReset": "Autenticazione a due fattori ripristinata con successo",
+  "incorrectRecoveryKey": "Chiave di recupero errata",
+  "theRecoveryKeyYouEnteredIsIncorrect": "La chiave di recupero che hai inserito non è corretta",
+  "enterPassword": "Inserisci la password",
+  "selectExportFormat": "Seleziona formato di esportazione",
+  "exportDialogDesc": "Le esportazioni criptate saranno protette da una password a tua scelta.",
+  "encrypted": "Criptato",
+  "plainText": "Testo in chiaro",
+  "passwordToEncryptExport": "Password per criptare il file esportato",
+  "export": "Esporta",
+  "useOffline": "Utilizzare senza backup",
+  "signInToBackup": "Accedi per salvare i tuoi codici",
+  "singIn": "Accedi",
+  "sigInBackupReminder": "Si prega di esportare i codici per assicurarsi di avere un backup da cui è possibile ripristinare.",
+  "offlineModeWarning": "Hai scelto di procedere senza backup. Si prega di eseguire backup manuali per assicurarsi che i codici siano al sicuro.",
+  "showLargeIcons": "Mostra icone grandi",
+  "focusOnSearchBar": "Apri ricerca all'avvio dell'app"
 }

lib/l10n/arb/app_nl.arb

@@ -9,8 +9,13 @@
   "onBoardingGetStarted": "Begin",
   "setupFirstAccount": "Maak je account aan",
   "importScanQrCode": "Scan een QR-code",
+  "qrCode": "QR Code",
   "importEnterSetupKey": "Voer een toegangssleutel in",
   "importAccountPageTitle": "Accountgegevens invoeren",
+  "secretCanNotBeEmpty": "Geheime code mag niet leeg zijn",
+  "bothIssuerAndAccountCanNotBeEmpty": "Uitgever en account kunnen niet beiden leeg zijn",
+  "incorrectDetails": "Onjuiste gegevens",
+  "pleaseVerifyDetails": "Controleer je gegevens en probeer het nog eens",
   "codeIssuerHint": "Uitgever",
   "codeSecretKeyHint": "Geheime sleutel",
   "codeAccountHint": "Account (jij@domein.nl)",
@@ -53,6 +58,9 @@
     }
   },
   "contactSupport": "Klantenservice",
+  "rateUsOnStore": "Beoordeel ons op {storeName}",
+  "blog": "Blog",
+  "merchandise": "Merchandise",
   "verifyPassword": "Bevestig wachtwoord",
   "pleaseWait": "Een ogenblik geduld...",
   "generatingEncryptionKeysTitle": "Encryptiesleutels genereren...",
@@ -68,10 +76,23 @@
   "changePassword": "Wachtwoord wijzigen",
   "data": "Gegevens",
   "importCodes": "Codes importeren",
+  "importTypePlainText": "Kale tekst",
+  "importTypeEnteEncrypted": "ente versleutelde export",
+  "passwordForDecryptingExport": "Wachtwoord voor het decoderen van export",
+  "passwordEmptyError": "Wachtwoord kan niet leeg zijn",
+  "importFromApp": "Importeer codes van {appName}",
+  "importGoogleAuthGuide": "Exporteer uw accounts van Google Authenticator naar een QR-code met behulp van de optie \"Transfer Accounts\". Met een ander apparaat scan je de QR-code.\n\nTip: Je kunt de webcam van je laptop gebruiken om een foto van de QR-code te maken.",
+  "importSelectJsonFile": "Selecteer JSON bestand",
+  "importEnteEncGuide": "Selecteer het versleutelde JSON-bestand dat vanuit ente geëxporteerd is",
+  "importRaivoGuide": "Gebruik de optie \"Export OTPs to Zip archive\" in Raivo's instellingen.\n\nPak het zip-bestand uit en importeer het JSON-bestand.",
+  "importAegisGuide": "Gebruik de optie \"Exporteer de kluis\" in de instellingen van Aegis.\n\nAls uw kluis is versleuteld, moet u het wachtwoord invoeren om de kluis te ontsleutelen.",
   "exportCodes": "Codes exporteren",
+  "importLabel": "Importeren",
   "importInstruction": "Selecteer een bestand dat een lijst van uw codes in de volgende indeling bevat",
   "importCodeDelimiterInfo": "De codes mogen gescheiden worden door een komma of een nieuwe regel",
   "selectFile": "Bestand selecteren",
+  "emailVerificationToggle": "E-mailverificatie",
+  "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",
   "authToChangeYourPassword": "Graag verifiëren om je wachtwoord te wijzigen",
@@ -81,6 +102,7 @@
   "no": "Nee",
   "email": "E-mail",
   "support": "Ondersteuning",
+  "general": "Algemeen",
   "settings": "Instellingen",
   "copied": "Gekopieerd",
   "pleaseTryAgain": "Probeer het nog eens",
@@ -90,6 +112,18 @@
   "enterYourPasswordHint": "Voer je wachtwoord in",
   "forgotPassword": "Wachtwoord vergeten",
   "oops": "Oeps",
+  "suggestFeatures": "Features voorstellen",
+  "faq": "Veelgestelde vragen",
+  "faq_q_1": "Hoe veilig is ente Auth?",
+  "faq_a_1": "Alle codes in ente zijn versleuteld opgeslagen met end-to-end encryptie. Dit betekent dat alleen jij toegang hebt tot je codes. Onze apps zijn open source en onze cryptografie is extern gecontroleerd.",
+  "faq_q_2": "Kan ik toegang krijgen tot mijn codes op desktop?",
+  "faq_a_2": "U heeft toegang tot uw codes op het web @ auth.ente.io.",
+  "faq_q_3": "Hoe kan ik codes verwijderen?",
+  "faq_a_3": "Je kunt een code verwijderen door naar links te vegen op dat item.",
+  "faq_q_4": "Hoe kan ik dit project steunen?",
+  "faq_a_4": "U kunt de ontwikkeling van dit project steunen door u te abonneren op onze Photos app @ ente.io.",
+  "faq_q_5": "Hoe kan ik FaceID lock inschakelen in ente Auth",
+  "faq_a_5": "Je kunt FaceID vergrendelen onder Instellingen → Beveiliging → Lockscreen.",
   "somethingWentWrongMessage": "Er is iets fout gegaan, probeer het opnieuw",
   "leaveFamily": "Familie verlaten",
   "leaveFamilyMessage": "Weet je zeker dat je het familie-plan wil verlaten?",
@@ -150,12 +184,14 @@
   "enterDetailsManually": "Voer gegevens handmatig in",
   "edit": "Bewerken",
   "copiedToClipboard": "Gekopieerd naar klembord",
+  "copiedNextToClipboard": "Volgende code gekopieerd naar klembord",
   "error": "Foutmelding",
   "recoveryKeyCopiedToClipboard": "Herstelsleutel gekopieerd naar klembord",
   "recoveryKeyOnForgotPassword": "Als je je wachtwoord vergeet, kun je alleen met deze code je gegevens herstellen.",
   "recoveryKeySaveDescription": "We slaan deze code niet op, bewaar deze code met 24 woorden op een veilige plaats.",
   "doThisLater": "Doe dit later",
   "saveKey": "Sleutel opslaan",
+  "back": "Terug",
   "createAccount": "Account aanmaken",
   "passwordStrength": "Wachtwoord sterkte: {passwordStrengthValue}",
   "@passwordStrength": {
@@ -219,6 +255,10 @@
   "privacy": "Privacy",
   "terms": "Voorwaarden",
   "checkForUpdates": "Controleer op updates",
+  "downloadUpdate": "Downloaden",
+  "criticalUpdateAvailable": "Belangrijke update beschikbaar",
+  "updateAvailable": "Update beschikbaar",
+  "update": "Update",
   "checking": "Controleren...",
   "youAreOnTheLatestVersion": "Je hebt de meest recente versie",
   "warning": "Waarschuwing",
@@ -263,5 +303,31 @@
   "thisWillLogYouOutOfTheFollowingDevice": "Dit zal je uitloggen van het volgende apparaat:",
   "terminateSession": "Sessie beëindigen?",
   "terminate": "Beëindigen",
-  "thisDevice": "Dit apparaat"
+  "thisDevice": "Dit apparaat",
+  "toResetVerifyEmail": "Verifieer eerst je e-mailadres om je wachtwoord opnieuw in te stellen.",
+  "thisEmailIsAlreadyInUse": "Dit e-mailadres is al in gebruik",
+  "verificationFailedPleaseTryAgain": "Verificatie mislukt, probeer het opnieuw",
+  "yourVerificationCodeHasExpired": "Uw verificatiecode is verlopen",
+  "incorrectCode": "Onjuiste code",
+  "sorryTheCodeYouveEnteredIsIncorrect": "Sorry, de ingevoerde code is onjuist",
+  "emailChangedTo": "E-mailadres gewijzigd naar {newEmail}",
+  "authenticationFailedPleaseTryAgain": "Verificatie mislukt, probeer het opnieuw",
+  "authenticationSuccessful": "Verificatie geslaagd!",
+  "twofactorAuthenticationSuccessfullyReset": "Tweestapsverificatie succesvol gereset",
+  "incorrectRecoveryKey": "Onjuiste herstelsleutel",
+  "theRecoveryKeyYouEnteredIsIncorrect": "De ingevoerde herstelsleutel is onjuist",
+  "enterPassword": "Voer wachtwoord in",
+  "selectExportFormat": "Selecteer export formaat",
+  "exportDialogDesc": "Versleutelde exports worden beschermd door een wachtwoord van uw keuze.",
+  "encrypted": "Versleuteld",
+  "plainText": "Kale tekst",
+  "passwordToEncryptExport": "Wachtwoord voor het versleutelen van export",
+  "export": "Exporteren",
+  "useOffline": "Gebruik zonder back-ups",
+  "signInToBackup": "Meld je aan voor back-ups van je codes",
+  "singIn": "Aanmelden",
+  "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",
+  "focusOnSearchBar": "Focus zoekveld na starten app"
 }

lib/l10n/arb/app_ru.arb

@@ -9,8 +9,13 @@
   "onBoardingGetStarted": "Начать",
   "setupFirstAccount": "Настройте свой первый аккаунт",
   "importScanQrCode": "Сканировать QR-код",
-  "importEnterSetupKey": "Введите ключ установки",
+  "qrCode": "QR-код",
+  "importEnterSetupKey": "Ввести ключ настройки",
   "importAccountPageTitle": "Введите данные аккаунта",
+  "secretCanNotBeEmpty": "Секретный код не может быть пустым",
+  "bothIssuerAndAccountCanNotBeEmpty": "И эмитент, и аккаунт не могут быть пустыми",
+  "incorrectDetails": "Неправильные данные",
+  "pleaseVerifyDetails": "Пожалуйста, проверьте детали и попробуйте еще раз",
   "codeIssuerHint": "Эмитент",
   "codeSecretKeyHint": "Секретный ключ",
   "codeAccountHint": "Аккаунт (you@domain.com)",
@@ -53,6 +58,9 @@
     }
   },
   "contactSupport": "Связаться с поддержкой",
+  "rateUsOnStore": "Оценить нас на {storeName}",
+  "blog": "Блог",
+  "merchandise": "Товары",
   "verifyPassword": "Подтверждение пароля",
   "pleaseWait": "Пожалуйста, подождите...",
   "generatingEncryptionKeysTitle": "Генерируем ключи шифрования...",
@@ -64,14 +72,27 @@
   "madeWithLoveAtPrefix": "сделана с ❤️ в ",
   "supportDevs": "Подпишитесь на <bold-green>ente</bold-green> для поддержки этого проекта.",
   "supportDiscount": "Используйте код скидки \"AUTH\", чтобы получить скидку 10% в первый год",
-  "changeEmail": "изменить почту",
+  "changeEmail": "Изменить почту",
   "changePassword": "Изменить пароль",
   "data": "Данные",
   "importCodes": "Импортировать коды",
+  "importTypePlainText": "Обычный текст",
+  "importTypeEnteEncrypted": "ente Зашифрованный экспорт",
+  "passwordForDecryptingExport": "Пароль для расшифровки экспорта",
+  "passwordEmptyError": "Пароль не может быть пустым",
+  "importFromApp": "Импорт кодов из {appName}",
+  "importGoogleAuthGuide": "Экспортируйте учетные записи из Google Authenticator в QR-код, используя опцию «Перенести учетные записи». Затем с помощью другого устройства отсканируйте QR-код.\n\nСовет: Чтобы сфотографировать QR-код, можно воспользоваться веб-камерой ноутбука.",
+  "importSelectJsonFile": "Выбрать JSON-файл",
+  "importEnteEncGuide": "Выберите зашифрованный JSON-файл, экспортированный из ente",
+  "importRaivoGuide": "Используйте опцию «Export OTPs to Zip archive» в настройках Raivo.\n\nРаспакуйте zip-архив и импортируйте JSON-файл.",
+  "importAegisGuide": "Используйте опцию «Экспортировать хранилище» в настройках Aegis.\n\nЕсли ваше хранилище зашифровано, то для его расшифровки потребуется ввести пароль хранилища.",
   "exportCodes": "Экспортировать коды",
+  "importLabel": "Импорт",
   "importInstruction": "Пожалуйста, выберите файл, содержащий список ваших кодов в следующем формате",
   "importCodeDelimiterInfo": "Коды могут быть разделены запятой или новой строкой",
-  "selectFile": "Выберите файл",
+  "selectFile": "Выбрать файл",
+  "emailVerificationToggle": "Подтверждение электронной почты",
+  "authToChangeEmailVerificationSetting": "Авторизуйтесь, чтобы изменить подтверждение электронной почты",
   "authToViewYourRecoveryKey": "Пожалуйста, авторизуйтесь для просмотра вашего ключа восстановления",
   "authToChangeYourEmail": "Пожалуйста, авторизуйтесь, чтобы изменить адрес электронной почты",
   "authToChangeYourPassword": "Пожалуйста, авторизуйтесь, чтобы изменить пароль",
@@ -90,6 +111,18 @@
   "enterYourPasswordHint": "Введите пароль",
   "forgotPassword": "Забыл пароль",
   "oops": "Ой",
+  "suggestFeatures": "Предложить улучшения",
+  "faq": "FAQ",
+  "faq_q_1": "Насколько безопасен ente Auth?",
+  "faq_a_1": "Все коды, которые вы резервируете с помощью ente, хранятся в зашифрованном виде. Это означает, что только вы можете получить доступ к своим кодам. Наши приложения имеют открытый исходный код, а наша криптография прошла внешний аудит.",
+  "faq_q_2": "Могу ли я получить доступ к моим кодам на компьютере?",
+  "faq_a_2": "Вы можете получить доступ к своим кодам на сайте @ auth.ente.io.",
+  "faq_q_3": "Как я могу удалить коды?",
+  "faq_a_3": "Вы можете удалить код, проведя пальцем влево по этому элементу.",
+  "faq_q_4": "Как я могу поддержать этот проект?",
+  "faq_a_4": "Вы можете поддержать развитие этого проекта, подписавшись на наше приложение Photos @ ente.io.",
+  "faq_q_5": "Как мне включить блокировку FaceID в ente Auth?",
+  "faq_a_5": "Вы можете включить блокировку FaceID в Настройки → Безопасность → Экран блокировки.",
   "somethingWentWrongMessage": "Что-то пошло не так. Попробуйте еще раз",
   "leaveFamily": "Покинуть семью",
   "leaveFamilyMessage": "Вы уверены, что хотите отказаться от семейного плана?",
@@ -156,6 +189,7 @@
   "recoveryKeySaveDescription": "Мы не храним этот ключ, пожалуйста, сохраните этот ключ в безопасном месте.",
   "doThisLater": "Сделать позже",
   "saveKey": "Сохранить ключ",
+  "back": "Вернуться",
   "createAccount": "Создать аккаунт",
   "passwordStrength": "Мощность пароля: {passwordStrengthValue}",
   "@passwordStrength": {
@@ -263,5 +297,24 @@
   "thisWillLogYouOutOfTheFollowingDevice": "Вы выйдете из списка следующих устройств:",
   "terminateSession": "Завершить сеанс?",
   "terminate": "Завершить",
-  "thisDevice": "Это устройство"
+  "thisDevice": "Это устройство",
+  "toResetVerifyEmail": "Чтобы сбросить пароль, сначала подтвердите свой адрес электронной почты.",
+  "thisEmailIsAlreadyInUse": "Этот адрес электронной почты уже используется",
+  "verificationFailedPleaseTryAgain": "Проверка не удалась, попробуйте еще раз",
+  "yourVerificationCodeHasExpired": "Срок действия вашего проверочного кода истек",
+  "incorrectCode": "Неверный код",
+  "sorryTheCodeYouveEnteredIsIncorrect": "Извините, введенный вами код неверный",
+  "emailChangedTo": "Адрес электронной почты изменен на {newEmail}",
+  "authenticationFailedPleaseTryAgain": "Аутентификация не удалась, попробуйте еще раз",
+  "authenticationSuccessful": "Аутентификация прошла успешно!",
+  "twofactorAuthenticationSuccessfullyReset": "Двухфакторная аутентификация успешно сброшена",
+  "incorrectRecoveryKey": "Неправильный ключ восстановления",
+  "theRecoveryKeyYouEnteredIsIncorrect": "Введен неправильный ключ восстановления",
+  "enterPassword": "Введите пароль",
+  "selectExportFormat": "Выбрать формат экспорта",
+  "exportDialogDesc": "Зашифрованные экспортированные данные будут защищены паролем, который вы выберете.",
+  "encrypted": "Зашифрованный",
+  "plainText": "Обычный текст",
+  "passwordToEncryptExport": "Пароль для шифрования экспорта",
+  "export": "Экспорт"
 }

lib/l10n/arb/app_tr.arb

@@ -9,8 +9,11 @@
   "onBoardingGetStarted": "Başlayın",
   "setupFirstAccount": "İlk hesabınızı ekleyin",
   "importScanQrCode": "Karekodu tara",
+  "qrCode": "QR Kodu",
   "importEnterSetupKey": "Kurulum anahtarını giriniz",
   "importAccountPageTitle": "Hesap bilgilerinizi girin",
+  "incorrectDetails": "Bilgiler yanlış",
+  "pleaseVerifyDetails": "Lütfen bilgileri doğrulayın ve tekrar deneyin",
   "codeIssuerHint": "Yayınlayan",
   "codeSecretKeyHint": "Gizli Anahtar",
   "codeAccountHint": "Hesap (örnek@domain.com)",
@@ -24,7 +27,7 @@
   "timeBasedKeyType": "Zaman tabanlı (TOTP)",
   "counterBasedKeyType": "Sayaç tabanlı (HOTP)",
   "saveAction": "Kaydet",
-  "nextTotpTitle": "ileri",
+  "nextTotpTitle": "sonraki",
   "deleteCodeTitle": "Kodu silmek istiyor musunuz?",
   "deleteCodeMessage": "Bu kodu silmek istediğinize emin misiniz? Bu geri alınamaz bir işlemdir.",
   "viewLogsAction": "Günlüğü görüntüle",
@@ -53,6 +56,9 @@
     }
   },
   "contactSupport": "Destek ekibiyle iletişime geçin",
+  "rateUsOnStore": "Bizi {storeName} üzerinden değerlendirin",
+  "blog": "Blog",
+  "merchandise": "Ürünler",
   "verifyPassword": "Şifreyi doğrulayın",
   "pleaseWait": "Lütfen bekleyin...",
   "generatingEncryptionKeysTitle": "Şifreleme anahtarları üretiliyor...",
@@ -67,11 +73,24 @@
   "changeEmail": "E-postayı değiştir",
   "changePassword": "Şifreyi değiştir",
   "data": "Veriler",
-  "importCodes": "Kodu İçe Aktar",
+  "importCodes": "Kodu içe aktar",
+  "importTypePlainText": "Düz metin",
+  "importTypeEnteEncrypted": "ente Şifreli dışa aktarma",
+  "passwordForDecryptingExport": "Dışa aktarımın şifresini çözmek için parola",
+  "passwordEmptyError": "Şifre boş olamaz",
+  "importFromApp": "Kodları {appName} uygulamasından içe aktarın",
+  "importGoogleAuthGuide": "\"Hesapları Aktar\" seçeneğini kullanarak hesaplarınızı Google Authenticator'dan bir QR koduna aktarın. Ardından başka bir cihaz kullanarak QR kodunu tarayın.\n\nİpucu: QR kodunun fotoğrafını çekmek için dizüstü bilgisayarınızın kamerasını kullanabilirsiniz.",
+  "importSelectJsonFile": "JSON dosyasını seçin",
+  "importEnteEncGuide": "Ente'den dışa aktarılan şifrelenmiş JSON dosyasını seçin",
+  "importRaivoGuide": "Raivo'nun ayarlarında \"OTP'leri Zip arşivine aktar\" seçeneğini kullanın.\n\nZip dosyasını çıkarın ve JSON dosyasını içe aktarın.",
+  "importAegisGuide": "Aegis'in Ayarlarında \"Kasayı dışa aktar\" seçeneğini kullanın.\n\nKasanız şifrelenmişse, kasanın şifresini çözmek için kasa parolasını girmeniz gerekecektir.",
   "exportCodes": "Kodu dışa aktar",
+  "importLabel": "İçe aktar",
   "importInstruction": "Lütfen aşağıdaki şekilde kodlarınızın listesini içeren dosyayı seçiniz",
   "importCodeDelimiterInfo": "Kodlar, virgülle ya da yeni bir satırla ayrılabilir",
   "selectFile": "Dosya seç",
+  "emailVerificationToggle": "E-posta doğrulama",
+  "authToChangeEmailVerificationSetting": "E-posta doğrulamasını değiştirmek için lütfen kimlik doğrulaması yapın",
   "authToViewYourRecoveryKey": "Kurtarma anahtarınızı görmek için lütfen kimliğinizi doğrulayın",
   "authToChangeYourEmail": "Epostanızı değiştirmek için lütfen kimliğinizi doğrulayın",
   "authToChangeYourPassword": "Şifrenizi değiştirmek için lütfen kimliğinizi doğrulayın",
@@ -90,6 +109,18 @@
   "enterYourPasswordHint": "Parolanızı girin",
   "forgotPassword": "Şifremi unuttum",
   "oops": "Hay aksi",
+  "suggestFeatures": "Özellik önerin",
+  "faq": "SSS",
+  "faq_q_1": "Ente Auth ne kadar güvenli?",
+  "faq_a_1": "Ente aracılığıyla yedeklediğiniz tüm kodlar uçtan uca şifrelenmiş olarak saklanır. Bu, kodlarınıza yalnızca sizin erişebileceğiniz anlamına gelir. Uygulamalarımız açık kaynaklıdır ve kriptografimiz harici olarak denetlenmiştir.",
+  "faq_q_2": "Kodlarıma masaüstünden erişebilir miyim?",
+  "faq_a_2": "Kodlarınıza internet üzerinden @ auth.ente.io adresinden erişebilirsiniz.",
+  "faq_q_3": "Kodları nasıl silebilirim?",
+  "faq_a_3": "Bir kodu, o öğenin üzerinde sola kaydırarak silebilirsiniz.",
+  "faq_q_4": "Bu projeye nasıl destek olabilirim?",
+  "faq_a_4": "Fotoğraflar uygulamamıza @ ente.io abone olarak bu projenin geliştirilmesine destek olabilirsiniz.",
+  "faq_q_5": "FaceID kilidini ente Auth'ta nasıl etkinleştirebilirim",
+  "faq_a_5": "FaceID kilidini Ayarlar → Güvenlik → Kilit Ekranı altında etkinleştirebilirsiniz.",
   "somethingWentWrongMessage": "Bir şeyler ters gitti, lütfen tekrar deneyin",
   "leaveFamily": "Aile planından ayrıl",
   "leaveFamilyMessage": "Aile planından ayrılmak istediğinize emin misiniz?",
@@ -133,7 +164,7 @@
   "close": "Kapat",
   "oopsSomethingWentWrong": "Hay aksi, bir sorun oluştu.",
   "selectLanguage": "Dil Seçin",
-  "language": "Language",
+  "language": "Dil",
   "social": "Sosyal Medya",
   "security": "Güvenlik",
   "lockscreen": "Kilit ekranı",
@@ -156,6 +187,7 @@
   "recoveryKeySaveDescription": "Biz bu anahtarı saklamıyoruz, lütfen. bu 24 kelimelik anahtarı güvenli bir yerde saklayın.",
   "doThisLater": "Bunu daha sonra yap",
   "saveKey": "Anahtarı kaydet",
+  "back": "Geri",
   "createAccount": "Hesap oluştur",
   "passwordStrength": "Şifre gücü: {passwordStrengthValue}",
   "@passwordStrength": {
@@ -214,6 +246,7 @@
   "enterYourRecoveryKey": "Kurtarma anahtarınızı girin",
   "tempErrorContactSupportIfPersists": "Bir şeyler ters gitmiş gibi görünüyor. Lütfen bir süre sonra tekrar deneyin. Hata devam ederse, lütfen destek ekibimizle iletişime geçin.",
   "itLooksLikeSomethingWentWrongPleaseRetryAfterSome": "Bir şeyler ters gitmiş gibi görünüyor. Lütfen bir süre sonra tekrar deneyin. Hata devam ederse, lütfen destek ekibimizle iletişime geçin.",
+  "about": "Hakkında",
   "weAreOpenSource": "Biz açık kaynağız!",
   "privacy": "Gizlilik",
   "terms": "Şartlar",
@@ -238,6 +271,7 @@
       }
     }
   },
+  "sorry": "Üzgünüz",
   "importFailureDesc": "Seçilen dosya ayrıştırılamadı.\nYardıma ihtiyacınız varsa lütfen support@ente.io adresine yazın!",
   "pendingSyncs": "Uyarı",
   "pendingSyncsWarningBody": "Kodlarınızdan bazıları yedeklenmemiş.\n\nLütfen oturumu kapatmadan önce bu kodların yedeğini aldığınızdan emin olun.",
@@ -257,7 +291,28 @@
   },
   "activeSessions": "Aktif oturumlar",
   "somethingWentWrongPleaseTryAgain": "Bir şeyler ters gitti, lütfen tekrar deneyin",
+  "thisWillLogYouOutOfThisDevice": "Bu sizin bu cihazdaki oturumunuzu kapatacaktır!",
+  "thisWillLogYouOutOfTheFollowingDevice": "Bu, aşağıdaki cihazdan çıkış yapmanızı sağlayacaktır:",
   "terminateSession": "Oturumu sonlandır?",
   "terminate": "Sonlandır",
-  "thisDevice": "Bu cihaz"
+  "thisDevice": "Bu cihaz",
+  "toResetVerifyEmail": "Şifrenizi sıfırlamak için lütfen önce e-postanızı doğrulayın.",
+  "thisEmailIsAlreadyInUse": "Bu e-posta zaten kullanılıyor",
+  "verificationFailedPleaseTryAgain": "Doğrulama başarısız oldu, lütfen tekrar deneyin",
+  "yourVerificationCodeHasExpired": "Doğrulama kodunuzun süresi doldu",
+  "incorrectCode": "Yanlış kod",
+  "sorryTheCodeYouveEnteredIsIncorrect": "Üzgünüz, girdiğiniz kod yanlış",
+  "emailChangedTo": "E-posta {newEmail} olarak değiştirildi",
+  "authenticationFailedPleaseTryAgain": "Kimlik doğrulama başarısız oldu, lütfen tekrar deneyin",
+  "authenticationSuccessful": "Kimlik doğrulama başarılı!",
+  "twofactorAuthenticationSuccessfullyReset": "İki faktörlü kimlik doğrulama başarıyla sıfırlandı",
+  "incorrectRecoveryKey": "Yanlış kurtarma kodu",
+  "theRecoveryKeyYouEnteredIsIncorrect": "Girdiğiniz kurtarma kodu yanlış",
+  "enterPassword": "Şifreyi girin",
+  "selectExportFormat": "Dışa aktarma formatını seç",
+  "exportDialogDesc": "Şifrelenmiş dışa aktarımlar seçtiğiniz bir parola ile korunacaktır.",
+  "encrypted": "Şifreli",
+  "plainText": "Düz metin",
+  "passwordToEncryptExport": "Dışa aktarımı şifrelemek için parola",
+  "export": "Dışa aktar"
 }

lib/l10n/arb/app_vi.arb

@@ -0,0 +1,271 @@
+{
+  "account": "Tài khoản",
+  "recoveryKey": "Khóa khôi phục",
+  "counterAppBarTitle": "Bộ Đếm",
+  "@counterAppBarTitle": {
+    "description": "Text shown in the AppBar of the Counter Page"
+  },
+  "onBoardingBody": "Bảo mật mã 2FA của bạn",
+  "onBoardingGetStarted": "Bắt đầu",
+  "setupFirstAccount": "Thiết lập tài khoản đầu tiên của bạn",
+  "importScanQrCode": "Quét mã QR",
+  "importEnterSetupKey": "Nhập khóa thiết lập",
+  "importAccountPageTitle": "Nhập chi tiết tài khoản",
+  "secretCanNotBeEmpty": "Khoá bí mật không được để trống",
+  "bothIssuerAndAccountCanNotBeEmpty": "Cả nhà phát hành và tài khoản không được để trống",
+  "incorrectDetails": "Thông tin chi tiết không chính xác",
+  "pleaseVerifyDetails": "Vui lòng xác minh chi tiết và thử lại",
+  "codeIssuerHint": "Nhà phát hành",
+  "codeSecretKeyHint": "Khóa bí mật",
+  "codeAccountHint": "Tài khoản (bạn@miền.com)",
+  "accountKeyType": "Loại khóa",
+  "sessionExpired": "Phiên làm việc đã hết hạn",
+  "@sessionExpired": {
+    "description": "Title of the dialog when the users current session is invalid/expired"
+  },
+  "pleaseLoginAgain": "Vui lòng đăng nhập lại",
+  "loggingOut": "Đang thoát...",
+  "timeBasedKeyType": "Dựa trên thời gian (TOTP)",
+  "counterBasedKeyType": "Dựa trên bộ đếm (HOTP)",
+  "saveAction": "Lưu",
+  "nextTotpTitle": "tiếp",
+  "deleteCodeTitle": "Xóa mã?",
+  "deleteCodeMessage": "Bạn có chắc chắn muốn xóa mã này không? Hành động này không thể đảo ngược.",
+  "viewLogsAction": "Xem các bản ghi",
+  "sendLogsDescription": "Thao tác này sẽ gửi nhật ký để giúp chúng tôi gỡ lỗi sự cố của bạn. Mặc dù chúng tôi thực hiện các biện pháp phòng ngừa để đảm bảo rằng thông tin nhạy cảm không được ghi lại, nhưng chúng tôi khuyến khích bạn xem các nhật ký này trước khi chia sẻ chúng.",
+  "preparingLogsTitle": "Đang chuẩn bị nhật ký...",
+  "emailLogsTitle": "Nhật ký email",
+  "emailLogsMessage": "Vui lòng gửi nhật ký tới {email}",
+  "@emailLogsMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "copyEmailAction": "Sao chép email",
+  "exportLogsAction": "Xuất nhật ký",
+  "reportABug": "Báo cáo lỗi",
+  "crashAndErrorReporting": "Báo cáo sự cố và lỗi",
+  "reportBug": "Báo lỗi",
+  "emailUsMessage": "Vui lòng gửi email cho chúng tôi tại {email}",
+  "@emailUsMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "contactSupport": "Liên hệ hỗ trợ",
+  "verifyPassword": "Xác nhận mật khẩu",
+  "pleaseWait": "Vui lòng chờ...",
+  "generatingEncryptionKeysTitle": "Đang tạo khóa mã hóa...",
+  "recreatePassword": "Tạo lại mật khẩu",
+  "recreatePasswordMessage": "Thiết bị hiện tại không đủ mạnh để xác minh mật khẩu của bạn, vì vậy chúng tôi cần tạo lại mật khẩu một lần theo cách hoạt động với tất cả các thiết bị. \n\nVui lòng đăng nhập bằng khóa khôi phục và tạo lại mật khẩu của bạn (bạn có thể sử dụng lại cùng một mật khẩu nếu muốn).",
+  "useRecoveryKey": "Dùng khóa khôi phục",
+  "incorrectPasswordTitle": "Mật khẩu không đúng",
+  "welcomeBack": "Chào mừng trở lại!",
+  "madeWithLoveAtPrefix": "được làm bằng ❤️ tại ",
+  "supportDevs": "Đăng ký <bold-green>ente</bold-green> để hỗ trợ dự án này.",
+  "supportDiscount": "Sử dụng mã giảm giá \"AUTH\" để được giảm 10% trong năm đầu tiên",
+  "changeEmail": "Thay đổi email",
+  "changePassword": "Thay đổi mật khẩu",
+  "data": "Dữ liệu",
+  "importCodes": "Nhập mã",
+  "exportCodes": "Xuất mã",
+  "importInstruction": "Vui lòng chọn tệp chứa danh sách mã của bạn ở định dạng sau",
+  "importCodeDelimiterInfo": "Các mã có thể được phân tách bằng một dấu phẩy hoặc một dòng mới",
+  "selectFile": "Chọn tập tin",
+  "authToViewYourRecoveryKey": "Vui lòng xác thực để xem khóa khôi phục của bạn",
+  "authToChangeYourEmail": "Vui lòng xác thực để thay đổi email của bạn",
+  "authToChangeYourPassword": "Vui lòng xác thực để thay đổi mật khẩu của bạn",
+  "ok": "Được rồi",
+  "cancel": "Hủy",
+  "yes": "Đúng",
+  "no": "Không",
+  "email": "Thư điện tử",
+  "support": "Hỗ trợ",
+  "settings": "Cài đặt",
+  "copied": "\u001dĐã sao chép",
+  "pleaseTryAgain": "Vui lòng thử lại",
+  "existingUser": "Người dùng hiện tại",
+  "newUser": "Mới tham gia ente",
+  "delete": "Xóa",
+  "enterYourPasswordHint": "Nhập mật khẩu của bạn",
+  "forgotPassword": "Quên mật khẩu",
+  "oops": "Rất tiếc",
+  "somethingWentWrongMessage": "Phát hiện có lỗi, xin thử lại",
+  "leaveFamily": "Rời khỏi gia đình",
+  "leaveFamilyMessage": "Bạn có chắc chắn muốn thoát khỏi gói dành cho gia đình không?",
+  "inFamilyPlanMessage": "Bạn đang sử dụng gói dành cho gia đình!",
+  "swipeHint": "Vuốt sang trái để chỉnh sửa hoặc xóa mã",
+  "scan": "Quét",
+  "scanACode": "Quét mã",
+  "verify": "Xác minh",
+  "verifyEmail": "Xác nhận địa chỉ Email",
+  "enterCodeHint": "Nhập mã gồm 6 chữ số từ ứng dụng xác thực của bạn",
+  "lostDeviceTitle": "Bạn đã mất thiết bị?",
+  "twoFactorAuthTitle": "Xác thực hai yếu tố",
+  "recoverAccount": "Khôi phục tài khoản",
+  "enterRecoveryKeyHint": "Nhập khóa khôi phục của bạn",
+  "recover": "Khôi phục",
+  "contactSupportViaEmailMessage": "Vui lòng gửi email đến {email} từ địa chỉ email đã đăng ký của bạn",
+  "@contactSupportViaEmailMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "noRecoveryKeyTitle": "Không có khóa khôi phục?",
+  "enterEmailHint": "Nhập địa chỉ email của bạn",
+  "invalidEmailTitle": "Địa chỉ email không hợp lệ",
+  "invalidEmailMessage": "Xin vui lòng nhập một địa chỉ email hợp lệ.",
+  "deleteAccount": "Xoá tài khoản",
+  "deleteAccountQuery": "Chúng tôi sẽ rất tiếc khi thấy bạn đi. Bạn đang phải đối mặt với một số vấn đề?",
+  "yesSendFeedbackAction": "Có, gửi phản hồi",
+  "noDeleteAccountAction": "Không, xóa tài khoản",
+  "initiateAccountDeleteTitle": "Vui lòng xác thực để bắt đầu xóa tài khoản",
+  "confirmAccountDeleteTitle": "Bạn có chắc rằng bạn muốn xóa tài khoản ente của bạn không?",
+  "confirmAccountDeleteMessage": "Dữ liệu đã tải lên của bạn, trên tất cả các ứng dụng (cả Ảnh và Authenticator), sẽ được lên lịch xóa và tài khoản của bạn sẽ bị xóa vĩnh viễn.",
+  "sendEmail": "Gửi email",
+  "createNewAccount": "Tạo tài khoản mới",
+  "weakStrength": "Yếu",
+  "strongStrength": "Mạnh",
+  "moderateStrength": "Trung bình",
+  "confirmPassword": "Xác nhận mật khẩu",
+  "close": "Đóng",
+  "oopsSomethingWentWrong": "Rất tiếc, Đã xảy ra lỗi.",
+  "selectLanguage": "Chọn ngôn ngữ",
+  "language": "Ngôn ngữ",
+  "social": "Xã hội",
+  "security": "Bảo mật",
+  "lockscreen": "Màn hình khoá",
+  "authToChangeLockscreenSetting": "Vui lòng xác thực để thay đổi cài đặt màn hình khóa",
+  "lockScreenEnablePreSteps": "Để bật màn hình khóa, vui lòng thiết lập mật khẩu thiết bị hoặc khóa màn hình trong cài đặt hệ thống của bạn.",
+  "viewActiveSessions": "Xem danh sách phiên làm việc hiện tại",
+  "authToViewYourActiveSessions": "Vui lòng xác thực để xem danh sách phiên làm việc của bạn",
+  "searchHint": "Tìm kiếm...",
+  "search": "Tìm kiếm",
+  "sorryUnableToGenCode": "Rất tiếc, không thể tạo mã cho {issuerName}",
+  "noResult": "Không có kết quả",
+  "addCode": "Thêm mã",
+  "scanAQrCode": "Quét mã QR",
+  "enterDetailsManually": "Nhập chi tiết thủ công",
+  "edit": "Sửa",
+  "copiedToClipboard": "Đã sao chép vào khay nhớ tạm",
+  "error": "Lỗi",
+  "recoveryKeyCopiedToClipboard": "Đã sao chép khóa khôi phục vào bộ nhớ tạm",
+  "recoveryKeyOnForgotPassword": "Nếu bạn quên mật khẩu, cách duy nhất bạn có thể khôi phục dữ liệu của mình là sử dụng khóa này.",
+  "recoveryKeySaveDescription": "Chúng tôi không lưu trữ khóa này, vui lòng lưu khóa 24 từ này ở nơi an toàn.",
+  "doThisLater": "Để sau",
+  "saveKey": "Lưu khóa",
+  "createAccount": "Tạo tài khoản",
+  "passwordStrength": "Độ mạnh mật khẩu: {passwordStrengthValue}",
+  "@passwordStrength": {
+    "description": "Text to indicate the password strength",
+    "placeholders": {
+      "passwordStrengthValue": {
+        "description": "The strength of the password as a string",
+        "type": "String",
+        "example": "Weak or Moderate or Strong"
+      }
+    },
+    "message": "Password Strength: {passwordStrengthText}"
+  },
+  "password": "Mật khẩu",
+  "signUpTerms": "Tôi đồng ý với <u-terms>điều khoản dịch vụ</u-terms> và <u-policy>chính sách quyền riêng tư</u-policy>",
+  "privacyPolicyTitle": "Chính sách bảo mật",
+  "termsOfServicesTitle": "Điều khoản",
+  "encryption": "Mã hóa",
+  "setPasswordTitle": "Đặt mật khẩu",
+  "changePasswordTitle": "Thay đổi mật khẩu",
+  "resetPasswordTitle": "Đặt lại mật khẩu",
+  "encryptionKeys": "Khóa mã hóa",
+  "passwordWarning": "Chúng tôi không lưu trữ mật khẩu này, vì vậy nếu bạn quên, <underline>chúng tôi không thể giải mã dữ liệu của bạn</underline>",
+  "enterPasswordToEncrypt": "Nhập mật khẩu mà chúng tôi có thể sử dụng để mã hóa dữ liệu của bạn",
+  "enterNewPasswordToEncrypt": "Nhập một mật khẩu mới mà chúng tôi có thể sử dụng để mã hóa dữ liệu của bạn",
+  "passwordChangedSuccessfully": "Thay đổi mật khẩu thành công",
+  "generatingEncryptionKeys": "Đang tạo khóa mã hóa...",
+  "continueLabel": "Tiếp tục",
+  "insecureDevice": "Thiết bị không an toàn",
+  "sorryWeCouldNotGenerateSecureKeysOnThisDevicennplease": "Rất tiếc, chúng tôi không thể tạo khóa bảo mật trên thiết bị này.\n\nvui lòng đăng ký từ một thiết bị khác.",
+  "howItWorks": "Cách thức hoạt động",
+  "ackPasswordLostWarning": "Tôi hiểu rằng việc mất mật khẩu có thể đồng nghĩa với việc mất dữ liệu của tôi vì dữ liệu của tôi được <underline>mã hóa hai đầu</underline>.",
+  "loginTerms": "Bằng cách nhấp vào đăng nhập, tôi đồng ý với <u-terms>điều khoản dịch vụ</u-terms> và <u-policy>chính sách quyền riêng tư</u-policy>",
+  "logInLabel": "Đăng nhập",
+  "logout": "Đăng xuất",
+  "areYouSureYouWantToLogout": "Bạn có chắc chắn muốn đăng xuất?",
+  "yesLogout": "Có, đăng xuất",
+  "exit": "Thoát",
+  "verifyingRecoveryKey": "Đang xác minh khóa khôi phục...",
+  "recoveryKeyVerified": "Khóa khôi phục đã được xác thực",
+  "recoveryKeySuccessBody": "Tuyệt vời! Khóa khôi phục của bạn hợp lệ. Cảm ơn bạn đã xác minh.\n\nHãy nhớ sao lưu khóa khôi phục của bạn một cách an toàn.",
+  "invalidRecoveryKey": "Khóa khôi phục bạn đã nhập không hợp lệ. Vui lòng đảm bảo rằng nó chứa 24 từ và kiểm tra chính tả của từng từ.\n\nNếu bạn đã nhập mã khôi phục cũ hơn, hãy đảm bảo mã đó dài 64 ký tự và kiểm tra từng ký tự.",
+  "recreatePasswordTitle": "Tạo lại mật khẩu",
+  "recreatePasswordBody": "Thiết bị hiện tại không đủ mạnh để xác minh mật khẩu của bạn nhưng chúng tôi có thể tạo lại mật khẩu theo cách hoạt động với tất cả các thiết bị.\n\nVui lòng đăng nhập bằng khóa khôi phục và tạo lại mật khẩu của bạn (bạn có thể sử dụng lại cùng một mật khẩu nếu muốn).",
+  "invalidKey": "Khoá không hợp lệ",
+  "tryAgain": "Thử lại",
+  "viewRecoveryKey": "Hiển thị khóa khôi phục",
+  "confirmRecoveryKey": "Xác nhận khóa khôi phục",
+  "recoveryKeyVerifyReason": "Nếu bạn quên mật khẩu, khóa khôi phục là cách duy nhất để khôi phục ảnh của bạn. Bạn có thể tìm thấy khóa khôi phục của mình trong Cài đặt > Tài khoản.\n\nVui lòng nhập khóa khôi phục của bạn tại đây để xác minh rằng bạn đã lưu chính xác.",
+  "confirmYourRecoveryKey": "Xác nhận khóa khôi phục",
+  "confirm": "Xác nhận",
+  "emailYourLogs": "Gửi email nhật ký của bạn",
+  "pleaseSendTheLogsTo": "Vui lòng gửi nhật ký đến \n{toEmail}",
+  "copyEmailAddress": "Sao chép địa chỉ email",
+  "exportLogs": "Xuất nhật ký",
+  "enterYourRecoveryKey": "Nhập khóa khôi phục của bạn",
+  "tempErrorContactSupportIfPersists": "Có vẻ như đã xảy ra sự cố. Vui lòng thử lại sau một thời gian. Nếu lỗi vẫn tiếp diễn, vui lòng liên hệ với nhóm hỗ trợ của chúng tôi.",
+  "itLooksLikeSomethingWentWrongPleaseRetryAfterSome": "Có vẻ như đã xảy ra sự cố. Vui lòng thử lại sau một thời gian. Nếu lỗi vẫn tiếp diễn, vui lòng liên hệ với nhóm hỗ trợ của chúng tôi.",
+  "about": "Về chúng tôi",
+  "weAreOpenSource": "Chúng tôi có mã nguồn mở!",
+  "privacy": "Riêng tư",
+  "terms": "Điều khoản",
+  "checkForUpdates": "Kiểm tra cập nhật",
+  "checking": "Đang kiểm tra...",
+  "youAreOnTheLatestVersion": "Bạn đang sử dụng phiên bản mới nhất",
+  "warning": "Cánh báo",
+  "exportWarningDesc": "Tệp đã xuất chứa thông tin nhạy cảm. Hãy lưu trữ tệp này một cách an toàn.",
+  "iUnderStand": "Tôi hiểu",
+  "@iUnderStand": {
+    "description": "Text for the button to confirm the user understands the warning"
+  },
+  "authToExportCodes": "Vui lòng xác thực để xuất mã của bạn",
+  "importSuccessTitle": "Hoan hô!",
+  "importSuccessDesc": "Bạn đã nhập {count} mã!",
+  "@importSuccessDesc": {
+    "placeholders": {
+      "count": {
+        "description": "The number of codes imported",
+        "type": "int",
+        "example": "1"
+      }
+    }
+  },
+  "sorry": "Xin lỗi",
+  "importFailureDesc": "Không thể phân tích cú pháp tệp đã chọn.\nVui lòng viết thư cho support@ente.io nếu bạn cần trợ giúp!",
+  "pendingSyncs": "Cánh báo",
+  "pendingSyncsWarningBody": "Một số mã của bạn chưa được sao lưu.\n\nVui lòng đảm bảo rằng bạn có bản sao lưu cho các mã này trước khi đăng xuất.",
+  "checkInboxAndSpamFolder": "Vui lòng kiểm tra hộp thư đến (và thư rác) của bạn để hoàn tất xác minh",
+  "tapToEnterCode": "Chạm để nhập mã",
+  "resendEmail": "Gửi lại email",
+  "weHaveSendEmailTo": "Chúng tôi đã gửi thư đến <green>{email}</green>",
+  "@weHaveSendEmailTo": {
+    "description": "Text to indicate that we have sent a mail to the user",
+    "placeholders": {
+      "email": {
+        "description": "The email address of the user",
+        "type": "String",
+        "example": "example@ente.io"
+      }
+    }
+  },
+  "activeSessions": "Các phiên làm việc hiện tại",
+  "somethingWentWrongPleaseTryAgain": "Phát hiện có lỗi, xin thử lại",
+  "thisWillLogYouOutOfThisDevice": "Thao tác này sẽ đăng xuất bạn khỏi thiết bị này!",
+  "thisWillLogYouOutOfTheFollowingDevice": "Thao tác này sẽ đăng xuất bạn khỏi thiết bị sau:",
+  "terminateSession": "Chấm dứt phiên?",
+  "terminate": "Dừng lại",
+  "thisDevice": "Thiết bị này"
+}

lib/l10n/arb/app_zh.arb

@@ -9,8 +9,13 @@
   "onBoardingGetStarted": "开始",
   "setupFirstAccount": "设置您的第一个账户",
   "importScanQrCode": "扫描二维码",
+  "qrCode": "二维码",
   "importEnterSetupKey": "输入设置密钥",
   "importAccountPageTitle": "输入账户详细信息",
+  "secretCanNotBeEmpty": "密码不能为空",
+  "bothIssuerAndAccountCanNotBeEmpty": "发行人和账户均不能为空",
+  "incorrectDetails": "详细信息不正确",
+  "pleaseVerifyDetails": "请验证详细信息并重试",
   "codeIssuerHint": "发行人",
   "codeSecretKeyHint": "私钥",
   "codeAccountHint": "账户 (you@domain.com)",
@@ -24,7 +29,7 @@
   "timeBasedKeyType": "基于时间的 (TOTP)",
   "counterBasedKeyType": "基于计数器的(HOTP)",
   "saveAction": "保存",
-  "nextTotpTitle": "下一步",
+  "nextTotpTitle": "下一个",
   "deleteCodeTitle": "要删除代码吗？",
   "deleteCodeMessage": "您确定要删除此代码吗？此操作是不可逆的。",
   "viewLogsAction": "查看日志",
@@ -53,6 +58,9 @@
     }
   },
   "contactSupport": "联系支持",
+  "rateUsOnStore": "在 {storeName} 上给我们评分",
+  "blog": "博客",
+  "merchandise": "商品",
   "verifyPassword": "验证密码",
   "pleaseWait": "请稍候...",
   "generatingEncryptionKeysTitle": "正在生成加密密钥...",
@@ -68,10 +76,23 @@
   "changePassword": "修改密码",
   "data": "数据",
   "importCodes": "导入代码",
+  "importTypePlainText": "纯文本",
+  "importTypeEnteEncrypted": "ente 加密导出",
+  "passwordForDecryptingExport": "用来解密导出的密码",
+  "passwordEmptyError": "密码不能为空",
+  "importFromApp": "从 {appName} 导入代码",
+  "importGoogleAuthGuide": "使用“转移帐户”选项将您的帐户从 Google 身份验证器导出到二维码。然后使用另一台设备扫描二维码。\n\n提示：您可以使用笔记本电脑的网络摄像头拍摄二维码的照片。",
+  "importSelectJsonFile": "选择 JSON 文件",
+  "importEnteEncGuide": "选择从ente导出的加密JSON文件",
+  "importRaivoGuide": "使用 Raivo 设置中的“将 OTP 导出到 Zip 存档”选项。\n\n解压 zip 文件并导入 JSON 文件。",
+  "importAegisGuide": "在Aegis的设置中使用\"导出密码库\"选项。\n\n如果您的密码库已加密，您需要输入密码才能解密密码库。",
   "exportCodes": "导出代码",
+  "importLabel": "导入",
   "importInstruction": "请以以下格式选择包含代码列表的文件",
   "importCodeDelimiterInfo": "代码可以用逗号或新行分隔。",
   "selectFile": "选择文件",
+  "emailVerificationToggle": "电子邮件验证",
+  "authToChangeEmailVerificationSetting": "请进行身份验证以更改电子邮件验证",
   "authToViewYourRecoveryKey": "请验证以查看您的恢复密钥",
   "authToChangeYourEmail": "请验证以更改您的电子邮件",
   "authToChangeYourPassword": "请验证以更改密码",
@@ -81,6 +102,7 @@
   "no": "否",
   "email": "电子邮件地址",
   "support": "支持",
+  "general": "通用",
   "settings": "设置",
   "copied": "已复制",
   "pleaseTryAgain": "请重试",
@@ -90,6 +112,18 @@
   "enterYourPasswordHint": "输入您的密码",
   "forgotPassword": "忘记密码",
   "oops": "哎呀",
+  "suggestFeatures": "建议新功能",
+  "faq": "常见问题",
+  "faq_q_1": "ente Auth的安全程度如何？",
+  "faq_a_1": "您通过 ente 备份的所有代码均以端到端加密方式存储。这意味着只有您可以访问您的代码。 我们的应用程序是开源的，我们的加密技术已经过外部审计。",
+  "faq_q_2": "我可以在桌面上访问我的代码吗？",
+  "faq_a_2": "您可以在 web @auth.ente.io 上访问您的代码。",
+  "faq_q_3": "我如何删除代码？",
+  "faq_a_3": "您可以通过向左滑动该项目来删除该代码。",
+  "faq_q_4": "我该如何支持该项目？",
+  "faq_a_4": "您可以通过订阅我们的照片应用程序@ente.io来支持该项目的开发。",
+  "faq_q_5": "如何在 ente Auth 中启用 FaceID 锁定",
+  "faq_a_5": "您可以在“设置”→“安全”→“锁屏”下启用 FaceID 锁定。",
   "somethingWentWrongMessage": "出了点问题，请重试",
   "leaveFamily": "离开家庭",
   "leaveFamilyMessage": "您确定要离开家庭计划吗？",
@@ -150,12 +184,14 @@
   "enterDetailsManually": "手动输入详细信息",
   "edit": "编辑",
   "copiedToClipboard": "已复制到剪贴板",
+  "copiedNextToClipboard": "已将下一个代码复制到剪贴板",
   "error": "错误",
   "recoveryKeyCopiedToClipboard": "恢复密钥已复制到剪贴板",
   "recoveryKeyOnForgotPassword": "如果您忘记了密码，恢复数据的唯一方法就是使用此密钥。",
   "recoveryKeySaveDescription": "我们不会存储此密钥，请将此24个单词密钥保存在一个安全的地方。",
   "doThisLater": "稍后再做",
   "saveKey": "保存密钥",
+  "back": "返回",
   "createAccount": "创建账户",
   "passwordStrength": "密码强度： {passwordStrengthValue}",
   "@passwordStrength": {
@@ -219,6 +255,10 @@
   "privacy": "隐私",
   "terms": "使用条款",
   "checkForUpdates": "检查更新",
+  "downloadUpdate": "下载",
+  "criticalUpdateAvailable": "有重要更新可用",
+  "updateAvailable": "有可用的更新",
+  "update": "更新",
   "checking": "正在检查...",
   "youAreOnTheLatestVersion": "当前为最新版本",
   "warning": "警告",
@@ -263,5 +303,31 @@
   "thisWillLogYouOutOfTheFollowingDevice": "这将使您在以下设备中退出登录：",
   "terminateSession": "是否终止会话？",
   "terminate": "终止",
-  "thisDevice": "此设备"
+  "thisDevice": "此设备",
+  "toResetVerifyEmail": "要重置您的密码，请先验证您的电子邮件。",
+  "thisEmailIsAlreadyInUse": "该电子邮件已被使用",
+  "verificationFailedPleaseTryAgain": "验证失败，请再试一次",
+  "yourVerificationCodeHasExpired": "您的验证码已过期",
+  "incorrectCode": "验证码错误",
+  "sorryTheCodeYouveEnteredIsIncorrect": "抱歉，您输入的验证码不正确",
+  "emailChangedTo": "电子邮件已更改为 {newEmail}",
+  "authenticationFailedPleaseTryAgain": "认证失败，请重试",
+  "authenticationSuccessful": "认证成功！",
+  "twofactorAuthenticationSuccessfullyReset": "双因素身份验证已成功重置",
+  "incorrectRecoveryKey": "恢复密钥不正确",
+  "theRecoveryKeyYouEnteredIsIncorrect": "您输入的恢复密钥不正确",
+  "enterPassword": "输入密码",
+  "selectExportFormat": "选择导出格式",
+  "exportDialogDesc": "加密导出将由您选择的密码保护。",
+  "encrypted": "已加密",
+  "plainText": "纯文本",
+  "passwordToEncryptExport": "用来加密导出的密码",
+  "export": "导出",
+  "useOffline": "无需备份即可使用",
+  "signInToBackup": "登录以备份您的代码",
+  "singIn": "登录",
+  "sigInBackupReminder": "请导出您的代码以确保您有可以恢复的备份。",
+  "offlineModeWarning": "您已选择在不进行备份的情况下继续操作。请手动备份以确保您的代码安全。",
+  "showLargeIcons": "显示大图标",
+  "focusOnSearchBar": "应用启动后聚焦搜索"
 }

lib/main.dart

@@ -1,4 +1,5 @@
 import 'package:adaptive_theme/adaptive_theme.dart';
+import 'package:computer/computer.dart';
 import "package:ente_auth/app/view/app.dart";
 import 'package:ente_auth/core/configuration.dart';
 import 'package:ente_auth/core/constants.dart';
@@ -16,7 +17,9 @@ import 'package:ente_auth/services/user_service.dart';
 import 'package:ente_auth/store/code_store.dart';
 import 'package:ente_auth/ui/tools/app_lock.dart';
 import 'package:ente_auth/ui/tools/lock_screen.dart';
+import 'package:ente_auth/ui/utils/icon_utils.dart';
 import 'package:ente_auth/utils/crypto_util.dart';
+import 'package:flutter/foundation.dart';
 import "package:flutter/material.dart";
 import 'package:logging/logging.dart';
 import 'package:path_provider/path_provider.dart';
@@ -70,6 +73,8 @@ Future _runWithLogs(Function() function, {String prefix = ""}) async {
 }
 
 Future<void> _init(bool bool, {String? via}) async {
+  // Start workers asynchronously. No need to wait for them to start
+  Computer.shared().turnOn(workersCount: 4, verbose: kDebugMode);
   CryptoUtil.init();
   await PreferenceService.instance.init();
   await CodeStore.instance.init();
@@ -81,4 +86,5 @@ Future<void> _init(bool bool, {String? via}) async {
   await BillingService.instance.init();
   await NotificationService.instance.init();
   await UpdateService.instance.init();
+  await IconUtils.instance.init();
 }

lib/models/api/user/srp.dart

@@ -0,0 +1,135 @@
+class SetupSRPRequest {
+  final String srpUserID;
+  final String srpSalt;
+  final String srpVerifier;
+  final String srpA;
+  final bool isUpdate;
+
+  SetupSRPRequest({
+    required this.srpUserID,
+    required this.srpSalt,
+    required this.srpVerifier,
+    required this.srpA,
+    required this.isUpdate,
+  });
+
+  Map<String, dynamic> toMap() {
+    return {
+      'srpUserID': srpUserID.toString(),
+      'srpSalt': srpSalt,
+      'srpVerifier': srpVerifier,
+      'srpA': srpA,
+      'isUpdate': isUpdate,
+    };
+  }
+
+  factory SetupSRPRequest.fromJson(Map<String, dynamic> json) {
+    return SetupSRPRequest(
+      srpUserID: json['srpUserID'],
+      srpSalt: json['srpSalt'],
+      srpVerifier: json['srpVerifier'],
+      srpA: json['srpA'],
+      isUpdate: json['isUpdate'],
+    );
+  }
+}
+
+class SetupSRPResponse {
+  final String setupID;
+  final String srpB;
+
+  SetupSRPResponse({
+    required this.setupID,
+    required this.srpB,
+  });
+
+  Map<String, dynamic> toMap() {
+    return {
+      'setupID': setupID.toString(),
+      'srpB': srpB,
+    };
+  }
+
+  factory SetupSRPResponse.fromJson(Map<String, dynamic> json) {
+    return SetupSRPResponse(
+      setupID: json['setupID'],
+      srpB: json['srpB'],
+    );
+  }
+}
+
+class CompleteSRPSetupRequest {
+  final String setupID;
+  final String srpM1;
+
+  CompleteSRPSetupRequest({
+    required this.setupID,
+    required this.srpM1,
+  });
+
+  Map<String, dynamic> toMap() {
+    return {
+      'setupID': setupID.toString(),
+      'srpM1': srpM1,
+    };
+  }
+
+  factory CompleteSRPSetupRequest.fromJson(Map<String, dynamic> json) {
+    return CompleteSRPSetupRequest(
+      setupID: json['setupID'],
+      srpM1: json['srpM1'],
+    );
+  }
+}
+class SrpAttributes {
+  final String srpUserID;
+  final String srpSalt;
+  final int memLimit;
+  final int opsLimit;
+  final String kekSalt;
+  final bool isEmailMFAEnabled;
+
+  SrpAttributes({
+    required this.srpUserID,
+    required this.srpSalt,
+    required this.memLimit,
+    required this.opsLimit,
+    required this.kekSalt,
+    required this.isEmailMFAEnabled,
+  });
+
+  factory SrpAttributes.fromMap(Map<String, dynamic> map) {
+    return SrpAttributes(
+      srpUserID: map['attributes']['srpUserID'],
+      srpSalt: map['attributes']['srpSalt'],
+      memLimit: map['attributes']['memLimit'],
+      opsLimit: map['attributes']['opsLimit'],
+      kekSalt: map['attributes']['kekSalt'],
+      isEmailMFAEnabled: map['attributes']['isEmailMFAEnabled'],
+    );
+  }
+}
+
+class CompleteSRPSetupResponse {
+  final String setupID;
+  final String srpM2;
+
+  CompleteSRPSetupResponse({
+    required this.setupID,
+    required this.srpM2,
+  });
+
+  Map<String, dynamic> toMap() {
+    return {
+      'setupID': setupID,
+      'srpM2': srpM2,
+    };
+  }
+
+  factory CompleteSRPSetupResponse.fromJson(Map<String, dynamic> json) {
+    return CompleteSRPSetupResponse(
+      setupID: json['setupID'],
+      srpM2: json['srpM2'],
+    );
+  }
+}

lib/models/code.dart

@@ -13,6 +13,7 @@ class Code {
   final Algorithm algorithm;
   final Type type;
   final String rawData;
+  final int counter;
   bool? hasSynced;
 
   Code(
@@ -23,6 +24,7 @@ class Code {
     this.secret,
     this.algorithm,
     this.type,
+    this.counter,
     this.rawData, {
     this.generatedID,
   });
@@ -35,6 +37,7 @@ class Code {
     String? secret,
     Algorithm? algorithm,
     Type? type,
+    int? counter,
   }) {
     final String updateAccount = account ?? this.account;
     final String updateIssuer = issuer ?? this.issuer;
@@ -43,6 +46,7 @@ class Code {
     final String updatedSecret = secret ?? this.secret;
     final Algorithm updatedAlgo = algorithm ?? this.algorithm;
     final Type updatedType = type ?? this.type;
+    final int updatedCounter = counter ?? this.counter;
 
     return Code(
       updateAccount,
@@ -52,6 +56,7 @@ class Code {
       updatedSecret,
       updatedAlgo,
       updatedType,
+      updatedCounter,
       "otpauth://${updatedType.name}/" +
           updateIssuer +
           ":" +
@@ -59,7 +64,7 @@ class Code {
           "?algorithm=${updatedAlgo.name}&digits=$updatedDigits&issuer=" +
           updateIssuer +
           "&period=$updatePeriod&secret=" +
-          updatedSecret,
+          updatedSecret + (updatedType == Type.hotp ? "&counter=$updatedCounter" : ""),
       generatedID: generatedID,
     );
   }
@@ -77,6 +82,7 @@ class Code {
       secret,
       Algorithm.sha1,
       Type.totp,
+      0,
       "otpauth://totp/" +
           issuer +
           ":" +
@@ -99,6 +105,7 @@ class Code {
       getSanitizedSecret(uri.queryParameters['secret']!),
       _getAlgorithm(uri),
       _getType(uri),
+      _getCounter(uri),
       rawData,
     );
     } catch(e) {
@@ -163,6 +170,18 @@ class Code {
     }
   }
 
+  static int _getCounter(Uri uri) {
+    try {
+      final bool hasCounterKey = uri.queryParameters.containsKey('counter');
+      if (!hasCounterKey) {
+        return 0;
+      }
+      return int.parse(uri.queryParameters['counter']!);
+    } catch (e) {
+      return defaultPeriod;
+    }
+  }
+
   static Algorithm _getAlgorithm(Uri uri) {
     try {
       final algorithm =
@@ -197,6 +216,7 @@ class Code {
         other.digits == digits &&
         other.period == period &&
         other.secret == secret &&
+        other.counter == counter &&
         other.type == type &&
         other.rawData == rawData;
   }
@@ -209,6 +229,7 @@ class Code {
         period.hashCode ^
         secret.hashCode ^
         type.hashCode ^
+        counter.hashCode ^
         rawData.hashCode;
   }
 }

lib/models/export/ente.dart

@@ -0,0 +1,66 @@
+/*
+Version: 1.0
+KDF Algo: ARGON2ID
+Decrypted Data Format: It contains code.rawData [1] separated by new line.
+[1] otpauth://totp/provider.com:you@email.com?secret=YOUR_SECRET
+*/
+
+class EnteAuthExport {
+  final int version;
+  final KDFParams kdfParams;
+  final String encryptedData;
+  final String encryptionNonce;
+
+  // Named constructor which can be used to specify each field individually
+  EnteAuthExport({
+    required this.version,
+    required this.kdfParams,
+    required this.encryptedData,
+    required this.encryptionNonce,
+  });
+
+  // Convert EnteExport object to JSON
+  Map<String, dynamic> toJson() => {
+        'version': version,
+        'kdfParams': kdfParams.toJson(),
+        'encryptedData': encryptedData,
+        'encryptionNonce': encryptionNonce,
+      };
+
+  // Convert JSON to EnteExport object
+  static EnteAuthExport fromJson(Map<String, dynamic> json) => EnteAuthExport(
+        version: json['version'],
+        kdfParams: KDFParams.fromJson(json['kdfParams']),
+        encryptedData: json['encryptedData'],
+        encryptionNonce: json['encryptionNonce'],
+      );
+}
+
+// KDFParams is a class that holds the parameters for the KDF function.
+// It is used to derive a key from a password.
+class KDFParams {
+  final int memLimit;
+  final int opsLimit;
+  final String salt;
+
+  // Named constructor which can be used to specify each field individually
+  KDFParams({
+    required this.memLimit,
+    required this.opsLimit,
+    required this.salt,
+  });
+
+  // Convert KDFParams object to JSON
+  Map<String, dynamic> toJson() => {
+        'memLimit': memLimit,
+        'opsLimit': opsLimit,
+        'salt': salt,
+      };
+
+  // Convert JSON to KDFParams object
+  static KDFParams fromJson(Map<String, dynamic> json) => KDFParams(
+        memLimit: json['memLimit'],
+        opsLimit: json['opsLimit'],
+        salt: json['salt'],
+      );
+}

lib/models/key_gen_result.dart

@@ -1,9 +1,12 @@
+import 'dart:typed_data';
+
 import 'package:ente_auth/models/key_attributes.dart';
 import 'package:ente_auth/models/private_key_attributes.dart';
 
 class KeyGenResult {
   final KeyAttributes keyAttributes;
   final PrivateKeyAttributes privateKeyAttributes;
+  final Uint8List loginKey;
 
-  KeyGenResult(this.keyAttributes, this.privateKeyAttributes);
+  KeyGenResult(this.keyAttributes, this.privateKeyAttributes, this.loginKey);
 }

lib/models/protos/googleauth.pb.dart

@@ -0,0 +1,202 @@
+//
+//  Generated code. Do not modify.
+//  source: googleauth.proto
+//
+// @dart = 2.12
+
+// ignore_for_file: annotate_overrides, camel_case_types
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+
+import 'dart:core' as $core;
+
+import 'package:fixnum/fixnum.dart' as $fixnum;
+import 'package:protobuf/protobuf.dart' as $pb;
+
+// ignore: always_use_package_imports
+import 'googleauth.pbenum.dart';
+
+export 'googleauth.pbenum.dart';
+
+class MigrationPayload_OtpParameters extends $pb.GeneratedMessage {
+  factory MigrationPayload_OtpParameters() => create();
+  MigrationPayload_OtpParameters._() : super();
+  factory MigrationPayload_OtpParameters.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory MigrationPayload_OtpParameters.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'MigrationPayload.OtpParameters', package: const $pb.PackageName(_omitMessageNames ? '' : 'googleauth'), createEmptyInstance: create)
+    ..a<$core.List<$core.int>>(1, _omitFieldNames ? '' : 'secret', $pb.PbFieldType.OY)
+    ..aOS(2, _omitFieldNames ? '' : 'name')
+    ..aOS(3, _omitFieldNames ? '' : 'issuer')
+    ..e<MigrationPayload_Algorithm>(4, _omitFieldNames ? '' : 'algorithm', $pb.PbFieldType.OE, defaultOrMaker: MigrationPayload_Algorithm.ALGORITHM_UNSPECIFIED, valueOf: MigrationPayload_Algorithm.valueOf, enumValues: MigrationPayload_Algorithm.values)
+    ..e<MigrationPayload_DigitCount>(5, _omitFieldNames ? '' : 'digits', $pb.PbFieldType.OE, defaultOrMaker: MigrationPayload_DigitCount.DIGIT_COUNT_UNSPECIFIED, valueOf: MigrationPayload_DigitCount.valueOf, enumValues: MigrationPayload_DigitCount.values)
+    ..e<MigrationPayload_OtpType>(6, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE, defaultOrMaker: MigrationPayload_OtpType.OTP_TYPE_UNSPECIFIED, valueOf: MigrationPayload_OtpType.valueOf, enumValues: MigrationPayload_OtpType.values)
+    ..aInt64(7, _omitFieldNames ? '' : 'counter')
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
+  MigrationPayload_OtpParameters clone() => MigrationPayload_OtpParameters()..mergeFromMessage(this);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  MigrationPayload_OtpParameters copyWith(void Function(MigrationPayload_OtpParameters) updates) => super.copyWith((message) => updates(message as MigrationPayload_OtpParameters)) as MigrationPayload_OtpParameters;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static MigrationPayload_OtpParameters create() => MigrationPayload_OtpParameters._();
+  MigrationPayload_OtpParameters createEmptyInstance() => create();
+  static $pb.PbList<MigrationPayload_OtpParameters> createRepeated() => $pb.PbList<MigrationPayload_OtpParameters>();
+  @$core.pragma('dart2js:noInline')
+  static MigrationPayload_OtpParameters getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<MigrationPayload_OtpParameters>(create);
+  static MigrationPayload_OtpParameters? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.List<$core.int> get secret => $_getN(0);
+  @$pb.TagNumber(1)
+  set secret($core.List<$core.int> v) { $_setBytes(0, v); }
+  @$pb.TagNumber(1)
+  $core.bool hasSecret() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearSecret() => clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.String get name => $_getSZ(1);
+  @$pb.TagNumber(2)
+  set name($core.String v) { $_setString(1, v); }
+  @$pb.TagNumber(2)
+  $core.bool hasName() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearName() => clearField(2);
+
+  @$pb.TagNumber(3)
+  $core.String get issuer => $_getSZ(2);
+  @$pb.TagNumber(3)
+  set issuer($core.String v) { $_setString(2, v); }
+  @$pb.TagNumber(3)
+  $core.bool hasIssuer() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearIssuer() => clearField(3);
+
+  @$pb.TagNumber(4)
+  MigrationPayload_Algorithm get algorithm => $_getN(3);
+  @$pb.TagNumber(4)
+  set algorithm(MigrationPayload_Algorithm v) { setField(4, v); }
+  @$pb.TagNumber(4)
+  $core.bool hasAlgorithm() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearAlgorithm() => clearField(4);
+
+  @$pb.TagNumber(5)
+  MigrationPayload_DigitCount get digits => $_getN(4);
+  @$pb.TagNumber(5)
+  set digits(MigrationPayload_DigitCount v) { setField(5, v); }
+  @$pb.TagNumber(5)
+  $core.bool hasDigits() => $_has(4);
+  @$pb.TagNumber(5)
+  void clearDigits() => clearField(5);
+
+  @$pb.TagNumber(6)
+  MigrationPayload_OtpType get type => $_getN(5);
+  @$pb.TagNumber(6)
+  set type(MigrationPayload_OtpType v) { setField(6, v); }
+  @$pb.TagNumber(6)
+  $core.bool hasType() => $_has(5);
+  @$pb.TagNumber(6)
+  void clearType() => clearField(6);
+
+  @$pb.TagNumber(7)
+  $fixnum.Int64 get counter => $_getI64(6);
+  @$pb.TagNumber(7)
+  set counter($fixnum.Int64 v) { $_setInt64(6, v); }
+  @$pb.TagNumber(7)
+  $core.bool hasCounter() => $_has(6);
+  @$pb.TagNumber(7)
+  void clearCounter() => clearField(7);
+}
+
+class MigrationPayload extends $pb.GeneratedMessage {
+  factory MigrationPayload() => create();
+  MigrationPayload._() : super();
+  factory MigrationPayload.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory MigrationPayload.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'MigrationPayload', package: const $pb.PackageName(_omitMessageNames ? '' : 'googleauth'), createEmptyInstance: create)
+    ..pc<MigrationPayload_OtpParameters>(1, _omitFieldNames ? '' : 'otpParameters', $pb.PbFieldType.PM, subBuilder: MigrationPayload_OtpParameters.create)
+    ..a<$core.int>(2, _omitFieldNames ? '' : 'version', $pb.PbFieldType.O3)
+    ..a<$core.int>(3, _omitFieldNames ? '' : 'batchSize', $pb.PbFieldType.O3)
+    ..a<$core.int>(4, _omitFieldNames ? '' : 'batchIndex', $pb.PbFieldType.O3)
+    ..a<$core.int>(5, _omitFieldNames ? '' : 'batchId', $pb.PbFieldType.O3)
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
+  MigrationPayload clone() => MigrationPayload()..mergeFromMessage(this);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  MigrationPayload copyWith(void Function(MigrationPayload) updates) => super.copyWith((message) => updates(message as MigrationPayload)) as MigrationPayload;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static MigrationPayload create() => MigrationPayload._();
+  MigrationPayload createEmptyInstance() => create();
+  static $pb.PbList<MigrationPayload> createRepeated() => $pb.PbList<MigrationPayload>();
+  @$core.pragma('dart2js:noInline')
+  static MigrationPayload getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<MigrationPayload>(create);
+  static MigrationPayload? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.List<MigrationPayload_OtpParameters> get otpParameters => $_getList(0);
+
+  @$pb.TagNumber(2)
+  $core.int get version => $_getIZ(1);
+  @$pb.TagNumber(2)
+  set version($core.int v) { $_setSignedInt32(1, v); }
+  @$pb.TagNumber(2)
+  $core.bool hasVersion() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearVersion() => clearField(2);
+
+  @$pb.TagNumber(3)
+  $core.int get batchSize => $_getIZ(2);
+  @$pb.TagNumber(3)
+  set batchSize($core.int v) { $_setSignedInt32(2, v); }
+  @$pb.TagNumber(3)
+  $core.bool hasBatchSize() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearBatchSize() => clearField(3);
+
+  @$pb.TagNumber(4)
+  $core.int get batchIndex => $_getIZ(3);
+  @$pb.TagNumber(4)
+  set batchIndex($core.int v) { $_setSignedInt32(3, v); }
+  @$pb.TagNumber(4)
+  $core.bool hasBatchIndex() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearBatchIndex() => clearField(4);
+
+  @$pb.TagNumber(5)
+  $core.int get batchId => $_getIZ(4);
+  @$pb.TagNumber(5)
+  set batchId($core.int v) { $_setSignedInt32(4, v); }
+  @$pb.TagNumber(5)
+  $core.bool hasBatchId() => $_has(4);
+  @$pb.TagNumber(5)
+  void clearBatchId() => clearField(5);
+}
+
+
+const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
+const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');

lib/models/protos/googleauth.pbenum.dart

@@ -0,0 +1,72 @@
+//
+//  Generated code. Do not modify.
+//  source: googleauth.proto
+//
+// @dart = 2.12
+
+// ignore_for_file: annotate_overrides, camel_case_types
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+
+import 'dart:core' as $core;
+
+import 'package:protobuf/protobuf.dart' as $pb;
+
+class MigrationPayload_Algorithm extends $pb.ProtobufEnum {
+  static const MigrationPayload_Algorithm ALGORITHM_UNSPECIFIED = MigrationPayload_Algorithm._(0, _omitEnumNames ? '' : 'ALGORITHM_UNSPECIFIED');
+  static const MigrationPayload_Algorithm ALGORITHM_SHA1 = MigrationPayload_Algorithm._(1, _omitEnumNames ? '' : 'ALGORITHM_SHA1');
+  static const MigrationPayload_Algorithm ALGORITHM_SHA256 = MigrationPayload_Algorithm._(2, _omitEnumNames ? '' : 'ALGORITHM_SHA256');
+  static const MigrationPayload_Algorithm ALGORITHM_SHA512 = MigrationPayload_Algorithm._(3, _omitEnumNames ? '' : 'ALGORITHM_SHA512');
+  static const MigrationPayload_Algorithm ALGORITHM_MD5 = MigrationPayload_Algorithm._(4, _omitEnumNames ? '' : 'ALGORITHM_MD5');
+
+  static const $core.List<MigrationPayload_Algorithm> values = <MigrationPayload_Algorithm> [
+    ALGORITHM_UNSPECIFIED,
+    ALGORITHM_SHA1,
+    ALGORITHM_SHA256,
+    ALGORITHM_SHA512,
+    ALGORITHM_MD5,
+  ];
+
+  static final $core.Map<$core.int, MigrationPayload_Algorithm> _byValue = $pb.ProtobufEnum.initByValue(values);
+  static MigrationPayload_Algorithm? valueOf($core.int value) => _byValue[value];
+
+  const MigrationPayload_Algorithm._($core.int v, $core.String n) : super(v, n);
+}
+
+class MigrationPayload_DigitCount extends $pb.ProtobufEnum {
+  static const MigrationPayload_DigitCount DIGIT_COUNT_UNSPECIFIED = MigrationPayload_DigitCount._(0, _omitEnumNames ? '' : 'DIGIT_COUNT_UNSPECIFIED');
+  static const MigrationPayload_DigitCount DIGIT_COUNT_SIX = MigrationPayload_DigitCount._(1, _omitEnumNames ? '' : 'DIGIT_COUNT_SIX');
+  static const MigrationPayload_DigitCount DIGIT_COUNT_EIGHT = MigrationPayload_DigitCount._(2, _omitEnumNames ? '' : 'DIGIT_COUNT_EIGHT');
+
+  static const $core.List<MigrationPayload_DigitCount> values = <MigrationPayload_DigitCount> [
+    DIGIT_COUNT_UNSPECIFIED,
+    DIGIT_COUNT_SIX,
+    DIGIT_COUNT_EIGHT,
+  ];
+
+  static final $core.Map<$core.int, MigrationPayload_DigitCount> _byValue = $pb.ProtobufEnum.initByValue(values);
+  static MigrationPayload_DigitCount? valueOf($core.int value) => _byValue[value];
+
+  const MigrationPayload_DigitCount._($core.int v, $core.String n) : super(v, n);
+}
+
+class MigrationPayload_OtpType extends $pb.ProtobufEnum {
+  static const MigrationPayload_OtpType OTP_TYPE_UNSPECIFIED = MigrationPayload_OtpType._(0, _omitEnumNames ? '' : 'OTP_TYPE_UNSPECIFIED');
+  static const MigrationPayload_OtpType OTP_TYPE_HOTP = MigrationPayload_OtpType._(1, _omitEnumNames ? '' : 'OTP_TYPE_HOTP');
+  static const MigrationPayload_OtpType OTP_TYPE_TOTP = MigrationPayload_OtpType._(2, _omitEnumNames ? '' : 'OTP_TYPE_TOTP');
+
+  static const $core.List<MigrationPayload_OtpType> values = <MigrationPayload_OtpType> [
+    OTP_TYPE_UNSPECIFIED,
+    OTP_TYPE_HOTP,
+    OTP_TYPE_TOTP,
+  ];
+
+  static final $core.Map<$core.int, MigrationPayload_OtpType> _byValue = $pb.ProtobufEnum.initByValue(values);
+  static MigrationPayload_OtpType? valueOf($core.int value) => _byValue[value];
+
+  const MigrationPayload_OtpType._($core.int v, $core.String n) : super(v, n);
+}
+
+
+const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names');

lib/models/protos/googleauth.pbjson.dart

@@ -0,0 +1,93 @@
+//
+//  Generated code. Do not modify.
+//  source: googleauth.proto
+//
+// @dart = 2.12
+
+// ignore_for_file: annotate_overrides, camel_case_types
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+
+import 'dart:convert' as $convert;
+import 'dart:core' as $core;
+import 'dart:typed_data' as $typed_data;
+
+@$core.Deprecated('Use migrationPayloadDescriptor instead')
+const MigrationPayload$json = {
+  '1': 'MigrationPayload',
+  '2': [
+    {'1': 'otp_parameters', '3': 1, '4': 3, '5': 11, '6': '.googleauth.MigrationPayload.OtpParameters', '10': 'otpParameters'},
+    {'1': 'version', '3': 2, '4': 1, '5': 5, '10': 'version'},
+    {'1': 'batch_size', '3': 3, '4': 1, '5': 5, '10': 'batchSize'},
+    {'1': 'batch_index', '3': 4, '4': 1, '5': 5, '10': 'batchIndex'},
+    {'1': 'batch_id', '3': 5, '4': 1, '5': 5, '10': 'batchId'},
+  ],
+  '3': [MigrationPayload_OtpParameters$json],
+  '4': [MigrationPayload_Algorithm$json, MigrationPayload_DigitCount$json, MigrationPayload_OtpType$json],
+};
+
+@$core.Deprecated('Use migrationPayloadDescriptor instead')
+const MigrationPayload_OtpParameters$json = {
+  '1': 'OtpParameters',
+  '2': [
+    {'1': 'secret', '3': 1, '4': 1, '5': 12, '10': 'secret'},
+    {'1': 'name', '3': 2, '4': 1, '5': 9, '10': 'name'},
+    {'1': 'issuer', '3': 3, '4': 1, '5': 9, '10': 'issuer'},
+    {'1': 'algorithm', '3': 4, '4': 1, '5': 14, '6': '.googleauth.MigrationPayload.Algorithm', '10': 'algorithm'},
+    {'1': 'digits', '3': 5, '4': 1, '5': 14, '6': '.googleauth.MigrationPayload.DigitCount', '10': 'digits'},
+    {'1': 'type', '3': 6, '4': 1, '5': 14, '6': '.googleauth.MigrationPayload.OtpType', '10': 'type'},
+    {'1': 'counter', '3': 7, '4': 1, '5': 3, '10': 'counter'},
+  ],
+};
+
+@$core.Deprecated('Use migrationPayloadDescriptor instead')
+const MigrationPayload_Algorithm$json = {
+  '1': 'Algorithm',
+  '2': [
+    {'1': 'ALGORITHM_UNSPECIFIED', '2': 0},
+    {'1': 'ALGORITHM_SHA1', '2': 1},
+    {'1': 'ALGORITHM_SHA256', '2': 2},
+    {'1': 'ALGORITHM_SHA512', '2': 3},
+    {'1': 'ALGORITHM_MD5', '2': 4},
+  ],
+};
+
+@$core.Deprecated('Use migrationPayloadDescriptor instead')
+const MigrationPayload_DigitCount$json = {
+  '1': 'DigitCount',
+  '2': [
+    {'1': 'DIGIT_COUNT_UNSPECIFIED', '2': 0},
+    {'1': 'DIGIT_COUNT_SIX', '2': 1},
+    {'1': 'DIGIT_COUNT_EIGHT', '2': 2},
+  ],
+};
+
+@$core.Deprecated('Use migrationPayloadDescriptor instead')
+const MigrationPayload_OtpType$json = {
+  '1': 'OtpType',
+  '2': [
+    {'1': 'OTP_TYPE_UNSPECIFIED', '2': 0},
+    {'1': 'OTP_TYPE_HOTP', '2': 1},
+    {'1': 'OTP_TYPE_TOTP', '2': 2},
+  ],
+};
+
+/// Descriptor for `MigrationPayload`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List migrationPayloadDescriptor = $convert.base64Decode(
+    'ChBNaWdyYXRpb25QYXlsb2FkElEKDm90cF9wYXJhbWV0ZXJzGAEgAygLMiouZ29vZ2xlYXV0aC'
+    '5NaWdyYXRpb25QYXlsb2FkLk90cFBhcmFtZXRlcnNSDW90cFBhcmFtZXRlcnMSGAoHdmVyc2lv'
+    'bhgCIAEoBVIHdmVyc2lvbhIdCgpiYXRjaF9zaXplGAMgASgFUgliYXRjaFNpemUSHwoLYmF0Y2'
+    'hfaW5kZXgYBCABKAVSCmJhdGNoSW5kZXgSGQoIYmF0Y2hfaWQYBSABKAVSB2JhdGNoSWQargIK'
+    'DU90cFBhcmFtZXRlcnMSFgoGc2VjcmV0GAEgASgMUgZzZWNyZXQSEgoEbmFtZRgCIAEoCVIEbm'
+    'FtZRIWCgZpc3N1ZXIYAyABKAlSBmlzc3VlchJECglhbGdvcml0aG0YBCABKA4yJi5nb29nbGVh'
+    'dXRoLk1pZ3JhdGlvblBheWxvYWQuQWxnb3JpdGhtUglhbGdvcml0aG0SPwoGZGlnaXRzGAUgAS'
+    'gOMicuZ29vZ2xlYXV0aC5NaWdyYXRpb25QYXlsb2FkLkRpZ2l0Q291bnRSBmRpZ2l0cxI4CgR0'
+    'eXBlGAYgASgOMiQuZ29vZ2xlYXV0aC5NaWdyYXRpb25QYXlsb2FkLk90cFR5cGVSBHR5cGUSGA'
+    'oHY291bnRlchgHIAEoA1IHY291bnRlciJ5CglBbGdvcml0aG0SGQoVQUxHT1JJVEhNX1VOU1BF'
+    'Q0lGSUVEEAASEgoOQUxHT1JJVEhNX1NIQTEQARIUChBBTEdPUklUSE1fU0hBMjU2EAISFAoQQU'
+    'xHT1JJVEhNX1NIQTUxMhADEhEKDUFMR09SSVRITV9NRDUQBCJVCgpEaWdpdENvdW50EhsKF0RJ'
+    'R0lUX0NPVU5UX1VOU1BFQ0lGSUVEEAASEwoPRElHSVRfQ09VTlRfU0lYEAESFQoRRElHSVRfQ0'
+    '9VTlRfRUlHSFQQAiJJCgdPdHBUeXBlEhgKFE9UUF9UWVBFX1VOU1BFQ0lGSUVEEAASEQoNT1RQ'
+    'X1RZUEVfSE9UUBABEhEKDU9UUF9UWVBFX1RPVFAQAg==');
+

lib/models/protos/googleauth.pbserver.dart

@@ -0,0 +1,14 @@
+//
+//  Generated code. Do not modify.
+//  source: googleauth.proto
+//
+// @dart = 2.12
+
+// ignore_for_file: annotate_overrides, camel_case_types
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+
+export 'googleauth.pb.dart';
+

lib/models/user_details.dart

@@ -1,3 +1,4 @@
+import 'dart:convert';
 import 'dart:math';
 
 import 'package:collection/collection.dart';
@@ -10,6 +11,7 @@ class UserDetails {
   final int sharedCollectionsCount;
   final Subscription subscription;
   final FamilyData? familyData;
+  final ProfileData? profileData;
 
   UserDetails(
     this.email,
@@ -18,6 +20,7 @@ class UserDetails {
     this.sharedCollectionsCount,
     this.subscription,
     this.familyData,
+      this.profileData,
   );
 
   bool isPartOfFamily() {
@@ -59,8 +62,10 @@ class UserDetails {
       (map['sharedCollectionsCount'] ?? 0) as int,
       Subscription.fromMap(map['subscription']),
       FamilyData.fromMap(map['familyData']),
+      ProfileData.fromJson(map['profileData']),
     );
   }
+
 }
 
 class FamilyMember {
@@ -80,7 +85,39 @@ class FamilyMember {
     );
   }
 }
+class ProfileData {
+  bool canDisableEmailMFA;
+  bool isEmailMFAEnabled;
+  bool isTwoFactorEnabled;
 
+  // Constructor with default values
+  ProfileData({
+    this.canDisableEmailMFA = false,
+    this.isEmailMFAEnabled = false,
+    this.isTwoFactorEnabled = false,
+  });
+
+  // Factory method to create ProfileData instance from JSON
+  factory ProfileData.fromJson(Map<String, dynamic>? json) {
+    if (json == null) null;
+
+    return ProfileData(
+      canDisableEmailMFA: json!['canDisableEmailMFA'] ?? false,
+      isEmailMFAEnabled: json['isEmailMFAEnabled'] ?? false,
+      isTwoFactorEnabled: json['isTwoFactorEnabled'] ?? false,
+    );
+  }
+
+  // Method to convert ProfileData instance to JSON
+  Map<String, dynamic> toJson() {
+    return {
+      'canDisableEmailMFA': canDisableEmailMFA,
+      'isEmailMFAEnabled': isEmailMFAEnabled,
+      'isTwoFactorEnabled': isTwoFactorEnabled,
+    };
+  }
+  String toJsonString() => json.encode(toJson());
+}
 class FamilyData {
   final List<FamilyMember>? members;
 

lib/onboarding/view/onboarding_page.dart

@@ -7,17 +7,23 @@ import 'package:ente_auth/ente_theme_data.dart';
 import 'package:ente_auth/events/trigger_logout_event.dart';
 import "package:ente_auth/l10n/l10n.dart";
 import 'package:ente_auth/locale.dart';
+import 'package:ente_auth/theme/text_style.dart';
 import 'package:ente_auth/ui/account/email_entry_page.dart';
 import 'package:ente_auth/ui/account/login_page.dart';
 import 'package:ente_auth/ui/account/logout_dialog.dart';
 import 'package:ente_auth/ui/account/password_entry_page.dart';
 import 'package:ente_auth/ui/account/password_reentry_page.dart';
 import 'package:ente_auth/ui/common/gradient_button.dart';
+import 'package:ente_auth/ui/components/buttons/button_widget.dart';
+import 'package:ente_auth/ui/components/models/button_result.dart';
 import 'package:ente_auth/ui/home_page.dart';
 import 'package:ente_auth/ui/settings/language_picker.dart';
+import 'package:ente_auth/utils/dialog_util.dart';
 import 'package:ente_auth/utils/navigation_util.dart';
+import 'package:ente_auth/utils/toast_util.dart';
 import 'package:flutter/foundation.dart';
 import "package:flutter/material.dart";
+import 'package:local_auth/local_auth.dart';
 
 class OnboardingPage extends StatefulWidget {
   const OnboardingPage({Key? key}) : super(key: key);
@@ -103,15 +109,18 @@ class _OnboardingPageState extends State<OnboardingPage> {
                         const SizedBox(height: 4),
                         Text(
                           "Authenticator",
-                          style: Theme.of(context).textTheme.headline4,
+                          style: Theme.of(context).textTheme.headlineMedium,
                         ),
                         const SizedBox(height: 32),
                         Text(
                           l10n.onBoardingBody,
                           textAlign: TextAlign.center,
                           style:
-                              Theme.of(context).textTheme.headline6!.copyWith(
+                              Theme.of(context).textTheme.titleLarge!.copyWith(
                                     color: Colors.white38,
+                                    // color: Theme.of(context)
+                                    //                            .colorScheme
+                                    //                            .mutedTextColor,
                                   ),
                         ),
                       ],
@@ -128,7 +137,7 @@ class _OnboardingPageState extends State<OnboardingPage> {
                     const SizedBox(height: 4),
                     Container(
                       width: double.infinity,
-                      padding: const EdgeInsets.fromLTRB(20, 12, 20, 28),
+                      padding: const EdgeInsets.fromLTRB(20, 12, 20, 0),
                       child: Hero(
                         tag: "log_in",
                         child: ElevatedButton(
@@ -145,6 +154,23 @@ class _OnboardingPageState extends State<OnboardingPage> {
                         ),
                       ),
                     ),
+                    const SizedBox(height: 4),
+                    Container(
+                      width: double.infinity,
+                      padding: const EdgeInsets.only(top: 20, bottom: 20),
+                      child: GestureDetector(
+                        onTap: _optForOfflineMode,
+                        child: Center(
+                          child: Text(
+                            l10n.useOffline,
+                            style: body.copyWith(
+                              color:
+                                  Theme.of(context).colorScheme.mutedTextColor,
+                            ),
+                          ),
+                        ),
+                      ),
+                    ),
                   ],
                 ),
               ),
@@ -155,6 +181,36 @@ class _OnboardingPageState extends State<OnboardingPage> {
     );
   }
 
+  Future<void> _optForOfflineMode() async {
+    bool canCheckBio = await LocalAuthentication().canCheckBiometrics;
+    if(!canCheckBio) {
+      showToast(context, "Sorry, biometric authentication is not supported on this device.");
+      return;
+    }
+    final bool hasOptedBefore = Configuration.instance.hasOptedForOfflineMode();
+    ButtonResult? result;
+    if(!hasOptedBefore) {
+      result = await showChoiceActionSheet(
+        context,
+        title: context.l10n.warning,
+        body: context.l10n.offlineModeWarning,
+        secondButtonLabel: context.l10n.cancel,
+        firstButtonLabel: context.l10n.ok,
+      );
+    }
+    if (hasOptedBefore || result?.action == ButtonAction.first) {
+      await Configuration.instance.optForOfflineMode();
+      Navigator.of(context).push(
+        MaterialPageRoute(
+          builder: (BuildContext context) {
+            return const HomePage();
+          },
+        ),
+      );
+    }
+
+  }
+
   void _navigateToSignUpPage() {
     Widget page;
     if (Configuration.instance.getEncryptedToken() == null) {
@@ -163,7 +219,9 @@ class _OnboardingPageState extends State<OnboardingPage> {
       // No key
       if (Configuration.instance.getKeyAttributes() == null) {
         // Never had a key
-        page = const PasswordEntryPage();
+        page = const PasswordEntryPage(
+          mode: PasswordEntryMode.set,
+        );
       } else if (Configuration.instance.getKey() == null) {
         // Yet to decrypt the key
         page = const PasswordReentryPage();
@@ -189,7 +247,9 @@ class _OnboardingPageState extends State<OnboardingPage> {
       // No key
       if (Configuration.instance.getKeyAttributes() == null) {
         // Never had a key
-        page = const PasswordEntryPage();
+        page = const PasswordEntryPage(
+          mode: PasswordEntryMode.set,
+        );
       } else if (Configuration.instance.getKey() == null) {
         // Yet to decrypt the key
         page = const PasswordReentryPage();

lib/onboarding/view/setup_enter_secret_key_page.dart

@@ -10,30 +10,27 @@ class SetupEnterSecretKeyPage extends StatefulWidget {
   SetupEnterSecretKeyPage({this.code, Key? key}) : super(key: key);
 
   @override
-  State<SetupEnterSecretKeyPage> createState() =>
-      _SetupEnterSecretKeyPageState();
+  State<SetupEnterSecretKeyPage> createState() => _SetupEnterSecretKeyPageState();
 }
 
 class _SetupEnterSecretKeyPageState extends State<SetupEnterSecretKeyPage> {
   late TextEditingController _issuerController;
   late TextEditingController _accountController;
   late TextEditingController _secretController;
+  late bool _secretKeyObscured;
 
   @override
   void initState() {
     _issuerController = TextEditingController(
-      text: widget.code != null
-          ? Uri.decodeFull(widget.code!.issuer).trim()
-          : null,
+      text: widget.code != null ? safeDecode(widget.code!.issuer).trim() : null,
     );
     _accountController = TextEditingController(
-      text: widget.code != null
-          ? Uri.decodeFull(widget.code!.account).trim()
-          : null,
+      text: widget.code != null ? safeDecode(widget.code!.account).trim() : null,
     );
     _secretController = TextEditingController(
       text: widget.code != null ? widget.code!.secret : null,
     );
+    _secretKeyObscured = widget.code != null;
     super.initState();
   }
 
@@ -77,7 +74,18 @@ class _SetupEnterSecretKeyPageState extends State<SetupEnterSecretKeyPage> {
                   },
                   decoration: InputDecoration(
                     hintText: l10n.codeSecretKeyHint,
+                    suffixIcon: IconButton(
+                      onPressed: () {
+                        setState(() {
+                          _secretKeyObscured = !_secretKeyObscured;
+                        });
+                      },
+                      icon: _secretKeyObscured
+                          ? const Icon(Icons.visibility_off_rounded)
+                          : const Icon(Icons.visibility_rounded),
+                    ),
                   ),
+                  obscureText: _secretKeyObscured,
                   controller: _secretController,
                 ),
                 const SizedBox(
@@ -118,8 +126,7 @@ class _SetupEnterSecretKeyPageState extends State<SetupEnterSecretKeyPage> {
                       try {
                         final account = _accountController.text.trim();
                         final issuer = _issuerController.text.trim();
-                        final secret =
-                            _secretController.text.trim().replaceAll(' ', '');
+                        final secret = _secretController.text.trim().replaceAll(' ', '');
                         final Code newCode = widget.code == null
                             ? Code.fromAccountAndSecret(
                                 account,
@@ -132,7 +139,7 @@ class _SetupEnterSecretKeyPageState extends State<SetupEnterSecretKeyPage> {
                                 secret: secret,
                               );
                         // Verify the validity of the code
-                        getTotp(newCode);
+                        getOTP(newCode);
                         Navigator.of(context).pop(newCode);
                       } catch (e) {
                         _showIncorrectDetailsDialog(context);

lib/onboarding/view/view_qr_page.dart

@@ -0,0 +1,100 @@
+
+import 'dart:math';
+
+import "package:ente_auth/l10n/l10n.dart";
+import 'package:ente_auth/models/code.dart';
+import 'package:ente_auth/theme/ente_theme.dart';
+import "package:flutter/material.dart";
+import 'package:qr_flutter/qr_flutter.dart';
+
+class ViewQrPage extends StatelessWidget {
+  final Code? code;
+
+  ViewQrPage({this.code, Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    final screenWidth = MediaQuery.of(context).size.width;
+    final double qrSize = min(screenWidth - 80, 300.0);
+    final enteTextTheme = getEnteTextTheme(context);
+    final l10n = context.l10n;
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(l10n.qrCode),
+      ),
+      body: SafeArea(
+        child: Center(
+          child: Padding(
+            padding: const EdgeInsets.symmetric(vertical: 40.0, horizontal: 40),
+            child: Column(
+              children: [
+                QrImage(
+                  data: code!.rawData,
+                  foregroundColor: Theme.of(context).colorScheme.onBackground,
+                  version: QrVersions.auto,
+                  size: qrSize,
+                ),
+                const SizedBox(
+                  height: 20,
+                ),
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    Text(
+                      l10n.account,
+                      style: enteTextTheme.largeMuted,
+                    ),
+                    const SizedBox(
+                      width: 10,
+                    ),
+                    Text(
+                      code?.account ?? '',
+                      style: enteTextTheme.largeBold,
+                    ),
+                  ],
+                ),
+                const SizedBox(
+                  height: 4,
+                ),
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    Text(
+                      l10n.codeIssuerHint,
+                      style: enteTextTheme.largeMuted,
+                    ),
+                    const SizedBox(
+                      width: 10,
+                    ),
+                    Text(
+                      code?.issuer ?? '',
+                      style: enteTextTheme.largeBold,
+                    ),
+                  ],
+                ),
+                const SizedBox(
+                  height: 80,
+                ),
+                SizedBox(
+                  width: 400,
+                  child: OutlinedButton(
+                    onPressed: () {
+                      Navigator.of(context).pop();
+                    },
+                    child: Padding(
+                      padding: const EdgeInsets.symmetric(
+                        horizontal: 16.0,
+                        vertical: 4,
+                      ),
+                      child: Text(l10n.back),
+                    ),
+                  ),
+                )
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/services/authenticator_service.dart

@@ -15,18 +15,29 @@ import 'package:ente_auth/models/authenticator/auth_key.dart';
 import 'package:ente_auth/models/authenticator/entity_result.dart';
 import 'package:ente_auth/models/authenticator/local_auth_entity.dart';
 import 'package:ente_auth/store/authenticator_db.dart';
+import 'package:ente_auth/store/offline_authenticator_db.dart';
 import 'package:ente_auth/utils/crypto_util.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_sodium/flutter_sodium.dart';
 import 'package:logging/logging.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
+enum AccountMode {
+  online,
+  offline,
+}
+extension on AccountMode {
+  bool get isOnline => this == AccountMode.online;
+  bool get isOffline => this == AccountMode.offline;
+}
+
 class AuthenticatorService {
   final _logger = Logger((AuthenticatorService).toString());
   final _config = Configuration.instance;
   late SharedPreferences _prefs;
   late AuthenticatorGateway _gateway;
   late AuthenticatorDB _db;
+  late OfflineAuthenticatorDB _offlineDb;
   final String _lastEntitySyncTime = "lastEntitySyncTime";
 
   AuthenticatorService._privateConstructor();
@@ -34,25 +45,34 @@ class AuthenticatorService {
   static final AuthenticatorService instance =
       AuthenticatorService._privateConstructor();
 
+  AccountMode getAccountMode() {
+    return Configuration.instance.hasOptedForOfflineMode() &&
+            !Configuration.instance.hasConfiguredAccount()
+        ? AccountMode.offline
+        : AccountMode.online;
+  }
+
   Future<void> init() async {
     _prefs = await SharedPreferences.getInstance();
     _db = AuthenticatorDB.instance;
+    _offlineDb = OfflineAuthenticatorDB.instance;
     _gateway = AuthenticatorGateway(Network.instance.getDio(), _config);
     if (Configuration.instance.hasConfiguredAccount()) {
-      unawaited(sync());
+      unawaited(onlineSync());
     }
     Bus.instance.on<SignedInEvent>().listen((event) {
-      unawaited(sync());
+      unawaited(onlineSync());
     });
   }
 
-  Future<List<EntityResult>> getEntities() async {
-    final List<LocalAuthEntity> result = await _db.getAll();
+  Future<List<EntityResult>> getEntities(AccountMode mode) async {
+    final List<LocalAuthEntity> result =
+        mode.isOnline ? await _db.getAll() : await _offlineDb.getAll();
     final List<EntityResult> entities = [];
     if (result.isEmpty) {
       return entities;
     }
-    final key = await getOrCreateAuthDataKey();
+    final key = await getOrCreateAuthDataKey(mode);
     for (LocalAuthEntity e in result) {
       try {
         final decryptedValue = await CryptoUtil.decryptChaCha(
@@ -75,17 +95,23 @@ class AuthenticatorService {
     return entities;
   }
 
-  Future<int> addEntry(String plainText, bool shouldSync) async {
-    var key = await getOrCreateAuthDataKey();
+  Future<int> addEntry(
+    String plainText,
+    bool shouldSync,
+    AccountMode accountMode,
+  ) async {
+    var key = await getOrCreateAuthDataKey(accountMode);
     final encryptedKeyData = await CryptoUtil.encryptChaCha(
       utf8.encode(plainText) as Uint8List,
       key,
     );
     String encryptedData = Sodium.bin2base64(encryptedKeyData.encryptedData!);
     String header = Sodium.bin2base64(encryptedKeyData.header!);
-    final insertedID = await _db.insert(encryptedData, header);
+    final insertedID = accountMode.isOnline
+        ? await _db.insert(encryptedData, header)
+        : await _offlineDb.insert(encryptedData, header);
     if (shouldSync) {
-      unawaited(sync());
+      unawaited(onlineSync());
     }
     return insertedID;
   }
@@ -94,45 +120,60 @@ class AuthenticatorService {
     int generatedID,
     String plainText,
     bool shouldSync,
+    AccountMode accountMode,
   ) async {
-    var key = await getOrCreateAuthDataKey();
+    var key = await getOrCreateAuthDataKey(accountMode);
     final encryptedKeyData = await CryptoUtil.encryptChaCha(
       utf8.encode(plainText) as Uint8List,
       key,
     );
     String encryptedData = Sodium.bin2base64(encryptedKeyData.encryptedData!);
     String header = Sodium.bin2base64(encryptedKeyData.header!);
-    final int affectedRows =
-        await _db.updateEntry(generatedID, encryptedData, header);
+    final int affectedRows = accountMode.isOnline
+        ? await _db.updateEntry(generatedID, encryptedData, header)
+        : await _offlineDb.updateEntry(generatedID, encryptedData, header);
     assert(
       affectedRows == 1,
       "updateEntry should have updated exactly one row",
     );
     if (shouldSync) {
-      unawaited(sync());
+      unawaited(onlineSync());
     }
   }
 
-  Future<void> deleteEntry(int genID) async {
-    LocalAuthEntity? result = await _db.getEntryByID(genID);
+  Future<void> deleteEntry(int genID, AccountMode accountMode) async {
+    LocalAuthEntity? result = accountMode.isOnline
+        ? await _db.getEntryByID(genID)
+        : await _offlineDb.getEntryByID(genID);
     if (result == null) {
       _logger.info("No entry found for given id");
       return;
     }
-    if (result.id != null) {
+    if (result.id != null && accountMode.isOnline) {
       await _gateway.deleteEntity(result.id!);
+    } else {
+      debugPrint("Skipping delete since account mode is offline");
+    }
+    if(accountMode.isOnline) {
+      await _db.deleteByIDs(generatedIDs: [genID]);
+    } else {
+      await _offlineDb.deleteByIDs(generatedIDs: [genID]);
     }
-    await _db.deleteByIDs(generatedIDs: [genID]);
   }
 
-  Future<void> sync() async {
+  Future<bool> onlineSync() async {
     try {
+      if(getAccountMode().isOffline) {
+        debugPrint("Skipping sync since account mode is offline");
+        return false;
+      }
       _logger.info("Sync");
       await _remoteToLocalSync();
       _logger.info("remote fetch completed");
       await _localToRemoteSync();
       _logger.info("local push completed");
       Bus.instance.fire(CodesUpdatedEvent());
+      return true;
     } on UnauthorizedError {
       if ((await _db.removeSyncedData()) > 0) {
         Bus.instance.fire(CodesUpdatedEvent());
@@ -140,8 +181,10 @@ class AuthenticatorService {
       debugPrint("Firing logout event");
 
       Bus.instance.fire(TriggerLogoutEvent());
+      return false;
     } catch (e) {
       _logger.severe("Failed to sync with remote", e);
+      return false;
     }
   }
 
@@ -209,7 +252,10 @@ class AuthenticatorService {
     }
   }
 
-  Future<Uint8List> getOrCreateAuthDataKey() async {
+  Future<Uint8List> getOrCreateAuthDataKey(AccountMode mode) async {
+    if(mode.isOffline) {
+      return _config.getOfflineSecretKey()!;
+    }
     if (_config.getAuthSecretKey() != null) {
       return _config.getAuthSecretKey()!;
     }
@@ -217,7 +263,7 @@ class AuthenticatorService {
       final AuthKey response = await _gateway.getKey();
       final authKey = CryptoUtil.decryptSync(
         Sodium.base642bin(response.encryptedKey),
-        _config.getKey(),
+        _config.getKey()!,
         Sodium.base642bin(response.header),
       );
       await _config.setAuthSecretKey(Sodium.bin2base64(authKey));

lib/services/preference_service.dart

@@ -1,3 +1,5 @@
+import 'package:ente_auth/core/event_bus.dart';
+import 'package:ente_auth/events/icons_changed_event.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 class PreferenceService {
@@ -8,6 +10,8 @@ class PreferenceService {
   late final SharedPreferences _prefs;
 
   static const kHasShownCoachMarkKey = "has_shown_coach_mark";
+  static const kShouldShowLargeIconsKey = "should_show_large_icons";
+  static const kShouldAutoFocusOnSearchBar = "should_auto_focus_on_search_bar";
 
   Future<void> init() async {
     _prefs = await SharedPreferences.getInstance();
@@ -24,4 +28,30 @@ class PreferenceService {
   Future<void> setHasShownCoachMark(bool value) {
     return _prefs.setBool(kHasShownCoachMarkKey, value);
   }
+
+  bool shouldShowLargeIcons() {
+    if (_prefs.containsKey(kShouldShowLargeIconsKey)) {
+      return _prefs.getBool(kShouldShowLargeIconsKey)!;
+    } else {
+      return false;
+    }
+  }
+
+  Future<void> setShowLargeIcons(bool value) async {
+    await _prefs.setBool(kShouldShowLargeIconsKey, value);
+    Bus.instance.fire(IconsChangedEvent());
+  }
+
+  bool shouldAutoFocusOnSearchBar() {
+    if (_prefs.containsKey(kShouldAutoFocusOnSearchBar)) {
+      return _prefs.getBool(kShouldAutoFocusOnSearchBar)!;
+    } else {
+      return false;
+    }
+  }
+
+  Future<void> setAutoFocusOnSearchBar(bool value) async {
+    await _prefs.setBool(kShouldAutoFocusOnSearchBar, value);
+    Bus.instance.fire(IconsChangedEvent());
+  }
 }

lib/services/update_service.dart

@@ -5,16 +5,18 @@ import 'dart:io';
 import 'package:ente_auth/core/constants.dart';
 import 'package:ente_auth/core/network.dart';
 import 'package:ente_auth/services/notification_service.dart';
-import 'package:flutter/foundation.dart';
 import 'package:logging/logging.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:shared_preferences/shared_preferences.dart';
+import 'package:tuple/tuple.dart';
+import 'package:url_launcher/url_launcher_string.dart';
 
 class UpdateService {
   UpdateService._privateConstructor();
 
   static final UpdateService instance = UpdateService._privateConstructor();
   static const kUpdateAvailableShownTimeKey = "update_available_shown_time_key";
+  static const String flavor = String.fromEnvironment('app.flavor');
 
   LatestVersionInfo? _latestVersion;
   final _logger = Logger("UpdateService");
@@ -87,11 +89,47 @@ class UpdateService {
     return LatestVersionInfo.fromMap(response.data["latestVersion"]);
   }
 
-  bool isIndependent() {
-    if (Platform.isIOS) {
-      return false;
+  // getRateDetails returns details about the place
+  Tuple2<String, String> getRateDetails() {
+    // 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") {
+        return const Tuple2(
+          "Play Store",
+          "market://details??id=io.ente.auth",
+        );
+      }
+      return const Tuple2(
+        "AlternativeTo",
+        "https://alternativeto.net/software/ente-authenticator/about/",
+      );
     }
-    return kDebugMode || _packageInfo.packageName.endsWith("independent");
+    return const Tuple2(
+      "App Store",
+      "https://apps.apple.com/in/app/ente-photos/id6444121398",
+    );
+  }
+
+  Future<void> launchReviewUrl() async {
+    final String url = getRateDetails().item2;
+    try {
+      await launchUrlString(url, mode: LaunchMode.externalApplication);
+    } catch (e) {
+      _logger.severe("Failed top open launch url $url", e);
+      // 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",
+          mode: LaunchMode.externalApplication,
+        ).ignore();
+      }
+    }
+  }
+
+  bool isIndependent() {
+    return flavor == "independent" || _packageInfo.packageName.endsWith("independent");
   }
 }
 

lib/store/code_store.dart

@@ -1,10 +1,13 @@
 import 'dart:convert';
 
+import 'package:collection/collection.dart';
+import 'package:ente_auth/core/configuration.dart';
 import 'package:ente_auth/core/event_bus.dart';
 import 'package:ente_auth/events/codes_updated_event.dart';
 import 'package:ente_auth/models/authenticator/entity_result.dart';
 import 'package:ente_auth/models/code.dart';
 import 'package:ente_auth/services/authenticator_service.dart';
+import 'package:ente_auth/store/offline_authenticator_db.dart';
 import 'package:logging/logging.dart';
 
 class CodeStore {
@@ -19,9 +22,10 @@ class CodeStore {
     _authenticatorService = AuthenticatorService.instance;
   }
 
-  Future<List<Code>> getAllCodes() async {
+  Future<List<Code>> getAllCodes({AccountMode? accountMode}) async {
+    final mode = accountMode ?? _authenticatorService.getAccountMode();
     final List<EntityResult> entities =
-        await _authenticatorService.getEntities();
+        await _authenticatorService.getEntities(mode);
     final List<Code> codes = [];
     for (final entity in entities) {
       final decodeJson = jsonDecode(entity.rawData);
@@ -33,47 +37,129 @@ class CodeStore {
 
     // sort codes by issuer,account
     codes.sort((a, b) {
-      final issuerComparison = a.issuer.compareTo(b.issuer);
+      final issuerComparison = compareAsciiLowerCaseNatural(a.issuer, b.issuer);
       if (issuerComparison != 0) {
         return issuerComparison;
       }
-      return a.account.compareTo(b.account);
+      return compareAsciiLowerCaseNatural(a.account, b.account);
     });
     return codes;
   }
 
-  Future<void> addCode(
+  Future<AddResult> addCode(
     Code code, {
     bool shouldSync = true,
+    AccountMode? accountMode,
   }) async {
-    final codes = await getAllCodes();
+    final mode = accountMode ?? _authenticatorService.getAccountMode();
+    final codes = await getAllCodes(accountMode: mode);
     bool isExistingCode = false;
     for (final existingCode in codes) {
       if (existingCode == code) {
         _logger.info("Found duplicate code, skipping add");
-        return;
+        return AddResult.duplicate;
       } else if (existingCode.generatedID == code.generatedID) {
         isExistingCode = true;
         break;
       }
     }
+    late AddResult result;
     if (isExistingCode) {
+      result = AddResult.updateCode;
       await _authenticatorService.updateEntry(
         code.generatedID!,
         jsonEncode(code.rawData),
         shouldSync,
+        mode,
       );
     } else {
+      result = AddResult.newCode;
       code.generatedID = await _authenticatorService.addEntry(
         jsonEncode(code.rawData),
         shouldSync,
+        mode,
       );
     }
     Bus.instance.fire(CodesUpdatedEvent());
+    return result;
   }
 
-  Future<void> removeCode(Code code) async {
-    await _authenticatorService.deleteEntry(code.generatedID!);
+  Future<void> removeCode(Code code, {AccountMode? accountMode}) async {
+    final mode = accountMode ?? _authenticatorService.getAccountMode();
+    await _authenticatorService.deleteEntry(code.generatedID!, mode);
     Bus.instance.fire(CodesUpdatedEvent());
   }
+
+  bool _isOfflineImportRunning = false;
+
+  Future<void> importOfflineCodes() async {
+    if(_isOfflineImportRunning) {
+      return;
+    }
+    _isOfflineImportRunning = true;
+    Logger logger = Logger('importOfflineCodes');
+    try {
+      Configuration config = Configuration.instance;
+      if (!config.hasConfiguredAccount() ||
+          !config.hasOptedForOfflineMode() ||
+          config.getOfflineSecretKey() == null) {
+        return;
+      }
+      logger.info('start import');
+
+      List<Code> offlineCodes = await CodeStore.instance
+          .getAllCodes(accountMode: AccountMode.offline);
+      if (offlineCodes.isEmpty) {
+        return;
+      }
+      bool isOnlineSyncDone = await AuthenticatorService.instance.onlineSync();
+      if (!isOnlineSyncDone) {
+        logger.info("skip as online sync is not done");
+        return;
+      }
+      final List<Code> onlineCodes =
+          await CodeStore.instance.getAllCodes(accountMode: AccountMode.online);
+      logger.info(
+        'importing ${offlineCodes.length} offline codes with ${onlineCodes.length} online codes',
+      );
+      for (Code eachCode in offlineCodes) {
+        bool alreadyPresent = onlineCodes.any(
+          (oc) =>
+              oc.issuer == eachCode.issuer &&
+              oc.account == eachCode.account &&
+              oc.secret == eachCode.secret,
+        );
+        int? generatedID = eachCode.generatedID!;
+        logger.info(
+          'importingCode: genID ${eachCode.generatedID} & isAlreadyPresent $alreadyPresent',
+        );
+        if (!alreadyPresent) {
+          // Avoid conflict with generatedID of online codes
+          eachCode.generatedID = null;
+          final AddResult result = await CodeStore.instance.addCode(
+            eachCode,
+            accountMode: AccountMode.online,
+            shouldSync: false,
+          );
+          logger.info(
+            'importedCode: genID ${eachCode.generatedID} result: ${result.name}',
+          );
+        }
+        await OfflineAuthenticatorDB.instance.deleteByIDs(
+          generatedIDs: [generatedID],
+        );
+      }
+      AuthenticatorService.instance.onlineSync().ignore();
+    } catch (e, s) {
+      _logger.severe("error while importing offline codes", e, s);
+    } finally {
+      _isOfflineImportRunning = false;
+    }
+  }
+}
+
+enum AddResult {
+  newCode,
+  duplicate,
+  updateCode,
 }

lib/store/offline_authenticator_db.dart

@@ -0,0 +1,170 @@
+import 'dart:async';
+import 'dart:io';
+
+import 'package:ente_auth/models/authenticator/auth_entity.dart';
+import 'package:ente_auth/models/authenticator/local_auth_entity.dart';
+import 'package:flutter/foundation.dart';
+import 'package:path/path.dart';
+import 'package:path_provider/path_provider.dart';
+import 'package:sqflite/sqflite.dart';
+
+class OfflineAuthenticatorDB {
+  static const _databaseName = "ente.offline_authenticator.db";
+  static const _databaseVersion = 1;
+
+  static const entityTable = 'entities';
+
+  OfflineAuthenticatorDB._privateConstructor();
+  static final OfflineAuthenticatorDB instance = OfflineAuthenticatorDB._privateConstructor();
+
+  static Future<Database>? _dbFuture;
+
+  Future<Database> get database async {
+    _dbFuture ??= _initDatabase();
+    return _dbFuture!;
+  }
+
+  Future<Database> _initDatabase() async {
+    final Directory documentsDirectory =
+    await getApplicationDocumentsDirectory();
+    final String path = join(documentsDirectory.path, _databaseName);
+    debugPrint(path);
+    return await openDatabase(
+      path,
+      version: _databaseVersion,
+      onCreate: _onCreate,
+    );
+  }
+
+  Future _onCreate(Database db, int version) async {
+    await db.execute(
+      '''
+                CREATE TABLE $entityTable (
+                  _generatedID INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                  id TEXT,
+                  encryptedData TEXT NOT NULL,
+                  header TEXT NOT NULL,
+                  createdAt INTEGER NOT NULL,
+                  updatedAt INTEGER NOT NULL,
+                  shouldSync INTEGER DEFAULT 0,
+                  UNIQUE(id)
+                );
+      ''',
+    );
+  }
+
+  Future<int> insert(String encData, String header) async {
+    final db = await instance.database;
+    final int timeInMicroSeconds = DateTime.now().microsecondsSinceEpoch;
+    final insertedID = await db.insert(
+      entityTable,
+      {
+        "encryptedData": encData,
+        "header": header,
+        "shouldSync": 1,
+        "createdAt": timeInMicroSeconds,
+        "updatedAt": timeInMicroSeconds,
+      },
+    );
+    return insertedID;
+  }
+
+  Future<int> updateEntry(
+      int generatedID,
+      String encData,
+      String header,
+      ) async {
+    final db = await instance.database;
+    final int timeInMicroSeconds = DateTime.now().microsecondsSinceEpoch;
+    int affectedRows = await db.update(
+      entityTable,
+      {
+        "encryptedData": encData,
+        "header": header,
+        "shouldSync": 1,
+        "updatedAt": timeInMicroSeconds,
+      },
+      where: '_generatedID = ?',
+      whereArgs: [generatedID],
+    );
+    return affectedRows;
+  }
+
+  Future<void> insertOrReplace(List<AuthEntity> authEntities) async {
+    final db = await instance.database;
+    final batch = db.batch();
+    for (AuthEntity authEntity in authEntities) {
+      final insertRow = authEntity.toMap();
+      insertRow.remove('isDeleted');
+      insertRow.putIfAbsent('shouldSync', () => 0);
+      batch.insert(
+        entityTable,
+        insertRow,
+        conflictAlgorithm: ConflictAlgorithm.replace,
+      );
+    }
+    await batch.commit(noResult: true);
+  }
+
+  Future<void> updateLocalEntity(LocalAuthEntity localAuthEntity) async {
+    final db = await instance.database;
+    await db.update(
+      entityTable,
+      localAuthEntity.toMap(),
+      where: '_generatedID = ?',
+      whereArgs: [localAuthEntity.generatedID],
+      conflictAlgorithm: ConflictAlgorithm.replace,
+    );
+  }
+
+  Future<LocalAuthEntity?> getEntryByID(int genID) async {
+    final db = await instance.database;
+    final rows = await db
+        .query(entityTable, where: '_generatedID = ?', whereArgs: [genID]);
+    final listOfAuthEntities = _convertRows(rows);
+    if (listOfAuthEntities.isEmpty) {
+      return null;
+    } else {
+      return listOfAuthEntities.first;
+    }
+  }
+
+  Future<List<LocalAuthEntity>> getAll() async {
+    final db = await instance.database;
+    final rows = await db.rawQuery("SELECT * from $entityTable");
+    return _convertRows(rows);
+  }
+
+// deleteByID will prefer generated id if both ids are passed during deletion
+  Future<void> deleteByIDs({List<int>? generatedIDs, List<String>? ids}) async {
+    final db = await instance.database;
+    final batch = db.batch();
+    const whereGenID = '_generatedID = ?';
+    const whereID = 'id = ?';
+    if (generatedIDs != null) {
+      for (int genId in generatedIDs) {
+        batch.delete(entityTable, where: whereGenID, whereArgs: [genId]);
+      }
+    }
+    if (ids != null) {
+      for (String id in ids) {
+        batch.delete(entityTable, where: whereID, whereArgs: [id]);
+      }
+    }
+    final result = await batch.commit();
+    debugPrint("Done");
+  }
+
+  Future<void> clearTable() async {
+    final db = await instance.database;
+    await db.delete(entityTable);
+  }
+
+  List<LocalAuthEntity> _convertRows(List<Map<String, dynamic>> rows) {
+    final keys = <LocalAuthEntity>[];
+    for (final row in rows) {
+      keys.add(LocalAuthEntity.fromMap(row));
+    }
+    return keys;
+  }
+}