v2.0.8

Forgot comma

.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,70 +1,86 @@
-name: Flutter CI
+name: release
 
 # This workflow is triggered on pushes to the repository.
 on:
-  workflow_dispatch:
-    # Enable manual run
-  push:
-    # Sequence of patterns matched against refs/tags
-    tags:
-      - 'v*' # Push events to matching v*, i.e. v4.2.0
+    workflow_dispatch:
+        # Enable manual run
+    push:
+        # Sequence of patterns matched against refs/tags
+        tags:
+            - "v*" # Push events to matching v*, i.e. v4.2.0
 
 jobs:
-  build:
-    # This job will run on ubuntu virtual machine
-    runs-on: ubuntu-latest
-    steps:
+    build:
+        # This job will run on ubuntu virtual machine
+        runs-on: ubuntu-latest
+        steps:
+            # Setup Java environment in order to build the Android app.
+            - uses: actions/checkout@v2
+            - uses: actions/setup-java@v2
+              with:
+                  distribution: "adopt"
+                  java-version: "11"
 
-      # Setup Java environment in order to build the Android app.
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2
-        with:
-          distribution: 'adopt'
-          java-version: '11'
+            # Setup the flutter environment.
+            - uses: subosito/flutter-action@v2
+              with:
+                  channel: "stable"
+                  flutter-version: "3.13.4"
 
-      # Setup the flutter environment.
-      - uses: subosito/flutter-action@v2
-        with:
-          channel: 'stable'
-          flutter-version: '3.3.8'
+            # Fetch sub modules
+            - run: git submodule update --init --recursive
 
-      # Fetch sub modules
-      - run: git submodule update --init --recursive
+            # Get flutter dependencies.
+            - run: flutter pub get
 
-      # Get flutter dependencies.
-      - run: flutter pub get
+            - name: Setup keys
+              uses: timheuer/base64-to-file@v1
+              with:
+                  fileName: "keystore/ente_auth_key.jks"
+                  encodedString: ${{ secrets.SIGNING_KEY }}
 
-      - name: Setup keys
-        uses: timheuer/base64-to-file@v1
-        with:
-          fileName: 'keystore/ente_auth_key.jks'
-          encodedString: ${{ secrets.SIGNING_KEY }}
+            # Build independent apk.
+            - name: Build
+              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 }}
+                  SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
+                  SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
 
-      # 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
-        env:
-          SIGNING_KEY_PATH: '/home/runner/work/_temp/keystore/ente_auth_key.jks'
-          SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
-          SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
-          SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
+            # Build Play store aab.
+            - name: Build
+              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 }}
+                  SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
+                  SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
 
-      - name: Checksum
-        run: sha256sum build/app/outputs/flutter-apk/ente-auth.apk > build/app/outputs/flutter-apk/sha256sum
+            - name: Checksum
+              run: sha256sum build/app/outputs/flutter-apk/ente-auth.apk > build/app/outputs/flutter-apk/sha256sum
 
-      # Upload generated apk to the artifacts.
-      - uses: actions/upload-artifact@v2
-        with:
-          name: release-apk
-          path: build/app/outputs/flutter-apk/ente-auth.apk
+            # Upload generated apk to the artifacts.
+            - uses: actions/upload-artifact@v2
+              with:
+                  name: release-apk
+                  path: build/app/outputs/flutter-apk/ente-auth.apk
 
-      - uses: actions/upload-artifact@v2
-        with:
-          name: release-checksum
-          path: build/app/outputs/flutter-apk/sha256sum
+            - uses: actions/upload-artifact@v2
+              with:
+                  name: release-checksum
+                  path: build/app/outputs/flutter-apk/sha256sum
 
-      # Create a Github release
-      - uses: ncipollo/release-action@v1
-        with:
-          artifacts: "build/app/outputs/flutter-apk/ente-auth.apk,build/app/outputs/flutter-apk/sha256sum"
-          token: ${{ secrets.GITHUB_TOKEN }}
+            # Create a Github release
+            - uses: ncipollo/release-action@v1
+              with:
+                  artifacts: "build/app/outputs/flutter-apk/ente-auth.apk,build/app/outputs/flutter-apk/sha256sum"
+                  token: ${{ secrets.GITHUB_TOKEN }}
+
+            # Upload to Play store
+            - uses: ente-io/upload-google-play@v1
+              with:
+                  serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
+                  packageName: io.ente.auth
+                  releaseFiles: build/app/outputs/bundle/playstoreRelease/app-playstore-release.aab
+                  track: internal

.github/workflows/cla.yaml

@@ -1,36 +0,0 @@
-name: "CLA Assistant"
-on:
-    issue_comment:
-        types: [created]
-    pull_request_target:
-        types: [opened, closed, synchronize]
-
-jobs:
-    CLAAssistant:
-        runs-on: ubuntu-latest
-        steps:
-            - name: "CLA Assistant"
-              if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
-              # Beta Release
-              uses: contributor-assistant/github-action@v2.2.1
-              env:
-                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-                  # the below token should have repo scope and must be manually added by you in the repository's secret
-                  PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
-              with:
-                  path-to-signatures: "signatures/version1/cla.json"
-                  path-to-document: "https://github.com/ente-io/cla/blob/main/CLA.md" # e.g. a CLA or a DCO document
-                  # branch should not be protected
-                  branch: "main"
-                  allowlist: enteio
-
-                  # the followings are the optional inputs - If the optional inputs are not given, then default values will be taken
-                  #remote-organization-name: enter the remote organization name where the signatures should be stored (Default is storing the signatures in the same repository)
-                  remote-repository-name: cla
-                  #create-file-commit-message: 'For example: Creating file for storing CLA Signatures'
-                  #signed-commit-message: 'For example: $contributorName has signed the CLA in #$pullRequestNo'
-                  #custom-notsigned-prcomment: 'pull request comment with Introductory message to ask new contributors to sign'
-                  #custom-pr-sign-comment: 'The signature to be committed in order to sign the CLA'
-                  #custom-allsigned-prcomment: 'pull request comment when all contributors has signed, defaults to **CLA Assistant Lite bot** All Contributors have signed the CLA.'
-                  #lock-pullrequest-aftermerge: false - if you don't want this bot to automatically lock the pull request after merging (default - true)
-                  #use-dco-flag: true - If you are using DCO instead of CLA

.github/workflows/l18n-crowdin.yml

@@ -0,0 +1,35 @@
+name: Sync crowdin translation
+
+on:
+  push:
+    paths: # run action automatically when app_en.arb file is changed
+      - 'lib/l10n/arb/app_en.arb'
+    branches: [ main ]
+  schedule:
+    - cron: '0 */12 * * *' # Every 12 hours - https://crontab.guru/#0_*/12_*_*_*
+  workflow_dispatch: # for manually running the action
+
+jobs:
+  synchronize-with-crowdin:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: crowdin action
+        uses: crowdin/github-action@v1
+        with:
+          upload_sources: true
+          upload_translations: true
+          download_translations: true
+          localization_branch_name: l10n_translations
+          create_pull_request: true
+          skip_untranslated_strings: true
+          pull_request_title: 'New Translations'
+          pull_request_body: 'New translations via [Crowdin GH Action](https://github.com/crowdin/github-action)'
+          pull_request_base_branch_name: 'main'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
+          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

.gitmodules

@@ -2,3 +2,10 @@
 	path = thirdparty/sentry-dart
 	url = https://github.com/ente-io/sentry-dart.git
 	branch = sentry_flutter_ente
+[submodule "flutter"]
+	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

CLA.md

@@ -1,98 +0,0 @@
-## Contributor License Agreement
-
-Thank you for your contribution to ente projects.
-
-This contributor license agreement documents the rights granted by contributors
-to Ente Technologies, Inc ("ente"). This license is for your protection as a
-Contributor as well as the protection of ente, its users, and its licensees; you
-may still license your own Contributions under other terms.
-
-In exchange for the ability to participate in the ente community and for other
-good consideration, the receipt of which is hereby acknowledged, you accept and
-agree to the following terms and conditions for Your present and future
-Contributions submitted to ente. Except for the license granted herein to ente
-and recipients of software distributed by ente, You reserve all right, title,
-and interest in and to Your Contributions.
-
-1. Definitions.
-
-   "You" (or "Your") shall mean the copyright owner or legal entity authorized
-   by the copyright owner that is making this Agreement with ente. For legal
-   entities, the entity making a Contribution and all other entities that
-   control, are controlled by, or are under common control with that entity are
-   considered to be a single Contributor. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the direction or
-   management of such entity, whether by contract or otherwise, or (ii)
-   ownership of fifty percent (50%) or more of the outstanding shares, or (iii)
-   beneficial ownership of such entity.
-
-   "Contribution" shall mean any original work of authorship or invention,
-   including any modifications or additions to an existing work, that is
-   intentionally submitted by You to ente for inclusion in, or documentation of,
-   any of the products owned or managed by ente (the "Work"). For the purposes
-   of this definition, "submitted" means any form of electronic, verbal, or
-   written communication sent to ente or its representatives, including but not
-   limited to communication on electronic mailing lists, source code control
-   systems, and issue tracking systems that are managed by, or on behalf of,
-   ente for the purpose of discussing and improving the Work, but excluding
-   communication that is conspicuously marked or otherwise designated in writing
-   by You as "Not a Contribution."
-
-2. Grant of Copyright License. Subject to the terms and conditions of this
-   Agreement, You hereby grant to ente and to recipients of software distributed
-   by ente a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-   irrevocable copyright license to reproduce, prepare derivative works of,
-   publicly display, publicly perform, and distribute Your Contributions and
-   such derivative works.
-
-3. Grant of Patent License. Subject to the terms and conditions of this
-   Agreement, You hereby grant to ente and to recipients of software distributed
-   by ente a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-   irrevocable (except as stated in this section) patent license to make, have
-   made, use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable by You that
-   are necessarily infringed by Your Contribution(s) alone or by combination of
-   Your Contribution(s) with the Work to which such Contribution(s) was
-   submitted. If any entity institutes patent litigation against You or any
-   other entity (including a cross-claim or counterclaim in a lawsuit) alleging
-   that your Contribution, or the Work to which you have contributed,
-   constitutes direct or contributory patent infringement, then any patent
-   licenses granted to that entity under this Agreement for that Contribution or
-   Work shall terminate as of the date such litigation is filed.
-
-4. You represent that you are legally entitled to grant the above license. If
-   your employer(s) has rights to intellectual property that you create that
-   includes your Contributions, you represent that you have received permission
-   to make Contributions on behalf of that employer, that your employer has
-   waived such rights for your contributions to ente, or that your employer has
-   executed with ente a separate contributor license agreement substantially
-   similar to this Agreement. If You are a current employee or contractor of
-   ente, then the terms of your existing Employment Agreement or Consulting
-   Services Agreement shall supersede this CLA, and remain in full effect.
-
-5. You represent that each of Your Contributions is Your original creation (see
-   section 7 for submissions on behalf of others). You represent that Your
-   Contribution submissions include complete details of any third-party license
-   or other restriction (including, but not limited to, related patents and
-   trademarks) of which you are personally aware and which are associated with
-   any part of Your Contributions.
-
-6. You are not expected to provide support for Your Contributions, except to the
-   extent You desire to provide support. You may provide support for free, for
-   a fee, or not at all. Unless required by applicable law or agreed to in
-   writing, You provide Your Contributions on an "AS IS" BASIS, WITHOUT
-   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including,
-   without limitation, any warranties or conditions of title, non-infringement,
-   merchantability, or fitness for a particular purpose.
-
-7. Should You wish to submit work that is not Your original creation, You may
-   submit it to ente separately from any Contribution, identifying the complete
-   details of its source and of any license or other restriction (including, but
-   not limited to, related patents, trademarks, and license agreements) of which
-   you are personally aware, and conspicuously marking the work as "Not a
-   Contribution". Third-party materials licensed pursuant to: [license name(s)
-   here]" (substituting the bracketed text with the appropriate license
-   name(s)).
-
-8. You agree to notify ente of any facts or circumstances of which you become
-   aware that would make these representations inaccurate in any respect.

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/ACCOUNT?secret=SUPERSECRET&issuer=SERVICE
-```
-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
@@ -48,30 +53,33 @@ file, that adheres to the above format.
 ### Android
 
 This repository's [GitHub
-releases](https://github.com/ente-io/auth/releases/latest/download/ente-auth.apks)
+releases](https://github.com/ente-io/auth/releases/latest/download/ente-auth.apk)
 contains APKs, built straight from source. These builds keep themselves updated,
 without relying on third party stores.
 
-You can alternatively install the build from PlayStore.
+You can alternatively install the build from PlayStore or F-Droid.
 
 <a href="https://play.google.com/store/apps/details?id=io.ente.auth"> <img
   width="197" alt="Get it on Google Play"
 src="https://ente.io/static/ed265c3abdcd3efa5e29f64b927bcb44/e230a/play-store-badge.webp">
 </a>
 
-### iOS
+<a href="https://f-droid.org/packages/io.ente.auth/">
+  <img width="197" alt="Get it on F-Droid" src="https://ente.io/static/5378d3de690a04a5011268b9caf739f5/e230a/f-droid-badge.webp">
+</a>
+
+### iPhone / Apple Silicon
+
 
 <a href="https://apps.apple.com/us/app/ente-authenticator/id6444121398"> <img
   width="197" alt="Download on AppStore"
 src="https://user-images.githubusercontent.com/1161789/154795157-c4468ff9-97fd-46f3-87fe-dca789d8733a.png">
 </a>
 
-### Desktop
+### Web / Desktop
 
-Support for desktop platforms (Linux, Mac and Windows) is a [work in
-progress](https://github.com/ente-io/auth/tree/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.
 
-Please ⭐ this repo to be notified of updates.
 
 
 ## 🔩 Architecture
@@ -80,24 +88,38 @@ 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` 
 3. Pull in all submodules with `git submodule update --init --recursive`
-4. For Android, run `flutter build apk --release --flavor independent`
+4. For Android, [setup your keystore](https://docs.flutter.dev/deployment/android#create-an-upload-keystore) and run `flutter build apk --release --flavor independent`
 5. For iOS, run `flutter build ios` 
 
+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](./issues).
+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.
 
 
 ## 💜 Community

RELEASES.md

@@ -0,0 +1,12 @@
+# Releases
+
+1. Create a PR to bump up the version number in `pubspec.yaml`.
+
+2. Once that is merged, tag main. This'll trigger the
+   [workflow](.github/workflows/ci.yml) to (a) create a new GitHub release with
+   the independently distributed APK, and (b) build and upload a release to
+   Google Play.
+
+3. Xcode Cloud has already been configured and will automatically build and
+   release to TestFlight when step 1 was merged to main (you can see logs under
+   the PR checks).

analysis_options.yaml

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

android/app/build.gradle

@@ -72,6 +72,9 @@ android {
         playstore {
             dimension "default"
         }
+        fdroid {
+            dimension "default"
+        }
     }
 
     buildTypes {

android/app/src/main/AndroidManifest.xml

@@ -25,7 +25,14 @@
                 <action android:name="android.intent.action.VIEW"/>
                 <category android:name="android.intent.category.DEFAULT"/>
                 <category android:name="android.intent.category.BROWSABLE"/>
-                <data android:scheme="ente"/>
+                <data android:scheme="ente-auth"/>
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="otpauth" />
             </intent-filter>
 
         </activity>
@@ -54,4 +61,4 @@
             tools:ignore="ScopedStorage"/>
     <uses-permission android:name="android.permission.USE_BIOMETRIC"/>
 
-</manifest>
+</manifest>

android/app/src/main/res/mipmap-anydpi-v26/launcher_icon.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
   <background android:drawable="@color/ic_launcher_background"/>
   <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+  <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>

android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.8.22'
     repositories {
         google()
         mavenCentral()
@@ -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,183 @@
+{
+  "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"
+    },
+    {
+      "title": "NextDNS"
+    },
+    {
+      "title": "Skiff",
+      "hex": "EF5A3C"
+    }
+    
+  ]
+}

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/nextdns.svg

@@ -0,0 +1 @@
+<svg height="512pt" viewBox="0 0 512 512" width="512pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientTransform="matrix(.43837115 .89879405 -.89879405 .43837115 0 0)">&gt;<stop offset="0" stop-color="#00a9ff"/><stop offset="1" stop-color="#05f"/></linearGradient><path d="m469.139 139.984-.016-.391c-.218-4.819-.363-9.919-.452-15.592-.409-27.666-22.402-50.55-50.071-52.097-57.69-3.219-102.319-22.031-140.45-59.198l-.326-.31c-12.437-11.404-31.199-11.404-43.64 0l-.326.31c-38.132 37.167-82.76 55.979-140.45 59.202-27.666 1.543-49.662 24.427-50.072 52.097-.084 5.635-.233 10.734-.452 15.588l-.023.907c-1.121 58.827-2.515 132.04 21.978 198.493 13.467 36.543 33.863 68.309 60.618 94.42 30.472 29.737 70.384 53.345 118.626 70.166 1.57.547 3.2.991 4.862 1.324 2.343.467 4.701.701 7.059.701s4.72-.234 7.059-.701c1.661-.333 3.304-.78 4.881-1.332 48.184-16.851 88.054-40.471 118.499-70.204 26.744-26.119 47.14-57.892 60.619-94.443 24.584-66.652 23.194-140.003 22.077-198.94z" fill="url(#a)"/></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/skiff.svg

@@ -0,0 +1,13 @@
+<svg version="1.2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 90 90" width="90" height="90">
+	<title>skiff</title>
+	<style>
+		.s0 { fill: #000000 } 
+	</style>
+	<g id="Layer">
+		<g id="Layer">
+			<path id="Layer" fill-rule="evenodd" class="s0" d="m54.8 16.3q-1.8 0-3.6 0.3-1.7 0.4-3.4 1-1.7 0.7-3.2 1.7-1.5 0.9-2.8 2.2-1.3 1.2-2.3 2.7-1.1 1.4-1.8 3.1-0.8 1.6-1.2 3.3-0.5 1.8-0.6 3.6-0.1 1.8 0.2 3.5 0.2 1.8 0.7 3.5 0.6 1.8 1.5 3.3 0.8 1.6 2 3 1.1 1.4 2.5 2.5 1.4 1.2 2.9 2 1.6 0.9 3.3 1.4 1.7 0.6 3.5 0.8c0.6 0.1 1.2 0.2 1.8 0.2v0.9q-0.1 1.3-0.3 2.5c0 0.2-0.1 0.4-0.1 0.6-0.1 0.4-0.2 0.9-0.3 1.3-0.1 0.2-0.3 0.7-0.3 0.8l-0.2 0.6q-0.3 0.8-0.8 1.6-0.4 0.9-0.9 1.7-0.5 0.7-1 1.5-0.6 0.7-1.3 1.4-0.6 0.7-1.3 1.3-0.7 0.6-1.5 1.1-0.7 0.5-1.5 1-0.8 0.4-1.7 0.8c-2.1 0.9-4.4 1.4-6.8 1.5q-1.4 0-2.8-0.3l-0.8-0.1-0.9-0.2c-0.3-0.1-0.6-0.2-0.9-0.2-0.5-0.2-1.1-0.4-1.7-0.6-0.2-0.1-0.5-0.3-0.8-0.4l-0.7-0.4c-0.1 0-0.2-0.1-0.5-0.2-0.2-0.2-0.7-0.4-0.9-0.6l-0.3-0.2-0.2-0.1c-0.3-0.2-0.6-0.5-0.9-0.7l-0.2-0.2-0.2-0.1-0.4-0.4c-0.3-0.2-0.6-0.6-0.8-0.8l-1.2-1.2-1.1-1.2-0.7-0.9c-0.2-0.3-0.5-0.7-0.6-0.9-0.5-0.6-1-1.5-1.4-2.2q-1.4-2.4-2.4-5.1-0.9-2.7-1.4-5.5-0.5-2.8-0.5-5.7 0-2.8 0.5-5.6v-0.3c0.1-0.4 0.3-1.3 0.4-1.7 0.2-0.6 0.3-1.2 0.5-1.8 0.1-0.4 0.3-1 0.4-1.1 0-0.1 0.5-1.2 0.5-1.3l0.5-1.3c0.2-0.3 0.6-1.3 0.7-1.5 0.2-0.3 0.7-1.3 0.8-1.4 0.1-0.1 0.3-0.4 0.4-0.6 0.1-0.1 0.2-0.4 0.4-0.7 0.2-0.3 0.7-1.1 1-1.4l0.8-1.1c0.2-0.3 0.7-0.9 1.1-1.3 0.4-0.3 0.9-0.9 1.2-1.2 0.2-0.3 0.9-0.9 1.1-1.2 0.3-0.2 1-0.9 1.3-1.1q1.6-1.3 3.4-2.4 1.7-1.1 3.6-1.9 1.9-0.9 3.9-1.5 1.9-0.6 4-1 2-0.3 4.1-0.4 2.1-0.1 4.1 0.1 2.1 0.2 4.1 0.7 2 0.4 3.9 1.2 0.8 0.2 1.6 0.6 0.8 0.3 1.5 0.7 0.8 0.4 1.5 0.8 0.8 0.4 1.5 0.8c-2.5-1.1-5.3-1.7-8.1-1.6zm-22.3 50.8q2.3 0.9 4.7 1.1 2.5 0.2 4.9-0.3 2.5-0.5 4.6-1.7c-2.9 1.3-6.1 1.8-9.2 1.3q-1.1-0.2-2.3-0.5-1.1-0.4-2.2-0.8-1.1-0.5-2-1.2-1-0.6-1.9-1.4-0.3-0.2-0.5-0.5-0.2-0.2-0.5-0.4-0.2-0.3-0.4-0.5-0.3-0.3-0.5-0.5l-0.1-0.1-0.1-0.2-0.2-0.2q-0.8-1-1.6-2.1-0.7-1-1.3-2.1-0.6-1.1-1.2-2.2-0.5-1.2-0.9-2.4-1.1-3-1.5-6.1-0.4-3.1-0.1-6.2 0.3-3.2 1.2-6.2 1-3 2.6-5.7 0.7-1.4 1.6-2.6 1-1.3 2-2.5 1.1-1.1 2.2-2.2 1.2-1 2.5-1.9 1.2-0.9 2.6-1.7 1.4-0.7 2.8-1.3 1.4-0.6 2.9-1.1 1.5-0.4 3.1-0.7l1.3-0.2 1.4-0.2 1.3-0.1h-2.7l-1.4 0.1c-3.7 0.4-7.3 1.6-10.6 3.4q-1.5 0.9-2.9 1.9c-0.2 0.2-0.6 0.5-0.9 0.7q-1.1 0.9-2.2 2-1.1 1-2 2.2-1 1.2-1.8 2.4-0.8 1.3-1.5 2.6-1.4 2.7-2.2 5.6-0.8 2.9-1 5.9-0.3 3 0.1 6 0.4 3 1.5 5.9 0.4 1.4 1.1 2.7 0.6 1.4 1.4 2.7 0.8 1.3 1.7 2.5 0.9 1.2 1.9 2.3 0.3 0.2 0.5 0.5 0.3 0.3 0.5 0.5 0.3 0.2 0.5 0.5 0.3 0.2 0.6 0.4 1.9 1.6 4.2 2.6zm17.2-6.4c-2.9 1.5-6.1 2-9.2 1.4q-1.1-0.2-2.3-0.6-1.1-0.4-2.1-1-1-0.6-1.9-1.3-0.9-0.8-1.7-1.7c-0.4-0.4-0.8-0.9-1.2-1.4-0.2-0.2-0.5-0.7-0.7-0.9q-1-1.4-1.8-2.9-0.8-1.5-1.4-3-0.6-1.6-0.9-3.2-0.4-1.6-0.6-3.3-0.2-1.7-0.1-3.3 0-1.7 0.3-3.4 0.3-1.6 0.8-3.2 0.5-1.6 1.1-3.2 0.7-1.4 1.5-2.7 0.8-1.4 1.8-2.6 1-1.2 2.1-2.3 1.2-1.1 2.4-2.1 1.2-0.9 2.6-1.7 1.3-0.8 2.8-1.4 1.4-0.6 2.9-1.1 1.5-0.4 3.1-0.7 0.5-0.1 1-0.1 0.6-0.1 1.1-0.2 0.6 0 1.1 0 0.5-0.1 1.1-0.1-1.4-0.1-2.8-0.1h-1c-0.3 0-0.9 0.1-1.2 0.1q-0.8 0.1-1.7 0.3-0.8 0.1-1.6 0.3-0.8 0.2-1.6 0.5-0.8 0.2-1.5 0.5c-0.2 0.1-0.7 0.3-0.9 0.4-0.2 0.1-0.4 0.2-0.6 0.3-0.5 0.2-1.2 0.6-1.7 0.9-0.5 0.2-1.1 0.7-1.6 1q-0.3 0.2-0.7 0.4-0.3 0.3-0.6 0.5-0.3 0.3-0.6 0.5-0.3 0.3-0.6 0.6-1 0.8-1.9 1.8-0.8 0.9-1.6 2-0.8 1-1.5 2.1-0.6 1.1-1.2 2.3-1.1 2.3-1.7 4.8-0.6 2.6-0.8 5.2-0.1 2.6 0.3 5.1 0.4 2.6 1.3 5 0.5 1.3 1 2.4 0.6 1.2 1.3 2.3 0.7 1.1 1.5 2.1 0.7 1 1.6 2l0.8 0.8 0.1 0.1 0.2 0.2c4.7 4.3 12.2 5.4 17.5 1.6zm-14.3-10.1q-0.7-1.1-1.3-2.2-0.6-1.1-1.1-2.3-0.5-1.2-0.8-2.5-0.3-1.2-0.5-2.5-0.2-1.3-0.2-2.6-0.1-1.2 0.1-2.5 0.1-1.3 0.3-2.6 0.3-1.2 0.7-2.5 0.4-1.2 1-2.3 0.5-1.2 1.2-2.3 0.6-1.1 1.4-2.1 0.8-1 1.7-1.9 1-0.9 2-1.7 1-0.8 2.1-1.5 1-0.7 2.2-1.2 1.2-0.5 2.4-0.9 0.7-0.3 1.5-0.5 0.7-0.2 1.5-0.3 0.7-0.2 1.5-0.3 0.7-0.1 1.5-0.1h2.4c-0.4-0.1-0.9-0.2-1.3-0.2l-0.8-0.1h-2.2q-1 0.1-1.9 0.2-1 0.1-1.9 0.3-1 0.3-1.9 0.6-0.9 0.3-1.8 0.6c-0.4 0.2-0.7 0.3-1.3 0.6-0.5 0.3-1.1 0.7-1.6 1-0.3 0.2-0.7 0.4-1 0.6q-0.9 0.7-1.8 1.5-0.9 0.8-1.7 1.7-0.8 0.9-1.6 1.8-0.7 1-1.3 2-1.2 2.1-1.9 4.4-0.8 2.3-1 4.7-0.3 2.4 0 4.8 0.2 2.4 1 4.6 0.4 1.2 0.9 2.3 0.5 1.1 1.1 2.1 0.6 1 1.3 2 0.7 1 1.5 1.8 0.5 0.6 1 1 0.5 0.5 1.1 0.9 0.5 0.5 1.1 0.8 0.6 0.4 1.3 0.7 1.2 0.7 2.5 1 1.4 0.3 2.8 0.4 1.3 0 2.7-0.2 1.3-0.3 2.6-0.9c-2 0.7-4.2 0.8-6.3 0.3q-0.7-0.1-1.5-0.4-0.7-0.2-1.5-0.5-0.7-0.4-1.4-0.8-0.6-0.4-1.2-0.9-0.6-0.5-1-0.9-0.5-0.5-0.9-1-0.5-0.4-0.9-1-0.4-0.5-0.8-1z"/>
+			<path id="Layer" class="s0" d="m37.4 35.8l-0.7-0.1v0.1q0.8 0 1.5 0.1z"/>
+			<path id="Layer" fill-rule="evenodd" class="s0" d="m62 72.2q-1.7 1.1-3.6 2-1.9 0.8-3.9 1.4-2 0.6-4 1-2.1 0.3-4.1 0.4-2.1 0.1-4.2-0.1-2-0.2-4.1-0.6-2-0.5-3.9-1.2-0.8-0.3-1.6-0.6-0.8-0.3-1.5-0.7-0.8-0.4-1.5-0.8-0.7-0.4-1.5-0.9 2.2 1 4.5 1.4 2.3 0.4 4.7 0.2 2.3-0.1 4.6-0.9 2.2-0.7 4.2-2 1-0.6 1.9-1.3 0.9-0.8 1.7-1.6 0.8-0.9 1.5-1.8 0.8-0.9 1.3-2 0.6-1 1.1-2.1 0.5-1 0.8-2.2 0.3-1.1 0.5-2.3 0.2-1.1 0.3-2.3 0-1-0.1-1.9 0-0.9-0.2-1.9-0.2-0.9-0.4-1.8-0.2-0.9-0.6-1.8-0.3-0.8-0.7-1.7-0.4-0.8-0.9-1.6-0.5-0.8-1.1-1.5-0.6-0.8-1.2-1.5-0.7-0.6-1.4-1.3-0.7-0.6-1.5-1.1-0.7-0.5-1.5-1-0.9-0.4-1.7-0.8c-2.3-1-4.7-1.5-7.2-1.6v-1q0-1.3 0.3-2.5c0-0.2 0.1-0.4 0.1-0.6 0.1-0.4 0.2-0.9 0.3-1.3 0.1-0.2 0.2-0.7 0.3-0.8l0.2-0.6q0.3-0.8 0.7-1.7 0.4-0.8 0.9-1.6 0.5-0.8 1.1-1.5 0.6-0.7 1.2-1.4 0.7-0.7 1.4-1.3 0.7-0.6 1.4-1.1 0.8-0.5 1.6-1 0.8-0.4 1.7-0.8c2.1-0.9 4.4-1.4 6.7-1.5q0.4 0 0.8 0 0.3 0.1 0.7 0.1 0.3 0 0.7 0.1 0.3 0 0.7 0l0.8 0.2 0.8 0.2 1 0.2c0.5 0.2 1.1 0.4 1.7 0.6l0.7 0.4 0.8 0.4c0.1 0 0.2 0.1 0.4 0.2 0.3 0.2 0.7 0.4 1 0.6l0.2 0.2 0.3 0.1c0.2 0.2 0.6 0.5 0.8 0.7l0.3 0.2h0.1l0.1 0.1 0.4 0.4c0.2 0.2 0.6 0.6 0.8 0.8 0.4 0.3 0.9 0.9 1.2 1.1 0.2 0.3 0.8 1.1 1.1 1.3l0.6 0.9q0.1 0.1 0.2 0.3 0.1 0.1 0.2 0.2 0.1 0.1 0.1 0.2 0.1 0.1 0.2 0.2c0.4 0.7 1 1.5 1.4 2.2q1.4 2.4 2.3 5.1 1 2.7 1.5 5.5 0.5 2.8 0.5 5.7 0 2.8-0.6 5.6v0.3c0 0.4-0.2 1.3-0.3 1.7-0.2 0.6-0.4 1.2-0.6 1.8 0 0.3-0.2 1-0.3 1.1-0.1 0.1-0.5 1.2-0.5 1.3-0.2 0.4-0.4 1-0.5 1.3-0.2 0.3-0.7 1.3-0.8 1.5-0.1 0.3-0.7 1.3-0.7 1.4-0.1 0.1-0.3 0.5-0.4 0.6l-0.4 0.7c-0.2 0.3-0.8 1.1-1 1.4l-0.8 1.1c-0.3 0.3-0.8 1-1.1 1.3l-2.4 2.4c-0.2 0.2-1 0.9-1.2 1.1q-1.6 1.3-3.4 2.4zm-3.4-49.3q-2.3-0.9-4.8-1.2-2.5-0.2-4.9 0.4-2.4 0.5-4.6 1.7 1.2-0.5 2.5-0.9 1.3-0.3 2.7-0.5 1.3-0.1 2.6 0 1.4 0.1 2.7 0.4 1.3 0.3 2.6 0.8 1.2 0.5 2.4 1.2 1.1 0.7 2.1 1.6 1 0.9 1.9 2l0.1 0.1 0.1 0.1 0.2 0.3c0.3 0.3 0.6 0.7 0.9 1q1.5 2.1 2.6 4.3 1.2 2.3 1.9 4.7 0.8 2.4 1.1 4.9 0.3 2.5 0.1 5.1-0.1 2.5-0.7 4.9-0.5 2.5-1.5 4.8-1 2.4-2.4 4.5-1.3 2.1-3.1 4-1.9 2-4.2 3.7-2.2 1.6-4.8 2.8-2.5 1.2-5.3 1.9-2.7 0.7-5.5 0.8 1.7 0.1 3.5 0 1.7-0.2 3.4-0.5 1.7-0.4 3.4-1 1.6-0.6 3.2-1.3l1.2-0.7q0.4-0.2 0.8-0.4 0.4-0.3 0.7-0.5 0.4-0.3 0.8-0.5 0.3-0.3 0.7-0.5l0.7-0.6 0.1-0.1 0.3-0.2 0.5-0.5c0.4-0.2 0.8-0.6 1.1-0.9q2.1-2 3.7-4.3 1.6-2.4 2.8-5 1.2-2.6 1.8-5.4 0.6-2.8 0.7-5.7 0.1-2.8-0.4-5.7-0.5-2.8-1.5-5.5-1-2.6-2.5-5.1-1.5-2.4-3.4-4.5-0.3-0.3-0.5-0.5-0.3-0.3-0.5-0.5-0.3-0.3-0.6-0.5-0.2-0.3-0.5-0.5-1.9-1.6-4.2-2.5zm-0.5 7.3q0 0 0 0 0 0 0 0 0 0 0 0zm0 0c0 0 0 0 0 0-4.6-3.8-11.8-4.5-16.7-0.9q1-0.6 2.1-0.9 1.1-0.4 2.2-0.6 1.2-0.2 2.3-0.2 1.2 0 2.3 0.2 1.2 0.2 2.3 0.6 1.1 0.4 2.1 1 1 0.5 1.9 1.2 0.9 0.8 1.7 1.6c0.3 0.4 0.8 0.9 1 1.2 0.3 0.3 0.6 0.6 0.8 0.9q1 1.4 1.8 2.9 0.9 1.5 1.5 3.1 0.6 1.6 1 3.2 0.5 1.7 0.6 3.4 0.2 1.7 0.2 3.4 0 1.7-0.3 3.4-0.3 1.6-0.8 3.3-0.4 1.6-1.1 3.2-0.7 1.4-1.5 2.7-0.8 1.3-1.7 2.5-1 1.2-2 2.3-1.1 1.1-2.3 2-1.2 0.9-2.5 1.7-1.3 0.8-2.7 1.5-1.4 0.6-2.8 1.1-1.5 0.5-3 0.8-0.6 0.1-1.2 0.2-0.6 0.1-1.2 0.1-0.6 0.1-1.3 0.1-0.6 0.1-1.2 0.1 1.3 0.1 2.5 0.1 1.3 0 2.5-0.1 1.3-0.2 2.5-0.4 1.3-0.3 2.5-0.7c0.3-0.1 0.8-0.3 1.1-0.4l0.3-0.1 0.2-0.1 0.1-0.1 0.6-0.2q1.4-0.7 2.8-1.5 1.3-0.8 2.6-1.8 1.2-0.9 2.3-2.1 1.1-1.1 2-2.3 1-1.3 1.8-2.6 0.8-1.4 1.5-2.8 0.6-1.5 1-3 0.5-1.5 0.8-3 0.2-1.6 0.3-3.2 0.1-1.5 0-3.1-0.1-1.6-0.4-3.1-0.3-1.6-0.8-3.1-0.5-1.5-1.2-2.9-0.6-1.4-1.5-2.8-0.8-1.3-1.8-2.6-1-1.2-2.1-2.3c-0.4-0.3-0.7-0.6-1.1-0.9zm-12.6 42.4c-3 1.2-6.2 1.7-9.4 1.6q1.2 0.2 2.5 0.3 1.2 0.1 2.4 0 1.3-0.1 2.5-0.3 1.2-0.3 2.4-0.6 1.3-0.5 2.5-1 1.3-0.6 2.4-1.3 1.2-0.8 2.3-1.6 1-0.9 2-1.9 0.9-1 1.8-2.1 0.8-1.1 1.5-2.3 0.7-1.2 1.2-2.4 0.5-1.3 0.9-2.6 0.4-1.3 0.6-2.7 0.2-1.4 0.3-2.8 0-1.3-0.1-2.7-0.1-1.4-0.4-2.7-0.3-1.4-0.8-2.7-0.4-1.3-1-2.5-0.6-1.3-1.4-2.4-0.7-1.2-1.6-2.2-0.4-0.5-0.8-0.9-0.4-0.4-0.8-0.8-0.4-0.4-0.8-0.7-0.4-0.4-0.9-0.7-1.3-1-2.9-1.6-1.6-0.6-3.2-0.8-1.7-0.2-3.4 0-1.6 0.3-3.2 1 0.8-0.3 1.6-0.4 0.8-0.1 1.6-0.2 0.7 0 1.5 0 0.8 0.1 1.6 0.3 0.8 0.1 1.5 0.4 0.8 0.2 1.5 0.5 0.7 0.4 1.4 0.8 0.7 0.4 1.3 0.9 0.3 0.3 0.6 0.5 0.3 0.3 0.5 0.6 0.3 0.2 0.6 0.5 0.2 0.3 0.5 0.6l0.6 0.9 0.7 0.8 0.5 0.9q1.1 1.7 1.9 3.6 0.7 1.9 1.1 4 0.4 2 0.4 4 0 2.1-0.3 4.1-0.4 2-1.1 3.9-0.8 1.9-1.8 3.7-1.1 1.7-2.5 3.3-1.4 1.5-3 2.7c-0.3 0.2-0.7 0.6-1.1 0.8l-1.1 0.7c-0.4 0.2-0.8 0.4-1.2 0.6l-0.9 0.5-1 0.4z"/>
+		</g>
+	</g>
+</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>

crowdin.yml

@@ -0,0 +1,6 @@
+project_id_env: CROWDIN_PROJECT_ID
+api_token_env: CROWDIN_PERSONAL_TOKEN
+
+files:
+  - source: /lib/l10n/arb/app_en.arb
+    translation: /lib/l10n/arb/app_%two_letters_code%.arb

fastlane/metadata/android/en-US/changelogs/23.txt

@@ -0,0 +1 @@
+- Hello, FDroid!

fastlane/metadata/android/en-US/changelogs/39.txt

@@ -0,0 +1,3 @@
+- Added OTPAuth URL Scheme Support: Our Two-Factor Authenticator app now supports the otpauth:// URL scheme for easy setup and configuration of your one-time password (OTP) accounts.
+
+- Expanded Language Support: Thanks to the help from our community, in addition to English, French, and Spanish, our app now supports German, Spanish, Dutch, Brazilian Portuguese, Russian, and Simplified Chinese. To change your language preferences, go to Settings > Account > Language.

fastlane/metadata/android/en-US/full_description.txt

@@ -0,0 +1,40 @@
+ente's Authenticator app helps you generate and store 2 step verification (2FA)
+tokens on your mobile devices.
+
+
+FEATURES
+
+- Secure Backups
+ente provides end-to-end encrypted cloud backups so that you don't have to worry
+about losing your tokens. We use the same protocols ente Photos uses to encrypt
+and preserve your data.
+
+- Multi Device Synchronization
+ente will automatically sync the 2FA tokens you add to your account, across all
+your devices. Every new device you sign into will have access to these tokens.
+
+- Web access
+You can access your 2FA code from any web browser by visiting https://auth.ente.io .
+
+- Offline Mode
+ente generates 2FA tokens offline, so your network connectivity will not get in
+the way of your workflow.
+
+- 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.
+
+You can also export the codes you have added to ente, to an **unencrypted** text
+file, that adheres to the above format.
+
+
+SUPPORT
+
+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 an issue @ https://github.com/ente-io/auth

fastlane/metadata/android/en-US/short_description.txt

@@ -0,0 +1 @@
+ente is an end-to-end encrypted authenticator app

fastlane/metadata/android/en-US/title.txt

@@ -0,0 +1 @@
+ente Authenticator

fdroid_flutter_icons.yaml

@@ -0,0 +1,6 @@
+flutter_icons:
+  android: "launcher_icon"
+  image_path: "assets/icon-light.png"
+  adaptive_icon_foreground: "assets/icon-light-adaptive-fg.png"
+  adaptive_icon_background: "#ffffff"
+

ios/Podfile.lock

@@ -2,7 +2,7 @@ PODS:
   - connectivity (0.0.1):
     - Flutter
     - Reachability
-  - device_info (0.0.1):
+  - device_info_plus (0.0.1):
     - Flutter
   - DKImagePickerController/Core (4.3.4):
     - DKImagePickerController/ImageDataManager
@@ -54,7 +54,7 @@ PODS:
     - Flutter
   - flutter_native_splash (0.0.1):
     - Flutter
-  - flutter_secure_storage (3.3.1):
+  - flutter_secure_storage (6.0.0):
     - Flutter
   - flutter_sodium (0.0.1):
     - Flutter
@@ -64,43 +64,51 @@ PODS:
   - FMDB (2.7.5):
     - FMDB/standard (= 2.7.5)
   - FMDB/standard (2.7.5)
-  - local_auth (0.0.1):
+  - local_auth_ios (0.0.1):
     - Flutter
   - move_to_background (0.0.1):
     - Flutter
   - MTBBarcodeScanner (5.0.11)
+  - open_filex (0.0.2):
+    - Flutter
   - OrderedSet (5.0.0)
   - package_info_plus (0.4.5):
     - Flutter
-  - path_provider_ios (0.0.1):
+  - path_provider_foundation (0.0.1):
     - Flutter
+    - FlutterMacOS
   - qr_code_scanner (0.2.0):
     - Flutter
     - MTBBarcodeScanner
   - Reachability (3.2)
-  - SDWebImage (5.13.4):
-    - SDWebImage/Core (= 5.13.4)
-  - SDWebImage/Core (5.13.4)
-  - Sentry/HybridSDK (7.30.2)
+  - 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.30.2)
+    - Sentry/HybridSDK (= 8.9.1)
+  - SentryPrivate (8.9.1)
   - share_plus (0.0.1):
     - Flutter
-  - shared_preferences_ios (0.0.1):
+  - shared_preferences_foundation (0.0.1):
     - Flutter
-  - sqflite (0.0.2):
+    - FlutterMacOS
+  - sqflite (0.0.3):
     - Flutter
     - FMDB (>= 2.7.5)
-  - SwiftyGif (5.4.3)
+  - SwiftyGif (5.4.4)
   - Toast (4.0.0)
+  - uni_links (0.0.1):
+    - Flutter
   - url_launcher_ios (0.0.1):
     - Flutter
 
 DEPENDENCIES:
   - connectivity (from `.symlinks/plugins/connectivity/ios`)
-  - device_info (from `.symlinks/plugins/device_info/ios`)
+  - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
   - file_picker (from `.symlinks/plugins/file_picker/ios`)
   - fk_user_agent (from `.symlinks/plugins/fk_user_agent/ios`)
   - Flutter (from `Flutter`)
@@ -111,15 +119,17 @@ DEPENDENCIES:
   - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
   - flutter_sodium (from `.symlinks/plugins/flutter_sodium/ios`)
   - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
-  - local_auth (from `.symlinks/plugins/local_auth/ios`)
+  - local_auth_ios (from `.symlinks/plugins/local_auth_ios/ios`)
   - 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_ios (from `.symlinks/plugins/path_provider_ios/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_ios (from `.symlinks/plugins/shared_preferences_ios/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`)
 
 SPEC REPOS:
@@ -132,14 +142,15 @@ SPEC REPOS:
     - Reachability
     - SDWebImage
     - Sentry
+    - SentryPrivate
     - SwiftyGif
     - Toast
 
 EXTERNAL SOURCES:
   connectivity:
     :path: ".symlinks/plugins/connectivity/ios"
-  device_info:
-    :path: ".symlinks/plugins/device_info/ios"
+  device_info_plus:
+    :path: ".symlinks/plugins/device_info_plus/ios"
   file_picker:
     :path: ".symlinks/plugins/file_picker/ios"
   fk_user_agent:
@@ -160,61 +171,68 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/flutter_sodium/ios"
   fluttertoast:
     :path: ".symlinks/plugins/fluttertoast/ios"
-  local_auth:
-    :path: ".symlinks/plugins/local_auth/ios"
+  local_auth_ios:
+    :path: ".symlinks/plugins/local_auth_ios/ios"
   move_to_background:
     :path: ".symlinks/plugins/move_to_background/ios"
+  open_filex:
+    :path: ".symlinks/plugins/open_filex/ios"
   package_info_plus:
     :path: ".symlinks/plugins/package_info_plus/ios"
-  path_provider_ios:
-    :path: ".symlinks/plugins/path_provider_ios/ios"
+  path_provider_foundation:
+    :path: ".symlinks/plugins/path_provider_foundation/darwin"
   qr_code_scanner:
     :path: ".symlinks/plugins/qr_code_scanner/ios"
   sentry_flutter:
     :path: ".symlinks/plugins/sentry_flutter/ios"
   share_plus:
     :path: ".symlinks/plugins/share_plus/ios"
-  shared_preferences_ios:
-    :path: ".symlinks/plugins/shared_preferences_ios/ios"
+  shared_preferences_foundation:
+    :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
   sqflite:
     :path: ".symlinks/plugins/sqflite/ios"
+  uni_links:
+    :path: ".symlinks/plugins/uni_links/ios"
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
 
 SPEC CHECKSUMS:
   connectivity: c4130b2985d4ef6fd26f9702e886bd5260681467
-  device_info: d7d233b645a32c40dfdc212de5cf646ca482f175
+  device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed
   DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
   DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
-  file_picker: 817ab1d8cd2da9d2da412a417162deee3500fc95
+  file_picker: ce3938a0df3cc1ef404671531facef740d03f920
   fk_user_agent: 1f47ec39291e8372b1d692b50084b0d54103c545
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_email_sender: 02d7443217d8c41483223627972bfdc09f74276b
   flutter_inappwebview: bfd58618f49dc62f2676de690fc6dcda1d6c3721
   flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
   flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef
-  flutter_secure_storage: 7953c38a04c3fdbb00571bcd87d8e3b5ceb9daec
+  flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
   flutter_sodium: c84426b4de738514b5b66cfdeb8a06634e72fe0b
-  fluttertoast: 74526702fea2c060ea55dde75895b7e1bde1c86b
+  fluttertoast: fafc4fa4d01a6a9e4f772ecd190ffa525e9e2d9c
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
-  local_auth: 1740f55d7af0a2e2a8684ce225fe79d8931e808c
+  local_auth_ios: c6cf091ded637a88f24f86a8875d8b0f526e2605
   move_to_background: 39a5b79b26d577b0372cbe8a8c55e7aa9fcd3a2d
   MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
+  open_filex: 6e26e659846ec990262224a12ef1c528bb4edbe4
   OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
-  package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
-  path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
+  package_info_plus: fd030dabf36271f146f1f3beacd48f564b0f17f7
+  path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
   qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e
   Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
-  SDWebImage: e5cc87bf736e60f49592f307bdf9e157189298a3
-  Sentry: 9be48e341494bc976c963b05aa4a8ca48308c684
-  sentry_flutter: 544e6376e35b00eef9f0864f8bb7f10a0e204993
+  SDWebImage: 750adf017a315a280c60fde706ab1e552a3ae4e9
+  Sentry: e3203780941722a1fcfee99e351de14244c7f806
+  sentry_flutter: 8f0ffd53088e6a4d50c095852c5cad9e4405025c
+  SentryPrivate: 5e3683390f66611fc7c6215e27645873adb55d13
   share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
-  shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad
-  sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
-  SwiftyGif: 6c3eafd0ce693cad58bb63d2b2fb9bacb8552780
+  shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
+  sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a
+  SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
   Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
-  url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de
+  uni_links: d97da20c7701486ba192624d99bffaaffcfc298a
+  url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
 
 PODFILE CHECKSUM: b4e3a7eabb03395b66e81fc061789f61526ee6bb
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.1

ios/Runner.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 51;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -159,7 +159,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -220,10 +220,12 @@
 		};
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
+				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
 			);
 			name = "Thin Binary";
 			outputPaths = (
@@ -256,7 +258,7 @@
 		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
+			buildActionMask = 12;
 			files = (
 			);
 			inputPaths = (
@@ -266,7 +268,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

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"

ios/Runner/Info.plist

@@ -1,64 +1,81 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-	<dict>
-		<key>CADisableMinimumFrameDurationOnPhone</key>
-		<true/>
-		<key>CFBundleDevelopmentRegion</key>
-		<string>$(DEVELOPMENT_LANGUAGE)</string>
-		<key>CFBundleDisplayName</key>
-		<string>auth</string>
-		<key>CFBundleExecutable</key>
-		<string>$(EXECUTABLE_NAME)</string>
-		<key>CFBundleIdentifier</key>
-		<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-		<key>CFBundleInfoDictionaryVersion</key>
-		<string>6.0</string>
-		<key>CFBundleLocalizations</key>
-		<array>
-			<string>en</string>
-			<string>es</string>
-		</array>
-		<key>CFBundleName</key>
-		<string>auth</string>
-		<key>CFBundlePackageType</key>
-		<string>APPL</string>
-		<key>CFBundleShortVersionString</key>
-		<string>$(FLUTTER_BUILD_NAME)</string>
-		<key>CFBundleSignature</key>
-		<string>????</string>
-		<key>CFBundleVersion</key>
-		<string>$(FLUTTER_BUILD_NUMBER)</string>
-		<key>LSRequiresIPhoneOS</key>
-		<true/>
-		<key>MinimumOSVersion</key>
-		<string>12.0</string>
-		<key>NSCameraUsageDescription</key>
-		<string>This app needs camera access to scan QR codes</string>
-		<key>UILaunchStoryboardName</key>
-		<string>LaunchScreen</string>
-		<key>UIMainStoryboardFile</key>
-		<string>Main</string>
-		<key>UIStatusBarHidden</key>
-		<false/>
-		<key>UISupportedInterfaceOrientations</key>
-		<array>
-			<string>UIInterfaceOrientationPortrait</string>
-			<string>UIInterfaceOrientationLandscapeLeft</string>
-			<string>UIInterfaceOrientationLandscapeRight</string>
-		</array>
-		<key>UISupportedInterfaceOrientations~ipad</key>
-		<array>
-			<string>UIInterfaceOrientationPortrait</string>
-			<string>UIInterfaceOrientationPortraitUpsideDown</string>
-			<string>UIInterfaceOrientationLandscapeLeft</string>
-			<string>UIInterfaceOrientationLandscapeRight</string>
-		</array>
-		<key>UIViewControllerBasedStatusBarAppearance</key>
-		<false/>
-		<key>NSFaceIDUsageDescription</key>
-		<string>Please allow auth to lock itself with FaceID or TouchID</string>
-		<key>NSPhotoLibraryUsageDescription</key>
-		<string>Please allow auth to pick a file to import data from</string>
-	</dict>
+<dict>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleDisplayName</key>
+	<string>auth</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleLocalizations</key>
+	<array>
+		<string>en</string>
+		<string>es</string>
+	</array>
+	<key>CFBundleName</key>
+	<string>auth</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>$(FLUTTER_BUILD_NAME)</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>otpauth</string>
+			</array>
+		</dict>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>$(FLUTTER_BUILD_NUMBER)</string>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>MinimumOSVersion</key>
+	<string>12.0</string>
+	<key>NSCameraUsageDescription</key>
+	<string>This app needs camera access to scan QR codes</string>
+	<key>NSFaceIDUsageDescription</key>
+	<string>Please allow auth to lock itself with FaceID or TouchID</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>Please allow auth to pick a file to import data from</string>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIMainStoryboardFile</key>
+	<string>Main</string>
+	<key>UIStatusBarHidden</key>
+	<false/>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<false/>
+</dict>
 </plist>

ios/ci_scripts/ci_post_clone.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# by default, the execution directory of this script is the ci_scripts directory
+# CI_WORKSPACE is the directory of your cloned repo
+echo "🟩 Navigate from ($PWD) to ($CI_WORKSPACE)"
+cd $CI_WORKSPACE
+
+echo "🟩 Install Flutter"
+time git clone https://github.com/flutter/flutter.git -b stable $HOME/flutter
+export PATH="$PATH:$HOME/flutter/bin"
+
+echo "🟩 Flutter Precache"
+time flutter precache --ios
+
+echo "🟩 Install Flutter Dependencies"
+time flutter pub get
+
+echo "🟩 Install CocoaPods via Homebrew"
+time HOMEBREW_NO_AUTO_UPDATE=1 brew install cocoapods
+
+echo "🟩 Install CocoaPods dependencies..."
+time cd ios && pod install
+
+exit 0

lib/app/app.dart

@@ -1,2 +1,2 @@
-// @dart=2.9
+
 export "view/app.dart";

lib/app/view/app.dart

@@ -1,4 +1,3 @@
-// @dart=2.9
 import 'dart:async';
 import 'dart:io';
 
@@ -9,24 +8,38 @@ import 'package:ente_auth/ente_theme_data.dart';
 import 'package:ente_auth/events/signed_in_event.dart';
 import 'package:ente_auth/events/signed_out_event.dart';
 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';
 import "package:flutter/material.dart";
-import "package:flutter_localizations/flutter_localizations.dart";
+import 'package:flutter_localizations/flutter_localizations.dart';
 
 class App extends StatefulWidget {
-  const App({Key key});
+  final Locale locale;
+  const App({Key? key, this.locale = const Locale("en")}) : super(key: key);
+
+  static void setLocale(BuildContext context, Locale newLocale) {
+    _AppState state = context.findAncestorStateOfType<_AppState>()!;
+    state.setLocale(newLocale);
+  }
 
   @override
   State<App> createState() => _AppState();
 }
 
 class _AppState extends State<App> {
-  StreamSubscription<SignedOutEvent> _signedOutEvent;
-  StreamSubscription<SignedInEvent> _signedInEvent;
+  late StreamSubscription<SignedOutEvent> _signedOutEvent;
+  late StreamSubscription<SignedInEvent> _signedInEvent;
+  Locale? locale;
+  setLocale(Locale newLocale) {
+    setState(() {
+      locale = newLocale;
+    });
+  }
 
   @override
   void initState() {
@@ -36,10 +49,12 @@ class _AppState extends State<App> {
       }
     });
     _signedInEvent = Bus.instance.on<SignedInEvent>().listen((event) {
+      UserService.instance.getUserDetailsV2().ignore();
       if (mounted) {
         setState(() {});
       }
     });
+    locale = widget.locale;
     UpdateService.instance.shouldUpdate().then((shouldUpdate) {
       if (shouldUpdate) {
         Future.delayed(Duration.zero, () {
@@ -78,7 +93,9 @@ class _AppState extends State<App> {
           theme: lightTheme,
           darkTheme: dartTheme,
           debugShowCheckedModeBanner: false,
-          supportedLocales: AppLocalizations.supportedLocales,
+          locale: locale,
+          supportedLocales: appSupportedLocales,
+          localeListResolutionCallback: localResolutionCallBack,
           localizationsDelegates: const [
             AppLocalizations.delegate,
             GlobalMaterialLocalizations.delegate,
@@ -95,7 +112,9 @@ class _AppState extends State<App> {
         theme: lightThemeData,
         darkTheme: darkThemeData,
         debugShowCheckedModeBanner: false,
-        supportedLocales: AppLocalizations.supportedLocales,
+        locale: locale,
+        supportedLocales: appSupportedLocales,
+        localeListResolutionCallback: localResolutionCallBack,
         localizationsDelegates: const [
           AppLocalizations.delegate,
           GlobalMaterialLocalizations.delegate,
@@ -109,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,12 +1,11 @@
+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';
-// ignore: import_of_legacy_library_into_null_safe
 import 'package:ente_auth/events/signed_in_event.dart';
 import 'package:ente_auth/events/signed_out_event.dart';
 import 'package:ente_auth/models/key_attributes.dart';
@@ -19,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();
@@ -30,17 +30,23 @@ class Configuration {
   );
   static const emailKey = "email";
   static const keyAttributesKey = "key_attributes";
-  static const keyKey = "key";
-  static const keyShouldHideFromRecents = "should_hide_from_recents";
+
   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 hasMigratedSecureStorageToFirstUnlockKey =
-      "has_migrated_secure_storage_to_first_unlock";
+  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;
 
@@ -48,26 +54,19 @@ 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);
-
-  // const IOSOptions(accessibility: IOSAccessibility.first_unlock);
+  final _secureStorageOptionsIOS = const IOSOptions(
+    accessibility: KeychainAccessibility.first_unlock_this_device,
+  );
 
   Future<void> init() async {
     _preferences = await SharedPreferences.getInstance();
@@ -90,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,
@@ -115,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;
@@ -148,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 =
@@ -177,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();
 
@@ -191,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 =
@@ -198,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) {
@@ -258,6 +274,7 @@ class Configuration {
     await setToken(
       Sodium.bin2base64(token, variant: Sodium.base64VariantUrlsafe),
     );
+    return keyEncryptionKey;
   }
 
   Future<void> recover(String recoveryKey) async {
@@ -308,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);
@@ -351,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() {
@@ -411,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),
     );
   }
@@ -425,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)!;
@@ -453,42 +469,11 @@ class Configuration {
     return _preferences.setBool(keyShouldShowLockScreen, value);
   }
 
-  bool shouldHideFromRecents() {
-    return _preferences.getBool(keyShouldHideFromRecents) ?? false;
-  }
-
-  Future<void> setShouldHideFromRecents(bool value) {
-    return _preferences.setBool(keyShouldHideFromRecents, value);
-  }
-
-  void setVolatilePassword(String volatilePassword) {
+  void setVolatilePassword(String? volatilePassword) {
     _volatilePassword = volatilePassword;
   }
 
   String? getVolatilePassword() {
     return _volatilePassword;
   }
-
-  Future<void> _migrateSecurityStorageToFirstUnlock() async {
-    final hasMigratedSecureStorageToFirstUnlock =
-        _preferences.getBool(hasMigratedSecureStorageToFirstUnlockKey) ?? 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(
-        hasMigratedSecureStorageToFirstUnlockKey,
-        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

@@ -1,5 +1,3 @@
-// @dart=2.9
-
 library super_logging;
 
 import 'dart:async';
@@ -8,6 +6,7 @@ import 'dart:core';
 import 'dart:io';
 
 import 'package:ente_auth/core/logging/tunneled_transport.dart';
+import 'package:ente_auth/models/typedefs.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 import 'package:http/http.dart' as http;
@@ -20,8 +19,6 @@ import 'package:sentry_flutter/sentry_flutter.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:uuid/uuid.dart';
 
-typedef FutureOrVoidCallback = FutureOr<void> Function();
-
 extension SuperString on String {
   Iterable<String> chunked(int chunkSize) sync* {
     var start = 0;
@@ -40,7 +37,7 @@ extension SuperString on String {
 }
 
 extension SuperLogRecord on LogRecord {
-  String toPrettyString([String extraLines]) {
+  String toPrettyString([String? extraLines]) {
     final header = "[$loggerName] [$level] [$time]";
 
     var msg = "$header $message";
@@ -78,9 +75,9 @@ class LogConfig {
   /// ```
   ///
   /// If this is [null], Sentry logger is completely disabled (default).
-  String sentryDsn;
+  String? sentryDsn;
 
-  String tunnel;
+  String? tunnel;
 
   /// A built-in retry mechanism for sending errors to sentry.
   ///
@@ -97,7 +94,7 @@ class LogConfig {
   /// A non-empty string will be treated as an explicit path to a directory.
   ///
   /// The chosen directory can be accessed using [SuperLogging.logFile.parent].
-  String logDirPath;
+  String? logDirPath;
 
   /// The maximum number of log files inside [logDirPath].
   ///
@@ -115,12 +112,12 @@ class LogConfig {
   /// any uncaught errors during its execution will be reported.
   ///
   /// Works by using [FlutterError.onError] and [runZoned].
-  FutureOrVoidCallback body;
+  FutureOrVoidCallback? body;
 
   /// The date format for storing log files.
   ///
   /// `DateFormat('y-M-d')` by default.
-  DateFormat dateFmt;
+  DateFormat? dateFmt;
 
   String prefix;
 
@@ -144,77 +141,78 @@ class SuperLogging {
   static final $ = Logger('ente_logging');
 
   /// The current super logging configuration
-  static LogConfig config;
+  static late LogConfig config;
 
-  static SharedPreferences _preferences;
+  static late SharedPreferences _preferences;
 
   static const keyShouldReportErrors = "should_report_errors";
 
   static const keyAnonymousUserID = "anonymous_user_id";
 
-  static Future<void> main([LogConfig config]) async {
-    config ??= LogConfig();
-
-    SuperLogging.config = config;
+  static Future<void> main([LogConfig? appConfig]) async {
+    appConfig ??= LogConfig();
+    SuperLogging.config = appConfig;
 
     WidgetsFlutterBinding.ensureInitialized();
-
     _preferences = await SharedPreferences.getInstance();
 
     appVersion ??= await getAppVersion();
 
-    final loggingEnabled = config.enableInDebugMode || kReleaseMode;
+    final enable = appConfig.enableInDebugMode || kReleaseMode;
     sentryIsEnabled =
-        loggingEnabled && config.sentryDsn != null && shouldReportErrors();
-    fileIsEnabled = loggingEnabled && config.logDirPath != null;
+        enable && appConfig.sentryDsn != null && shouldReportErrors();
+    fileIsEnabled = enable && appConfig.logDirPath != null;
 
     if (fileIsEnabled) {
       await setupLogDir();
     }
+    if (sentryIsEnabled) {
+      setupSentry();
+    }
 
     Logger.root.level = Level.ALL;
     Logger.root.onRecord.listen(onLogRecord);
 
-    if (sentryIsEnabled) {
-      setupSentry();
-    } else {
-      $.info("Sentry is disabled");
-    }
-
-    if (!loggingEnabled) {
+    if (!enable) {
       $.info("detected debug mode; sentry & file logging disabled.");
     }
     if (fileIsEnabled) {
-      $.info("log file for today: $logFile with prefix ${config.prefix}");
+      $.info("log file for today: $logFile with prefix ${appConfig.prefix}");
+    }
+    if (sentryIsEnabled) {
+      $.info("sentry uploader started");
     }
 
-    if (config.body == null) return;
+    if (appConfig.body == null) return;
 
-    if (loggingEnabled && sentryIsEnabled) {
+    if (enable && sentryIsEnabled) {
       await SentryFlutter.init(
         (options) {
-          options.dsn = config.sentryDsn;
+          options.dsn = appConfig!.sentryDsn;
           options.httpClient = http.Client();
-          if (config.tunnel != null) {
+          if (appConfig.tunnel != null) {
             options.transport =
-                TunneledTransport(Uri.parse(config.tunnel), options);
+                TunneledTransport(Uri.parse(appConfig.tunnel!), options);
           }
         },
-        appRunner: () => config.body(),
+        appRunner: () => appConfig!.body!(),
       );
     } else {
-      await config.body();
+      await appConfig.body!();
     }
   }
 
   static void setUserID(String userID) async {
-    if (config?.sentryDsn != null) {
-      Sentry.configureScope((scope) => scope.user = SentryUser(id: userID));
+    if (config.sentryDsn != null) {
+      Sentry.configureScope((scope) => scope.setUser(SentryUser(id: userID)));
       $.info("setting sentry user ID to: $userID");
     }
   }
 
-  static Future<void> _sendErrorToSentry(Object error, StackTrace stack) async {
+  static Future<void> _sendErrorToSentry(
+    Object error,
+    StackTrace? stack,
+  ) async {
     try {
       await Sentry.captureException(
         error,
@@ -230,14 +228,14 @@ class SuperLogging {
 
   static Future onLogRecord(LogRecord rec) async {
     // log misc info if it changed
-    String extraLines = "app version: '$appVersion'\n";
+    String? extraLines = "app version: '$appVersion'\n";
     if (extraLines != _lastExtraLines) {
       _lastExtraLines = extraLines;
     } else {
       extraLines = null;
     }
 
-    final str = config.prefix + " " + rec.toPrettyString(extraLines);
+    final str = (config.prefix) + " " + rec.toPrettyString(extraLines);
 
     // write to stdout
     printLog(str);
@@ -251,16 +249,8 @@ class SuperLogging {
     }
 
     // add error to sentry queue
-    if (sentryIsEnabled) {
-      if (rec.error != null) {
-        _sendErrorToSentry(rec.error, null);
-      } else if (rec.level == Level.SEVERE || rec.level == Level.SHOUT) {
-        if (rec.error != null) {
-          _sendErrorToSentry(rec.error, null);
-        } else {
-          _sendErrorToSentry(rec.message, null);
-        }
-      }
+    if (sentryIsEnabled && rec.error != null) {
+      _sendErrorToSentry(rec.error!, null);
     }
   }
 
@@ -268,12 +258,12 @@ class SuperLogging {
   static bool isFlushing = false;
 
   static void flushQueue() async {
-    if (isFlushing) {
+    if (isFlushing || logFile == null) {
       return;
     }
     isFlushing = true;
     final entry = fileQueueEntries.removeFirst();
-    await logFile.writeAsString(entry, mode: FileMode.append, flush: true);
+    await logFile!.writeAsString(entry, mode: FileMode.append, flush: true);
     isFlushing = false;
     if (fileQueueEntries.isNotEmpty) {
       flushQueue();
@@ -292,7 +282,7 @@ class SuperLogging {
   static final sentryQueueControl = StreamController<Error>();
 
   /// Whether sentry logging is currently enabled or not.
-  static bool sentryIsEnabled;
+  static bool sentryIsEnabled = false;
 
   static Future<void> setupSentry() async {
     $.info("Setting up sentry");
@@ -318,9 +308,9 @@ class SuperLogging {
 
   static bool shouldReportErrors() {
     if (_preferences.containsKey(keyShouldReportErrors)) {
-      return _preferences.getBool(keyShouldReportErrors);
+      return _preferences.getBool(keyShouldReportErrors)!;
     } else {
-      return false;
+      return kDebugMode;
     }
   }
 
@@ -333,22 +323,22 @@ class SuperLogging {
       //ignore: prefer_const_constructors
       await _preferences.setString(keyAnonymousUserID, Uuid().v4());
     }
-    return _preferences.getString(keyAnonymousUserID);
+    return _preferences.getString(keyAnonymousUserID)!;
   }
 
   /// The log file currently in use.
-  static File logFile;
+  static File? logFile;
 
   /// Whether file logging is currently enabled or not.
-  static bool fileIsEnabled;
+  static bool fileIsEnabled = false;
 
   static Future<void> setupLogDir() async {
     var dirPath = config.logDirPath;
 
     // choose [logDir]
-    if (dirPath.isEmpty) {
+    if (dirPath == null || dirPath.isEmpty) {
       final root = await getExternalStorageDirectory();
-      dirPath = '${root.path}/logs';
+      dirPath = '${root!.path}/logs';
     }
 
     // create [logDir]
@@ -361,16 +351,19 @@ class SuperLogging {
     // collect all log files with valid names
     await for (final file in dir.list()) {
       try {
-        final date = config.dateFmt.parse(basename(file.path));
+        final date = config.dateFmt!.parse(basename(file.path));
         dates[file as File] = date;
         files.add(file);
       } on FormatException {}
     }
+    final nowTime = DateTime.now();
 
     // delete old log files, if [maxLogFiles] is exceeded.
     if (files.length > config.maxLogFiles) {
       // sort files based on ascending order of date (older first)
-      files.sort((a, b) => dates[a].compareTo(dates[b]));
+      files.sort(
+        (a, b) => (dates[a] ?? nowTime).compareTo((dates[b] ?? nowTime)),
+      );
 
       final extra = files.length - config.maxLogFiles;
       final toDelete = files.sublist(0, extra);
@@ -385,13 +378,13 @@ class SuperLogging {
       }
     }
 
-    logFile = File("$dirPath/${config.dateFmt.format(DateTime.now())}.txt");
+    logFile = File("$dirPath/${config.dateFmt!.format(DateTime.now())}.txt");
   }
 
   /// Current app version, obtained from package_info plugin.
   ///
   /// See: [getAppVersion]
-  static String appVersion;
+  static String? appVersion;
 
   static Future<String> getAppVersion() async {
     final pkgInfo = await PackageInfo.fromPlatform();

lib/core/logging/tunneled_transport.dart

@@ -1,5 +1,3 @@
-// @dart=2.9
-
 import 'dart:convert';
 
 import 'package:http/http.dart';
@@ -10,9 +8,9 @@ class TunneledTransport implements Transport {
   final Uri _tunnel;
   final SentryOptions _options;
 
-  final Dsn _dsn;
+  final Dsn? _dsn;
 
-  _CredentialBuilder _credentialBuilder;
+  _CredentialBuilder? _credentialBuilder;
 
   final Map<String, String> _headers;
 
@@ -21,20 +19,20 @@ class TunneledTransport implements Transport {
   }
 
   TunneledTransport._(this._tunnel, this._options)
-      : _dsn = Dsn.parse(_options.dsn),
+      : _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,
     );
   }
 
   @override
-  Future<SentryId> send(SentryEnvelope envelope) async {
+  Future<SentryId?> send(SentryEnvelope envelope) async {
     final streamedRequest = await _createStreamedRequest(envelope);
     final response = await _options.httpClient
         .send(streamedRequest)
@@ -47,7 +45,7 @@ class TunneledTransport implements Transport {
         _options.logger(
           SentryLevel.error,
           'API returned an error, statusCode = ${response.statusCode}, '
-          'body = ${response.body}',
+              'body = ${response.body}',
         );
       }
       return const SentryId.empty();
@@ -66,15 +64,15 @@ class TunneledTransport implements Transport {
   }
 
   Future<StreamedRequest> _createStreamedRequest(
-    SentryEnvelope envelope,
-  ) async {
+      SentryEnvelope envelope,
+      ) async {
     final streamedRequest = StreamedRequest('POST', _tunnel);
     envelope
         .envelopeStream(_options)
         .listen(streamedRequest.sink.add)
         .onDone(streamedRequest.sink.close);
 
-    streamedRequest.headers.addAll(_credentialBuilder.configure(_headers));
+    streamedRequest.headers.addAll(_credentialBuilder!.configure(_headers));
 
     return streamedRequest;
   }
@@ -92,13 +90,13 @@ class _CredentialBuilder {
         _clock = clock;
 
   factory _CredentialBuilder(
-    Dsn dsn,
-    String sdkIdentifier,
-    ClockProvider clock,
-  ) {
+      Dsn? dsn,
+      String sdkIdentifier,
+      ClockProvider clock,
+      ) {
     final authHeader = _buildAuthHeader(
-      publicKey: dsn.publicKey,
-      secretKey: dsn.secretKey,
+      publicKey: dsn?.publicKey,
+      secretKey: dsn?.secretKey,
       sdkIdentifier: sdkIdentifier,
     );
 
@@ -106,9 +104,9 @@ class _CredentialBuilder {
   }
 
   static String _buildAuthHeader({
-    String publicKey,
-    String secretKey,
-    String sdkIdentifier,
+    String? publicKey,
+    String? secretKey,
+    String? sdkIdentifier,
   }) {
     var header = 'Sentry sentry_version=7, sentry_client=$sdkIdentifier, '
         'sentry_key=$publicKey';
@@ -124,7 +122,7 @@ class _CredentialBuilder {
     return headers
       ..addAll(
         <String, String>{
-          'X-Sentry-Auth': '$_authHeader, sentry_timestamp=$timestamp'
+          'X-Sentry-Auth': '$_authHeader, sentry_timestamp=$timestamp',
         },
       );
   }

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);
 
@@ -358,6 +384,9 @@ extension CustomColorScheme on ColorScheme {
 
   EnteTheme get enteTheme =>
       brightness == Brightness.light ? lightTheme : darkTheme;
+
+  EnteTheme get inverseEnteTheme =>
+      brightness == Brightness.light ? darkTheme : lightTheme;
 }
 
 OutlinedButtonThemeData buildOutlinedButtonThemeData({
@@ -407,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/events/trigger_logout_event.dart

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

lib/gateway/authenticator.dart

@@ -103,24 +103,32 @@ class AuthenticatorGateway {
   }
 
   Future<List<AuthEntity>> getDiff(int sinceTime, {int limit = 500}) async {
-    final response = await _dio.get(
-      _basedEndpoint + "/entity/diff",
-      queryParameters: {
-        "sinceTime": sinceTime,
-        "limit": limit,
-      },
-      options: Options(
-        headers: {
-          "X-Auth-Token": _config.getToken(),
+    try {
+      final response = await _dio.get(
+        _basedEndpoint + "/entity/diff",
+        queryParameters: {
+          "sinceTime": sinceTime,
+          "limit": limit,
         },
-      ),
-    );
-    final List<AuthEntity> authEntities = <AuthEntity>[];
-    final diff = response.data["diff"] as List;
-    for (var entry in diff) {
-      final AuthEntity entity = AuthEntity.fromMap(entry);
-      authEntities.add(entity);
+        options: Options(
+          headers: {
+            "X-Auth-Token": _config.getToken(),
+          },
+        ),
+      );
+      final List<AuthEntity> authEntities = <AuthEntity>[];
+      final diff = response.data["diff"] as List;
+      for (var entry in diff) {
+        final AuthEntity entity = AuthEntity.fromMap(entry);
+        authEntities.add(entity);
+      }
+      return authEntities;
+    } catch (e) {
+      if (e is DioError && e.response?.statusCode == 401) {
+        throw UnauthorizedError();
+      } else {
+        rethrow;
+      }
     }
-    return authEntities;
   }
 }

lib/l10n/arb/app_de.arb

@@ -0,0 +1,317 @@
+{
+  "account": "Konto",
+  "recoveryKey": "Wiederherstellungsschlüssel",
+  "counterAppBarTitle": "Zähler",
+  "@counterAppBarTitle": {
+    "description": "Text shown in the AppBar of the Counter Page"
+  },
+  "onBoardingBody": "Sichern Sie Ihre 2FA-Codes",
+  "onBoardingGetStarted": "Los geht's",
+  "setupFirstAccount": "Ihr erstes Konto einrichten",
+  "importScanQrCode": "Scannen eines QR-Codes",
+  "qrCode": "QR-Code",
+  "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)",
+  "accountKeyType": "Art des Schlüssels",
+  "sessionExpired": "Sitzung abgelaufen",
+  "@sessionExpired": {
+    "description": "Title of the dialog when the users current session is invalid/expired"
+  },
+  "pleaseLoginAgain": "Bitte melden Sie sich wieder an",
+  "loggingOut": "Wird abgemeldet...",
+  "timeBasedKeyType": "Zeitbasiert (TOTP)",
+  "counterBasedKeyType": "Zählerbasiert (HOTP)",
+  "saveAction": "Speichern",
+  "nextTotpTitle": "Weiter",
+  "deleteCodeTitle": "Code löschen?",
+  "deleteCodeMessage": "Sind Sie sicher, dass Sie diesen Code löschen wollen? Diese Aktion ist unumkehrbar.",
+  "viewLogsAction": "Protokolle anzeigen",
+  "sendLogsDescription": "Dadurch werden Protokolle übermittelt, die uns bei der Behebung Ihres Problems helfen. Obwohl wir Vorkehrungen treffen, um sicherzustellen, dass keine sensiblen Informationen protokolliert werden, empfehlen wir Ihnen, diese Protokolle anzusehen, bevor Sie sie weitergeben.",
+  "preparingLogsTitle": "Vorbereiten der Protokolle...",
+  "emailLogsTitle": "Protokolle versenden",
+  "emailLogsMessage": "Bitte senden Sie die Protokolle an {email}",
+  "@emailLogsMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "copyEmailAction": "E-Mail kopieren",
+  "exportLogsAction": "Protokolle exportieren",
+  "reportABug": "Fehlermelden",
+  "crashAndErrorReporting": "Absturz- und Fehlerberichte",
+  "reportBug": "Fehlermelden",
+  "emailUsMessage": "Bitte senden Sie uns eine E-Mail an {email}",
+  "@emailUsMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "contactSupport": "Support kontaktieren",
+  "rateUsOnStore": "Bewerte uns auf {storeName}",
+  "blog": "Blog",
+  "verifyPassword": "Passwort überprüfen",
+  "pleaseWait": "Bitte warten...",
+  "generatingEncryptionKeysTitle": "Generierung von Verschlüsselungsschlüsseln...",
+  "recreatePassword": "Passwort wiederherstellen",
+  "recreatePasswordMessage": "Das aktuelle Gerät ist nicht leistungsfähig genug, um Ihr Passwort zu verifizieren, daher müssen wir es einmalig auf eine Weise neu generieren, die mit allen Geräten funktioniert. \n\nBitte melden Sie sich mit Ihrem Wiederherstellungsschlüssel an und generieren Sie Ihr Passwort neu (Sie können dasselbe erneut verwenden, wenn Sie möchten).",
+  "useRecoveryKey": "Wiederherstellungsschlüssel verwenden",
+  "incorrectPasswordTitle": "Falsches Passwort",
+  "welcomeBack": "Willkommen zurück!",
+  "madeWithLoveAtPrefix": "gemacht mit ❤️ bei ",
+  "supportDevs": "Bei <bold-green>ente</bold-green> registrieren um das Projekt zu unterstützen.",
+  "supportDiscount": "Benutze den Rabattcode \"AUTH\" für 10% Rabatt im ersten Jahr",
+  "changeEmail": "E-Mail ändern",
+  "changePassword": "Passwort ändern",
+  "data": "Datei",
+  "importCodes": "Codes importieren",
+  "importTypeEnteEncrypted": "ente verschlüsselt exportieren",
+  "passwordForDecryptingExport": "Passwort um den Export zu entschlüsseln",
+  "passwordEmptyError": "Passwort kann nicht leer sein",
+  "importFromApp": "Importiere Codes von {appName}",
+  "importGoogleAuthGuide": "Exportiere deine Accounts von Google Authenticator zu einem QR-Code, durch die \"Konten übertragen\" Option. Scanne den QR-Code danach mit einem anderen Gerät.\n\nTipp: Du kannst die Kamera eines Laptops verwenden, um ein Foto den dem QR-Code zu erstellen.",
+  "importSelectJsonFile": "Wähle eine JSON-Datei",
+  "importEnteEncGuide": "Wähle die von ente exportierte, verschlüsselte JSON-Datei",
+  "exportCodes": "Codes exportieren",
+  "importLabel": "Importieren",
+  "importInstruction": "Bitte wählen sie eine Datei die Codes in folgendem Format beinhaltet",
+  "importCodeDelimiterInfo": "Codes können in einer neuen Zeile stehen oder durch Kommata getrennt sein",
+  "selectFile": "Datei auswählen",
+  "emailVerificationToggle": "E-Mail-Verifizierung",
+  "authToChangeEmailVerificationSetting": "Bitte Authentifizieren um die E-Mail Bestätigung zu ändern",
+  "authToViewYourRecoveryKey": "Bitte authentifizieren um ihren Wiederherstellungscode anzuzeigen",
+  "authToChangeYourEmail": "Bitte authentifizieren um ihre Emailadresse zu ändern",
+  "authToChangeYourPassword": "Bitte authentifizieren um ihr Passwort zu ändern",
+  "ok": "Ok",
+  "cancel": "Abbrechen",
+  "yes": "Ja",
+  "no": "Nein",
+  "email": "E-Mail",
+  "support": "Unterstützung",
+  "general": "Allgemein",
+  "settings": "Einstellungen",
+  "copied": "Kopiert",
+  "pleaseTryAgain": "Bitte versuchen Sie es erneut",
+  "existingUser": "Bestehender Benutzer",
+  "newUser": "Neu bei ente",
+  "delete": "Löschen",
+  "enterYourPasswordHint": "Geben Sie Ihr Passwort ein",
+  "forgotPassword": "Passwort vergessen",
+  "oops": "Hopla",
+  "suggestFeatures": "Features vorschlagen",
+  "faq": "FAQ",
+  "faq_q_1": "Wie sicher ist ente Auth?",
+  "faq_a_1": "Alle Codes, die Sie über ente sichern, werden Ende-zu-Ende-verschlüsselt gespeichert. Das bedeutet, dass nur Sie auf Ihre Codes zugreifen können. Unsere Apps sind Open Source und unsere Kryptografie wurde extern überprüft.",
+  "faq_q_2": "Kann ich auf meine Codes auf dem Desktop zugreifen?",
+  "faq_a_2": "Sie können auf Ihre Codes im Web via auth.ente.io zugreifen.",
+  "faq_q_3": "Wie kann ich Codes löschen?",
+  "faq_a_3": "Sie können einen Code löschen, indem Sie auf dem Code nach links wischen.",
+  "faq_q_4": "Wie kann ich das Projekt unterstützen?",
+  "faq_a_4": "Sie können die Entwicklung dieses Projekts unterstützen, indem Sie unsere Fotos-App auf ente.io abonnieren.",
+  "faq_q_5": "Wie kann ich FaceID Sperre in ente Auth aktivieren",
+  "somethingWentWrongMessage": "Ein Fehler ist aufgetreten, bitte versuchen Sie es erneut",
+  "leaveFamily": "Familie verlassen",
+  "leaveFamilyMessage": "Sind Sie sicher, dass Sie den Familien-Plan verlassen wollen?",
+  "inFamilyPlanMessage": "Sie haben einen Familien-Plan!",
+  "swipeHint": "Wischen Sie nach links, um Codes zu bearbeiten oder zu entfernen",
+  "scan": "Scannen",
+  "scanACode": "Scannen eines Codes",
+  "verify": "Überprüfen Sie",
+  "verifyEmail": "E-Mail-Adresse verifizieren",
+  "enterCodeHint": "Geben Sie den 6-stelligen Code \naus Ihrer Authentifikator-App ein.",
+  "lostDeviceTitle": "Gerät verloren?",
+  "twoFactorAuthTitle": "Zwei-Faktor-Authentifizierung",
+  "recoverAccount": "Konto wiederherstellen",
+  "enterRecoveryKeyHint": "Geben Sie Ihren Wiederherstellungsschlüssel ein",
+  "recover": "Wiederherstellen",
+  "contactSupportViaEmailMessage": "Bitte senden Sie eine E-Mail an {email} von Ihrer registrierten E-Mail-Adresse",
+  "@contactSupportViaEmailMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "noRecoveryKeyTitle": "Kein Wiederherstellungsschlüssel?",
+  "enterEmailHint": "Geben Sie Ihre E-Mail Adresse ein",
+  "invalidEmailTitle": "Ungültige E-Mail Adresse",
+  "invalidEmailMessage": "Bitte geben Sie eine gültige E-Mail Adresse ein.",
+  "deleteAccount": "Konto löschen",
+  "deleteAccountQuery": "Es wird uns leid tun, Sie gehen zu sehen. Haben Sie ein Problem?",
+  "yesSendFeedbackAction": "Ja, Feedback senden",
+  "noDeleteAccountAction": "Nein, Konto löschen",
+  "initiateAccountDeleteTitle": "Bitte authentifizieren Sie sich, um die Kontolöschung einzuleiten",
+  "confirmAccountDeleteTitle": "Sind Sie sicher, dass Sie Ihr ente Konto löschen wollen?",
+  "confirmAccountDeleteMessage": "Ihre hochgeladenen Daten werden in allen Anwendungen (sowohl Fotos als auch Authenticator) zur Löschung vorgesehen und Ihr Konto wird dauerhaft gelöscht.",
+  "sendEmail": "E-Mail senden",
+  "createNewAccount": "Neues Konto erstellen",
+  "weakStrength": "Schwach",
+  "strongStrength": "Stark",
+  "moderateStrength": "Mittel",
+  "confirmPassword": "Bestätigen Sie das Passwort",
+  "close": "Schließen",
+  "oopsSomethingWentWrong": "Ups, da ist etwas schief gelaufen.",
+  "selectLanguage": "Sprache auswählen",
+  "language": "Sprache",
+  "social": "Social",
+  "security": "Sicherheit",
+  "lockscreen": "Sperrbildschirm",
+  "authToChangeLockscreenSetting": "Bitte authentifizieren um die Einstellungen des Sperrbildschirms zu ändern",
+  "lockScreenEnablePreSteps": "Um den Sperrbildschirm zu aktivieren, konfigurieren sie ein Gerätekennwort oder Gerätesperre in ihren Systemeinstellungen.",
+  "viewActiveSessions": "Aktive Sitzungen anzeigen",
+  "authToViewYourActiveSessions": "Bitte authentifizieren um, die aktiven Sitzungen zu sehen",
+  "searchHint": "Suchen...",
+  "search": "Suchen",
+  "sorryUnableToGenCode": "Das Erstellen eines Codes für {issuerName} war leider nicht möglich",
+  "noResult": "Kein Ergebnis",
+  "addCode": "Code hinzufügen",
+  "scanAQrCode": "QR-Code scannen",
+  "enterDetailsManually": "Details manuell hinzufügen",
+  "edit": "Editieren",
+  "copiedToClipboard": "In die Zwischenablage kopieren",
+  "error": "Fehler",
+  "recoveryKeyCopiedToClipboard": "Wiederherstellungsschlüssel in die Zwischenablage kopiert",
+  "recoveryKeyOnForgotPassword": "Sollten sie ihr Passwort vergessen, dann ist dieser Schlüssel die einzige Möglichkeit ihre Daten wiederherzustellen.",
+  "recoveryKeySaveDescription": "Wir speichern diesen Schlüssel nicht. Sichern sie dieses diesen Schlüssel bestehend aus 24 Wörtern an einem sicheren Platz.",
+  "doThisLater": "Auf später verschieben",
+  "saveKey": "Schlüssel speichern",
+  "back": "Zurück",
+  "createAccount": "Account erstellen",
+  "passwordStrength": "Passwortstärke: {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": "Passwort",
+  "signUpTerms": "Ich stimme den <u-terms>Nutzerbedingungen</u-terms> und <u-policy>Datenschutzbestimmungen</u-policy> zu",
+  "privacyPolicyTitle": "Datenschutzbestimmungen",
+  "termsOfServicesTitle": "Bedingungen",
+  "encryption": "Verschlüsselung",
+  "setPasswordTitle": "Passwort setzen",
+  "changePasswordTitle": "Passwort ändern",
+  "resetPasswordTitle": "Passwort zurücksetzen",
+  "encryptionKeys": "Verschlüsselungsschlüssel",
+  "passwordWarning": "Wir speichern dieses Passwort nicht. Wenn du es vergisst, <underline>können wir deine Daten nicht entschlüsseln</underline>",
+  "enterPasswordToEncrypt": "Gib ein Passwort ein, mit dem wir deine Daten verschlüsseln können",
+  "enterNewPasswordToEncrypt": "Gib ein neues Passwort ein, mit dem wir deine Daten verschlüsseln können",
+  "passwordChangedSuccessfully": "Passwort erfolgreich geändert",
+  "generatingEncryptionKeys": "Generierung von Verschlüsselungsschlüsseln...",
+  "continueLabel": "Weiter",
+  "insecureDevice": "Unsicheres Gerät",
+  "sorryWeCouldNotGenerateSecureKeysOnThisDevicennplease": "Es tut uns leid, wir konnten keine sicheren Schlüssel auf diesem Gerät generieren.\n\nBitte registrieren Sie sich auf einem anderen Gerät.",
+  "howItWorks": "So funktioniert's",
+  "ackPasswordLostWarning": "Ich verstehe, dass der Verlust meines Passworts zum Verlust meiner Daten führen kann, denn diese ist <underline>Ende-zu-Ende verschlüsselt</underline>.",
+  "loginTerms": "Durch das Klicken auf den Login-Button, stimme ich <u-terms>den Nutzungsbedingungen</u-terms> und den <u-policy>Datenschutzbestimmungen</u-policy> zu",
+  "logInLabel": "Einloggen",
+  "logout": "Ausloggen",
+  "areYouSureYouWantToLogout": "Sind sie sicher, dass sie sich ausloggen möchten?",
+  "yesLogout": "Ja ausloggen",
+  "exit": "Schließen",
+  "verifyingRecoveryKey": "Verifiziere Wiederherstellungsschlüssel...",
+  "recoveryKeyVerified": "Wiederherstellungsschlüssel verifiziert",
+  "recoveryKeySuccessBody": "Großartig! Ihr Wiederherstellungsschlüssel ist gültig. Vielen Dank für die Verifizierung.\n\nBitte denken sie daran, dass sie ihren Wiederherstellungsschlüssel sicher aufbewahren.",
+  "invalidRecoveryKey": "Der eingegebene Wiederherstellungsschlüssel ist nicht gültig. Bitte stellen sie sicher, dass er aus 24 Wörtern besteht und prüfen sie die Schreibweise eines jeden.\n\nSollten sie einen Wiederherstellungsschlüssel im alten Format eingegeben haben vergewissern sie sich, dass er 64 Zeichen lang ist und prüfen sie jedes dieser Zeichen.",
+  "recreatePasswordTitle": "Neues Passwort erstellen",
+  "recreatePasswordBody": "Das benutzte Gerät ist nicht leistungsfähig genug das Passwort zu prüfen. Wir können es aber neu erstellen damit es auf jedem Gerät funktioniert. \n\nBitte loggen sie sich mit ihrem Wiederherstellungsschlüssel ein und erstellen sie ein neues Passwort (Sie können das selbe Passwort wieder verwenden, wenn sie möchten).",
+  "invalidKey": "Ungültiger Schlüssel",
+  "tryAgain": "Noch einmal versuchen",
+  "viewRecoveryKey": "Wiederherstellungsschlüssel anzeigen",
+  "confirmRecoveryKey": "Wiederherstellungsschlüssel bestätigen",
+  "recoveryKeyVerifyReason": "Ihr Wiederherstellungsschlüssel ist der einzige Weg ihre Fotos wiederherzustellen sollten, sie ihr Passwort vergessen. Sie finden ihren Wiederherstellungsschlüssel unter Einstellungen > Account.\n\nBitte tragen sie ihren Wiederherstellungsschlüssel hier ein um zu prüfen ob sie in korrekt abgespeichert haben.",
+  "confirmYourRecoveryKey": "Wiederherstellungsschlüssel bestätigen",
+  "confirm": "Bestätigen",
+  "emailYourLogs": "Email mit Logs senden",
+  "pleaseSendTheLogsTo": "Bitte Logs an {toEmail} senden",
+  "copyEmailAddress": "Emailadresse kopieren",
+  "exportLogs": "Logs exportieren",
+  "enterYourRecoveryKey": "Wiederherstellungsschlüssel eingeben",
+  "tempErrorContactSupportIfPersists": "Etwas ist schiefgelaufen. Bitte versuchen sie es später noch einmal. Sollte der Fehler weiter bestehen, kontaktieren sie unser Supportteam.",
+  "itLooksLikeSomethingWentWrongPleaseRetryAfterSome": "Etwas ist schiefgelaufen. Bitte versuchen sie es später noch einmal. Sollte der Fehler weiter bestehen, kontaktieren sie unser Supportteam.",
+  "about": "Über uns",
+  "weAreOpenSource": "Wir sind Opensource!",
+  "privacy": "Datenschutz",
+  "terms": "Bestimmungen",
+  "checkForUpdates": "Auf Updates prüfen",
+  "downloadUpdate": "Herunterladen",
+  "criticalUpdateAvailable": "Kritische neue Aktualisierung ist verfügbar",
+  "updateAvailable": "Aktualisierung verfügbar",
+  "update": "Aktualisierung",
+  "checking": "Prüfe...",
+  "youAreOnTheLatestVersion": "Sie haben die aktuellste Version",
+  "warning": "Warnung",
+  "exportWarningDesc": "Die exportierte Datei enthält vertrauliche Informationen. Bitte sicher speichern.",
+  "iUnderStand": "Verstanden",
+  "@iUnderStand": {
+    "description": "Text for the button to confirm the user understands the warning"
+  },
+  "authToExportCodes": "Bitte authentifizieren, um ihre Codes zu exportieren",
+  "importSuccessTitle": "Geschafft!",
+  "importSuccessDesc": "Sie haben {count} Codes importiert!",
+  "@importSuccessDesc": {
+    "placeholders": {
+      "count": {
+        "description": "The number of codes imported",
+        "type": "int",
+        "example": "1"
+      }
+    }
+  },
+  "sorry": "Entschuldigen sie",
+  "importFailureDesc": "Ausgewählte Datei ließ sich nicht verarbeiten.\nBitte wenden sie sich an support@ente.io für Hilfe!",
+  "pendingSyncs": "Warnung",
+  "pendingSyncsWarningBody": "Einige Codes wurden nicht gesichert.\n\nBitte gehen sie sicher, dass sie einen Backupcode für diese Codes haben bevor sie sich ausloggen.",
+  "checkInboxAndSpamFolder": "Bitte überprüfe deinen E-Mail-Posteingang (und Spam), um die Verifizierung abzuschließen",
+  "tapToEnterCode": "Antippen, um den Code einzugeben",
+  "resendEmail": "E-Mail erneut senden",
+  "weHaveSendEmailTo": "Wir haben eine E-Mail an <green>{email}</green> gesendet",
+  "@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": "Aktive Sitzungen",
+  "somethingWentWrongPleaseTryAgain": "Ein Fehler ist aufgetreten, bitte versuche es erneut",
+  "thisWillLogYouOutOfThisDevice": "Dadurch wirst du von diesem Gerät abgemeldet!",
+  "thisWillLogYouOutOfTheFollowingDevice": "Dadurch wirst du von folgendem Gerät abgemeldet:",
+  "terminateSession": "Sitzungen beenden?",
+  "terminate": "Beenden",
+  "thisDevice": "Dieses Gerät",
+  "toResetVerifyEmail": "Um Ihr Passwort zurückzusetzen, verifizieren Sie bitte zuerst Ihre E-Mail-Adresse.",
+  "thisEmailIsAlreadyInUse": "Diese E-Mail-Adresse wird bereits verwendet",
+  "verificationFailedPleaseTryAgain": "Verifizierung fehlgeschlagen, bitte versuchen Sie es erneut",
+  "yourVerificationCodeHasExpired": "Ihr Bestätigungscode ist abgelaufen",
+  "incorrectCode": "Falscher Code",
+  "sorryTheCodeYouveEnteredIsIncorrect": "Leider ist der eingegebene Code falsch",
+  "emailChangedTo": "E-Mail-Adresse geändert zu {newEmail}",
+  "authenticationFailedPleaseTryAgain": "Authentifizierung fehlgeschlagen, versuchen Sie es bitte erneut",
+  "authenticationSuccessful": "Authentifizierung erfolgreich!",
+  "twofactorAuthenticationSuccessfullyReset": "Zwei-Faktor-Authentifizierung (2FA) erfolgreich zurückgesetzt",
+  "incorrectRecoveryKey": "Falscher Wiederherstellungs-Schlüssel",
+  "theRecoveryKeyYouEnteredIsIncorrect": "Der eingegebene Wiederherstellungs-Schlüssel ist ungültig",
+  "enterPassword": "Passwort eingeben",
+  "editCodeAuthMessage": "Authentifizieren, um Code zu bearbeiten",
+  "deleteCodeAuthMessage": "Authentifizieren, um Code zu löschen",
+  "showQRAuthMessage": "Authentifizieren, um QR-Code anzuzeigen"
+}